Changeset 83388 in vbox for trunk

Timestamp:

Mar 24, 2020 3:50:54 PM (5 years ago)

Author:

vboxsync

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

136605

Message:

FE/Qt: Rename os_type and os_version icons to system_type and system_version to avoid name conflict with os_ type icons.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (2 diffs)
• VirtualBox2_x2.qrc (modified) (2 diffs)
• VirtualBox2_x3.qrc (modified) (2 diffs)
• VirtualBox2_x4.qrc (modified) (2 diffs)
• images/system_type_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/os_type_16px.png )
• images/system_version_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/os_version_16px.png )
• images/x2/system_type_16px_x2.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/x2/os_type_16px_x2.png )
• images/x2/system_version_16px_x2.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/x2/os_version_16px_x2.png )
• images/x3/system_type_16px_x3.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/x3/os_type_16px_x3.png )
• images/x4/system_type_16px_x4.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/x4/os_type_16px_x4.png )
• src/widgets/UIApplianceEditorWidget.cpp (modified) (1 diff)
• src/widgets/UIFormEditorWidget.cpp (modified) (1 diff)

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

@@ -93 +93 @@
         <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
         <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
-        <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>
-        <file alias="os_version_16px.png">images/os_version_16px.png</file>
         <file alias="os_win10.png">images/os_win10.png</file>
         <file alias="os_win10_64.png">images/os_win10_64.png</file>
@@ -301 +299 @@
         <file alias="statusbar_settings_disabled_16px.png">images/statusbar_settings_disabled_16px.png</file>
         <file alias="subnet_16px.png">images/subnet_16px.png</file>
+        <file alias="system_type_16px.png">images/system_type_16px.png</file>
+        <file alias="system_version_16px.png">images/system_version_16px.png</file>
         <file alias="tools_banner_global_200px.png">images/tools_banner_global_200px.png</file>
         <file alias="tools_banner_machine_200px.png">images/tools_banner_machine_200px.png</file>

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

@@ -94 +94 @@
         <file alias="os_turbolinux_64_x2.png">images/x2/os_turbolinux_64_x2.png</file>
         <file alias="os_turbolinux_x2.png">images/x2/os_turbolinux_x2.png</file>
-        <file alias="os_type_16px_x2.png">images/x2/os_type_16px_x2.png</file>
         <file alias="os_ubuntu_64_x2.png">images/x2/os_ubuntu_64_x2.png</file>
         <file alias="os_ubuntu_x2.png">images/x2/os_ubuntu_x2.png</file>
-        <file alias="os_version_16px_x2.png">images/x2/os_version_16px_x2.png</file>
         <file alias="os_win10_64_x2.png">images/x2/os_win10_64_x2.png</file>
         <file alias="os_win10_x2.png">images/x2/os_win10_x2.png</file>
@@ -302 +300 @@
         <file alias="statusbar_settings_disabled_16px_x2.png">images/x2/statusbar_settings_disabled_16px_x2.png</file>
         <file alias="subnet_16px_x2.png">images/x2/subnet_16px_x2.png</file>
+        <file alias="system_type_16px_x2.png">images/x2/system_type_16px_x2.png</file>
+        <file alias="system_version_16px_x2.png">images/x2/system_version_16px_x2.png</file>
         <file alias="tools_banner_global_200px_x2.png">images/x2/tools_banner_global_200px_x2.png</file>
         <file alias="tools_banner_machine_200px_x2.png">images/x2/tools_banner_machine_200px_x2.png</file>

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

@@ -22 +22 @@
         <file alias="os_turbolinux_64_x3.png">images/x3/os_turbolinux_64_x3.png</file>
         <file alias="os_turbolinux_x3.png">images/x3/os_turbolinux_x3.png</file>
-        <file alias="os_type_16px_x3.png">images/x3/os_type_16px_x3.png</file>
         <file alias="os_ubuntu_64_x3.png">images/x3/os_ubuntu_64_x3.png</file>
         <file alias="os_ubuntu_x3.png">images/x3/os_ubuntu_x3.png</file>
@@ -207 +206 @@
         <file alias="statusbar_settings_16px_x3.png">images/x3/statusbar_settings_16px_x3.png</file>
         <file alias="statusbar_settings_disabled_16px_x3.png">images/x3/statusbar_settings_disabled_16px_x3.png</file>
+        <file alias="system_type_16px_x3.png">images/x3/system_type_16px_x3.png</file>
         <file alias="tools_banner_global_200px_x3.png">images/x3/tools_banner_global_200px_x3.png</file>
         <file alias="tools_banner_machine_200px_x3.png">images/x3/tools_banner_machine_200px_x3.png</file>

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

@@ -22 +22 @@
         <file alias="os_turbolinux_64_x4.png">images/x4/os_turbolinux_64_x4.png</file>
         <file alias="os_turbolinux_x4.png">images/x4/os_turbolinux_x4.png</file>
-        <file alias="os_type_16px_x4.png">images/x4/os_type_16px_x4.png</file>
         <file alias="os_ubuntu_64_x4.png">images/x4/os_ubuntu_64_x4.png</file>
         <file alias="os_ubuntu_x4.png">images/x4/os_ubuntu_x4.png</file>
@@ -207 +206 @@
         <file alias="statusbar_settings_16px_x4.png">images/x4/statusbar_settings_16px_x4.png</file>
         <file alias="statusbar_settings_disabled_16px_x4.png">images/x4/statusbar_settings_disabled_16px_x4.png</file>
+        <file alias="system_type_16px_x4.png">images/x4/system_type_16px_x4.png</file>
         <file alias="tools_banner_global_200px_x4.png">images/x4/tools_banner_global_200px_x4.png</file>
         <file alias="tools_banner_machine_200px_x4.png">images/x4/tools_banner_machine_200px_x4.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -650 +650 @@
                     case KVirtualSystemDescriptionType_Description:
                     case KVirtualSystemDescriptionType_License:                value = UIIconPool::iconSet(":/description_16px.png"); break;
-                    case KVirtualSystemDescriptionType_OS:                     value = UIIconPool::iconSet(":/os_type_16px.png"); break;
+                    case KVirtualSystemDescriptionType_OS:                     value = UIIconPool::iconSet(":/system_type_16px.png"); break;
                     case KVirtualSystemDescriptionType_CPU:                    value = UIIconPool::iconSet(":/cpu_16px.png"); break;
                     case KVirtualSystemDescriptionType_Memory:                 value = UIIconPool::iconSet(":/ram_16px.png"); break;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp

@@ -1305 +1305 @@
     m_icons["Name"]                = UIIconPool::iconSet(":/name_16px.png");
     m_icons["Display Name"]        = UIIconPool::iconSet(":/name_16px.png");
-    m_icons["Type"]                = UIIconPool::iconSet(":/os_type_16px.png");
-    m_icons["Version"]             = UIIconPool::iconSet(":/os_version_16px.png");
+    m_icons["Type"]                = UIIconPool::iconSet(":/system_type_16px.png");
+    m_icons["Version"]             = UIIconPool::iconSet(":/system_version_16px.png");
     m_icons["CPU"]                 = UIIconPool::iconSet(":/cpu_16px.png");
     m_icons["Memory"]              = UIIconPool::iconSet(":/ram_16px.png");