VirtualBox

Timestamp:

Sep 16, 2015 3:50:24 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Action-pool: On shortcut changes do not forget to propagate initial shortcut values from _both_ action-pools to shortcut-pool.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

-              r57347
+              r57787
+{
     /* Prepare connections: */
+    connect(gShortcutPool, SIGNAL(sigSelectorShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
     connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
     connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QString&)),
 …
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 void UIActionPoolRuntime::retranslateUi()
+void UIActionPoolRuntime::updateShortcuts()
+{
     /* Call to base-class: */
     UIActionPool::retranslateUi();
+    UIActionPool::updateShortcuts();
     /* Create temporary Selector UI pool to do the same: */
     if (!m_fTemporary)

-              r57067
+              r57787
 #endif /* VBOX_WITH_DEBUGGER_GUI */
     /** Translation handler. */
     virtual void retranslateUi();
+    /** Update shortcuts. */
+    virtual void updateShortcuts();
     /** Returns extra-data ID to save keyboard shortcuts under. */

-              r56241
+              r57787
     /* Prepare connections: */
     connect(gShortcutPool, SIGNAL(sigSelectorShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
+    connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
     /* Call to base-class: */
 …
+}
 void UIActionPoolSelector::retranslateUi()
+void UIActionPoolSelector::updateShortcuts()
+{
     /* Call to base-class: */
     UIActionPool::retranslateUi();
+    UIActionPool::updateShortcuts();
     /* Create temporary Runtime UI pool to do the same: */
     if (!m_fTemporary)

-              r55507
+              r57787
     virtual void updateMenus();
     /** Translation handler. */
     virtual void retranslateUi();
+    /** Update shortcuts. */
+    virtual void updateShortcuts();
     /** Returns extra-data ID to save keyboard shortcuts under. */

Note: See TracChangeset for help on using the changeset viewer.