Changeset 29700 in vbox for trunk

Timestamp:

May 20, 2010 2:48:14 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: 4758: New running VM core: Fullscreen, Seamless, Guest Display Auto-resize, Logging actions are named according current state.

Location:

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

Files:

• UIActionsPool.cpp (modified) (4 diffs)
• UIMachine.cpp (modified) (5 diffs)
• UISession.cpp (modified) (1 diff)

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

@@ -161 +161 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Fullscreen Mode"), "F"));
-        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to fullscreen mode"));
+        if (!isChecked())
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Enter &Fullscreen Mode"), "F"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to fullscreen mode"));
+        }
+        else
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Exit &Fullscreen Mode"), "F"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to normal mode"));
+        }
     }
 };
@@ -184 +192 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Seam&less Mode"), "L"));
-        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to seamless desktop integration mode"));
+        if (!isChecked())
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Enter Seam&less Mode"), "L"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to seamless desktop integration mode"));
+        }
+        else
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Exit Seam&less Mode"), "L"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to normal mode"));
+        }
     }
 };
@@ -207 +223 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Auto-resize &Guest Display"), "G"));
-        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
+        if (!isChecked())
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Enable &Guest Display Auto-resize"), "G"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
+        }
+        else
+        {
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Disable &Guest Display Auto-resize"), "G"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Disable automatic resize of the guest display when the window is resized"));
+        }
     }
 };
@@ -791 +815 @@
     void retranslateUi()
     {
-        setText(QApplication::translate("VBoxConsoleWnd", "&Logging...", "debug action"));
+        if (!isChecked())
+        {
+            setText(QApplication::translate("VBoxConsoleWnd", "Enable &Logging...", "debug action"));
+        }
+        else
+        {
+            setText(QApplication::translate("VBoxConsoleWnd", "Disable &Logging...", "debug action"));
+        }
     }
 };

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

@@ -18 +18 @@
  */
 
+/* Global includes */
+#include <QTimer>
+
 /* Local includes */
 #include "VBoxGlobal.h"
@@ -165 +168 @@
             pActionFullscreen->blockSignals(true);
             pActionFullscreen->setChecked(true);
+            QTimer::singleShot(0, pActionFullscreen, SLOT(sltUpdateAppearance()));
             pActionFullscreen->blockSignals(false);
         }
@@ -178 +182 @@
             pActionFullscreen->blockSignals(true);
             pActionFullscreen->setChecked(false);
+            QTimer::singleShot(0, pActionFullscreen, SLOT(sltUpdateAppearance()));
             pActionFullscreen->blockSignals(false);
         }
@@ -227 +232 @@
             pActionSeamless->blockSignals(true);
             pActionSeamless->setChecked(true);
+            QTimer::singleShot(0, pActionSeamless, SLOT(sltUpdateAppearance()));
             pActionSeamless->blockSignals(false);
         }
@@ -240 +246 @@
             pActionSeamless->blockSignals(true);
             pActionSeamless->setChecked(false);
+            QTimer::singleShot(0, pActionSeamless, SLOT(sltUpdateAppearance()));
             pActionSeamless->blockSignals(false);
         }

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

@@ -1200 +1200 @@
         strSettings = machine.GetExtraData(VBoxDefs::GUI_AutoresizeGuest);
         QAction *pGuestAutoresizeSwitch = uimachine()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize);
-        pGuestAutoresizeSwitch->blockSignals(true);
         pGuestAutoresizeSwitch->setChecked(strSettings != "off");
-        pGuestAutoresizeSwitch->blockSignals(false);
     }
 }