Changeset 54509 in vbox

Timestamp:

Feb 25, 2015 6:14:06 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Update View menu with new icons (part #3).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (2 diffs)
• images/scale_factor_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scale_16px.png )
• images/scale_factor_disabled_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scale_disabled_16px.png )
• images/virtual_screen_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/fullscreen_16px.png )
• images/virtual_screen_disabled_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/fullscreen_disabled_16px.png )
• src/runtime/UIActionPoolRuntime.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -85 +85 @@
         <file alias="scale_16px.png">images/scale_16px.png</file>
         <file alias="scale_disabled_16px.png">images/scale_disabled_16px.png</file>
+        <file alias="scale_factor_16px.png">images/scale_factor_16px.png</file>
+        <file alias="scale_factor_disabled_16px.png">images/scale_factor_disabled_16px.png</file>
         <file alias="scale_on_16px.png">images/scale_on_16px.png</file>
         <file alias="scale_on_disabled_16px.png">images/scale_on_disabled_16px.png</file>
@@ -202 +204 @@
         <file alias="video_capture_on_disabled_16px.png">images/video_capture_on_disabled_16px.png</file>
         <file alias="video_capture_settings_16px.png">images/video_capture_settings_16px.png</file>
+        <file alias="virtual_screen_16px.png">images/virtual_screen_16px.png</file>
+        <file alias="virtual_screen_disabled_16px.png">images/virtual_screen_disabled_16px.png</file>
         <file alias="vm_add_16px.png">images/vm_add_16px.png</file>
         <file alias="vm_clone_16px.png">images/vm_clone_16px.png</file>

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

@@ -27 +27 @@
 # include "UIFrameBuffer.h"
 # include "UIConverter.h"
+# include "UIIconPool.h"
 # include "UISession.h"
 # include "VBoxGlobal.h"
@@ -941 +942 @@
 
     UIActionMenuScaleFactor(UIActionPool *pParent)
-        : UIActionMenu(pParent) {}
+        : UIActionMenu(pParent, ":/scale_factor_16px.png", ":/scale_factor_disabled_16px.png") {}
 
 protected:
@@ -2460 +2461 @@
         {
             /* Add 'Virtual Screen %1' menu: */
-            QMenu *pSubMenu = pMenu->addMenu(QApplication::translate("UIMultiScreenLayout",
+            QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
+                                                                 ":/virtual_screen_disabled_16px.png"),
+                                             QApplication::translate("UIMultiScreenLayout",
                                                                      "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
@@ -2474 +2477 @@
             {
                 /* Add 'Virtual Screen %1' menu: */
-                QMenu *pSubMenu = pMenu->addMenu(QApplication::translate("UIMultiScreenLayout",
+                QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
+                                                                     ":/virtual_screen_disabled_16px.png"),
+                                                 QApplication::translate("UIMultiScreenLayout",
                                                                          "Virtual Screen %1").arg(iGuestScreenIndex + 1));
                 pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
@@ -2520 +2525 @@
         {
             /* Add 'Virtual Screen %1' menu: */
-            QMenu *pSubMenu = pMenu->addMenu(QApplication::translate("UIMultiScreenLayout",
+            QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
+                                                                 ":/virtual_screen_disabled_16px.png"),
+                                             QApplication::translate("UIMultiScreenLayout",
                                                                      "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);