Mercurial > octave
diff libgui/src/dialog.h @ 27551:564bba235594
move some dialog slot functions from octave-qobject.cc to dialog.cc
* dialog.h, dialog.cc (QUIWidgetCreator::handle_create_dialog,
QUIWidgetCreator::handle_create_listview,
QUIWidgetCreator::handle_create_inputlayout,
QUIWidgetCreator::handle_create_filedialog):
Move here from base_qobject. Connect finish signals and slots here
instead of in dialog object constructors.
(QUIWidgetCreator::QUIWidgetCreator): Connect create signals and slots
for dialogs here instead of in base_qobject::connect_uiwidget_links
* octave-qobject.h, octave-qobject.cc (base_qobject::base_qobject):
Don't call connect_uiwidget_links.
(base_qobject::connect_uiwidget_links): Delete.
(base_qobject::handle_create_dialog,
base_qobject::handle_create_listview,
base_qobject::handle_create_inputlayout,
base_qobject::handle_create_filedialog): Delete.
* qt-interpreter-events.cc
(qt_interpreter_events::qt_interpreter_events): Call qRegisterMetaType
for QIntList and QFloatList here instead of in
base_qobject::connect_uiwidget_links.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 24 Oct 2019 01:50:58 -0400 |
| parents | 5189bfa8ad2a |
| children | de5129cb0796 |
line wrap: on
line diff
--- a/libgui/src/dialog.h Thu Oct 24 01:26:31 2019 -0400 +++ b/libgui/src/dialog.h Thu Oct 24 01:50:58 2019 -0400 @@ -143,12 +143,35 @@ const QString& multimode); public slots: + void handle_create_dialog (const QString& message, const QString& title, + const QString& icon, const QStringList& button, + const QString& defbutton, + const QStringList& role); + void dialog_button_clicked (QAbstractButton *button); + void handle_create_listview (const QStringList& list, const QString& mode, + int width, int height, + const QIntList& initial, + const QString& name, + const QStringList& prompt, + const QString& ok_string, + const QString& cancel_string); + void list_select_finished (const QIntList& selected, int button_pressed); + void handle_create_inputlayout (const QStringList&, const QString&, + const QFloatList&, const QFloatList&, + const QStringList&); + void input_finished (const QStringList& input, int button_pressed); + void handle_create_filedialog (const QStringList& filters, + const QString& title, + const QString& filename, + const QString& dirname, + const QString& multimode); + void filedialog_finished (const QStringList& files, const QString& path, int filterindex);