Mercurial > octave-nkf
diff libgui/src/dialog.h @ 16551:6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
* octave-qt-link.cc (octave_qt_link::do_message_dialog):
Change initializer from QString to QString::fromStdString(dlg).
(octave_qt_link::do_question_dialog): New function. Make all buttons
AcceptRole. Signal dialog creation. Go to wait state. Get dialog
button result when awakened.
(octave_qt_link::do_list_dialog): Change std string 'prompt_string' to
std list of std string 'prompt'. Use make_qstring_list(prompt).
(octave_qt_link::do_input_dialog): Change 'nr' and 'nc' to std list of
float. Use QFloatList::fromStdList(nc).
* octave-qt-link.h (octave_qt_link : QObject, public octave_link): Add
member do_question_dialog.
(octave_qt_link::do_list_dialog): Use std list of std string for
prompt.
(octave_qt_link::do_input_dialog): Change 'nr' and 'nc' to std list of
float.
* octave-link.cc (__octave_link_question_dialog__): New
builtin. Translate args to inputs of octave_link::question_dialog
function.
(__octave_link_list_dialog__): Retain prompt string cell list as a std
list of std string.
(__octave_link_input_dialog__): Make 'nr' and 'nc' std list of float.
* octave-link.h (octave_link::question_dialog,
octave_link::do_question_dialog): Add.
(octave_link::list_dialog, octave_link::do_list_dialog): Change prompt
to std list of std string.
(octave_link::input_dialog, octave_link::do_input_dialog): Change 'nr'
and 'nc' to std list of float.
* errordlg.m (errordlg): Make retval return variable. Add "error" icon
as message_dialog input.
* helpdlg.m (helpdlg): Make retval return variable. Add "help" icon as
message_dialog input.
* warndlg.m (warndlg): Add "warn" icon as message_dialog input.
* message_dialog.m (message_dialog): Define default icon "none". Use
dlg variable with icon variable as input to
__octave_link_message_dialog__. Use __octave_link_enabled__ rather
than return value.
* inputdlg.m (inputdlg): Round up rowscols to integer. Replace
iscell(cstr) with __octave_link_enabled__.
* listdlg.m (listdlg): Correct indentation. Change default selmode
from "multiple" to "Multiple". Make default prompt {}. Check valid
selmode entry. Use __octave_link_enabled__ rather than ok return
value. Remove FIXME note. Use Rich Text in prompt of demo. Add demo
using ListSize.
* questdlg.m (questdlg): Add case 0 to switch. Add error message for
default button not matching options. In all cases, check that default
button matches an button option. Add __octave_link_question_dialog__
call conditioned under __octave_link_enabled__. Add three demos.
* dialog.cc (QUIWidgetCreator::dialog_finished): Remove.
(QUIWidgetCreator::dialog_button_clicked): Test that button pointer is
nonzero. Move dialog_result assignment and waitcondition.wakeAll here.
(MessageDialog::MessageDialog): If title "", change to " ". Reverse
order that buttons are installed. Remove signal 'finished' connection.
(ListDialog::ListDialog): Change prompt from QString to QStringList.
Make list items noneditable. Add Rich Text support to prompt, place
RT <br> between prompt list lines. Use label for prompt. Disable
select_all button if not "Multiple". Remove horizontal group box. If
title "", change to " ".
(InputDialog::InputDialog): Change 'nr' and 'nc' to QFloatList.
Define pre-processor variables, then undefine. If title "", change to
" ".
* dialog.h (QUIWidgetCreator::signal_listviewQUI,
WidgetCreator::create_listview): Change QString 'prompt_string'
to QStringList 'prompt'.
(QUIWidgetCreator::signal_inputlayout,
QUIWidgetCreator::create_inputlayout): Use QFloatList for 'nr' and
'nc'.
(QUIWidgetCreator::dialog_finished): Remove.
(MessageDialog::closeEvent): New override, emitting buttonClicked(0).
(ListDialog::ListDialog): Change QString 'prompt_string' to
QStringList 'prompt'.
(InputDialog::InputDialog): Use QFloatList for 'nr' and 'nc'.
* main_window.cc, main_window.h: Make function call changes that match
dialog.h changes.
(main_window::find_files_finished): Remove unused 'button' variable.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Mon, 22 Apr 2013 15:07:13 -0400 |
parents | 3cd80afc3509 |
children | e4b94abfeb96 |
line wrap: on
line diff
--- a/libgui/src/dialog.h Mon Apr 22 11:50:40 2013 -0400 +++ b/libgui/src/dialog.h Mon Apr 22 15:07:13 2013 -0400 @@ -58,7 +58,7 @@ { // Use the last button in the list as the reject result, i.e., when no - // button is pressed such as in the case of <esc> and close button. + // button is pressed such as in the case of the upper right close tab. if (!button.isEmpty ()) dialog_button = button.last (); @@ -75,14 +75,14 @@ bool signal_listview (const QStringList& list, const QString& mode, int wd, int ht, const QList<int>& initial, - const QString& name, const QString& prompt_string, + const QString& name, const QStringList& prompt, const QString& ok_string, const QString& cancel_string) { if (list.isEmpty ()) return false; emit create_listview (list, mode, wd, ht, initial, name, - prompt_string, ok_string, cancel_string); + prompt, ok_string, cancel_string); return true; }; @@ -90,7 +90,7 @@ const QIntList *get_list_index (void) { return list_index; } bool signal_inputlayout (const QStringList& prompt, const QString& title, - const QIntList& nr, const QIntList& nc, + const QFloatList& nr, const QFloatList& nc, const QStringList& defaults) { if (prompt.isEmpty ()) @@ -126,19 +126,17 @@ const QStringList&, const QString&, const QStringList&); void create_listview (const QStringList&, const QString&, int, int, - const QIntList&, const QString&, const QString&, + const QIntList&, const QString&, const QStringList&, const QString&, const QString&); void create_inputlayout (const QStringList&, const QString&, - const QIntList&, const QIntList&, + const QFloatList&, const QFloatList&, const QStringList&); void create_debug_cd_or_addpath_dialog (const QString&, const QString&, bool); public slots: - void dialog_finished (int result); - void dialog_button_clicked (QAbstractButton *button); void list_select_finished (const QIntList& selected, @@ -167,6 +165,7 @@ extern QUIWidgetCreator uiwidget_creator; + class MessageDialog : public QMessageBox { Q_OBJECT @@ -177,6 +176,15 @@ const QString& icon, const QStringList& button, const QString& defbutton, const QStringList& role); + +private: + + void closeEvent (QCloseEvent *) + { + // Reroute the close tab to a button click so there is only a single + // route to waking the wait condition. + emit buttonClicked (0); + } }; @@ -190,7 +198,7 @@ explicit ListDialog (const QStringList& list, const QString& mode, int width, int height, const QList<int>& initial, - const QString& name, const QString& prompt_string, + const QString& name, const QStringList& prompt, const QString& ok_string, const QString& cancel_string); signals: @@ -216,7 +224,7 @@ public: explicit InputDialog (const QStringList& prompt, const QString& title, - const QIntList& nr, const QIntList& nc, + const QFloatList& nr, const QFloatList& nc, const QStringList& defaults); signals: