From 6cfd78b792a13f8a9e81df44720b30c868d59d12 Mon Sep 17 00:00:00 2001 From: Olivier Langella <olivier.langella@u-psud.fr> Date: Sat, 23 Feb 2019 23:37:36 +0100 Subject: [PATCH] glue code needed for settings dialog box and it is done --- src/gui/edit/edit_settings/edit_settings.ui | 66 ++++++++++++++++----- src/gui/edit/edit_settings/editsettings.cpp | 14 +++++ src/gui/edit/edit_settings/editsettings.h | 6 +- 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/src/gui/edit/edit_settings/edit_settings.ui b/src/gui/edit/edit_settings/edit_settings.ui index 8ca058e2c..2116bee70 100644 --- a/src/gui/edit/edit_settings/edit_settings.ui +++ b/src/gui/edit/edit_settings/edit_settings.ui @@ -16,22 +16,53 @@ <property name="windowTitle"> <string>About</string> </property> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="geometry"> - <rect> - <x>9</x> - <y>263</y> - <width>166</width> - <height>28</height> - </rect> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QFormLayout" name="formLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>MSrun XIC reader</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QRadioButton" name="xic_reader_buffered_button"> + <property name="text"> + <string>direct</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">xic_reader_button_group</string> + </attribute> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButton"> + <property name="text"> + <string>&buffered</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">xic_reader_button_group</string> + </attribute> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> </widget> <resources> <include location="../../xtpcpp.qrc"/> @@ -70,4 +101,7 @@ </hints> </connection> </connections> + <buttongroups> + <buttongroup name="xic_reader_button_group"/> + </buttongroups> </ui> diff --git a/src/gui/edit/edit_settings/editsettings.cpp b/src/gui/edit/edit_settings/editsettings.cpp index a8809f459..9d15ecd0e 100644 --- a/src/gui/edit/edit_settings/editsettings.cpp +++ b/src/gui/edit/edit_settings/editsettings.cpp @@ -47,3 +47,17 @@ EditSettings::~EditSettings() delete ui; qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__; } + + +void +EditSettings::done(int r) +{ + if(QDialog::Accepted == r) // ok was pressed + { + } + else // cancel, close or exc was pressed + { + QDialog::done(r); + return; + } +} diff --git a/src/gui/edit/edit_settings/editsettings.h b/src/gui/edit/edit_settings/editsettings.h index 63dd425ab..0789f5b33 100644 --- a/src/gui/edit/edit_settings/editsettings.h +++ b/src/gui/edit/edit_settings/editsettings.h @@ -41,11 +41,13 @@ class EditSettings : public QDialog { Q_OBJECT - + private: Ui::EditSettingsDialog *ui; - + protected: + void done(int r) override; + public: explicit EditSettings(QWidget *parent = 0); ~EditSettings(); -- GitLab