Mercurial > hg > octave-nkf
diff libinterp/interpfcn/octave-link.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 | 45ae1038ee89 |
| children | 6a8e63dadfad |
line wrap: on
line diff
--- a/libinterp/interpfcn/octave-link.h +++ b/libinterp/interpfcn/octave-link.h @@ -134,6 +134,42 @@ return enabled () ? instance->do_edit_file (file) : false; } + static int + message_dialog (const std::string& dlg, const std::string& msg, + const std::string& title) + { + return enabled () ? instance->do_message_dialog (dlg, msg, title) : 0; + } + + static std::pair<std::list<int>, int> + list_dialog (const std::list<std::string>& list, + const std::string& mode, + int width, int height, + const std::list<int>& initial_value, + const std::string& name, + const std::string& prompt_string, + const std::string& ok_string, + const std::string& cancel_string) + { + return enabled () + ? instance->do_list_dialog (list, mode, width, height, + initial_value, name, prompt_string, + ok_string, cancel_string) + : std::pair<std::list<int>, int> (); + } + + static std::list<std::string> + input_dialog (const std::list<std::string>& prompt, + const std::string& title, + const std::list<int>& nr, + const std::list<int>& nc, + const std::list<std::string>& defaults) + { + return enabled () + ? instance->do_input_dialog (prompt, title, nr, nc, defaults) + : std::list<std::string> (); + } + static void change_directory (const std::string& dir) { if (enabled ()) @@ -275,6 +311,27 @@ virtual bool do_edit_file (const std::string& file) = 0; + virtual int + do_message_dialog (const std::string& dlg, const std::string& msg, + const std::string& title) = 0; + + virtual std::pair<std::list<int>, int> + do_list_dialog (const std::list<std::string>& list, + const std::string& mode, + int width, int height, + const std::list<int>& initial_value, + const std::string& name, + const std::string& prompt_string, + const std::string& ok_string, + const std::string& cancel_string) = 0; + + virtual std::list<std::string> + do_input_dialog (const std::list<std::string>& prompt, + const std::string& title, + const std::list<int>& nr, + const std::list<int>& nc, + const std::list<std::string>& defaults) = 0; + virtual void do_change_directory (const std::string& dir) = 0; virtual void