Mercurial > hg > octave-lyh
comparison libgui/src/main-window.h @ 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 | 49b059bf27c7 |
children | db045633405c |
comparison
equal
deleted
inserted
replaced
16511:eee1b78d031f | 16512:7f2395651a1c |
---|---|
42 | 42 |
43 // QTerminal includes | 43 // QTerminal includes |
44 #include "QTerminal.h" | 44 #include "QTerminal.h" |
45 | 45 |
46 // Own includes | 46 // Own includes |
47 #include "dialog.h" | |
47 #include "resource-manager.h" | 48 #include "resource-manager.h" |
48 #include "workspace-model.h" | 49 #include "workspace-model.h" |
49 #include "workspace-view.h" | 50 #include "workspace-view.h" |
50 #include "history-dock-widget.h" | 51 #include "history-dock-widget.h" |
51 #include "files-dock-widget.h" | 52 #include "files-dock-widget.h" |
117 | 118 |
118 void read_settings (void); | 119 void read_settings (void); |
119 void write_settings (void); | 120 void write_settings (void); |
120 void connect_visibility_changed (void); | 121 void connect_visibility_changed (void); |
121 | 122 |
123 void connect_uiwidget_links (); | |
124 | |
125 void handle_create_dialog (const QString& message, const QString& title, | |
126 const QString& icon, const QStringList& button, | |
127 const QString& defbutton, | |
128 const QStringList& role); | |
129 | |
130 void handle_create_listview (const QStringList& list, const QString& mode, | |
131 int width, int height, | |
132 const QIntList& initial, | |
133 const QString& name, | |
134 const QString& prompt_string, | |
135 const QString& ok_string, | |
136 const QString& cancel_string); | |
137 | |
138 void handle_create_inputlayout (const QStringList&, const QString&, | |
139 const QIntList&, const QIntList&, | |
140 const QStringList&); | |
141 | |
122 protected: | 142 protected: |
123 void closeEvent (QCloseEvent * closeEvent); | 143 void closeEvent (QCloseEvent * closeEvent); |
124 | 144 |
125 private: | 145 private: |
126 | 146 |