VirtualBox

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


Ignore:
Timestamp:
Jun 18, 2013 2:00:20 PM (12 years ago)
Author:
vboxsync
Message:

FE/Qt: Runtime UI: Small action-pool cleanup; Few icons replaced for settings menu-actions.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

    r46623 r46626  
    196196        <file alias="group_abstract_16px.png">images/group_abstract_16px.png</file>
    197197        <file alias="machine_abstract_16px.png">images/machine_abstract_16px.png</file>
     198        <file alias="nw_settings_16px.png">images/nw_settings_16px.png</file>
     199        <file alias="nw_settings_disabled_16px.png">images/nw_settings_disabled_16px.png</file>
     200        <file alias="sf_settings_16px.png">images/sf_settings_16px.png</file>
     201        <file alias="sf_settings_disabled_16px.png">images/sf_settings_disabled_16px.png</file>
    198202    </qresource>
    199203</RCC>

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

    r46604 r46626  
    787787};
    788788
    789 class UIActionSimpleShowNetworkAdaptersDialog : public UIActionSimple
    790 {
    791     Q_OBJECT;
    792 
    793 public:
    794 
    795     UIActionSimpleShowNetworkAdaptersDialog(UIActionPool *pParent)
    796         : UIActionSimple(pParent, ":/nw_16px.png", ":/nw_disabled_16px.png")
    797     {
    798         retranslateUi();
    799     }
    800 
    801 protected:
    802 
    803     QString shortcutExtraDataID() const
    804     {
    805         return QString("NetworkAdaptersDialog");
    806     }
    807 
    808     void retranslateUi()
    809     {
    810         setName(QApplication::translate("UIActionPool", "&Network Adapters..."));
     789class UIActionSimpleShowNetworkSettingsDialog : public UIActionSimple
     790{
     791    Q_OBJECT;
     792
     793public:
     794
     795    UIActionSimpleShowNetworkSettingsDialog(UIActionPool *pParent)
     796        : UIActionSimple(pParent, ":/nw_settings_16px.png", ":/nw_settings_disabled_16px.png")
     797    {
     798        retranslateUi();
     799    }
     800
     801protected:
     802
     803    QString shortcutExtraDataID() const
     804    {
     805        return QString("NetworkSettingsDialog");
     806    }
     807
     808    void retranslateUi()
     809    {
     810        setName(QApplication::translate("UIActionPool", "&Network Settings..."));
    811811        setStatusTip(QApplication::translate("UIActionPool", "Change the settings of network adapters"));
    812812    }
    … …  
    830830};
    831831
    832 class UIActionSimpleShowSharedFoldersDialog : public UIActionSimple
    833 {
    834     Q_OBJECT;
    835 
    836 public:
    837 
    838     UIActionSimpleShowSharedFoldersDialog(UIActionPool *pParent)
    839         : UIActionSimple(pParent, ":/shared_folder_16px.png", ":/shared_folder_disabled_16px.png")
    840     {
    841         retranslateUi();
    842     }
    843 
    844 protected:
    845 
    846     QString shortcutExtraDataID() const
    847     {
    848         return QString("SharedFoldersDialog");
    849     }
    850 
    851     void retranslateUi()
    852     {
    853         setName(QApplication::translate("UIActionPool", "&Shared Folders..."));
     832class UIActionSimpleShowSharedFoldersSettingsDialog : public UIActionSimple
     833{
     834    Q_OBJECT;
     835
     836public:
     837
     838    UIActionSimpleShowSharedFoldersSettingsDialog(UIActionPool *pParent)
     839        : UIActionSimple(pParent, ":/sf_settings_16px.png", ":/sf_settings_disabled_16px.png")
     840    {
     841        retranslateUi();
     842    }
     843
     844protected:
     845
     846    QString shortcutExtraDataID() const
     847    {
     848        return QString("SharedFoldersSettingsDialog");
     849    }
     850
     851    void retranslateUi()
     852    {
     853        setName(QApplication::translate("UIActionPool", "&Shared Folders Settings..."));
    854854        setStatusTip(QApplication::translate("UIActionPool", "Create or modify shared folders"));
    855855    }
    … …  
    928928};
    929929
    930 class UIActionSimpleShowVideoCaptureOptions : public UIActionSimple
    931 {
    932     Q_OBJECT;
    933 
    934 public:
    935 
    936     UIActionSimpleShowVideoCaptureOptions(UIActionPool *pParent)
     930class UIActionSimpleShowVideoCaptureSettingsDialog : public UIActionSimple
     931{
     932    Q_OBJECT;
     933
     934public:
     935
     936    UIActionSimpleShowVideoCaptureSettingsDialog(UIActionPool *pParent)
    937937        : UIActionSimple(pParent, ":/video_capture_settings_16px.png")
    938938    {
    … …  
    944944    QString shortcutExtraDataID() const
    945945    {
    946         return QString("VideoCaptureOptions");
    947     }
    948 
    949     void retranslateUi()
    950     {
    951         setName(QApplication::translate("UIActionPool", "&Video Capture Options..."));
    952         setStatusTip(QApplication::translate("UIActionPool", "Configure video capture options"));
     946        return QString("VideoCaptureSettingsDialog");
     947    }
     948
     949    void retranslateUi()
     950    {
     951        setName(QApplication::translate("UIActionPool", "&Video Capture Settings..."));
     952        setStatusTip(QApplication::translate("UIActionPool", "Configure video capture settings"));
    953953    }
    954954};
    … …  
    12141214
    12151215    /* 'Devices' actions: */
    1216     m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new UIActionSimpleShowNetworkAdaptersDialog(this);
    1217     m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new UIActionSimpleShowSharedFoldersDialog(this);
     1216    m_pool[UIActionIndexRuntime_Simple_NetworkSettings] = new UIActionSimpleShowNetworkSettingsDialog(this);
     1217    m_pool[UIActionIndexRuntime_Simple_SharedFoldersSettings] = new UIActionSimpleShowSharedFoldersSettingsDialog(this);
    12181218    m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new UIActionToggleVRDEServer(this);
    12191219    m_pool[UIActionIndexRuntime_Toggle_VideoCapture] = new UIActionToggleVideoCapture(this);
    1220     m_pool[UIActionIndexRuntime_Simple_VideoCaptureOptions] = new UIActionSimpleShowVideoCaptureOptions(this);
     1220    m_pool[UIActionIndexRuntime_Simple_VideoCaptureSettings] = new UIActionSimpleShowVideoCaptureSettingsDialog(this);
    12211221    m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new UIActionSimplePerformInstallGuestTools(this);
    12221222
    … …  
    12821282        delete m_pool[UIActionIndexRuntime_Menu_DragAndDrop];
    12831283    m_pool[UIActionIndexRuntime_Menu_DragAndDrop] = new UIActionMenuDragAndDrop(this);
    1284     if (m_pool[UIActionIndexRuntime_Menu_NetworkAdapters])
    1285         delete m_pool[UIActionIndexRuntime_Menu_NetworkAdapters];
    1286     m_pool[UIActionIndexRuntime_Menu_NetworkAdapters] = new UIActionMenuNetworkAdapters(this);
     1284    if (m_pool[UIActionIndexRuntime_Menu_Network])
     1285        delete m_pool[UIActionIndexRuntime_Menu_Network];
     1286    m_pool[UIActionIndexRuntime_Menu_Network] = new UIActionMenuNetworkAdapters(this);
    12871287    if (m_pool[UIActionIndexRuntime_Menu_SharedFolders])
    12881288        delete m_pool[UIActionIndexRuntime_Menu_SharedFolders];

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

    r46582 r46626  
    6060    UIActionIndexRuntime_Menu_SharedClipboard,
    6161    UIActionIndexRuntime_Menu_DragAndDrop,
    62     UIActionIndexRuntime_Menu_NetworkAdapters,
    63     UIActionIndexRuntime_Simple_NetworkAdaptersDialog,
     62    UIActionIndexRuntime_Menu_Network,
     63    UIActionIndexRuntime_Simple_NetworkSettings,
    6464    UIActionIndexRuntime_Menu_SharedFolders,
    65     UIActionIndexRuntime_Simple_SharedFoldersDialog,
     65    UIActionIndexRuntime_Simple_SharedFoldersSettings,
    6666    UIActionIndexRuntime_Toggle_VRDEServer,
    6767    UIActionIndexRuntime_Menu_VideoCapture,
    6868    UIActionIndexRuntime_Toggle_VideoCapture,
    69     UIActionIndexRuntime_Simple_VideoCaptureOptions,
     69    UIActionIndexRuntime_Simple_VideoCaptureSettings,
    7070    UIActionIndexRuntime_Simple_InstallGuestTools,
    7171

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r46599 r46626  
    742742    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard));
    743743    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop));
    744     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_NetworkAdapters));
    745     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
     744    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_Network));
     745    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
    746746    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
    747     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
     747    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
    748748    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
    749749    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture));
    750750    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
    751     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureOptions));
     751    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings));
    752752    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
    753753
    … …  
    805805    connect(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu(), SIGNAL(aboutToShow()),
    806806            this, SLOT(sltPrepareDragAndDropMenu()));
    807     connect(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog), SIGNAL(triggered()),
     807    connect(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings), SIGNAL(triggered()),
    808808            this, SLOT(sltOpenNetworkAdaptersDialog()));
    809     connect(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog), SIGNAL(triggered()),
     809    connect(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings), SIGNAL(triggered()),
    810810            this, SLOT(sltOpenSharedFoldersDialog()));
    811811    connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
    … …  
    813813    connect(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture), SIGNAL(toggled(bool)),
    814814            this, SLOT(sltToggleVideoCapture(bool)));
    815     connect(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureOptions), SIGNAL(triggered()),
     815    connect(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings), SIGNAL(triggered()),
    816816            this, SLOT(sltOpenVideoCaptureOptions()));
    817817    connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

    r46582 r46626  
    242242    pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu());
    243243    pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu());
    244     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
    245     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
     244    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
     245    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
    246246    pMenu->addSeparator();
    247247    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r46582 r46626  
    995995    bool fAllowReconfiguration = m_machineState != KMachineState_Stuck && m_fReconfigurable;
    996996    gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog)->setEnabled(fAllowReconfiguration);
    997     gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)->setEnabled(fAllowReconfiguration);
    998     gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureOptions)->setEnabled(fAllowReconfiguration);
    999     gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)->setEnabled(fAllowReconfiguration);
     997    gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings)->setEnabled(fAllowReconfiguration);
     998    gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings)->setEnabled(fAllowReconfiguration);
     999    gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setEnabled(fAllowReconfiguration);
    10001000}
    10011001
    … …  
    12811281        }
    12821282        /* Show/Hide Network Adapters action depending on overall adapters activity status: */
    1283         gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)->setVisible(fAtLeastOneAdapterActive);
     1283        gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setVisible(fAtLeastOneAdapterActive);
    12841284    }
    12851285

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r46582 r46626  
    5151    AssertMsg(menu, ("This slot should be called only on Network Adapters menu show!\n"));
    5252    menu->clear();
    53     menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
     53    menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
    5454}
    5555
    … …  
    5959    AssertMsg(menu, ("This slot should be called only on Shared Folders menu show!\n"));
    6060    menu->clear();
    61     menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
     61    menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
    6262}
    6363
    … …  
    6868    pMenu->clear();
    6969    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
    70     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureOptions));
     70    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings));
    7171}
    7272
    … …  
    8585
    8686    /* This class connections: */
    87     connect(gActionPool->action(UIActionIndexRuntime_Menu_NetworkAdapters)->menu(), SIGNAL(aboutToShow()),
     87    connect(gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu(), SIGNAL(aboutToShow()),
    8888            this, SLOT(sltPrepareNetworkAdaptersMenu()));
    8989    connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)->menu(), SIGNAL(aboutToShow()),

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r46582 r46626  
    146146    else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_NetworkAdapters))
    147147    {
    148         if (gActionPool->action(UIActionIndexRuntime_Menu_NetworkAdapters)->isEnabled())
    149             gActionPool->action(UIActionIndexRuntime_Menu_NetworkAdapters)->menu()->exec(pEvent->globalPos());
     148        if (gActionPool->action(UIActionIndexRuntime_Menu_Network)->isEnabled())
     149            gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu()->exec(pEvent->globalPos());
    150150    }
    151151    /* Show shared-folders LED context menu: */
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