Changeset 34984 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 13, 2010 10:29:58 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 3635: Scale mode: Notify user about entering scale mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (2 diffs)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• runtime/scale/UIMachineLogicScale.cpp (modified) (1 diff)
• runtime/scale/UIMachineLogicScale.h (modified) (1 diff)

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

@@ -1872 +1872 @@
 {
     return messageOkCancel (mainMachineWindowShown(), Info,
-        tr ("<p>The virtual machine window will be now switched to "
-            "<b>fullscreen</b> mode. "
-            "You can go back to windowed mode at any time by pressing "
-            "<b>%1</b>. Note that the <i>Host</i> key is currently "
-            "defined as <b>%2</b>.</p>"
-            "<p>Note that the main menu bar is hidden in fullscreen mode. You "
-            "can access it by pressing <b>Host+Home</b>.</p>")
+        tr ("<p>The virtual machine window will be now switched to <b>fullscreen</b> mode. "
+            "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
+            "<p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p>"
+            "<p>Note that the main menu bar is hidden in fullscreen mode. "
+            "You can access it by pressing <b>Host+Home</b>.</p>")
             .arg (aHotKey)
             .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
@@ -1894 +1892 @@
 {
     return messageOkCancel (mainMachineWindowShown(), Info,
-        tr ("<p>The virtual machine window will be now switched to "
-            "<b>Seamless</b> mode. "
-            "You can go back to windowed mode at any time by pressing "
-            "<b>%1</b>. Note that the <i>Host</i> key is currently "
-            "defined as <b>%2</b>.</p>"
-            "<p>Note that the main menu bar is hidden in seamless mode. You "
-            "can access it by pressing <b>Host+Home</b>.</p>")
+        tr ("<p>The virtual machine window will be now switched to <b>Seamless</b> mode. "
+            "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
+            "<p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p>"
+            "<p>Note that the main menu bar is hidden in seamless mode. "
+            "You can access it by pressing <b>Host+Home</b>.</p>")
             .arg (aHotKey)
             .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
         "confirmGoingSeamless",
         tr ("Switch", "seamless"));
+}
+
+/**
+ *  @param aHotKey Scale hot key as defined in the menu.
+ *
+ *  @return @c true if the user has chosen to go scale (this is always
+ *  the case if the dialog was autoconfirmed).
+ */
+bool VBoxProblemReporter::confirmGoingScale (const QString &aHotKey)
+{
+    return messageOkCancel (mainMachineWindowShown(), Info,
+        tr ("<p>The virtual machine window will be now switched to <b>Scale</b> mode. "
+            "You can go back to windowed mode at any time by pressing <b>%1</b>.</p>"
+            "<p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p>"
+            "<p>Note that the main menu bar is hidden in scale mode. "
+            "You can access it by pressing <b>Host+Home</b>.</p>")
+            .arg (aHotKey)
+            .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
+        "confirmGoingScale",
+        tr ("Switch", "scale"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.h

@@ -315 +315 @@
     bool confirmGoingFullscreen (const QString &aHotKey);
     bool confirmGoingSeamless (const QString &aHotKey);
+    bool confirmGoingScale (const QString &aHotKey);
 
     bool remindAboutGuruMeditation (const CConsole &aConsole,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -53 +53 @@
     /* Cleanup actions groups: */
     cleanupActionGroups();
+}
+
+bool UIMachineLogicScale::checkAvailability()
+{
+    /* Base class availability: */
+    if (!UIMachineLogic::checkAvailability())
+        return false;
+
+    /* 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 strHotKey = QString("Host+%1")
+        .arg(VBoxGlobal::extractKeyFromActionText(actionsPool()->action(UIActionIndex_Toggle_Scale)->text()));
+    Assert(!strHotKey.isEmpty());
+
+    /* Show the info message. */
+    if (!vboxProblem().confirmGoingScale(strHotKey))
+        return false;
+
+    return true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.h

@@ -38 +38 @@
     virtual ~UIMachineLogicScale();
 
+    bool checkAvailability();
     void initialize();