Changeset 56026 in vbox for trunk/src

Timestamp:

May 22, 2015 11:07:31 AM (10 years ago)

Author:

vboxsync

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

100544

Message:

FE/Qt: Action pool: Pause action no more using direct 32px icon.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• VirtualBox1_hidpi.qrc (modified) (1 diff)
• VirtualBox2.qrc (modified) (2 diffs)
• VirtualBox2_hidpi.qrc (modified) (2 diffs)
• images/unused/vm_pause_32px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vm_pause_32px.png )
• images/unused/vm_pause_32px_hidpi.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/vm_pause_32px_hidpi.png )
• images/unused/vm_pause_disabled_32px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vm_pause_disabled_32px.png )
• images/unused/vm_pause_disabled_32px_hidpi.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/vm_pause_disabled_32px_hidpi.png )
• src/selector/UIActionPoolSelector.cpp (modified) (1 diff)

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

@@ -280 +280 @@
         <file alias="os_type_16px.png">images/os_type_16px.png</file>
         <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
-        <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
     </qresource>
 </RCC>

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

@@ -271 +271 @@
         <file alias="os_os2warp4_hidpi.png">images/hidpi/os_os2warp4_hidpi.png</file>
         <file alias="os_other_64_hidpi.png">images/hidpi/os_other_64_hidpi.png</file>
-        <file alias="os_other_hidpi.png">images/hidpi/os_other_hidpi.png</file>
     </qresource>
 </RCC>

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

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
         <file alias="os_win10.png">images/os_win10.png</file>
         <file alias="os_win10_64.png">images/os_win10_64.png</file>
@@ -230 +231 @@
         <file alias="vm_open_filemanager_disabled_16px.png">images/vm_open_filemanager_disabled_16px.png</file>
         <file alias="vm_pause_16px.png">images/vm_pause_16px.png</file>
-        <file alias="vm_pause_32px.png">images/vm_pause_32px.png</file>
         <file alias="vm_pause_disabled_16px.png">images/vm_pause_disabled_16px.png</file>
-        <file alias="vm_pause_disabled_32px.png">images/vm_pause_disabled_32px.png</file>
         <file alias="vm_pause_on_16px.png">images/vm_pause_on_16px.png</file>
         <file alias="vm_pause_on_disabled_16px.png">images/vm_pause_on_disabled_16px.png</file>

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

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="os_other_hidpi.png">images/hidpi/os_other_hidpi.png</file>
         <file alias="os_qnx_hidpi.png">images/hidpi/os_qnx_hidpi.png</file>
         <file alias="os_redhat_64_hidpi.png">images/hidpi/os_redhat_64_hidpi.png</file>
@@ -238 +239 @@
         <file alias="vm_open_filemanager_disabled_16px_hidpi.png">images/hidpi/vm_open_filemanager_disabled_16px_hidpi.png</file>
         <file alias="vm_pause_16px_hidpi.png">images/hidpi/vm_pause_16px_hidpi.png</file>
-        <file alias="vm_pause_32px_hidpi.png">images/hidpi/vm_pause_32px_hidpi.png</file>
         <file alias="vm_pause_disabled_16px_hidpi.png">images/hidpi/vm_pause_disabled_16px_hidpi.png</file>
-        <file alias="vm_pause_disabled_32px_hidpi.png">images/hidpi/vm_pause_disabled_32px_hidpi.png</file>
         <file alias="vm_pause_on_16px_hidpi.png">images/hidpi/vm_pause_on_16px_hidpi.png</file>
         <file alias="vm_pause_on_disabled_16px_hidpi.png">images/hidpi/vm_pause_on_disabled_16px_hidpi.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -677 +677 @@
 
     UIActionToggleCommonPauseAndResume(UIActionPool *pParent)
-        : UIActionToggle(pParent,
-                         ":/vm_pause_32px.png", ":/vm_pause_16px.png",
-                         ":/vm_pause_disabled_32px.png", ":/vm_pause_disabled_16px.png") {}
+        : UIActionToggle(pParent, ":/vm_pause_16px.png", ":/vm_pause_disabled_16px.png") {}
 
 protected: