Changeset 14449 in vbox for trunk

Timestamp:

Nov 21, 2008 11:10:23 AM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Systray:

• Added ability to disable systray menu using the "guiFeatures" -> "noSystrayMenu" property (GUI entry not implemented yet).
• Added state icons to VM sub menu entries (instead of OS icons).
• Changed VM sub menus only having basic commands for now (start/show, pause/resume, delete).
• Fixed showing the selector window using the systray menu (force to front).
• Misc small bugfixes / code cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSelectorWnd.h (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (19 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -147 +147 @@
     QAction *vmShowLogsAction;
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    QAction *mTrayShowWindowAction;
-#endif
-
     VBoxHelpActions mHelpActions;
 
@@ -214 +210 @@
 private:
 
+    bool mActive;           /* Is systray menu active/available? */
+
     /* The vm list model */
     VBoxVMModel *mVMModel;
@@ -219 +217 @@
     VBoxSelectorWnd* mParent;
     QMenu *mTrayIconMenu;
+
+    QAction *mShowSelectorAction;
+    QAction *mExitSelectorAction;
     QAction *mVmConfigAction;
     QAction *mVmDeleteAction;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -383 +383 @@
     , doneInaccessibleWarningOnce (false)
 {
+    VBoxGlobalSettings settings = vboxGlobal().settings();
+
     if (aSelf)
         *aSelf = this;
@@ -565 +567 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    mTrayShowWindowAction = new QAction (this);
-    Assert (mTrayShowWindowAction);
-    mTrayShowWindowAction->setIcon (VBoxGlobal::iconSet (":/VirtualBox_16px.png"));
-    mTrayShowWindowAction->setText (tr ("Sun xVM VirtualBox"));
-
-    if (QSystemTrayIcon::isSystemTrayAvailable())
-    {
-        mTrayIcon = new VBoxTrayIcon (this, mVMModel);
-        Assert (mTrayIcon);
-        connect (mTrayIcon, SIGNAL (activated (QSystemTrayIcon::ActivationReason)),
-                this, SLOT (trayIconActivated (QSystemTrayIcon::ActivationReason)));
-    }
+    mTrayIcon = new VBoxTrayIcon (this, mVMModel);
+    Assert (mTrayIcon);
+    connect (mTrayIcon, SIGNAL (activated (QSystemTrayIcon::ActivationReason)),
+             this, SLOT (trayIconActivated (QSystemTrayIcon::ActivationReason)));
 #endif
 
@@ -653 +647 @@
     connect (vmShowLogsAction, SIGNAL (triggered()), this, SLOT (vmShowLogs()));
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    connect (mTrayShowWindowAction, SIGNAL (triggered()), this, SLOT (showWindow()));
-#endif
-
     connect (mVMListView, SIGNAL (currentChanged()),
              this, SLOT (vmListViewCurrentChanged()));
@@ -714 +704 @@
         vbox.SetExtraData (VBoxDefs::GUI_LastVMSelected, curVMId);
     }
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    /* Delete systray menu object */
+    delete mTrayIcon;
+#endif
+
     /* Delete the items from our model */
     mVMModel->clear();
@@ -1138 +1134 @@
 {
     showNormal();
-    setFocus();
+    raise();
+    activateWindow();
 }
 
@@ -1606 +1603 @@
 VBoxTrayIcon::VBoxTrayIcon (VBoxSelectorWnd* aParent, VBoxVMModel* aVMModel)
 {
+    mShowSelectorAction = new QAction (this);
+    Assert (mShowSelectorAction);
+    mShowSelectorAction->setIcon (VBoxGlobal::iconSet (
+        ":/VirtualBox_16px.png"));
+    mShowSelectorAction->setText (VBoxVMListView::tr ("Show Selector Window"));
+    mShowSelectorAction->setStatusTip (VBoxVMListView::tr ("Shows the selector window assigned to this menu"));
+    mExitSelectorAction = new QAction (this);
+    Assert (mExitSelectorAction);
+    mExitSelectorAction->setIcon (VBoxGlobal::iconSet (
+        ":/exit_16px.png"));
+    mExitSelectorAction->setText (VBoxVMListView::tr ("Exit Selector Window"));
+    mExitSelectorAction->setStatusTip (VBoxVMListView::tr ("Exits the selector window assigned to this menu"));
+
     mVmConfigAction = new QAction (this);
     Assert (mVmConfigAction);
@@ -1659 +1669 @@
     setContextMenu (mTrayIconMenu);
 
+    VBoxGlobalSettings settings = vboxGlobal().settings();
+    mActive = QSystemTrayIcon::isSystemTrayAvailable() &&
+              !settings.isFeatureActive ("noSystrayMenu");
+
+    connect (mShowSelectorAction, SIGNAL (triggered()), mParent, SLOT (showWindow()));
+    connect (mExitSelectorAction, SIGNAL (triggered()), mParent, SLOT (fileExit()));
+
     retranslateUi();
 }
@@ -1664 +1681 @@
 VBoxTrayIcon::~VBoxTrayIcon ()
 {
-
+    hide();
 }
 
@@ -1672 +1689 @@
     QMenu *pMenu = NULL;
     QVariant vID;
+
+    if (!mActive)
+        return;
+
     if ((pMenu = qobject_cast<QMenu*>(sender())))
     {
@@ -1691 +1712 @@
         CMachine m = pItem->machine();
         KMachineState s = pItem->state();
-        bool bRunning = pItem->sessionState() != KSessionState_Closed;
-        bool bModifyEnabled = !bRunning && s != KMachineState_Saved;
+        bool running = pItem->sessionState() != KSessionState_Closed;
+        bool modifyEnabled = !running && s != KMachineState_Saved;
 
         /* Settings */
-        mVmConfigAction->setEnabled (bModifyEnabled);
+        mVmConfigAction->setEnabled (modifyEnabled);
 
         /* Delete */
-        mVmDeleteAction->setEnabled (bModifyEnabled);
+        mVmDeleteAction->setEnabled (modifyEnabled);
 
         /* Discard */
-        mVmDiscardAction->setEnabled (s == KMachineState_Saved && !bRunning);
+        mVmDiscardAction->setEnabled (s == KMachineState_Saved && !running);
 
         /* Change the Start button text accordingly */
@@ -1716 +1737 @@
             mVmStartAction->setStatusTip (
                   VBoxVMListView::tr ("Start the selected virtual machine"));
-            mVmStartAction->setEnabled (!bRunning);
+            mVmStartAction->setEnabled (!running);
         }
 
@@ -1777 +1798 @@
     }
 
-    /* Build sub menu entries. */
-    pMenu->addAction (mVmConfigAction);
+    /* Build sub menu entries (add rest of sub menu entries later here). */
+    pMenu->addAction (mVmStartAction);
+    pMenu->addAction (mVmPauseAction);
     pMenu->addAction (mVmDeleteAction);
-    pMenu->addSeparator();
-    pMenu->addAction (mVmStartAction);
-    pMenu->addAction (mVmDiscardAction);
-    pMenu->addAction (mVmPauseAction);
-    pMenu->addSeparator();
-    pMenu->addAction (mVmShowLogsAction);
 }
 
 void VBoxTrayIcon::retranslateUi ()
 {
+    if (!mActive)
+        return;
+
     mVmConfigAction->setText (VBoxVMListView::tr ("&Settings..."));
     mVmConfigAction->setStatusTip (VBoxVMListView::tr ("Configure the selected virtual machine"));
@@ -1796 +1815 @@
     mVmDeleteAction->setStatusTip (VBoxVMListView::tr ("Delete the selected virtual machine"));
 
+    mVmPauseAction->setText (VBoxVMListView::tr ("&Pause"));
+    mVmPauseAction->setStatusTip (VBoxVMListView::tr ("Suspend the execution of the virtual machine"));
+
     mVmDiscardAction->setText (VBoxVMListView::tr ("D&iscard"));
     mVmDiscardAction->setStatusTip (VBoxVMListView::tr ("Discard the saved state of the selected virtual machine"));
@@ -1807 +1829 @@
     VBoxVMItem* pItem = NULL;
     QVariant vID;
+
+    if (!mActive)
+        return;
+
     if (QMenu *pMenu = qobject_cast<QMenu*>(sender()))
     {
@@ -1821 +1847 @@
 void VBoxTrayIcon::refresh ()
 {
-    if (false == QSystemTrayIcon::isSystemTrayAvailable())
+    if (!mActive)
         return;
 
@@ -1827 +1853 @@
     AssertReturnVoid (mTrayIconMenu);
 
-    setVisible (true);
     mTrayIconMenu->clear();
 
@@ -1835 +1860 @@
 
     int iCurItemCount = 0;
+
+    mTrayIconMenu->addAction (mShowSelectorAction);
 
     for (int i = 0; i < mVMModel->rowCount(); i++, iCurItemCount++)
@@ -1850 +1877 @@
         }
 
-        QString strStatus;
-        if (pItem->state() >= KMachineState_Running)
-            strStatus = "(R)";
-
-        pSubMenu = new QMenu (QString ("&%1. %2 %3")
-                              .arg ((iCurItemCount + 1) % 100).arg (pItem->name()).arg (strStatus));
+        pSubMenu = new QMenu (QString ("&%1. %2")
+                              .arg ((iCurItemCount + 1) % 100).arg (pItem->name()));
         Assert (pSubMenu);
-        pSubMenu->setIcon (pItem->osIcon());
+        pSubMenu->setIcon (pItem->sessionStateIcon());
 
         QAction *pAction = NULL;
@@ -1868 +1891 @@
         pCurMenu->addMenu (pSubMenu);
     }
+
+    mTrayIconMenu->addAction (mExitSelectorAction);
+
+    /* We're done constructing the menu, show it */
+    setVisible (true);
 }