Changeset 85599 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 3, 2020 1:25:05 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9609: A bit of cleanup for shortcut-pool stuff: Rename Selector to Manager, Machine to Runtime for signal names.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPoolManager.cpp (modified) (1 diff)
• UIActionPoolRuntime.cpp (modified) (1 diff)
• UIShortcutPool.cpp (modified) (2 diffs)
• UIShortcutPool.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -3568 +3568 @@
 {
     /* Prepare connections: */
-    connect(gShortcutPool, &UIShortcutPool::sigSelectorShortcutsReloaded, this, &UIActionPoolManager::sltApplyShortcuts);
-    connect(gShortcutPool, &UIShortcutPool::sigMachineShortcutsReloaded, this, &UIActionPoolManager::sltApplyShortcuts);
+    connect(gShortcutPool, &UIShortcutPool::sigManagerShortcutsReloaded, this, &UIActionPoolManager::sltApplyShortcuts);
+    connect(gShortcutPool, &UIShortcutPool::sigRuntimeShortcutsReloaded, this, &UIActionPoolManager::sltApplyShortcuts);
 
     /* Call to base-class: */

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

@@ -3469 +3469 @@
 {
     /* Prepare connections: */
-    connect(gShortcutPool, &UIShortcutPool::sigSelectorShortcutsReloaded,
+    connect(gShortcutPool, &UIShortcutPool::sigManagerShortcutsReloaded,
             this, &UIActionPoolRuntime::sltApplyShortcuts);
-    connect(gShortcutPool, &UIShortcutPool::sigMachineShortcutsReloaded,
+    connect(gShortcutPool, &UIShortcutPool::sigRuntimeShortcutsReloaded,
             this, &UIActionPoolRuntime::sltApplyShortcuts);
     connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp

@@ -237 +237 @@
     loadOverridesFor(GUI_Input_SelectorShortcuts);
 
-    /* Notify selector shortcuts reloaded: */
-    emit sigSelectorShortcutsReloaded();
+    /* Notify manager shortcuts reloaded: */
+    emit sigManagerShortcutsReloaded();
 }
 
@@ -254 +254 @@
     loadOverridesFor(GUI_Input_MachineShortcuts);
 
-    /* Notify machine shortcuts reloaded: */
-    emit sigMachineShortcutsReloaded();
+    /* Notify runtime shortcuts reloaded: */
+    emit sigRuntimeShortcutsReloaded();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h

@@ -119 +119 @@
 signals:
 
-    /** Notifies about Selector UI shortcuts changed. */
-    void sigSelectorShortcutsReloaded();
+    /** Notifies about Manager UI shortcuts changed. */
+    void sigManagerShortcutsReloaded();
     /** Notifies about Runtime UI shortcuts changed. */
-    void sigMachineShortcutsReloaded();
+    void sigRuntimeShortcutsReloaded();
 
 public: