Changeset 55507 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 29, 2015 8:46:07 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7791: Some NLS changes; Adding action to start Headless VM.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UIActionPoolSelector.cpp (modified) (5 diffs)
• UIActionPoolSelector.h (modified) (2 diffs)
• UISelectorWindow.cpp (modified) (8 diffs)
• UISelectorWindow.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -595 +595 @@
 };
 
-class UIActionSimpleStartDefault : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleStartDefault(UIActionPool *pParent)
+class UIActionSimpleStartNormal : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleStartNormal(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/vm_start_32px.png", ":/vm_start_16px.png",
@@ -610 +610 @@
     QString shortcutExtraDataID() const
     {
-        return QString("StartVMDefault");
-    }
-
-    void retranslateUi()
-    {
-        setName(QApplication::translate("UIActionPool", "&Default Start"));
+        return QString("StartVMNormal");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Normal Start"));
         setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines"));
     }
 };
 
-class UIActionSimpleStartSeparate : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleStartSeparate(UIActionPool *pParent)
+class UIActionSimpleStartHeadless : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleStartHeadless(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/vm_start_32px.png", ":/vm_start_16px.png",
@@ -635 +635 @@
     QString shortcutExtraDataID() const
     {
-        return QString("StartVMSeparate");
-    }
-
-    void retranslateUi()
-    {
-        setName(QApplication::translate("UIActionPool", "S&eparate Start"));
-        setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines with detachable GUI"));
+        return QString("StartVMHeadless");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Headless Start"));
+        setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines in the background"));
+    }
+};
+
+class UIActionSimpleStartDetachable : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleStartDetachable(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/vm_start_32px.png", ":/vm_start_16px.png",
+                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("StartVMDetachable");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Detachable Start"));
+        setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines with the option of continuing them in the background"));
     }
 };
@@ -1003 +1028 @@
     m_pool[UIActionIndexST_M_Group_S_Remove] = new UIActionSimpleGroupRemove(this);
     m_pool[UIActionIndexST_M_Group_M_StartOrShow] = new UIActionStateCommonStartOrShow(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault] = new UIActionSimpleStartDefault(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate] = new UIActionSimpleStartSeparate(this);
+    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal] = new UIActionSimpleStartNormal(this);
+    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless] = new UIActionSimpleStartHeadless(this);
+    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable] = new UIActionSimpleStartDetachable(this);
     m_pool[UIActionIndexST_M_Group_T_Pause] = new UIActionToggleCommonPauseAndResume(this);
     m_pool[UIActionIndexST_M_Group_S_Reset] = new UIActionSimpleCommonReset(this);
@@ -1027 +1053 @@
     m_pool[UIActionIndexST_M_Machine_S_AddGroup] = new UIActionSimpleMachineAddGroup(this);
     m_pool[UIActionIndexST_M_Machine_M_StartOrShow] = new UIActionStateCommonStartOrShow(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault] = new UIActionSimpleStartDefault(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate] = new UIActionSimpleStartSeparate(this);
+    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal] = new UIActionSimpleStartNormal(this);
+    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless] = new UIActionSimpleStartHeadless(this);
+    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable] = new UIActionSimpleStartDetachable(this);
     m_pool[UIActionIndexST_M_Machine_T_Pause] = new UIActionToggleCommonPauseAndResume(this);
     m_pool[UIActionIndexST_M_Machine_S_Reset] = new UIActionSimpleCommonReset(this);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -48 +48 @@
     UIActionIndexST_M_Group_S_Remove,
     UIActionIndexST_M_Group_M_StartOrShow,
-    UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault,
-    UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate,
+    UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal,
+    UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless,
+    UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable,
     UIActionIndexST_M_Group_T_Pause,
     UIActionIndexST_M_Group_S_Reset,
@@ -72 +73 @@
     UIActionIndexST_M_Machine_S_AddGroup,
     UIActionIndexST_M_Machine_M_StartOrShow,
-    UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault,
-    UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate,
+    UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal,
+    UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless,
+    UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable,
     UIActionIndexST_M_Machine_T_Pause,
     UIActionIndexST_M_Machine_S_Reset,

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -470 +470 @@
 }
 
-void UISelectorWindow::sltPerformDefaultStart()
+void UISelectorWindow::sltPerformStartNormal()
 {
     /* Get selected items: */
@@ -485 +485 @@
         /* Launch/show current VM: */
         CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, qApp->keyboardModifiers() == Qt::ShiftModifier ?
-                                            VBoxGlobal::LaunchMode_Headless :
-                                            VBoxGlobal::LaunchMode_Default);
-    }
-}
-
-void UISelectorWindow::sltPerformSeparateStart()
+        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Default);
+    }
+}
+
+void UISelectorWindow::sltPerformStartHeadless()
 {
     /* Get selected items: */
@@ -506 +504 @@
         /* Launch/show current VM: */
         CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, qApp->keyboardModifiers() == Qt::ShiftModifier ?
-                                            VBoxGlobal::LaunchMode_Headless :
-                                            VBoxGlobal::LaunchMode_Separate);
+        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Headless);
+    }
+}
+
+void UISelectorWindow::sltPerformStartDetachable()
+{
+    /* Get selected items: */
+    QList<UIVMItem*> items = currentItems();
+    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
+
+    /* For every selected item: */
+    foreach (UIVMItem *pItem, items)
+    {
+        /* Check if current item could be started/showed: */
+        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
+            continue;
+
+        /* Launch/show current VM: */
+        CMachine machine = pItem->machine();
+        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Separate);
     }
 }
@@ -1309 +1324 @@
 
     /* Populate 'Group' / 'Start or Show' menu: */
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault));
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable));
 
     /* Remember action list: */
-    m_groupActions << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault)
-                   << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate);
+    m_groupActions << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal)
+                   << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless)
+                   << actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable);
 }
 
@@ -1324 +1341 @@
 
     /* Populate 'Machine' / 'Start or Show' menu: */
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault));
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable));
 
     /* Remember action list: */
-    m_machineActions << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault)
-                     << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate);
+    m_machineActions << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal)
+                     << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless)
+                     << actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable);
 }
 
@@ -1485 +1504 @@
 
     /* 'Group/Start or Show' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault), SIGNAL(triggered()), this, SLOT(sltPerformDefaultStart()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate), SIGNAL(triggered()), this, SLOT(sltPerformSeparateStart()));
+    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal), SIGNAL(triggered()), this, SLOT(sltPerformStartNormal()));
+    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless), SIGNAL(triggered()), this, SLOT(sltPerformStartHeadless()));
+    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable), SIGNAL(triggered()), this, SLOT(sltPerformStartDetachable()));
 
     /* 'Machine/Start or Show' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault), SIGNAL(triggered()), this, SLOT(sltPerformDefaultStart()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate), SIGNAL(triggered()), this, SLOT(sltPerformSeparateStart()));
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal), SIGNAL(triggered()), this, SLOT(sltPerformStartNormal()));
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless), SIGNAL(triggered()), this, SLOT(sltPerformStartHeadless()));
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable), SIGNAL(triggered()), this, SLOT(sltPerformStartDetachable()));
 
     /* 'Group/Close' menu connections: */
@@ -1671 +1692 @@
     /* Enable/disable group-start-or-show actions: */
     actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate, items));
+    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal, items));
+    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless, items));
+    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable, items));
 
     /* Enable/disable machine-start-or-show actions: */
     actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable, items));
 
     /* Enable/disable group-close actions: */
@@ -1776 +1799 @@
         }
         case UIActionIndexST_M_Group_M_StartOrShow:
-        case UIActionIndexST_M_Group_M_StartOrShow_S_StartDefault:
-        case UIActionIndexST_M_Group_M_StartOrShow_S_StartSeparate:
+        case UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal:
+        case UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless:
+        case UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable:
         case UIActionIndexST_M_Machine_M_StartOrShow:
-        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartDefault:
-        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartSeparate:
+        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal:
+        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless:
+        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable:
         {
             return !m_pChooser->isGroupSavingInProgress() &&

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -88 +88 @@
     void sltShowCloneMachineWizard();
     void sltPerformStartOrShowAction();
-    void sltPerformDefaultStart();
-    void sltPerformSeparateStart();
+    void sltPerformStartNormal();
+    void sltPerformStartHeadless();
+    void sltPerformStartDetachable();
     void sltPerformDiscardAction();
     void sltPerformPauseResumeAction(bool fPause);