Mercurial > hg > octave-nkf
diff scripts/ui/questdlg.m @ 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 | ff061068a66c |
children | e39f00a32dc7 |
line wrap: on
line diff
--- a/scripts/ui/questdlg.m +++ b/scripts/ui/questdlg.m @@ -70,10 +70,18 @@ options{3} = "Cancel"; # button3 options{4} = "Yes"; # default + defbtn_error_msg = "questdlg: DEFAULT must match one of the button options"; + switch (numel (varargin)) + case 0 + ## use default default + case 1 ## default button string options{4} = varargin{1}; # default + if (! any (strcmp (options{4}, options(1:3)))) + error (defbtn_error_msg); + end case 3 ## two buttons and default button string @@ -81,6 +89,9 @@ options{2} = ""; # not used, no middle button options{3} = varargin{2}; # button3 options{4} = varargin{3}; # default + if (! any (strcmp (options{4}, options([1 3])))) + error (defbtn_error_msg); + end case 4 ## three buttons and default button string @@ -88,14 +99,76 @@ options{2} = varargin{2}; # button2 options{3} = varargin{3}; # button3 options{4} = varargin{4}; # default + if (! any (strcmp (options{4}, options(1:3)))) + error (defbtn_error_msg); + end otherwise print_usage (); endswitch - btn = javaMethod ("questdlg", "org.octave.JDialogBox", msg, - title, options); + if (__octave_link_enabled__ ()) + btn = __octave_link_question_dialog__ (msg, title, options{1}, options{2}, + options{3}, options{4}); + elseif (__have_feature__ ("JAVA")) + btn = javaMethod ("questdlg", "org.octave.JDialogBox", msg, + title, options); + else + error ("questdlg is not available in this version of Octave"); + endif endfunction +%!demo +%! disp('- test questdlg with two buttons'); +%! a = questdlg('Would you like some free money?',... +%! '$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $',... +%! 'No', 'Cancel', 'Cancel'); +%! if strcmp (a, 'No') +%! msgbox('Suit yourself.', 'Message Box'); +%! endif + +%!demo +%! disp('- test questdlg with message and title only.'); +%! a = 'No'; +%! c = 0; +%! while (strcmp(a, 'No') || !c) +%! a = questdlg('Close this Question Dialog?', 'Reductio Ad Absurdum'); +%! if strcmp(a, 'Yes') +%! q = 'Are you sure?'; +%! while (strcmp(a, 'Yes') && !c) +%! a = questdlg(q, 'Reductio Ad Absurdum'); +%! word = ' really'; +%! i = strfind(q, word); +%! if isempty( i ) +%! i = strfind(q, ' sure'); +%! q = [q '!']; +%! else +%! word = [word ',']; +%! endif +%! q = [q(1:i-1) word q(i:end)]; +%! endwhile +%! endif +%! if strcmp(a, 'Cancel') +%! warndlg('Answer "Yes" or "No".', 'Warning Dialog'); +%! a = 'No'; +%! c = 1; +%! endif +%! endwhile +%! msgbox('Whew!'); + +%!demo +%! disp('- test questdlg with five inputs'); +%! ans = questdlg('Are you ready Steve?', 'Brian', 'No', 'Uh huh', 'Uh huh'); +%! if !strcmp (ans, 'No') +%! ans = questdlg ('Andy?', 'Brian', 'No', 'Yeah', 'Yeah'); +%! if !strcmp (ans, 'No') +%! ans = questdlg ('Mick?', 'Brian', 'No', 'Okay', 'Okay'); +%! if !strcmp (ans, 'No') +%! ans = msgbox ("Well all right, fellas. \n\n Let''s GO!!!!!",... +%! 'Ballroom Blitz', 'none'); +%! endif +%! endif +%! endif +