Changeset 11787 in vbox

Timestamp:

Aug 28, 2008 7:42:37 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35571

Message:

Fe/Qt4: Fix the text (wrong hot-key shown) for entering fullscreen/seamless modes.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (2 diffs)

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

@@ -1151 +1151 @@
              * See http://trolltech.com/developer/task-tracker/index_html?id=206165&method=entry
              * for details. */
-#if defined (Q_WS_X11) && (QT_VERSION >= 0x040309) && (QT_VERSION < 0x040401) 
+#if defined (Q_WS_X11) && (QT_VERSION >= 0x040309) && (QT_VERSION < 0x040401)
             qApp->setOverrideCursor(Qt::ArrowCursor);
 #endif
@@ -2046 +2046 @@
     if (aOn)
     {
-        /* Take the toggle hot key from the menu item. */
-        QString hotKey = VBoxGlobal::extractKeyFromActionText (aSeamless ? vmSeamlessAction->text() :
-                                                                           vmFullscreenAction->text());
+        /* 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 (aSeamless ?
+                  vmSeamlessAction->text() : vmFullscreenAction->text()));
 
         Assert (!hotKey.isEmpty());