VirtualBox

Changeset 107348 in vbox


Ignore:
Timestamp:
Dec 18, 2024 11:15:50 AM (4 weeks ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10814: VBox Manager: Adjust Global tool manager to have public access point for internal Machine tool manager; Besides that, Help stuff for Global tool manager needs to propagate Machine tool manager's help.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/manager
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIGlobalToolsManagerWidget.cpp

    r107343 r107348  
    6464}
    6565
     66UIMachineManagerWidget *UIGlobalToolsManagerWidget::machineManager() const
     67{
     68    return toolPane()->machineManager();
     69}
     70
    6671UIToolType UIGlobalToolsManagerWidget::menuToolType() const
    6772{
     
    152157QString UIGlobalToolsManagerWidget::currentHelpKeyword() const
    153158{
     159    if (toolType() == UIToolType_Machines)
     160    {
     161        AssertPtrReturn(machineManager(), QString());
     162        return machineManager()->currentHelpKeyword();
     163    }
     164
    154165    AssertPtrReturn(toolPane(), QString());
    155166    return toolPane()->currentHelpKeyword();
     
    237248            this, &UIGlobalToolsManagerWidget::sltHandleCommitData);
    238249
    239     /* Global VBox extra-data event handlers: */
     250    /* Global COM event handlers: */
    240251    connect(gEDataManager, &UIExtraDataManager::sigSettingsExpertModeChange,
    241252            this, &UIGlobalToolsManagerWidget::sltHandleSettingsExpertModeChange);
     
    262273void UIGlobalToolsManagerWidget::cleanupConnections()
    263274{
    264     /* Global VBox extra-data event handlers: */
     275    /* Global COM event handlers: */
    265276    disconnect(gEDataManager, &UIExtraDataManager::sigSettingsExpertModeChange,
    266277               this, &UIGlobalToolsManagerWidget::sltHandleSettingsExpertModeChange);
     
    288299{
    289300    return m_pMenu;
    290 }
    291 
    292 UIMachineManagerWidget *UIGlobalToolsManagerWidget::machineManager() const
    293 {
    294     return toolPane()->machineManager();
    295301}
    296302
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIGlobalToolsManagerWidget.h

    r107343 r107348  
    7878        /** Returns tool-pane instance. */
    7979        UIToolPaneGlobal *toolPane() const;
     80        /** Returns Machine Manager reference. */
     81        UIMachineManagerWidget *machineManager() const;
    8082
    8183        /** Returns menu tool type. */
     
    154156        /** Returns tool-menu instance. */
    155157        UITools *toolMenu() const;
    156        /** Returns Machine Manager reference. */
    157         UIMachineManagerWidget *machineManager() const;
    158158        /** Returns Machine Manager's Chooser-pane reference. */
    159159        UIChooser *chooser() const;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette