Mercurial > octave
diff libinterp/interpfcn/octave-link.cc @ 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 | 6a8e63dadfad |
children | 8fc1f6535380 |
line wrap: on
line diff
--- a/libinterp/interpfcn/octave-link.cc Mon Apr 22 11:50:40 2013 -0400 +++ b/libinterp/interpfcn/octave-link.cc Mon Apr 22 15:07:13 2013 -0400 @@ -154,6 +154,36 @@ return retval; } +DEFUN (__octave_link_question_dialog__, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {} __octave_link_question_dialog__ (@var{msg}, @var{title}, @var{btn1}, @var{btn2}, @var{btn3}, @var{default})\n\ +Undocumented internal function.\n\ +@end deftypefn") +{ + octave_value retval; + + if (args.length () == 6) + { + std::string msg = args(0).string_value (); + std::string title = args(1).string_value (); + std::string btn1 = args(2).string_value (); + std::string btn2 = args(3).string_value (); + std::string btn3 = args(4).string_value (); + std::string btndef = args(5).string_value (); + + if (! error_state) + { + flush_octave_stdout (); + + retval = octave_link::question_dialog (msg, title, btn1, btn2, btn3, btndef); + } + else + error ("invalid arguments"); + } + + return retval; +} + DEFUN (__octave_link_list_dialog__, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} __octave_link_list_dialog__ (@var{list}, @var{mode}, @var{size}, @var{intial}, @var{name}, @var{prompt}, @var{ok_string}, @var{cancel_string})\n\ @@ -165,7 +195,7 @@ if (args.length () == 8) { Cell list = args(0).cell_value (); - const Array<std::string> tlist= list.cellstr_value (); + const Array<std::string> tlist = list.cellstr_value (); octave_idx_type nel = tlist.numel (); std::list<std::string> list_lst; for (octave_idx_type i = 0; i < nel; i++) @@ -184,7 +214,12 @@ initial_lst.push_back (initial_matrix(i)); std::string name = args(4).string_value (); - std::string prompt_string = args(5).string_value (); + list = args(5).cell_value (); + const Array<std::string> plist = list.cellstr_value (); + nel = plist.numel (); + std::list<std::string> prompt_lst; + for (octave_idx_type i = 0; i < nel; i++) + prompt_lst.push_back (plist(i)); std::string ok_string = args(6).string_value (); std::string cancel_string = args(7).string_value (); @@ -194,7 +229,7 @@ std::pair<std::list<int>, int> result = octave_link::list_dialog (list_lst, mode, width, height, - initial_lst, name, prompt_string, + initial_lst, name, prompt_lst, ok_string, cancel_string); std::list<int> items_lst = result.first; @@ -238,8 +273,8 @@ Matrix rc = args(2).matrix_value (); nel = rc.rows (); - std::list<int> nr; - std::list<int> nc; + std::list<float> nr; + std::list<float> nc; for (octave_idx_type i = 0; i < nel; i++) { nr.push_back (rc(i,0));