Changeset 15664 in vbox

Timestamp:

Dec 18, 2008 2:46:02 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Added option to enable/disable the real time VM preview in the dock
icon.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobalSettings.h (modified) (3 diffs)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGLSettingsGeneral.cpp (modified) (4 diffs)
• src/VBoxGlobalSettings.cpp (modified) (4 diffs)
• ui/VBoxGLSettingsGeneral.ui (modified) (1 diff)

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

@@ -162 +162 @@
 #ifdef Q_WS_MAC
     static const char* GUI_RealtimeDockIconUpdateEnabled;
-#endif
+#endif /* Q_WS_MAC */
     static const char* GUI_PassCAD;
 };

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

@@ -48 +48 @@
     QString maxGuestRes;
     bool trayIconEnabled;
+    bool dockPreviewEnabled;
 
     friend class VBoxGlobalSettings;
@@ -63 +64 @@
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
     Q_PROPERTY (bool trayIconEnabled READ trayIconEnabled WRITE setTrayIconEnabled)
+    Q_PROPERTY (bool dockPreviewEnabled READ dockPreviewEnabled WRITE setDockPreviewEnabled)
 
 public:
@@ -106 +108 @@
 
     bool trayIconEnabled() const { return data()->trayIconEnabled; }
-    void setTrayIconEnabled (bool enabled) {
+    void setTrayIconEnabled (bool enabled)
+    {
         mData()->trayIconEnabled = enabled;
     }
+
+    bool dockPreviewEnabled() const { return data()->dockPreviewEnabled; }
+    void setDockPreviewEnabled (bool enabled)
+    {
+        mData()->dockPreviewEnabled = enabled;
+    }
+
 
     //

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

@@ -51 +51 @@
 #ifdef Q_WS_MAC
 const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
-#endif
+#endif /* Q_WS_MAC */
 const char* VBoxDefs::GUI_PassCAD = "GUI/PassCAD";

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

@@ -33 +33 @@
 #ifndef VBOX_GUI_WITH_SYSTRAY
     mCbCheckTrayIcon->hide();
-#endif
+#endif /* VBOX_GUI_WITH_SYSTRAY */
+#ifndef Q_WS_MAC
+    mCbCheckDockPreview->hide();
+#endif /* Q_WS_MAC */
 
     mPsHardDisk->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
@@ -51 +54 @@
     mPsVRDP->setPath (aProps.GetRemoteDisplayAuthLibrary());
     mCbCheckTrayIcon->setChecked (aGs.trayIconEnabled());
+#ifdef Q_WS_MAC
+    mCbCheckDockPreview->setChecked (aGs.dockPreviewEnabled());
+#endif /* Q_WS_MAC */
 }
 
@@ -63 +69 @@
         aProps.SetRemoteDisplayAuthLibrary (mPsVRDP->path());
     aGs.setTrayIconEnabled (mCbCheckTrayIcon->isChecked());
+#ifdef Q_WS_MAC
+    aGs.setDockPreviewEnabled (mCbCheckDockPreview->isChecked());
+#endif /* Q_WS_MAC */
 }
 
@@ -71 +80 @@
     setTabOrder (mPsMach, mPsVRDP);
     setTabOrder (mPsVRDP, mCbCheckTrayIcon);
+#ifdef Q_WS_MAC
+    setTabOrder (mCbCheckTrayIcon, mCbCheckDockPreview);
+#endif /* Q_WS_MAC */
 }
 

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

@@ -61 +61 @@
     maxGuestRes = "auto";
     trayIconEnabled = false;
+    dockPreviewEnabled = true;
 }
 
@@ -71 +72 @@
     maxGuestRes = that.maxGuestRes;
     trayIconEnabled = that.trayIconEnabled;
+    dockPreviewEnabled = that.dockPreviewEnabled;
 }
 
@@ -85 +87 @@
          languageId  == that.languageId &&
          maxGuestRes == that.maxGuestRes &&
-         trayIconEnabled == that.trayIconEnabled);
+         trayIconEnabled == that.trayIconEnabled
+         && dockPreviewEnabled == that.dockPreviewEnabled
+        );
 }
 
@@ -106 +110 @@
 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/TrayIcon/Enabled",    "trayIconEnabled", "true|false", 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 },
+#ifdef Q_WS_MAC
+    { VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "dockPreviewEnabled", "true|false", true }
+#endif /* Q_WS_MAC */
 };
 

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGLSettingsGeneral.ui

@@ -136 +136 @@
     </widget>
    </item>
-   <item row="6" column="0" colspan="3" >
+   <item row="6" column="1" colspan="2" >
+    <widget class="QCheckBox" name="mCbCheckDockPreview" >
+     <property name="whatsThis" >
+      <string>When checked, the Dock Icon will reflect the VM window content in realtime.</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Dock Icon Realtime Preview</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="3" >
     <spacer>
      <property name="orientation" >