Changeset 14455 in vbox

Timestamp:

Nov 21, 2008 1:15:28 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39725

Message:

Fe/Qt4: Systray:

• Removed "Delete" action from VM sub menu.
• Made the "Show Selector Window" entry bold.
• Added re-translation support for show/exit actions.
• Added separators to systray menu (only when VMs are existing).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobalSettings.h (modified) (3 diffs)
• src/VBoxGlobalSettings.cpp (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)

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

@@ -47 +47 @@
     QString languageId;
     QString maxGuestRes;
+    bool trayIconEnabled;
 
     friend class VBoxGlobalSettings;
@@ -61 +62 @@
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
+    Q_PROPERTY (bool trayIconEnabled READ trayIconEnabled WRITE setTrayIconEnabled)
 
 public:
@@ -103 +105 @@
     }
 
+    bool trayIconEnabled() const { return data()->trayIconEnabled; }
+    void setTrayIconEnabled (bool enabled) {
+        mData()->trayIconEnabled = enabled;
+    }
+
     //
 

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

@@ -60 +60 @@
     languageId  = QString::null;
     maxGuestRes = "auto";
+    trayIconEnabled = true;
 }
 
@@ -69 +70 @@
     languageId  = that.languageId;
     maxGuestRes = that.maxGuestRes;
+    trayIconEnabled = that.trayIconEnabled;
 }
 
@@ -82 +84 @@
          guiFeatures == that.guiFeatures &&
          languageId  == that.languageId &&
-         maxGuestRes == that.maxGuestRes);
+         maxGuestRes == that.maxGuestRes &&
+         trayIconEnabled == that.trayIconEnabled);
 }
 
@@ -103 +106 @@
 gPropertyMap[] =
 {
-    { "GUI/Input/HostKey",      "hostKey",      "\\d*[1-9]\\d*", true },
-    { "GUI/Input/AutoCapture",  "autoCapture",  "true|false", true },
-    { "GUI/Customizations",     "guiFeatures",  "\\S+", true },
-    { "GUI/LanguageID",         "languageId",   gVBoxLangIDRegExp, true },
-    { "GUI/MaxGuestResolution", "maxGuestRes",  "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true }
+    { "GUI/Input/HostKey",       "hostKey",         "\\d*[1-9]\\d*", true },
+    { "GUI/Input/AutoCapture",   "autoCapture",     "true|false", true },
+    { "GUI/Customizations",      "guiFeatures",     "\\S+", true },
+    { "GUI/LanguageID",          "languageId",      gVBoxLangIDRegExp, true },
+    { "GUI/MaxGuestResolution",  "maxGuestRes",     "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true },
+    { "GUI/TrayIcon/Enabled",    "trayIconEnabled", "true|false", true }
 };
 

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

@@ -1607 +1607 @@
     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);
@@ -1671 +1667 @@
     VBoxGlobalSettings settings = vboxGlobal().settings();
     mActive = QSystemTrayIcon::isSystemTrayAvailable() &&
-              !settings.isFeatureActive ("noSystrayMenu");
+              settings.trayIconEnabled();
 
     connect (mShowSelectorAction, SIGNAL (triggered()), mParent, SLOT (showWindow()));
@@ -1801 +1797 @@
     pMenu->addAction (mVmStartAction);
     pMenu->addAction (mVmPauseAction);
-    pMenu->addAction (mVmDeleteAction);
 }
 
@@ -1808 +1803 @@
     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..."));
@@ -1862 +1867 @@
 
     mTrayIconMenu->addAction (mShowSelectorAction);
+
+    if (mVMModel->rowCount() > 0)
+        mTrayIconMenu->addSeparator();
 
     for (int i = 0; i < mVMModel->rowCount(); i++, iCurItemCount++)
@@ -1892 +1900 @@
     }
 
+    if (mVMModel->rowCount() > 0)
+        mTrayIconMenu->addSeparator();
+
     mTrayIconMenu->addAction (mExitSelectorAction);