VirtualBox

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


Ignore:
Timestamp:
Feb 10, 2025 12:57:06 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167438
Message:

FE/Qt: bugref:10814: VBox Manager: Reordering code for Toggle and Machines tools and buttons.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r108083 r108137  
    16481648    {
    16491649        case UIToolType_Home:         strResult = "Home"; break;
     1650        case UIToolType_Machines:     strResult = "Machines"; break;
    16501651        case UIToolType_Extensions:   strResult = "Extensions"; break;
    16511652        case UIToolType_Media:        strResult = "Media"; break;
    … …  
    16541655        case UIToolType_CloudConsole: strResult = "CloudConsole"; break;
    16551656        case UIToolType_Activities:   strResult = "Activities"; break;
    1656         case UIToolType_Machines:     strResult = "Machines"; break;
    16571657        case UIToolType_Details:      strResult = "Details"; break;
    16581658        case UIToolType_Snapshots:    strResult = "Snapshots"; break;
    … …  
    16741674    if (strToolType.compare("Home", Qt::CaseInsensitive) == 0)
    16751675        return UIToolType_Home;
     1676    if (strToolType.compare("Machines", Qt::CaseInsensitive) == 0)
     1677        return UIToolType_Machines;
    16761678    if (strToolType.compare("Extensions", Qt::CaseInsensitive) == 0)
    16771679        return UIToolType_Extensions;
    … …  
    16861688    if (strToolType.compare("Activities", Qt::CaseInsensitive) == 0)
    16871689        return UIToolType_Activities;
    1688     if (strToolType.compare("Machines", Qt::CaseInsensitive) == 0)
    1689         return UIToolType_Machines;
    16901690    if (strToolType.compare("Details", Qt::CaseInsensitive) == 0)
    16911691        return UIToolType_Details;

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

    r108122 r108137  
    302302            {
    303303                case UIToolType_Home:
     304                case UIToolType_Machines:
    304305                case UIToolType_Extensions:
    305306                case UIToolType_Media:
    … …  
    308309                case UIToolType_CloudConsole:
    309310                case UIToolType_Activities:
    310                 case UIToolType_Machines:
    311311                    return true;
    312312                default:

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r108122 r108137  
    953953    /* Global types: */
    954954    UIToolType_Home,
     955    UIToolType_Machines,
    955956    UIToolType_Extensions,
    956957    UIToolType_Media,
    … …  
    959960    UIToolType_CloudConsole,
    960961    UIToolType_Activities,
    961     UIToolType_Machines,
    962962    /* Machine types: */
    963963    UIToolType_Error,

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

    r108084 r108137  
    205205};
    206206
     207/** Simple action extension, used as 'Machine Manager' action class. */
     208class UIActionToggleManagerToolsGlobalShowMachineManager : public UIActionToggle
     209{
     210    Q_OBJECT;
     211
     212public:
     213
     214    /** Constructs action passing @a pParent to the base-class. */
     215    UIActionToggleManagerToolsGlobalShowMachineManager(UIActionPool *pParent)
     216        : UIActionToggle(pParent)
     217    {
     218        setProperty("UIToolType", QVariant::fromValue(UIToolType_Machines));
     219        /// @todo use icons with check-boxes
     220        setIcon(UIIconPool::iconSetFull(":/machine_24px.png", ":/machine_16px.png"));
     221    }
     222
     223protected:
     224
     225    /** Returns shortcut extra-data ID. */
     226    virtual QString shortcutExtraDataID() const RT_OVERRIDE
     227    {
     228        return QString("ToolsGlobalMachineManager");
     229    }
     230
     231    /** Handles translation event. */
     232    virtual void retranslateUi() RT_OVERRIDE
     233    {
     234        setName(QApplication::translate("UIActionPool", "&Machine Manager"));
     235        setStatusTip(QApplication::translate("UIActionPool", "Open the Machine Manager"));
     236    }
     237};
     238
    207239/** Simple action extension, used as 'Show Extension Pack Manager' action class. */
    208240class UIActionToggleManagerToolsGlobalShowExtensionPackManager : public UIActionToggle
    … …  
    391423        setName(QApplication::translate("UIActionPool", "&VM Activity Overview"));
    392424        setStatusTip(QApplication::translate("UIActionPool", "Open the VM Activity Overview"));
    393     }
    394 };
    395 
    396 /** Simple action extension, used as 'Machine Manager' action class. */
    397 class UIActionToggleManagerToolsGlobalShowMachineManager : public UIActionToggle
    398 {
    399     Q_OBJECT;
    400 
    401 public:
    402 
    403     /** Constructs action passing @a pParent to the base-class. */
    404     UIActionToggleManagerToolsGlobalShowMachineManager(UIActionPool *pParent)
    405         : UIActionToggle(pParent)
    406     {
    407         setProperty("UIToolType", QVariant::fromValue(UIToolType_Machines));
    408         /// @todo use icons with check-boxes
    409         setIcon(UIIconPool::iconSetFull(":/machine_24px.png", ":/machine_16px.png"));
    410     }
    411 
    412 protected:
    413 
    414     /** Returns shortcut extra-data ID. */
    415     virtual QString shortcutExtraDataID() const RT_OVERRIDE
    416     {
    417         return QString("ToolsGlobalMachineManager");
    418     }
    419 
    420     /** Handles translation event. */
    421     virtual void retranslateUi() RT_OVERRIDE
    422     {
    423         setName(QApplication::translate("UIActionPool", "&Machine Manager"));
    424         setStatusTip(QApplication::translate("UIActionPool", "Open the Machine Manager"));
    425425    }
    426426};
    … …  
    35283528    m_pool[UIActionIndexMN_M_File_M_Tools] = new UIActionMenuManagerToolsGlobal(this);
    35293529    m_pool[UIActionIndexMN_M_File_M_Tools_T_HomeScreen] = new UIActionToggleManagerToolsGlobalShowHomeScreen(this);
     3530    m_pool[UIActionIndexMN_M_File_M_Tools_T_MachineManager] = new UIActionToggleManagerToolsGlobalShowMachineManager(this);
    35303531    m_pool[UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager] = new UIActionToggleManagerToolsGlobalShowExtensionPackManager(this);
    35313532    m_pool[UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager] = new UIActionToggleManagerToolsGlobalShowVirtualMediaManager(this);
    … …  
    35333534    m_pool[UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager] = new UIActionToggleManagerToolsGlobalShowCloudProfileManager(this);
    35343535    m_pool[UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview] = new UIActionToggleManagerToolsGlobalShowVMActivityOverview(this);
    3535     m_pool[UIActionIndexMN_M_File_M_Tools_T_MachineManager] = new UIActionToggleManagerToolsGlobalShowMachineManager(this);
    35363536#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    35373537    m_pool[UIActionIndexMN_M_File_S_ShowExtraDataManager] = new UIActionSimpleManagerFileShowExtraDataManager(this);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp

    r108086 r108137  
    5656    , m_pLayout(0)
    5757    , m_pPaneHome(0)
     58#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     59    , m_pPaneMachines(0)
     60#endif
    5861    , m_pPaneExtensions(0)
    5962    , m_pPaneMedia(0)
    … …  
    6164    , m_pPaneCloud(0)
    6265    , m_pPaneActivities(0)
    63 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    64     , m_pPaneMachines(0)
    65 #endif
    6666    , m_fActive(false)
    6767{
    … …  
    136136                break;
    137137            }
     138#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     139            case UIToolType_Machines:
     140            {
     141                /* Create Machine Manager: */
     142                m_pPaneMachines = new UIMachineManagerWidget(this, m_pActionPool);
     143                AssertPtrReturnVoid(m_pPaneMachines);
     144                {
     145                    /* Configure pane: */
     146                    m_pPaneMachines->setProperty("ToolType", QVariant::fromValue(UIToolType_Machines));
     147                    /// @todo connect!
     148# ifndef VBOX_WS_MAC
     149                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
     150                    m_pPaneMachines->setContentsMargins(iMargin, 0, iMargin, 0);
     151# endif
     152
     153                    /* Add into layout: */
     154                    m_pLayout->addWidget(m_pPaneMachines);
     155                    m_pLayout->setCurrentWidget(m_pPaneMachines);
     156                }
     157                break;
     158            }
     159#endif /* VBOX_GUI_WITH_ADVANCED_WIDGETS */
    138160            case UIToolType_Extensions:
    139161            {
    … …  
    238260                break;
    239261            }
    240 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    241             case UIToolType_Machines:
    242             {
    243                 /* Create Machine Manager: */
    244                 m_pPaneMachines = new UIMachineManagerWidget(this, m_pActionPool);
    245                 AssertPtrReturnVoid(m_pPaneMachines);
    246                 {
    247                     /* Configure pane: */
    248                     m_pPaneMachines->setProperty("ToolType", QVariant::fromValue(UIToolType_Machines));
    249                     /// @todo connect!
    250 # ifndef VBOX_WS_MAC
    251                     const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
    252                     m_pPaneMachines->setContentsMargins(iMargin, 0, iMargin, 0);
    253 # endif
    254 
    255                     /* Add into layout: */
    256                     m_pLayout->addWidget(m_pPaneMachines);
    257                     m_pLayout->setCurrentWidget(m_pPaneMachines);
    258                 }
    259                 break;
    260             }
    261 #endif /* VBOX_GUI_WITH_ADVANCED_WIDGETS */
    262262            default:
    263263                AssertFailedReturnVoid();
    … …  
    284284        {
    285285            case UIToolType_Home:       m_pPaneHome = 0; break;
     286#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     287            case UIToolType_Machines:   m_pPaneMachines = 0; break;
     288#endif
    286289            case UIToolType_Extensions: m_pPaneExtensions = 0; break;
    287290            case UIToolType_Media:      m_pPaneMedia = 0; break;
    … …  
    289292            case UIToolType_Cloud:      m_pPaneCloud = 0; break;
    290293            case UIToolType_Activities: m_pPaneActivities = 0; break;
    291 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    292             case UIToolType_Machines:   m_pPaneMachines = 0; break;
    293 #endif
    294294            default: break;
    295295        }
    … …  
    312312            pCurrentToolWidget = m_pPaneHome;
    313313            break;
     314#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     315        case UIToolType_Machines:
     316            pCurrentToolWidget = m_pPaneMachines;
     317            break;
     318#endif
    314319        case UIToolType_Extensions:
    315320            pCurrentToolWidget = m_pPaneExtensions;
    … …  
    327332            pCurrentToolWidget = m_pPaneActivities;
    328333            break;
    329 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    330         case UIToolType_Machines:
    331             pCurrentToolWidget = m_pPaneMachines;
    332             break;
    333 #endif
    334334        default:
    335335            break;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h

    r108086 r108137  
    123123    /** Holds the Home pane instance. */
    124124    UIHomePane                   *m_pPaneHome;
     125#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     126    /** Holds the Machine Manager instance. */
     127    UIMachineManagerWidget       *m_pPaneMachines;
     128#endif
    125129    /** Holds the Extension Pack Manager instance. */
    126130    UIExtensionPackManagerWidget *m_pPaneExtensions;
    … …  
    133137    /** Holds the VM Activity Overview instance. */
    134138    UIVMActivityOverviewWidget   *m_pPaneActivities;
    135 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    136     /** Holds the Machine Manager instance. */
    137     UIMachineManagerWidget       *m_pPaneMachines;
    138 #endif
    139139
    140140    /** Holds whether this pane is active. */

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerAdvancedWidget.cpp

    r108107 r108137  
    501501            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance));
    502502            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
    503             break;
    504         }
    505         case UIToolType_Extensions:
    506         {
    507             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Extension_S_Install));
    508             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Extension_S_Uninstall));
    509             break;
    510         }
    511         case UIToolType_Media:
    512         {
    513             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Add));
    514             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Create));
    515             m_pToolBar->addSeparator();
    516             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Copy));
    517             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Move));
    518             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Remove));
    519             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Release));
    520             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Clear));
    521             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Search));
    522             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Details));
    523             m_pToolBar->addSeparator();
    524             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Refresh));
    525             break;
    526         }
    527         case UIToolType_Network:
    528         {
    529             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Create));
    530             m_pToolBar->addSeparator();
    531             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Remove));
    532             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_T_Details));
    533             //m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Refresh));
    534             break;
    535         }
    536         case UIToolType_Cloud:
    537         {
    538             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Add));
    539             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Import));
    540             m_pToolBar->addSeparator();
    541             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Remove));
    542             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_T_Details));
    543             m_pToolBar->addSeparator();
    544             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_TryPage));
    545             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Help));
    546             break;
    547         }
    548         case UIToolType_Activities:
    549         {
    550             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
    551             m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity));
    552             QToolButton *pButton =
    553                 qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns)));
    554             if (pButton)
    555             {
    556                 pButton->setPopupMode(QToolButton::InstantPopup);
    557                 pButton->setAutoRaise(true);
    558             }
    559503            break;
    560504        }
    … …  
    655599            break;
    656600        }
     601        case UIToolType_Extensions:
     602        {
     603            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Extension_S_Install));
     604            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Extension_S_Uninstall));
     605            break;
     606        }
     607        case UIToolType_Media:
     608        {
     609            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Add));
     610            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Create));
     611            m_pToolBar->addSeparator();
     612            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Copy));
     613            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Move));
     614            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Remove));
     615            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Release));
     616            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Clear));
     617            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Search));
     618            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Details));
     619            m_pToolBar->addSeparator();
     620            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Refresh));
     621            break;
     622        }
     623        case UIToolType_Network:
     624        {
     625            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Create));
     626            m_pToolBar->addSeparator();
     627            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Remove));
     628            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_T_Details));
     629            //m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Refresh));
     630            break;
     631        }
     632        case UIToolType_Cloud:
     633        {
     634            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Add));
     635            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Import));
     636            m_pToolBar->addSeparator();
     637            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Remove));
     638            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_T_Details));
     639            m_pToolBar->addSeparator();
     640            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_TryPage));
     641            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Help));
     642            break;
     643        }
     644        case UIToolType_Activities:
     645        {
     646            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns));
     647            m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_S_SwitchToMachineActivity));
     648            QToolButton *pButton =
     649                qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_VMActivityOverview_M_Columns)));
     650            if (pButton)
     651            {
     652                pButton->setPopupMode(QToolButton::InstantPopup);
     653                pButton->setAutoRaise(true);
     654            }
     655            break;
     656        }
    657657        default:
    658658            break;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

    r108125 r108137  
    226226    QMap<UIToolType, UIAction*> actions;
    227227    actions[UIToolType_Home] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_HomeScreen);
     228#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     229    actions[UIToolType_Machines] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_MachineManager);
     230#endif
    228231    actions[UIToolType_Extensions] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_ExtensionPackManager);
    229232    actions[UIToolType_Media] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VirtualMediaManager);
    … …  
    231234    actions[UIToolType_Cloud] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_CloudProfileManager);
    232235    actions[UIToolType_Activities] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_VMActivityOverview);
    233 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    234     actions[UIToolType_Machines] = actionPool()->action(UIActionIndexMN_M_File_M_Tools_T_MachineManager);
    235 #endif
    236236    if (actions.contains(enmType))
    237237        actions.value(enmType)->setChecked(true);
    … …  
    506506        switch (pItem->itemType())
    507507        {
     508#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     509            case UIToolType_Toggle:      pItem->setName(QString()); break;
     510#endif
    508511            case UIToolType_Home:        pItem->setName(tr("Home")); break;
    509             case UIToolType_Toggle:      pItem->setName(QString()); break;
     512#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
     513            case UIToolType_Machines:    pItem->setName(tr("Machines")); break;
     514#endif
    510515            case UIToolType_Extensions:  pItem->setName(tr("Extensions")); break;
    511516            case UIToolType_Media:       pItem->setName(tr("Media")); break;
    … …  
    513518            case UIToolType_Cloud:       pItem->setName(tr("Cloud")); break;
    514519            case UIToolType_Activities:  pItem->setName(tr("Activities")); break;
    515 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
    516             case UIToolType_Machines:    pItem->setName(tr("Machines")); break;
    517 #endif
    518520            case UIToolType_Details:     pItem->setName(tr("Details")); break;
    519521            case UIToolType_Snapshots:   pItem->setName(tr("Snapshots")); break;
Note: See TracChangeset for help on using the changeset viewer.

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