Changeset 51470 in vbox for trunk/src/VBox

Timestamp:

May 30, 2014 12:32:20 PM (11 years ago)

Author:

vboxsync

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

94056

Message:

FE/Qt: Mac OS X: HiDPI: Integrate new keyboard settings icons.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (2 diffs)
• VirtualBox1_hidpi.qrc (modified) (2 diffs)
• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• images/hidpi/keyboard_16px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png )
• images/hidpi/keyboard_24px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png )
• images/hidpi/keyboard_32px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png )
• images/keyboard_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png )
• images/keyboard_24px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png )
• images/keyboard_32px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png )
• src/settings/UISettingsDialogSpecific.cpp (modified) (1 diff)

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

@@ -156 +156 @@
         <file alias="ide_expand_16px.png">images/ide_expand_16px.png</file>
         <file alias="import_16px.png">images/import_16px.png</file>
+        <file alias="keyboard_16px.png">images/keyboard_16px.png</file>
+        <file alias="keyboard_24px.png">images/keyboard_24px.png</file>
+        <file alias="keyboard_32px.png">images/keyboard_32px.png</file>
         <file alias="list_movedown_16px.png">images/list_movedown_16px.png</file>
         <file alias="list_movedown_disabled_16px.png">images/list_movedown_disabled_16px.png</file>
@@ -250 +253 @@
         <file alias="os_win2k8.png">images/os_win2k8.png</file>
         <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file>
-        <file alias="os_win31.png">images/os_win31.png</file>
-        <file alias="os_win7.png">images/os_win7.png</file>
     </qresource>
 </RCC>

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

@@ -156 +156 @@
         <file alias="ide_expand_16px_hidpi.png">images/hidpi/ide_expand_16px_hidpi.png</file>
         <file alias="import_16px_hidpi.png">images/hidpi/import_16px_hidpi.png</file>
+        <file alias="keyboard_16px_hidpi.png">images/hidpi/keyboard_16px_hidpi.png</file>
+        <file alias="keyboard_24px_hidpi.png">images/hidpi/keyboard_24px_hidpi.png</file>
+        <file alias="keyboard_32px_hidpi.png">images/hidpi/keyboard_32px_hidpi.png</file>
         <file alias="list_movedown_16px_hidpi.png">images/hidpi/list_movedown_16px_hidpi.png</file>
         <file alias="list_movedown_disabled_16px_hidpi.png">images/hidpi/list_movedown_disabled_16px_hidpi.png</file>
@@ -232 +235 @@
         <file alias="os_os2warp3_hidpi.png">images/hidpi/os_os2warp3_hidpi.png</file>
         <file alias="os_os2warp45_hidpi.png">images/hidpi/os_os2warp45_hidpi.png</file>
-        <file alias="os_os2warp4_hidpi.png">images/hidpi/os_os2warp4_hidpi.png</file>
     </qresource>
 </RCC>

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

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="os_win31.png">images/os_win31.png</file>
+        <file alias="os_win7.png">images/os_win7.png</file>
         <file alias="os_win7_64.png">images/os_win7_64.png</file>
         <file alias="os_win8.png">images/os_win8.png</file>

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

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
+        <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>

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -352 +352 @@
                 {
                     pSettingsPage = new UIGlobalSettingsInput;
-                    addItem(":/hostkey_32px.png", ":/hostkey_24px.png", ":/hostkey_16px.png",
+                    addItem(":/keyboard_32px.png", ":/keyboard_24px.png", ":/keyboard_16px.png",
                             iPageIndex, "#input", pSettingsPage);
                     break;