Changeset 81328 in vbox

Timestamp:

Oct 17, 2019 5:31:24 PM (6 years ago)

Author:

vboxsync

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

134041

Message:

FE/Qt: bugref:9582: New icons for PCIe controller type.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• VirtualBox1_x2.qrc (modified) (1 diff)
• VirtualBox1_x3.qrc (modified) (1 diff)
• VirtualBox1_x4.qrc (modified) (1 diff)
• VirtualBox2.qrc (modified) (2 diffs)
• VirtualBox2_x2.qrc (modified) (2 diffs)
• VirtualBox2_x3.qrc (modified) (2 diffs)
• VirtualBox2_x4.qrc (modified) (2 diffs)
• images/pcie_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_16px.png )
• images/pcie_add_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_16px.png )
• images/pcie_add_disabled_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_disabled_16px.png )
• images/pcie_collapse_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_collapse_16px.png )
• images/pcie_expand_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_expand_16px.png )
• images/x2/pcie_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_16px.png )
• images/x2/pcie_add_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_16px.png )
• images/x2/pcie_add_disabled_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_disabled_16px.png )
• images/x2/pcie_collapse_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_collapse_16px.png )
• images/x2/pcie_expand_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_expand_16px.png )
• images/x3/pcie_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_16px.png )
• images/x3/pcie_add_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_16px.png )
• images/x3/pcie_add_disabled_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_disabled_16px.png )
• images/x3/pcie_collapse_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_collapse_16px.png )
• images/x3/pcie_expand_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_expand_16px.png )
• images/x4/pcie_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_16px.png )
• images/x4/pcie_add_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_16px.png )
• images/x4/pcie_add_disabled_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_add_disabled_16px.png )
• images/x4/pcie_collapse_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_collapse_16px.png )
• images/x4/pcie_expand_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/scsi_expand_16px.png )
• src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

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

@@ -429 +429 @@
         <file alias="log_viewer_save_disabled_32px.png">images/log_viewer_save_disabled_32px.png</file>
         <file alias="log_viewer_search_backward_16px.png">images/log_viewer_search_backward_16px.png</file>
+        <file alias="log_viewer_search_forward_16px.png">images/log_viewer_search_forward_16px.png</file>
+        <file alias="machine_16px.png">images/machine_16px.png</file>
     </qresource>
 </RCC>

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

@@ -422 +422 @@
         <file alias="log_viewer_save_16px_x2.png">images/x2/log_viewer_save_16px_x2.png</file>
         <file alias="log_viewer_save_32px_x2.png">images/x2/log_viewer_save_32px_x2.png</file>
+        <file alias="log_viewer_save_disabled_16px_x2.png">images/x2/log_viewer_save_disabled_16px_x2.png</file>
+        <file alias="log_viewer_save_disabled_32px_x2.png">images/x2/log_viewer_save_disabled_32px_x2.png</file>
+        <file alias="log_viewer_search_backward_16px_x2.png">images/x2/log_viewer_search_backward_16px_x2.png</file>
     </qresource>
 </RCC>

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

@@ -318 +318 @@
         <file alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file>
         <file alias="os_netbsd_x3.png">images/x3/os_netbsd_x3.png</file>
+        <file alias="os_netware_x3.png">images/x3/os_netware_x3.png</file>
+        <file alias="os_openbsd_64_x3.png">images/x3/os_openbsd_64_x3.png</file>
     </qresource>
 </RCC>

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

@@ -318 +318 @@
         <file alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file>
         <file alias="os_netbsd_x4.png">images/x4/os_netbsd_x4.png</file>
+        <file alias="os_netware_x4.png">images/x4/os_netware_x4.png</file>
+        <file alias="os_openbsd_64_x4.png">images/x4/os_openbsd_64_x4.png</file>
     </qresource>
 </RCC>

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

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
-        <file alias="log_viewer_search_forward_16px.png">images/log_viewer_search_forward_16px.png</file>
-        <file alias="machine_16px.png">images/machine_16px.png</file>
         <file alias="machine_24px.png">images/machine_24px.png</file>
         <file alias="machine_32px.png">images/machine_32px.png</file>
@@ -128 +126 @@
         <file alias="os_xandros.png">images/os_xandros.png</file>
         <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
+        <file alias="pcie_16px.png">images/pcie_16px.png</file>
+        <file alias="pcie_add_16px.png">images/pcie_add_16px.png</file>
+        <file alias="pcie_add_disabled_16px.png">images/pcie_add_disabled_16px.png</file>
+        <file alias="pcie_collapse_16px.png">images/pcie_collapse_16px.png</file>
+        <file alias="pcie_expand_16px.png">images/pcie_expand_16px.png</file>
         <file alias="pin_16px.png">images/pin_16px.png</file>
         <file alias="preview_empty_16to10_242x167px.png">images/preview_empty_16to10_242x167px.png</file>

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

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
-        <file alias="log_viewer_save_disabled_16px_x2.png">images/x2/log_viewer_save_disabled_16px_x2.png</file>
-        <file alias="log_viewer_save_disabled_32px_x2.png">images/x2/log_viewer_save_disabled_32px_x2.png</file>
-        <file alias="log_viewer_search_backward_16px_x2.png">images/x2/log_viewer_search_backward_16px_x2.png</file>
         <file alias="log_viewer_search_forward_16px_x2.png">images/x2/log_viewer_search_forward_16px_x2.png</file>
         <file alias="machine_16px_x2.png">images/x2/machine_16px_x2.png</file>
@@ -129 +126 @@
         <file alias="os_xandros_64_x2.png">images/x2/os_xandros_64_x2.png</file>
         <file alias="os_xandros_x2.png">images/x2/os_xandros_x2.png</file>
+        <file alias="pcie_16px_x2.png">images/x2/pcie_16px_x2.png</file>
+        <file alias="pcie_add_16px_x2.png">images/x2/pcie_add_16px_x2.png</file>
+        <file alias="pcie_add_disabled_16px_x2.png">images/x2/pcie_add_disabled_16px_x2.png</file>
+        <file alias="pcie_collapse_16px_x2.png">images/x2/pcie_collapse_16px_x2.png</file>
+        <file alias="pcie_expand_16px_x2.png">images/x2/pcie_expand_16px_x2.png</file>
         <file alias="pin_16px_x2.png">images/x2/pin_16px_x2.png</file>
         <file alias="preview_empty_16to10_242x167px_x2.png">images/x2/preview_empty_16to10_242x167px_x2.png</file>

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

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
-        <file alias="os_netware_x3.png">images/x3/os_netware_x3.png</file>
-        <file alias="os_openbsd_64_x3.png">images/x3/os_openbsd_64_x3.png</file>
         <file alias="os_openbsd_x3.png">images/x3/os_openbsd_x3.png</file>
         <file alias="os_opensuse_64_x3.png">images/x3/os_opensuse_64_x3.png</file>
@@ -55 +53 @@
         <file alias="os_xandros_64_x3.png">images/x3/os_xandros_64_x3.png</file>
         <file alias="os_xandros_x3.png">images/x3/os_xandros_x3.png</file>
+        <file alias="pcie_16px_x3.png">images/x3/pcie_16px_x3.png</file>
+        <file alias="pcie_add_16px_x3.png">images/x3/pcie_add_16px_x3.png</file>
+        <file alias="pcie_add_disabled_16px_x3.png">images/x3/pcie_add_disabled_16px_x3.png</file>
+        <file alias="pcie_collapse_16px_x3.png">images/x3/pcie_collapse_16px_x3.png</file>
+        <file alias="pcie_expand_16px_x3.png">images/x3/pcie_expand_16px_x3.png</file>
         <file alias="pin_16px_x3.png">images/x3/pin_16px_x3.png</file>
         <file alias="preview_empty_16to10_242x167px_x3.png">images/x3/preview_empty_16to10_242x167px_x3.png</file>

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

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
-        <file alias="os_netware_x4.png">images/x4/os_netware_x4.png</file>
-        <file alias="os_openbsd_64_x4.png">images/x4/os_openbsd_64_x4.png</file>
         <file alias="os_openbsd_x4.png">images/x4/os_openbsd_x4.png</file>
         <file alias="os_opensuse_64_x4.png">images/x4/os_opensuse_64_x4.png</file>
@@ -55 +53 @@
         <file alias="os_xandros_64_x4.png">images/x4/os_xandros_64_x4.png</file>
         <file alias="os_xandros_x4.png">images/x4/os_xandros_x4.png</file>
+        <file alias="pcie_16px_x4.png">images/x4/pcie_16px_x4.png</file>
+        <file alias="pcie_add_16px_x4.png">images/x4/pcie_add_16px_x4.png</file>
+        <file alias="pcie_add_disabled_16px_x4.png">images/x4/pcie_add_disabled_16px_x4.png</file>
+        <file alias="pcie_collapse_16px_x4.png">images/x4/pcie_collapse_16px_x4.png</file>
+        <file alias="pcie_expand_16px_x4.png">images/x4/pcie_expand_16px_x4.png</file>
         <file alias="pin_16px_x4.png">images/x4/pin_16px_x4.png</file>
         <file alias="preview_empty_16to10_242x167px_x4.png">images/x4/preview_empty_16to10_242x167px_x4.png</file>

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

@@ -2767 +2767 @@
                     case KStorageBus_SAS:        pStorageMenu->setIcon(QIcon(":/sas_16px.png")); break;
                     case KStorageBus_USB:        pStorageMenu->setIcon(QIcon(":/usb_16px.png")); break;
-                    case KStorageBus_PCIe:       pStorageMenu->setIcon(QIcon(":/ide_16px.png")); break;
+                    case KStorageBus_PCIe:       pStorageMenu->setIcon(QIcon(":/pcie_16px.png")); break;
                     case KStorageBus_VirtioSCSI: pStorageMenu->setIcon(QIcon(":/virtio_scsi_16px.png")); break;
                     default: break;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -1045 +1045 @@
     m_names.insert(USBControllerExpand,          ":/usb_expand_16px.png");
     m_names.insert(USBControllerCollapse,        ":/usb_collapse_16px.png");
-    m_names.insert(NVMeControllerNormal,         ":/ide_16px.png");
-    m_names.insert(NVMeControllerExpand,         ":/ide_expand_16px.png");
-    m_names.insert(NVMeControllerCollapse,       ":/ide_collapse_16px.png");
+    m_names.insert(NVMeControllerNormal,         ":/pcie_16px.png");
+    m_names.insert(NVMeControllerExpand,         ":/pcie_expand_16px.png");
+    m_names.insert(NVMeControllerCollapse,       ":/pcie_collapse_16px.png");
     m_names.insert(VirtioSCSIControllerNormal,   ":/virtio_scsi_16px.png");
     m_names.insert(VirtioSCSIControllerExpand,   ":/virtio_scsi_expand_16px.png");
@@ -1065 +1065 @@
     m_names.insert(USBControllerAddEn,           ":/usb_add_16px.png");
     m_names.insert(USBControllerAddDis,          ":/usb_add_disabled_16px.png");
-    m_names.insert(NVMeControllerAddEn,          ":/ide_add_16px.png");
-    m_names.insert(NVMeControllerAddDis,         ":/ide_add_disabled_16px.png");
+    m_names.insert(NVMeControllerAddEn,          ":/pcie_add_16px.png");
+    m_names.insert(NVMeControllerAddDis,         ":/pcie_add_disabled_16px.png");
     m_names.insert(VirtioSCSIControllerAddEn,    ":/virtio_scsi_add_16px.png");
     m_names.insert(VirtioSCSIControllerAddDis,   ":/virtio_scsi_add_disabled_16px.png");