Mercurial > octave

diff libgui/src/shortcut-manager.h @ 18822:3f6280d0a36b gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow export and import of shortcut sets * settings-dialog.ui: new buttons for import/export of one of the shortcut sets * settings-dialog.cc (constrctor): bundle the code for the shortcut settings, connect slots to signals from the import/export-buttons; (im-/export_shortcut_set1/2): four new slots for the buttons signals * settings-dialog.h: new slots * shortcut-manager.cc (do_fill_treewidget): some code formatting; (do_write_shortcuts): set and settings as parameters, distinguish if all or only one set has to be written into the file; (import_shortcuts): new function for reading a shortcut set from a settings file; (do_import_export): new function called from the static wrapper function import_export for importing or exporting a shortcut sets; (enter_shortcut::enter_shortcut, enter_shortcut::handle_direct_shortcut, enter_shortcut::keyPressevent): added some comments * shortcut-manager.h (write_shortcuts): new parameters set and settings; (import_export): new static function; (do_write_shortcuts): new parameters set and settings; (do_import_export, import_shortcuts): new functions
author Torsten <ttl@justmail.de>
date Thu, 12 Jun 2014 18:45:29 +0200
parents 95249367d6fa
children ff56a9899101
line wrap: on
line diff
--- a/libgui/src/shortcut-manager.h	Sun Jun 08 16:34:22 2014 -0700
+++ b/libgui/src/shortcut-manager.h	Thu Jun 12 18:45:29 2014 +0200
@@ -63,10 +63,10 @@
       instance->do_init_data ();
   }
 
-  static void write_shortcuts ()
+  static void write_shortcuts (int set, QSettings *settings)
   {
     if (instance_ok ())
-      instance->do_write_shortcuts ();
+      instance->do_write_shortcuts (set, settings);
   }
 
   static void set_shortcut (QAction *action, const QString& key)
@@ -81,6 +81,12 @@
       instance->do_fill_treewidget (tree_view);
   }
 
+  static void import_export (bool import, int set)
+  {
+    if (instance_ok ())
+      instance->do_import_export (import, set);
+  }
+
 public slots:
 
 signals:
@@ -107,10 +113,12 @@
 
   void init (QString, QString, QKeySequence);
   void do_init_data ();
-  void do_write_shortcuts ();
+  void do_write_shortcuts (int set, QSettings *settings);
   void do_set_shortcut (QAction *action, const QString& key);
   void do_fill_treewidget (QTreeWidget *tree_view);
+  void do_import_export (bool import, int set);
   void shortcut_dialog (int);
+  void import_shortcuts (int set, QSettings *settings);
 
   struct shortcut_t
   {