Changeset 26581 in vbox

Timestamp:

Feb 16, 2010 2:21:00 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Moved the realtime dock preview settings to the VM settings (no global
option anymore). Use the dock menu to configure it. Added the VM menu to the
dock menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (5 diffs)
• VBoxConsoleWnd.h (modified) (3 diffs)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• settings/global/VBoxGLSettingsGeneral.cpp (modified) (4 diffs)
• settings/global/VBoxGLSettingsGeneral.ui (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -678 +678 @@
 #endif
 
+#ifdef Q_WS_MAC
+    m_pDockMenu = new QMenu(this);
+    /* Add all VM menu entries to the dock menu. Leave out close and stuff like
+     * this. */
+    QList<QAction*> actions = mVMMenu->actions();
+    for (int i=0; i < actions.size(); ++i)
+        if (actions.at(i)->menuRole() == QAction::TextHeuristicRole)
+            m_pDockMenu->addAction(actions.at(i));
+    m_pDockMenu->addSeparator();
+
+    m_pDockSettingsMenu = new QMenu(this);
+    QActionGroup *pDockPreviewModeGroup = new QActionGroup(this);
+    m_pDockEnablePreviewMonitor = new QAction(pDockPreviewModeGroup);
+    m_pDockEnablePreviewMonitor->setCheckable(true);
+    m_pDockDisablePreview = new QAction(pDockPreviewModeGroup);
+    m_pDockDisablePreview->setCheckable(true);
+    m_pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions());
+
+    m_pDockMenu->addMenu(m_pDockSettingsMenu);
+
+    /* Add it to the dock. */
+    extern void qt_mac_set_dock_menu(QMenu *);
+    qt_mac_set_dock_menu(m_pDockMenu);
+#endif /* Q_WS_MAC */
+
     /* add to statusbar */
     statusBar()->addPermanentWidget (indicatorBox, 0);
@@ -739 +764 @@
              this, SLOT (processGlobalSettingChange (const char *, const char *)));
 #ifdef Q_WS_MAC
+    connect(pDockPreviewModeGroup, SIGNAL(triggered(QAction*)),
+            this, SLOT(sltDockPreviewModeChanged(QAction*)));
     connect (&vboxGlobal(), SIGNAL (dockIconUpdateChanged (const VBoxChangeDockIconUpdateEvent &)),
              this, SLOT (changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &)));
@@ -777 +804 @@
 #endif
 }
+
+#ifdef Q_WS_MAC
+void VBoxConsoleWnd::sltDockPreviewModeChanged(QAction *pAction)
+{
+    if (mConsole)
+    {
+        CMachine machine = mSession.GetMachine();
+        if (!machine.isNull())
+        {
+            if (pAction == m_pDockDisablePreview)
+                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "false");
+            else if (pAction == m_pDockEnablePreviewMonitor)
+                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "true");
+            mConsole->updateDockOverlay();
+        }
+    }
+}
+#endif /* Q_WS_MAC */
 
 /**
@@ -1002 +1047 @@
 
 #ifdef Q_WS_MAC
-    QString testStr = vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
+    QString strTest = machine.GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
     /* Default to true if it is an empty value */
-    bool f = (testStr.isEmpty() || testStr == "true");
+    bool f = (strTest.isEmpty() || strTest == "true");
+    if (f)
+        m_pDockEnablePreviewMonitor->setChecked(true);
+    else
+        m_pDockDisablePreview->setChecked(true);
     mConsole->setDockIconEnabled (f);
     mConsole->updateDockOverlay();
@@ -1759 +1808 @@
     mHelpMenu->setTitle (tr ("&Help"));
     // mHelpMenu->setIcon (VBoxGlobal::iconSet (":/help_16px.png"));
+
+#ifdef Q_WS_MAC
+    m_pDockSettingsMenu->setTitle(tr("Dock Icon"));
+    m_pDockDisablePreview->setText(tr("Show Application Icon"));
+    m_pDockEnablePreviewMonitor->setText(tr("Show Monitor Preview"));
+#endif /* Q_WS_MAC */
 
     /* Status bar widgets */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h

@@ -115 +115 @@
     void onDisplayResize (ulong aWidth, ulong aHeight);
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
     /* used for obtaining the extradata settings */
     CSession &session() { return mSession; }
-#endif
 signals:
 
@@ -188 +186 @@
     void changePresentationMode (const VBoxChangePresentationModeEvent &aEvent);
     void processGlobalSettingChange (const char *aPublicName, const char *aName);
+
+#ifdef RT_OS_DARWIN /* Stupid moc doesn't recognize Q_WS_MAC */
+    void sltDockPreviewModeChanged(QAction *pAction);
+#endif /* RT_OS_DARWIN */
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -308 +310 @@
 #endif
 
+#ifdef Q_WS_MAC
+    QMenu *m_pDockMenu;
+    QMenu *m_pDockSettingsMenu;
+    QAction *m_pDockDisablePreview;
+    QAction *m_pDockEnablePreviewMonitor;
+#endif /* Q_WS_MAC */
+
     /* Timer to update LEDs */
     QTimer *mIdleTimer;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -373 +373 @@
 #endif
 #ifdef Q_WS_MAC
-                if (sKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled)
-                {
-                    /* Default to true if it is an empty value */
-                    QString testStr = sVal.toLower();
-                    bool f = (testStr.isEmpty() || testStr == "true");
-                    QApplication::postEvent (&mGlobal, new VBoxChangeDockIconUpdateEvent (f));
-                }
-                else if (sKey == VBoxDefs::GUI_PresentationModeEnabled)
+                if (sKey == VBoxDefs::GUI_PresentationModeEnabled)
                 {
                     /* Default to true if it is an empty value */
@@ -395 +388 @@
             }
         }
+#ifdef Q_WS_MAC
+        else if (mGlobal.isVMConsoleProcess())
+        {
+            /* Check for the currently running machine */
+            CMachine machine = mGlobal.consoleWnd().session().GetMachine();
+            if (QString::fromUtf16(id) == machine.GetId())
+            {
+                QString strKey = QString::fromUtf16(key);
+                QString strVal = QString::fromUtf16(value);
+                if (strKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled)
+                {
+                    /* Default to true if it is an empty value */
+                    QString strTest = strVal.toLower();
+                    bool f = (strTest.isEmpty() || strTest == "true");
+                    QApplication::postEvent(&mGlobal, new VBoxChangeDockIconUpdateEvent(f));
+                }
+            }
+        }
+#endif /* Q_WS_MAC */
         return S_OK;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.cpp

@@ -34 +34 @@
     mCbCheckTrayIcon->hide();
 #endif /* VBOX_GUI_WITH_SYSTRAY */
-#ifndef Q_WS_MAC
-    mCbCheckDockPreview->hide();
-#endif /* Q_WS_MAC */
 #ifndef QT_MAC_USE_COCOA
     mCbCheckPresentationMode->hide();
 #endif /* QT_MAC_USE_COCOA */
     if (   mCbCheckTrayIcon->isHidden()
-        && mCbCheckDockPreview->isHidden()
         && mCbCheckPresentationMode->isHidden())
         mLnSeparator2->hide();
@@ -62 +58 @@
     mCbCheckTrayIcon->setChecked (aGs.trayIconEnabled());
 #ifdef Q_WS_MAC
-    mCbCheckDockPreview->setChecked (aGs.dockPreviewEnabled());
     mCbCheckPresentationMode->setChecked (aGs.presentationModeEnabled());
 #endif /* Q_WS_MAC */
@@ -78 +73 @@
     aGs.setTrayIconEnabled (mCbCheckTrayIcon->isChecked());
 #ifdef Q_WS_MAC
-    aGs.setDockPreviewEnabled (mCbCheckDockPreview->isChecked());
     aGs.setPresentationModeEnabled (mCbCheckPresentationMode->isChecked());
 #endif /* Q_WS_MAC */
@@ -89 +83 @@
     setTabOrder (mPsMach, mPsVRDP);
     setTabOrder (mPsVRDP, mCbCheckTrayIcon);
-#ifdef Q_WS_MAC
-    setTabOrder (mCbCheckTrayIcon, mCbCheckDockPreview);
-#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui

@@ -24 +24 @@
     <x>0</x>
     <y>0</y>
-    <width>402</width>
-    <height>212</height>
+    <width>379</width>
+    <height>173</height>
    </rect>
   </property>
@@ -128 +128 @@
     </widget>
    </item>
-   <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="11" column="0" colspan="3">
+   <item row="10" column="0" colspan="3">
     <spacer>
      <property name="orientation">
@@ -154 +141 @@
     </spacer>
    </item>
-   <item row="7" column="1" colspan="2">
+   <item row="6" column="1" colspan="2">
     <widget class="QCheckBox" name="mCbCheckPresentationMode">
      <property name="text">