Changeset 14467 in vbox for trunk

Timestamp:

Nov 21, 2008 3:25:20 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Systray: Hide systray icon only instead of exiting selector window.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSelectorWnd.h (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)

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

@@ -194 +194 @@
 public slots:
 
+    void trayIconShow (bool aShow = false);
 
 private slots:
@@ -219 +220 @@
 
     QAction *mShowSelectorAction;
-    QAction *mExitSelectorAction;
+    QAction *mHideSystrayMenuAction;
     QAction *mVmConfigAction;
     QAction *mVmDeleteAction;

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

@@ -1611 +1611 @@
     mShowSelectorAction->setIcon (VBoxGlobal::iconSet (
         ":/VirtualBox_16px.png"));
-    mExitSelectorAction = new QAction (this);
-    Assert (mExitSelectorAction);
-    mExitSelectorAction->setIcon (VBoxGlobal::iconSet (
+    mHideSystrayMenuAction = new QAction (this);
+    Assert (mHideSystrayMenuAction);
+    mHideSystrayMenuAction->setIcon (VBoxGlobal::iconSet (
         ":/exit_16px.png"));
 
@@ -1674 +1674 @@
 
     connect (mShowSelectorAction, SIGNAL (triggered()), mParent, SLOT (showWindow()));
-    connect (mExitSelectorAction, SIGNAL (triggered()), mParent, SLOT (fileExit()));
+    connect (mHideSystrayMenuAction, SIGNAL (triggered()), this, SLOT (trayIconShow()));
 
     retranslateUi();
@@ -1682 +1682 @@
 {
     hide();
+}
+
+void VBoxTrayIcon::retranslateUi ()
+{
+    if (!mActive)
+        return;
+
+    QFont fontBold;
+    fontBold.setBold (true);
+
+    mShowSelectorAction->setText (VBoxVMListView::tr ("Show Selector Window"));
+    mShowSelectorAction->setStatusTip (VBoxVMListView::tr ("Shows the selector window assigned to this menu"));
+    mShowSelectorAction->setFont(fontBold);
+
+    mHideSystrayMenuAction->setText (VBoxVMListView::tr ("Hide this menu"));
+    mHideSystrayMenuAction->setStatusTip (VBoxVMListView::tr ("Removes this menu from the systray"));
+
+    mVmConfigAction->setText (VBoxVMListView::tr ("&Settings..."));
+    mVmConfigAction->setStatusTip (VBoxVMListView::tr ("Configure the selected virtual machine"));
+
+    mVmDeleteAction->setText (VBoxVMListView::tr ("&Delete"));
+    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"));
+
+    mVmShowLogsAction->setText (VBoxVMListView::tr ("Show &Log..."));
+    mVmShowLogsAction->setStatusTip (VBoxVMListView::tr ("Show the log files of the selected virtual machine"));
 }
 
@@ -1803 +1834 @@
 }
 
-void VBoxTrayIcon::retranslateUi ()
-{
-    if (!mActive)
-        return;
-
-    QFont fontBold;
-    fontBold.setBold (true);
-
-    mShowSelectorAction->setText (VBoxVMListView::tr ("Show Selector Window"));
-    mShowSelectorAction->setStatusTip (VBoxVMListView::tr ("Shows the selector window assigned to this menu"));
-    mShowSelectorAction->setFont(fontBold);
-
-    mExitSelectorAction->setText (VBoxVMListView::tr ("Exit Selector Window"));
-    mExitSelectorAction->setStatusTip (VBoxVMListView::tr ("Exits the selector window assigned to this menu"));
-
-    mVmConfigAction->setText (VBoxVMListView::tr ("&Settings..."));
-    mVmConfigAction->setStatusTip (VBoxVMListView::tr ("Configure the selected virtual machine"));
-
-    mVmDeleteAction->setText (VBoxVMListView::tr ("&Delete"));
-    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"));
-
-    mVmShowLogsAction->setText (VBoxVMListView::tr ("Show &Log..."));
-    mVmShowLogsAction->setStatusTip (VBoxVMListView::tr ("Show the log files of the selected virtual machine"));
-}
-
 void VBoxTrayIcon::hideSubMenu ()
 {
@@ -1907 +1907 @@
         mTrayIconMenu->addSeparator();
 
-    mTrayIconMenu->addAction (mExitSelectorAction);
+    mTrayIconMenu->addAction (mHideSystrayMenuAction);
 
     /* We're done constructing the menu, show it */
@@ -1927 +1927 @@
 }
 
+void VBoxTrayIcon::trayIconShow (bool aShow)
+{
+    mActive = aShow;
+    refresh();
+    setVisible (mActive);
+
+    VBoxGlobalSettings settings = vboxGlobal().settings();
+    settings.setTrayIconEnabled (mActive);
+    settings.save (vboxGlobal().virtualBox());
+}
+
 void VBoxTrayIcon::vmSettings()
 {