Mercurial > hg > octave-lyh
annotate scripts/ui/private/message_dialog.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 | 7f2395651a1c |
children | 1c89599167a6 |
rev | line source |
---|---|
16508
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 ## Copyright (C) 2010 Martin Hepperle |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 ## |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 ## This file is part of Octave. |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 ## |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 ## Octave is free software; you can redistribute it and/or modify it |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 ## under the terms of the GNU General Public License as published by |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 ## the Free Software Foundation; either version 3 of the License, or (at |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 ## your option) any later version. |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 ## |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 ## Octave is distributed in the hope that it will be useful, but |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 ## General Public License for more details. |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 ## |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 ## You should have received a copy of the GNU General Public License |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 ## along with Octave; see the file COPYING. If not, see |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 ## <http://www.gnu.org/licenses/>. |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 ## -*- texinfo -*- |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 ## @deftypefn {Function File} {@var{h} =} message_dialog (@var{caller}, @var{msg}, @var{title}, @var{icon}) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 ## Undocumented internal function. |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 ## @end deftypefn |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 function retval = message_dialog (caller, msg, title = "", icon) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 if (! ischar (msg)) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 if (iscell (msg)) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 msg = sprintf ("%s\n", msg{:}); |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 msg(end) = ""; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 else |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 error ("%s: MSG must be a character string or cellstr array", caller); |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 endif |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 endif |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 if (! ischar (title)) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 error ("%s: TITLE must be a character string", caller); |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 endif |
16551
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
38 |
16508
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 dlg = "emptydlg"; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 if (nargin == 4) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 switch (icon) |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 case "error" |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 dlg = "errordlg"; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 case "help" |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 dlg = "helpdlg"; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 case "warn" |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 dlg = "warndlg"; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 case "none" |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 dlg = "emptydlg"; |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 otherwise |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 error ("%s: ICON is not a valid type", caller); |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 endswitch |
16551
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
53 else |
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
54 icon = "none"; |
16512
7f2395651a1c
dialog boxes with Qt widgets
Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org>
parents:
16508
diff
changeset
|
55 endif |
7f2395651a1c
dialog boxes with Qt widgets
Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org>
parents:
16508
diff
changeset
|
56 |
16551
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
57 if (__octave_link_enabled__ ()) |
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
58 retval = __octave_link_message_dialog__ (icon, msg, title); |
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
59 elseif (__have_feature__ ("JAVA")) |
16508
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 retval = javaMethod (dlg, "org.octave.JDialogBox", msg, title); |
16551
6ae555fc8c43
Add questdlg dialog function and fix variety of dialog bugs.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16512
diff
changeset
|
61 else |
16508
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 error ("%s is not available in this version of Octave", dlg); |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 endif |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
64 |
f19e24c97b20
move common warndlg, errordlg, helpdlg, and msgbox code to private function
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
65 endfunction |