Changeset 7372 in vbox

Timestamp:

Mar 7, 2008 3:15:49 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fixed images in the state indicator tooltips and right click of mouse integration as well as shared folders.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)
• src/VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -747 +747 @@
     void processAboutToShow();
 
-//    void processActivated (int);
-
 private:
 

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

@@ -1610 +1610 @@
     QToolTip::add (autoresize_state,
         tr ("Indicates whether the guest display auto-resize function is On "
-            "(<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). "
+            "(<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). "
             "Note that this function requires Guest Additions to be installed in the guest OS."));
 #endif
     QToolTip::add (mouse_state,
         tr ("Indicates whether the host mouse pointer is captured by the guest OS:<br>"
-            "<nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br>"
-            "<nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br>"
-            "<nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br>"
-            "<nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br>"
-            "<nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>"
+            "<nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br>"
+            "<nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br>"
+            "<nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br>"
+            "<nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br>"
+            "<nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>"
             "Note that the mouse integration feature requires Guest Additions to be installed in the guest OS."));
     QToolTip::add (hostkey_state,
         tr ("Indicates whether the keyboard is captured by the guest OS "
-            "(<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)."));
+            "(<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>)."));
     QToolTip::add (hostkey_name,
         tr ("Shows the currently assigned Host key.<br>"
@@ -1863 +1863 @@
             /* compose status icon tooltip */
             QString tip = tr ("Indicates whether the Remote Display (VRDP Server) "
-                              "is enabled (<img src=vrdp_16px.png/>) or not "
-                              "(<img src=vrdp_disabled_16px.png/>)."
+                              "is enabled (<img src=:/vrdp_16px.png/>) or not "
+                              "(<img src=:/vrdp_disabled_16px.png/>)."
                               );
             if (vrdpsrv.GetEnabled())
@@ -3067 +3067 @@
         devicesSFMenu->exec (e->globalPos());
 #else
-#warning port me
-//        if (devicesSFDialogAction->isEnabled())
-//            devicesSFDialogAction->activate();
+        if (devicesSFDialogAction->isEnabled())
+            devicesSFDialogAction->trigger();
 #endif
     }

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

@@ -4263 +4263 @@
     /* this menu works only with toggle action */
     Assert (aAction->isCheckable());
+    addAction(aAction);
     connect (this, SIGNAL (aboutToShow()),
              this, SLOT   (processAboutToShow()));
-//    connect (this, SIGNAL (activated (int)),
-//             this, SLOT   (processActivated (int)));
 }
 
@@ -4279 +4278 @@
     mAction->setText (text);
 }
-
-#warning port me: no longer needed?
-//void VBoxSwitchMenu::processActivated (int /*aIndex*/)
-//{
-//    mAction->toggle();
-//}
 
 #ifdef Q_WS_X11