Changeset 27015 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 4, 2010 12:25:45 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: fs updates

Location:

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

Files:

• UIMachineView.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (4 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)

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

@@ -159 +159 @@
     virtual void sltMousePointerShapeChanged();
     virtual void sltMouseCapabilityChanged();
+    virtual void sltPerformGuestResize(const QSize & /* toSize */) {};
 
     /* Session callback handlers: */

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

@@ -54 +54 @@
     /* Cleanup machine window: */
     cleanupMachineWindow();
+
+    /* Cleanup action related stuff */
+    cleanupActionGroups();
 }
 
@@ -109 +112 @@
     }
 
+    /* Take the toggle hot key from the menu item. Since
+     * VBoxGlobal::extractKeyFromActionText gets exactly the
+     * linked key without the 'Host+' part we are adding it here. */
+    QString hotKey = QString ("Host+%1")
+        .arg (VBoxGlobal::extractKeyFromActionText(actionsPool()->action(UIActionIndex_Toggle_Fullscreen)->text()));
+    Assert (!hotKey.isEmpty());
+
+    /* Show the info message. */
+    if (!vboxProblem().confirmGoingFullscreen(hotKey))
+        return false;
+
     return true;
 }
@@ -161 +175 @@
     menu->clear();
     menu->addAction(actionsPool()->action(UIActionIndex_Toggle_MouseIntegration));
+}
+
+void UIMachineLogicFullscreen::prepareActionGroups()
+{
+    UIMachineLogic::prepareActionGroups();
+
+    /* Adjust window isn't allowed in fullscreen */
+    actionsPool()->action(UIActionIndex_Simple_AdjustWindow)->setEnabled(false);
 }
 
@@ -303 +325 @@
 }
 
+void UIMachineLogicFullscreen::cleanupActionGroups()
+{
+    /* Reenable adjust window */
+    actionsPool()->action(UIActionIndex_Simple_AdjustWindow)->setEnabled(true);
+}
+
 #ifdef Q_WS_MAC
 # ifdef QT_MAC_USE_COCOA

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

@@ -55 +55 @@
 
     /* Prepare helpers: */
+    void prepareActionGroups();
     void prepareActionConnections();
     void prepareMachineWindows();
@@ -61 +62 @@
     void cleanupMachineWindow();
     void cleanupActionConnections() {}
+    void cleanupActionGroups();
 
 #ifdef Q_WS_MAC

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

@@ -50 +50 @@
 #endif
                     , uMonitor)
-    , m_bIsGuestAutoresizeEnabled(pMachineWindow->machineLogic()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked())
+, m_bIsGuestAutoresizeEnabled(pMachineWindow->machineLogic()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked())
     , m_fShouldWeDoResize(false)
 {
@@ -189 +189 @@
         maybeRestrictMinimumSize();
 
-        if (uisession()->isGuestSupportsGraphics() && m_bIsGuestAutoresizeEnabled)
-            sltPerformGuestResize();
+        sltPerformGuestResize();
     }
 }

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

@@ -277 +277 @@
 }
 
-//#include "UIMachineViewFullscreen.h"
 void UIMachineWindowFullscreen::loadWindowSettings()
 {
-    /* Load normal window settings: */
-//    CMachine machine = session().GetMachine();
-
     /* Toggle console to manual resize mode. */
-//    m_pMachineView->setMachineWindowResizeIgnored(true);
     m_pMachineView->setFrameBufferResizeIgnored(true);
 
@@ -290 +285 @@
     QPalette palette(centralWidget()->palette());
     palette.setColor(centralWidget()->backgroundRole(), Qt::black);
-    centralWidget()->setPalette (palette);
-    centralWidget()->setAutoFillBackground (true);
-    setAutoFillBackground (true);
+    centralWidget()->setPalette(palette);
+    centralWidget()->setAutoFillBackground(true);
+    setAutoFillBackground(true);
 
     /* Here we are going really fullscreen */
@@ -301 +296 @@
     /* Make sure it is really on the right place (especially on the Mac) */
     move(0, 0);
-
-//    m_pMachineView->normalizeGeometry(true);
-//    ((UIMachineViewFullscreen*)m_pMachineView)->sltPerformGuestResize(maximumSize());
-
-//    QRect r = geometry();
-    /* Load global settings: */
-    {
-//        VBoxGlobalSettings settings = vboxGlobal().settings();
-//        menuBar()->setHidden(settings.isFeatureActive("noMenuBar"));
-    }
 }
 
 void UIMachineWindowFullscreen::saveWindowSettings()
 {
-//    CMachine machine = session().GetMachine();
-
-    /* Save extra-data settings: */
-    {
-    }
 }