Mercurial > hg > octave-jordi

diff libgui/src/settings-dialog.ui @ 19630:4e85ca0b4887 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add apply button to the settings dialog (bug #44081) * main-window.cc (process_settings_dialog_request) connect signal for applying the changes, settings dialog is non modal now; (request_reload_settings): new slot for siganl from settings dialog when when apply button was clicked * main-window .h: new slot request_reload_settings * settings-dialog.cc (constructor): connect signal when button box is clicked to the new slot button_clicked; (button_clicked): new slot * settings-dialog.h: new signal and related slot * settings-dialog.ui: new applay button
author Torsten <ttl@justmail.de>
date Sun, 25 Jan 2015 12:22:48 +0100
parents f9a944b9e1cb
children 101ce4eaa56c
line wrap: on
line diff
--- a/libgui/src/settings-dialog.ui
+++ b/libgui/src/settings-dialog.ui
@@ -2273,9 +2273,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
+    <widget class="QDialogButtonBox" name="button_box">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -2460,7 +2460,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
+   <sender>button_box</sender>
    <signal>accepted()</signal>
    <receiver>settings_dialog</receiver>
    <slot>accept()</slot>
@@ -2476,7 +2476,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
+   <sender>button_box</sender>
    <signal>rejected()</signal>
    <receiver>settings_dialog</receiver>
    <slot>reject()</slot>