Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 53320) @@ -3512,9 +3512,23 @@ } } - /* Make sure event came for the currently running VM: */ - else if ( vboxGlobal().isVMConsoleProcess() - && strMachineID == vboxGlobal().managedVMUuid()) - { - /* Status-bar configuration change: */ + /* Machine extra-data 'change' event: */ + else + { + /* Current VM only: */ + if ( vboxGlobal().isVMConsoleProcess() + && strMachineID == vboxGlobal().managedVMUuid()) + { + /* HID LEDs sync state changed (allowed if not restricted)? */ + if (strKey == GUI_HidLedsSync) + emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, strMachineID)); +#ifdef Q_WS_MAC + /* 'Dock icon' appearance changed (allowed if not restricted)? */ + else if ( strKey == GUI_RealtimeDockIconUpdateEnabled + || strKey == GUI_RealtimeDockIconUpdateMonitor) + emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, strMachineID)); +#endif /* Q_WS_MAC */ + } + + /* Menu-bar configuration change: */ if (strKey == GUI_MenuBar_Enabled || strKey == GUI_RestrictedRuntimeMenus || @@ -3530,19 +3544,10 @@ #endif /* VBOX_WITH_DEBUGGER_GUI */ strKey == GUI_RestrictedRuntimeHelpMenuActions) - emit sigMenuBarConfigurationChange(); + emit sigMenuBarConfigurationChange(strMachineID); /* Status-bar configuration change: */ else if (strKey == GUI_StatusBar_Enabled || strKey == GUI_RestrictedStatusBarIndicators || strKey == GUI_StatusBar_IndicatorOrder) - emit sigStatusBarConfigurationChange(); - /* HID LEDs sync state changed (allowed if not restricted)? */ - else if (strKey == GUI_HidLedsSync) - emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, strMachineID)); -#ifdef Q_WS_MAC - /* 'Dock icon' appearance changed (allowed if not restricted)? */ - else if ( strKey == GUI_RealtimeDockIconUpdateEnabled - || strKey == GUI_RealtimeDockIconUpdateMonitor) - emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, strMachineID)); -#endif /* Q_WS_MAC */ + emit sigStatusBarConfigurationChange(strMachineID); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 53320) @@ -69,7 +69,7 @@ /** Notifies about menu-bar configuration change. */ - void sigMenuBarConfigurationChange(); + void sigMenuBarConfigurationChange(const QString &strMachineID); /** Notifies about status-bar configuration change. */ - void sigStatusBarConfigurationChange(); + void sigStatusBarConfigurationChange(const QString &strMachineID); /** Notifies about HID LEDs synchronization state change. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 53320) @@ -1885,6 +1885,10 @@ #endif /* VBOX_WITH_DEBUGGER_GUI */ -void UIActionPoolRuntime::sltHandleConfigurationChange() -{ +void UIActionPoolRuntime::sltHandleConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (vboxGlobal().managedVMUuid() != strMachineID) + return; + /* Update configuration: */ updateConfiguration(); @@ -2059,5 +2063,6 @@ /* Prepare connections: */ connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts())); - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()), this, SLOT(sltHandleConfigurationChange())); + connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QString&)), + this, SLOT(sltHandleConfigurationChange(const QString&))); /* Call to base-class: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 53320) @@ -181,5 +181,5 @@ /** Handles configuration-change. */ - void sltHandleConfigurationChange(); + void sltHandleConfigurationChange(const QString &strMachineID); /** Prepare 'View' : 'Virtual Screen #' menu routine (Normal, Scale). */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 53320) @@ -1073,6 +1073,10 @@ } -void UIIndicatorsPool::sltHandleConfigurationChange() -{ +void UIIndicatorsPool::sltHandleConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (vboxGlobal().managedVMUuid() != strMachineID) + return; + /* Update pool: */ updatePool(); @@ -1150,6 +1154,6 @@ { /* Listen for the status-bar configuration changes: */ - connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange()), - this, SLOT(sltHandleConfigurationChange())); + connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QString&)), + this, SLOT(sltHandleConfigurationChange(const QString&))); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h (revision 53320) @@ -66,5 +66,5 @@ /** Handles configuration change. */ - void sltHandleConfigurationChange(); + void sltHandleConfigurationChange(const QString &strMachineID); /** Handles indicator-states auto-update. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 53320) @@ -58,6 +58,14 @@ public: - /** Constructor, taking @a pActionPool argument. */ - UIMenuBarEditorWidget(UIActionPool *pActionPool); + /** Constructor. + * @param pParent is passed to QWidget constructor, + * @param strMachineID brings the machine ID to be used by the editor, + * @param pActionPool brings the action-pool to be used by the editor. */ + UIMenuBarEditorWidget(QWidget *pParent, + const QString &strMachineID, + UIActionPool *pActionPool); + + /** Returns the machine ID instance. */ + const QString& machineID() const { return m_strMachineID; } /** Returns the action-pool reference. */ @@ -67,5 +75,5 @@ /** Handles configuration change. */ - void sltHandleConfigurationChange(); + void sltHandleConfigurationChange(const QString &strMachineID); /** Handles menu-bar menu click. */ @@ -143,4 +151,6 @@ /** @name General * @{ */ + /** Holds the machine ID instance. */ + QString m_strMachineID; /** Holds the action-pool reference. */ const UIActionPool *m_pActionPool; @@ -160,7 +170,10 @@ }; - -UIMenuBarEditorWidget::UIMenuBarEditorWidget(UIActionPool *pActionPool) - : m_pActionPool(pActionPool) +UIMenuBarEditorWidget::UIMenuBarEditorWidget(QWidget *pParent, + const QString &strMachineID, + UIActionPool *pActionPool) + : QIWithRetranslateUI2(pParent) + , m_strMachineID(strMachineID) + , m_pActionPool(pActionPool) , m_pMainLayout(0) , m_pToolBar(0) @@ -171,6 +184,10 @@ } -void UIMenuBarEditorWidget::sltHandleConfigurationChange() -{ +void UIMenuBarEditorWidget::sltHandleConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (machineID() != strMachineID) + return; + /* Update menus: */ updateMenus(); @@ -192,9 +209,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::MenuType restrictions = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::MenuType restrictions = gEDataManager->restrictedRuntimeMenuTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::MenuType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuTypes(restrictions, machineID()); break; } @@ -206,9 +223,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::MenuApplicationActionType restrictions = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::MenuApplicationActionType restrictions = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::MenuApplicationActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuApplicationActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuApplicationActionTypes(restrictions, machineID()); break; } @@ -220,9 +237,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictions = gEDataManager->restrictedRuntimeMenuMachineActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictions = gEDataManager->restrictedRuntimeMenuMachineActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::RuntimeMenuMachineActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuMachineActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuMachineActionTypes(restrictions, machineID()); break; } @@ -233,9 +250,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictions = gEDataManager->restrictedRuntimeMenuViewActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictions = gEDataManager->restrictedRuntimeMenuViewActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::RuntimeMenuViewActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuViewActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuViewActionTypes(restrictions, machineID()); break; } @@ -246,9 +263,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictions = gEDataManager->restrictedRuntimeMenuInputActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictions = gEDataManager->restrictedRuntimeMenuInputActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::RuntimeMenuInputActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuInputActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuInputActionTypes(restrictions, machineID()); break; } @@ -259,9 +276,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictions = gEDataManager->restrictedRuntimeMenuDevicesActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictions = gEDataManager->restrictedRuntimeMenuDevicesActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuDevicesActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuDevicesActionTypes(restrictions, machineID()); break; } @@ -273,9 +290,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictions = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictions = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuDebuggerActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuDebuggerActionTypes(restrictions, machineID()); break; } @@ -287,9 +304,9 @@ static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::MenuHelpActionType restrictions = gEDataManager->restrictedRuntimeMenuHelpActionTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::MenuHelpActionType restrictions = gEDataManager->restrictedRuntimeMenuHelpActionTypes(machineID()); /* Invert restriction for sender type: */ restrictions = (UIExtraDataMetaDefs::MenuHelpActionType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ - gEDataManager->setRestrictedRuntimeMenuHelpActionTypes(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedRuntimeMenuHelpActionTypes(restrictions, machineID()); break; } @@ -363,6 +380,6 @@ /* Listen for the menu-bar configuration changes: */ - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()), - this, SLOT(sltHandleConfigurationChange())); + connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QString&)), + this, SLOT(sltHandleConfigurationChange(const QString&))); /* Update menus: */ @@ -644,5 +661,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::MenuType restrictionsMenuBar = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::MenuType restrictionsMenuBar = gEDataManager->restrictedRuntimeMenuTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -687,5 +704,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::MenuApplicationActionType restrictionsMenuApplication = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::MenuApplicationActionType restrictionsMenuApplication = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -717,5 +734,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictionsMenuMachine = gEDataManager->restrictedRuntimeMenuMachineActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictionsMenuMachine = gEDataManager->restrictedRuntimeMenuMachineActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -746,5 +763,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictionsMenuView = gEDataManager->restrictedRuntimeMenuViewActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictionsMenuView = gEDataManager->restrictedRuntimeMenuViewActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -775,5 +792,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictionsMenuInput = gEDataManager->restrictedRuntimeMenuInputActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictionsMenuInput = gEDataManager->restrictedRuntimeMenuInputActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -804,5 +821,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictionsMenuDevices = gEDataManager->restrictedRuntimeMenuDevicesActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictionsMenuDevices = gEDataManager->restrictedRuntimeMenuDevicesActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -834,5 +851,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictionsMenuDebug = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictionsMenuDebug = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -864,5 +881,5 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::MenuHelpActionType restrictionsMenuHelp = gEDataManager->restrictedRuntimeMenuHelpActionTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::MenuHelpActionType restrictionsMenuHelp = gEDataManager->restrictedRuntimeMenuHelpActionTypes(machineID()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; @@ -964,7 +981,7 @@ UIMenuBarEditorWindow::UIMenuBarEditorWindow(UIMachineWindow *pParent, UIActionPool *pActionPool) #ifndef Q_WS_MAC - : UISlidingToolBar(pParent, pParent->menuBar(), new UIMenuBarEditorWidget(pActionPool), UISlidingToolBar::Position_Top) + : UISlidingToolBar(pParent, pParent->menuBar(), new UIMenuBarEditorWidget(0, vboxGlobal().managedVMUuid(), pActionPool), UISlidingToolBar::Position_Top) #else /* Q_WS_MAC */ - : UISlidingToolBar(pParent, 0, new UIMenuBarEditorWidget(pActionPool), UISlidingToolBar::Position_Top) + : UISlidingToolBar(pParent, 0, new UIMenuBarEditorWidget(0, vboxGlobal().managedVMUuid(), pActionPool), UISlidingToolBar::Position_Top) #endif /* Q_WS_MAC */ { Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 53320) @@ -637,6 +637,10 @@ #ifdef RT_OS_DARWIN -void UISession::sltHandleMenuBarConfigurationChange() -{ +void UISession::sltHandleMenuBarConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (vboxGlobal().managedVMUuid() != strMachineID) + return; + /* Update Mac OS X menu-bar: */ updateMenu(); @@ -1138,6 +1142,6 @@ { /* Configure Mac OS X menu-bar: */ - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()), - this, SLOT(sltHandleMenuBarConfigurationChange())); + connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QString&)), + this, SLOT(sltHandleMenuBarConfigurationChange(const QString&))); /* Update Mac OS X menu-bar: */ updateMenu(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 53320) @@ -309,5 +309,5 @@ #ifdef RT_OS_DARWIN /** Mac OS X: Handles menu-bar configuration-change. */ - void sltHandleMenuBarConfigurationChange(); + void sltHandleMenuBarConfigurationChange(const QString &strMachineID); #endif /* RT_OS_DARWIN */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (revision 53320) @@ -127,11 +127,17 @@ public: - /** Constructor, passes @a pParent to the QWidget constructor. */ - UIStatusBarEditorWidget(QWidget *pParent = 0); + /** Constructor. + * @param pParent is passed to QWidget constructor, + * @param strMachineID brings the machine ID to be used by the editor. */ + UIStatusBarEditorWidget(QWidget *pParent, + const QString &strMachineID); + + /** Returns the machine ID instance. */ + const QString& machineID() const { return m_strMachineID; } private slots: /** Handles configuration change. */ - void sltHandleConfigurationChange(); + void sltHandleConfigurationChange(const QString &strMachineID); /** Handles button click. */ @@ -170,4 +176,10 @@ /** Returns position for passed @a type. */ int position(IndicatorType type) const; + + /** @name General + * @{ */ + /** Holds the machine ID instance. */ + QString m_strMachineID; + /** @} */ /** @name Contents @@ -345,6 +357,8 @@ -UIStatusBarEditorWidget::UIStatusBarEditorWidget(QWidget *pParent /* = 0 */) +UIStatusBarEditorWidget::UIStatusBarEditorWidget(QWidget *pParent, + const QString &strMachineID) : QIWithRetranslateUI2(pParent) + , m_strMachineID(strMachineID) , m_pMainLayout(0), m_pButtonLayout(0) , m_pButtonClose(0) @@ -356,6 +370,10 @@ } -void UIStatusBarEditorWidget::sltHandleConfigurationChange() -{ +void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (machineID() != strMachineID) + return; + /* Update status buttons: */ updateStatusButtons(); @@ -373,5 +391,5 @@ /* Load current status-bar indicator restrictions: */ QList restrictions = - gEDataManager->restrictedStatusBarIndicators(vboxGlobal().managedVMUuid()); + gEDataManager->restrictedStatusBarIndicators(machineID()); /* Invert restriction for sender type: */ @@ -382,5 +400,5 @@ /* Save updated status-bar indicator restrictions: */ - gEDataManager->setRestrictedStatusBarIndicators(restrictions, vboxGlobal().managedVMUuid()); + gEDataManager->setRestrictedStatusBarIndicators(restrictions, machineID()); } @@ -464,6 +482,6 @@ /* Listen for the status-bar configuration changes: */ - connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange()), - this, SLOT(sltHandleConfigurationChange())); + connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QString&)), + this, SLOT(sltHandleConfigurationChange(const QString&))); /* Update status buttons: */ @@ -490,6 +508,6 @@ { /* Recache status-bar configuration: */ - m_restrictions = gEDataManager->restrictedStatusBarIndicators(vboxGlobal().managedVMUuid()); - m_order = gEDataManager->statusBarIndicatorOrder(vboxGlobal().managedVMUuid()); + m_restrictions = gEDataManager->restrictedStatusBarIndicators(machineID()); + m_order = gEDataManager->statusBarIndicatorOrder(machineID()); for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType) if (iType != IndicatorType_Invalid && iType != IndicatorType_KeyboardExtension && @@ -688,5 +706,5 @@ /* Load current status-bar indicator order and make sure it's complete: */ QList order = - gEDataManager->statusBarIndicatorOrder(vboxGlobal().managedVMUuid()); + gEDataManager->statusBarIndicatorOrder(machineID()); for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType) if (iType != IndicatorType_Invalid && iType != IndicatorType_KeyboardExtension && @@ -703,5 +721,5 @@ /* Save updated status-bar indicator order: */ - gEDataManager->setStatusBarIndicatorOrder(order, vboxGlobal().managedVMUuid()); + gEDataManager->setStatusBarIndicatorOrder(order, machineID()); } @@ -719,5 +737,5 @@ UIStatusBarEditorWindow::UIStatusBarEditorWindow(UIMachineWindow *pParent) - : UISlidingToolBar(pParent, pParent->statusBar(), new UIStatusBarEditorWidget, UISlidingToolBar::Position_Bottom) + : UISlidingToolBar(pParent, pParent->statusBar(), new UIStatusBarEditorWidget(0, vboxGlobal().managedVMUuid()), UISlidingToolBar::Position_Bottom) { } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 53320) @@ -121,6 +121,10 @@ #ifndef RT_OS_DARWIN -void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange() -{ +void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (vboxGlobal().managedVMUuid() != strMachineID) + return; + /* Check whether menu-bar is enabled: */ const bool fEnabled = gEDataManager->menuBarEnabled(vboxGlobal().managedVMUuid()); @@ -150,6 +154,10 @@ #endif /* !RT_OS_DARWIN */ -void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange() -{ +void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (vboxGlobal().managedVMUuid() != strMachineID) + return; + /* Check whether status-bar is enabled: */ const bool fEnabled = gEDataManager->statusBarEnabled(vboxGlobal().managedVMUuid()); @@ -246,6 +254,6 @@ connect(menuBar(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(sltHandleMenuBarContextMenuRequest(const QPoint&))); - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()), - this, SLOT(sltHandleMenuBarConfigurationChange())); + connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QString&)), + this, SLOT(sltHandleMenuBarConfigurationChange(const QString&))); /* Update menu-bar: */ updateMenu(); @@ -278,6 +286,6 @@ } /* Post-configure status-bar: */ - connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange()), - this, SLOT(sltHandleStatusBarConfigurationChange())); + connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QString&)), + this, SLOT(sltHandleStatusBarConfigurationChange(const QString&))); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h (revision 53319) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h (revision 53320) @@ -59,5 +59,5 @@ #ifndef RT_OS_DARWIN /** Handles menu-bar configuration-change. */ - void sltHandleMenuBarConfigurationChange(); + void sltHandleMenuBarConfigurationChange(const QString &strMachineID); /** Handles menu-bar context-menu-request. */ void sltHandleMenuBarContextMenuRequest(const QPoint &position); @@ -65,5 +65,5 @@ /** Handles status-bar configuration-change. */ - void sltHandleStatusBarConfigurationChange(); + void sltHandleStatusBarConfigurationChange(const QString &strMachineID); /** Handles status-bar context-menu-request. */ void sltHandleStatusBarContextMenuRequest(const QPoint &position);