Mercurial > hg > octave-lyh
view libgui/src/module.mk @ 16512:7f2395651a1c
dialog boxes with Qt widgets
* dialog.h, dialog.cc: New files.
* libgui/src/module.mk: Update file lists.
* main-window.h, main-window.ccmain_window::connect_uiwidget_links,
main_window::handle_create_dialog,
main_window::handle_create_listview,
main_window::handle_create_inputlayout): New functions.
(main_window::construct): Call connect_uiwidget_links.
* octave-link.h, octave-link.cc (octave_link::message_dialog,
octave_link::do_message_dialog, octave_link::list_dialog,
octave_link::do_list_dialog, octave_link::input_dialog,
octave_link::do_input_dialog): New functions.
* octave-qt-link.h, octave-qt-link.cc (octave_qt_link::message_dialog,
octave_qt_link::do_message_dialog, octave_qt_link::list_dialog,
octave_qt_link::do_list_dialog, octave_qt_link::input_dialog,
octave_qt_link::do_input_dialog, make_qstring_list): New functions.
* octave-link.cc (F__octave_link_edit_file__): Call
flush_octave_stdout before running the edit file action.
(F__octave_link_message_dialog__, F__octave_link_list_dialog__,
__octave_link_input_dialog__): New functions.
* errordlg.m, helpdlg.m, inputdlg.m, listdlg.m, msgbox.m, warndlg.m:
New demos adapted from dlgtest.m
* dlgtest.m: Delete.
* scripts/java/module.mk: Remove it from the list of files.
* inputdlg.m: Try __octave_link_input_dialog__ first. Only try java
method if JAVA feature is available.
* listdlg.m: Likwise, for __octave_link_list_dialog__.
* private/message_dialog.m: Likewise, for
__octave_link_message_dialog__.
author | Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 13 Apr 2013 15:22:34 -0400 |
parents | 8cb12cf9ca32 |
children | 3e8fd0c479b4 |
line wrap: on
line source
EXTRA_DIST += \ src/module.mk \ src/resource.qrc \ $(octave_gui_UI) \ $(octave_gui_ICONS) octave_gui_ICONS = \ src/icons/arrow_right.png \ src/icons/artsbuilderexecute.png \ src/icons/bookmark.png \ src/icons/bp_next.png \ src/icons/bp_prev.png \ src/icons/bp_rm_all.png \ src/icons/bp_toggle.png \ src/icons/chat.png \ src/icons/configure.png \ src/icons/db_cont.png \ src/icons/db_step_in.png \ src/icons/db_step_out.png \ src/icons/db_step.png \ src/icons/db_stop.png \ src/icons/editcopy.png \ src/icons/editcut.png \ src/icons/editdelete.png \ src/icons/editpaste.png \ src/icons/filenew.png \ src/icons/fileopen.png \ src/icons/fileprint.png \ src/icons/filesaveas.png \ src/icons/filesave.png \ src/icons/find.png \ src/icons/folder_new.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ src/icons/graphic_logo_HistoryDockWidget.png \ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/help_index.png \ src/icons/icons_license \ src/icons/jabber_protocol.png \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ src/icons/letter_logo_HistoryDockWidget.png \ src/icons/letter_logo_TerminalDockWidget.png \ src/icons/letter_logo_WorkspaceView.png \ src/icons/logo.png \ src/icons/ok.png \ src/icons/question.png \ src/icons/redled.png \ src/icons/redo.png \ src/icons/reload.png \ src/icons/search.png \ src/icons/star.png \ src/icons/stop.png \ src/icons/terminal.png \ src/icons/undo.png \ src/icons/up.png \ src/icons/zoom-in.png \ src/icons/zoom-out.png octave_gui_MOC = if AMCOND_HAVE_QSCINTILLA octave_gui_MOC += \ src/m-editor/moc-file-editor-interface.cc \ src/m-editor/moc-file-editor-tab.cc \ src/m-editor/moc-file-editor.cc \ src/m-editor/moc-find-dialog.cc \ src/m-editor/moc-lexer-octave-gui.cc endif octave_gui_MOC += \ src/moc-dialog.cc \ src/moc-documentation-dock-widget.cc \ src/moc-files-dock-widget.cc \ src/moc-history-dock-widget.cc \ src/moc-main-window.cc \ src/moc-octave-qt-link.cc \ src/moc-settings-dialog.cc \ src/moc-terminal-dock-widget.cc \ src/moc-color-picker.cc \ src/moc-welcome-wizard.cc \ src/moc-workspace-model.cc \ src/moc-workspace-view.cc \ src/qtinfo/moc-parser.cc \ src/qtinfo/moc-webinfo.cc \ src/moc-octave-dock-widget.cc octave_gui_RC = src/qrc-resource.cc octave_gui_UI = \ src/settings-dialog.ui \ src/welcome-wizard.ui octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) BUILT_SOURCES += $(octave_gui_UI_H) noinst_HEADERS += \ src/dialog.h \ src/octave-dock-widget.h \ src/documentation-dock-widget.h \ src/files-dock-widget.h \ src/history-dock-widget.h \ src/m-editor/file-editor-interface.h \ src/m-editor/file-editor-tab.h \ src/m-editor/file-editor.h \ src/m-editor/find-dialog.h \ src/m-editor/lexer-octave-gui.h \ src/main-window.h \ src/octave-gui.h \ src/octave-main-thread.h \ src/octave-qt-link.h \ src/qtinfo/parser.h \ src/qtinfo/webinfo.h \ src/resource-manager.h \ src/settings-dialog.h \ src/terminal-dock-widget.h \ src/color-picker.h \ src/welcome-wizard.h \ src/workspace-model.h \ src/workspace-view.h src_libgui_src_la_SOURCES = \ src/dialog.cc \ src/documentation-dock-widget.cc \ src/files-dock-widget.cc \ src/history-dock-widget.cc \ src/m-editor/file-editor-tab.cc \ src/m-editor/file-editor.cc \ src/m-editor/find-dialog.cc \ src/m-editor/lexer-octave-gui.cc \ src/main-window.cc \ src/octave-gui.cc \ src/octave-main-thread.cc \ src/octave-qt-link.cc \ src/qtinfo/parser.cc \ src/qtinfo/webinfo.cc \ src/resource-manager.cc \ src/settings-dialog.cc \ src/terminal-dock-widget.cc \ src/color-picker.cc \ src/welcome-wizard.cc \ src/workspace-model.cc \ src/workspace-view.cc nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ @QT_CPPFLAGS@ \ -I$(srcdir)/qterminal/libqterminal \ -Isrc -I$(srcdir)/src \ -I$(srcdir)/src/m-editor \ -I$(srcdir)/src/qtinfo \ -I$(top_srcdir)/liboctave/cruft/misc \ -I$(top_srcdir)/liboctave/array \ -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ -I$(top_srcdir)/libinterp/octave-value src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += src/libgui-src.la CLEANFILES += \ $(octave_gui_MOC) \ $(octave_gui_UI_H) \ $(octave_gui_RC)