Mercurial > octave
diff libgui/src/shortcut-manager.h @ 20685:be130eb147f8
provide only one set of gui shortcuts at a time
* settings-dialog.cc (settings_dialog): remove initializations of all items
related to the second shortcut set;
(write_changed_settings): remove storing the values of the second set;
(import_shortcut_set, export_shortcut_set): renamed slots for import/export;
(import_shortcut_set2, export_shortcut_set2): removed slots of second set
* settings-dialog.h: renamed and remoced slots for import/export of shortcuts
* settings-dialog.ui: removed all items related to the second shortcut set
* shortcut-manager.cc (do_init_data): shortcut structure and the used hash
only stores on shortcut now;
(do_fill_treewidget): adapt filling the table in the settings dialog;
(do_write_shortcuts): Only write the one shortcut set into the settings file;
(do_set_shortcut): Do not check for active shortcut set;
(handle_double_clicked): slot for changing a shortcut adapted to the new
table in the settings dialog;
(shortcut_dialog, shortcut_dialog_finish): only considering one shortcut set;
(import_shortcuts, do_import_export): do not consider a second set to import
or export
* shortcut-manager.h (write_shortcuts, do_write_shortcuts, import_export,
do_import_export, import_shortcuts): remove function parameter for shortcut
set;
(shortcut_t): no more arrays of QKeySequence in the structure for storing
the shortcuts;
removed class variable _selected_set
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Sun, 08 Nov 2015 11:59:50 +0100 |
| parents | aa36fb998a4d |
| children | b6b16d8c8b57 |
line wrap: on
line diff
--- a/libgui/src/shortcut-manager.h Sat Nov 07 17:24:02 2015 -0800 +++ b/libgui/src/shortcut-manager.h Sun Nov 08 11:59:50 2015 +0100 @@ -63,10 +63,10 @@ instance->do_init_data (); } - static void write_shortcuts (int set, QSettings *settings, bool closing) + static void write_shortcuts (QSettings *settings, bool closing) { if (instance_ok ()) - instance->do_write_shortcuts (set, settings, closing); + instance->do_write_shortcuts (settings, closing); } static void set_shortcut (QAction *action, const QString& key) @@ -81,10 +81,10 @@ instance->do_fill_treewidget (tree_view); } - static void import_export (bool import, int set) + static void import_export (bool import) { if (instance_ok ()) - instance->do_import_export (import, set); + instance->do_import_export (import); } public slots: @@ -113,12 +113,12 @@ void init (QString, QString, QKeySequence); void do_init_data (); - void do_write_shortcuts (int set, QSettings *settings, bool closing); + void do_write_shortcuts (QSettings *settings, bool closing); 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 do_import_export (bool import); void shortcut_dialog (int); - void import_shortcuts (int set, QSettings *settings); + void import_shortcuts (QSettings *settings); class shortcut_t { @@ -126,25 +126,15 @@ shortcut_t (void) : tree_item (0), description (), settings_key (), - actual_sc (new QKeySequence[2]), default_sc (new QKeySequence[2]) - { - actual_sc[0] = QKeySequence (); - actual_sc[1] = QKeySequence (); - - default_sc[0] = QKeySequence (); - default_sc[1] = QKeySequence (); - } + actual_sc (QKeySequence ()), default_sc (QKeySequence ()) + { } shortcut_t (const shortcut_t& x) : tree_item (x.tree_item), description (x.description), - settings_key (x.settings_key), - actual_sc (new QKeySequence[2]), default_sc (new QKeySequence[2]) + settings_key (x.settings_key) { - actual_sc[0] = x.actual_sc[0]; - actual_sc[1] = x.actual_sc[1]; - - default_sc[0] = x.default_sc[0]; - default_sc[1] = x.default_sc[1]; + actual_sc = x.actual_sc; + default_sc = x.default_sc; } shortcut_t& operator = (const shortcut_t& x) @@ -155,14 +145,11 @@ description = x.description; settings_key = x.settings_key; - actual_sc = new QKeySequence[2]; - default_sc = new QKeySequence[2]; + actual_sc = QKeySequence (); + default_sc = QKeySequence (); - actual_sc[0] = x.actual_sc[0]; - actual_sc[1] = x.actual_sc[1]; - - default_sc[0] = x.default_sc[0]; - default_sc[1] = x.default_sc[1]; + actual_sc = x.actual_sc; + default_sc = x.default_sc; } return *this; @@ -170,15 +157,13 @@ ~shortcut_t (void) { - delete [] actual_sc; - delete [] default_sc; } QTreeWidgetItem *tree_item; QString description; QString settings_key; - QKeySequence *actual_sc; - QKeySequence *default_sc; + QKeySequence actual_sc; + QKeySequence default_sc; }; QList<shortcut_t> _sc; @@ -194,7 +179,6 @@ int _handled_index; QSettings *_settings; - int _selected_set; };