Changeset 27132 in vbox for trunk/src

Timestamp:

Mar 6, 2010 1:33:12 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: dock menu

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIActionsPool.cpp (modified) (4 diffs)
• UIActionsPool.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

@@ -26 +26 @@
 #include "VBoxGlobal.h"
 
+/* Global includes */
+#include <QtGlobal>
+
 /* Action activation event */
 class ActivateActionEvent : public QEvent
@@ -957 +960 @@
 };
 
+#ifdef Q_WS_MAC
+class DockMenuAction : public UIMenuAction
+{
+    Q_OBJECT;
+
+public:
+
+    DockMenuAction(QObject *pParent)
+        : UIMenuAction(pParent)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi() {}
+};
+
+class DockSettingsMenuAction : public UIMenuAction
+{
+    Q_OBJECT;
+
+public:
+
+    DockSettingsMenuAction(QObject *pParent)
+        : UIMenuAction(pParent)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(UIActionsPool::tr("Dock Icon"));
+    }
+};
+
+class ToggleDockPreviewMonitorAction : public UIToggleAction
+{
+    Q_OBJECT;
+
+public:
+
+    ToggleDockPreviewMonitorAction(QObject *pParent)
+        : UIToggleAction(pParent)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(UIActionsPool::tr("Show Monitor Preview"));
+    }
+};
+
+class ToggleDockDisableMonitorAction : public UIToggleAction
+{
+    Q_OBJECT;
+
+public:
+
+    ToggleDockDisableMonitorAction(QObject *pParent)
+        : UIToggleAction(pParent)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(UIActionsPool::tr("Show Application Icon"));
+    }
+};
+#endif /* Q_WS_MAC */
 
 UIActionsPool::UIActionsPool(QObject *pParent)
@@ -1003 +1084 @@
     m_actionsPool[UIActionIndex_Simple_About] = new ShowAboutAction(this);
 
+#ifdef Q_WS_MAC
+    /* "Dock" menu actions: */
+    m_actionsPool[UIActionIndex_Toggle_DockPreviewMonitor] = new ToggleDockPreviewMonitorAction(this);
+    m_actionsPool[UIActionIndex_Toggle_DockDisableMonitor] = new ToggleDockDisableMonitorAction(this);
+#endif /* Q_WS_MAC */
+
     /* Create all menus */
     createMenus();
@@ -1064 +1151 @@
         delete m_actionsPool[UIActionIndex_Menu_Help];
     m_actionsPool[UIActionIndex_Menu_Help] = new MenuHelpAction(this);
+
+#ifdef Q_WS_MAC
+    if (m_actionsPool[UIActionIndex_Menu_Dock])
+        delete m_actionsPool[UIActionIndex_Menu_Dock];
+    m_actionsPool[UIActionIndex_Menu_Dock] = new DockMenuAction(this);
+    if (m_actionsPool[UIActionIndex_Menu_DockSettings])
+        delete m_actionsPool[UIActionIndex_Menu_DockSettings];
+    m_actionsPool[UIActionIndex_Menu_DockSettings] = new DockSettingsMenuAction(this);
+#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h

@@ -106 +106 @@
     UIActionIndex_Simple_About,
 
+#ifdef Q_WS_MAC
+    UIActionIndex_Menu_Dock,
+    UIActionIndex_Menu_DockSettings,
+    UIActionIndex_Toggle_DockPreviewMonitor,
+    UIActionIndex_Toggle_DockDisableMonitor,
+#endif /* Q_WS_MAC */
+
     UIActionIndex_End
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -562 +562 @@
 #endif
 }
+
+#ifdef Q_WS_MAC
+void UIMachineLogic::prepareDock()
+{
+    QMenu *pDockMenu = actionsPool()->action(UIActionIndex_Menu_Dock)->menu();
+
+    /* Add all VM menu entries to the dock menu. Leave out close and stuff like
+     * this. */
+    QList<QAction*> actions = actionsPool()->action(UIActionIndex_Menu_Machine)->menu()->actions();
+    for (int i=0; i < actions.size(); ++i)
+        if (actions.at(i)->menuRole() == QAction::TextHeuristicRole)
+            pDockMenu->addAction(actions.at(i));
+    pDockMenu->addSeparator();
+
+    QMenu *pDockSettingsMenu = actionsPool()->action(UIActionIndex_Menu_DockSettings)->menu();
+    QActionGroup *pDockPreviewModeGroup = new QActionGroup(this);
+    QAction *pDockEnablePreviewMonitor = actionsPool()->action(UIActionIndex_Toggle_DockPreviewMonitor);
+    pDockPreviewModeGroup->addAction(pDockEnablePreviewMonitor);
+    QAction *pDockDisablePreview = actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor);
+    pDockPreviewModeGroup->addAction(pDockDisablePreview);
+    pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions());
+
+    pDockMenu->addMenu(pDockSettingsMenu);
+
+    connect(pDockPreviewModeGroup, SIGNAL(triggered(QAction*)),
+            this, SLOT(sltDockPreviewModeChanged(QAction*)));
+
+    /* Add it to the dock. */
+    extern void qt_mac_set_dock_menu(QMenu *);
+    qt_mac_set_dock_menu(pDockMenu);
+}
+#endif /* Q_WS_MAC */
 
 void UIMachineLogic::prepareRequiredFeatures()
@@ -1399 +1431 @@
 #endif
 
+#ifdef Q_WS_MAC
+void UIMachineLogic::sltDockPreviewModeChanged(QAction *pAction)
+{
+//    if (mConsole)
+    {
+        CMachine machine = m_pSession->session().GetMachine();
+        if (!machine.isNull())
+        {
+            if (pAction == actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor))
+                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "false");
+            else if (pAction == actionsPool()->action(UIActionIndex_Toggle_DockPreviewMonitor))
+                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "true");
+//            mConsole->updateDockOverlay();
+        }
+    }
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineLogic::installGuestAdditionsFrom(const QString &strSource)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -34 +34 @@
 
 /* Global forwards */
+class QAction;
 class QActionGroup;
 
@@ -101 +102 @@
     virtual void prepareActionGroups();
     virtual void prepareActionConnections();
+#ifdef Q_WS_MAC
+    virtual void prepareDock();
+#endif /* Q_WS_MAC */
     virtual void prepareRequiredFeatures();
     virtual void prepareConsolePowerUp();
@@ -153 +157 @@
 #endif
 
+#ifdef Q_WS_MAC
+    void sltDockPreviewModeChanged(QAction *pAction);
+#endif /* Q_WS_MAC */
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -144 +144 @@
         prepareMachineWindows();
 
+#ifdef Q_WS_MAC
+        /* Prepare dock: */
+        prepareDock();
+#endif /* Q_WS_MAC */
+
+
         /* Initialization: */
         sltMachineStateChanged();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -69 +69 @@
         prepareMachineWindows();
 
+#ifdef Q_WS_MAC
+        /* Prepare dock: */
+        prepareDock();
+#endif /* Q_WS_MAC */
+
         /* Initialization: */
         sltMachineStateChanged();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -134 +134 @@
         prepareMachineWindows();
 
+#ifdef Q_WS_MAC
+        /* Prepare dock: */
+        prepareDock();
+#endif /* Q_WS_MAC */
+
         /* Initialization: */
         sltMachineStateChanged();