Mercurial > hg > octave-jordi

diff libgui/src/settings-dialog.ui @ 20701:b6b16d8c8b57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
possibility to set all shortcuts to default values and check overwriting * settings-dialog.cc (settings_dialog): connect new button to new slot; (import_shortcut_set, export_shortcut_set): calling common function shortcut_manager::import_export with an integer for the desired action; (default_shortcut_set): new slot for new button, calling sortcut_manager::import_export with an integer for the desired action * settings-dialog.h: new slot default_shortcut_set * settings-dialog.ui: new button for setting default values to the shortcuts * shortcut-manager.cc (import_shortcuts): take default values when settings pointer is 0; (overwrite_all_shortcuts): new private function checking whether the user wants to overwrite all current shrotcuts; (do_import_export): action import, export, set to default depends on integer parameter; return parameter indicates success of the action; * shortcut-manager.h: enum with actions for import and export, import_export and do_import_export with integer instead of bool parameter, do_import_export returns a boolean
author Torsten <ttl@justmail.de>
date Sat, 14 Nov 2015 13:31:00 +0100 (2015-11-14)
parents be130eb147f8
children fec7cc73507b
line wrap: on
line diff
--- a/libgui/src/settings-dialog.ui
+++ b/libgui/src/settings-dialog.ui
@@ -1986,14 +1986,10 @@
                <property name="topMargin">
                 <number>10</number>
                </property>
-               <item row="2" column="0">
-                <layout class="QHBoxLayout" name="horizontalLayout_16">
-                 <property name="topMargin">
-                  <number>0</number>
-                 </property>
-                </layout>
-               </item>
-               <item row="0" column="2">
+               <property name="bottomMargin">
+                <number>10</number>
+               </property>
+               <item row="0" column="3">
                 <spacer name="horizontalSpacer_26">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
@@ -2008,6 +2004,9 @@
                </item>
                <item row="0" column="0">
                 <widget class="QPushButton" name="btn_import_shortcut_set">
+                 <property name="toolTip">
+                  <string>Import shortcut set</string>
+                 </property>
                  <property name="text">
                   <string>Import</string>
                  </property>
@@ -2015,11 +2014,24 @@
                </item>
                <item row="0" column="1">
                 <widget class="QPushButton" name="btn_export_shortcut_set">
+                 <property name="toolTip">
+                  <string>Export current shortcut set</string>
+                 </property>
                  <property name="text">
                   <string>Export</string>
                  </property>
                 </widget>
                </item>
+               <item row="0" column="2">
+                <widget class="QPushButton" name="btn_default_shortcut_set">
+                 <property name="toolTip">
+                  <string>Reset shortcuts to their defaults</string>
+                 </property>
+                 <property name="text">
+                  <string>Default</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
              <item>