Changeset 75025 in vbox for trunk

Timestamp:

Oct 24, 2018 11:18:53 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: New HiDPI About icons; a bit of configuration changes.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/VirtualBoxBrand.qrc (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x2.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png )
• src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png )
• src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png )
• src/VBox/Frontends/VirtualBox/images/OSE/about_x3.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/OSE/about_x2.png )
• src/VBox/Frontends/VirtualBox/images/OSE/about_x4.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/OSE/about_x2.png )

trunk/Config.kmk

@@ -964 +964 @@
 VBOX_BRAND_LICENSE_VER               :=
 VBOX_BRAND_GUI_ABOUT_PNG             := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about.png
-VBOX_BRAND_GUI_ABOUT_HIDPI_PNG       := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/x2/NonOSE/about_x2.png
+VBOX_BRAND_GUI_ABOUT_X2_PNG          := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_x2.png
+VBOX_BRAND_GUI_ABOUT_X3_PNG          := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_x3.png
+VBOX_BRAND_GUI_ABOUT_X4_PNG          := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_x4.png
 VBOX_BRAND_GUI_ABOUT_16PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_16px.png
-VBOX_BRAND_GUI_ABOUT_16PX_HIDPI_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/x2/NonOSE/about_16px_x2.png
+VBOX_BRAND_GUI_ABOUT_16PX_X2_PNG     := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_16px_x2.png
+VBOX_BRAND_GUI_ABOUT_16PX_X3_PNG     := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_16px_x3.png
+VBOX_BRAND_GUI_ABOUT_16PX_X4_PNG     := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_16px_x4.png
 VBOX_BRAND_GUI_VBOX_16PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_16px.png
 VBOX_BRAND_GUI_VBOX_20PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_20px.png
@@ -1216 +1220 @@
  VBOX_BRAND_BIOS_LOGO                := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/ose_logo.bmp
  VBOX_BRAND_GUI_ABOUT_PNG            := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about.png
- VBOX_BRAND_GUI_ABOUT_HIDPI_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_x2.png
+ VBOX_BRAND_GUI_ABOUT_X2_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_x2.png
+ VBOX_BRAND_GUI_ABOUT_X3_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_x3.png
+ VBOX_BRAND_GUI_ABOUT_X4_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_x4.png
  VBOX_BRAND_GUI_ABOUT_16PX_PNG       := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png
- VBOX_BRAND_GUI_ABOUT_16PX_HIDPI_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png
+ VBOX_BRAND_GUI_ABOUT_16PX_X2_PNG    := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x2.png
+ VBOX_BRAND_GUI_ABOUT_16PX_X3_PNG    := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x3.png
+ VBOX_BRAND_GUI_ABOUT_16PX_X4_PNG    := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px_x4.png
  VBOX_BRAND_GUI_VBOX_16PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_16px.png
  VBOX_BRAND_GUI_VBOX_20PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_20px.png

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -2194 +2194 @@
         $(QUIET)$(SED) \
                 -e 's;@VBOX_ABOUT_PNG@;$(VBOX_BRAND_GUI_ABOUT_PNG);g' \
-                -e 's;@VBOX_ABOUT_HIDPI_PNG@;$(VBOX_BRAND_GUI_ABOUT_HIDPI_PNG);g' \
+                -e 's;@VBOX_ABOUT_X2_PNG@;$(VBOX_BRAND_GUI_ABOUT_X2_PNG);g' \
+                -e 's;@VBOX_ABOUT_X3_PNG@;$(VBOX_BRAND_GUI_ABOUT_X3_PNG);g' \
+                -e 's;@VBOX_ABOUT_X4_PNG@;$(VBOX_BRAND_GUI_ABOUT_X4_PNG);g' \
                 -e 's;@VBOX_ABOUT_16PX_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_PNG);g' \
-                -e 's;@VBOX_ABOUT_16PX_HIDPI_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_HIDPI_PNG);g' \
+                -e 's;@VBOX_ABOUT_16PX_X2_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_X2_PNG);g' \
+                -e 's;@VBOX_ABOUT_16PX_X3_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_X3_PNG);g' \
+                -e 's;@VBOX_ABOUT_16PX_X4_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_X4_PNG);g' \
                 -e 's;@VBOX_VBOX_16PX_PNG@;$(VBOX_BRAND_GUI_VBOX_16PX_PNG);g' \
                 -e 's;@VBOX_VBOX_20PX_PNG@;$(VBOX_BRAND_GUI_VBOX_20PX_PNG);g' \

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

@@ -2 +2 @@
  <qresource prefix="/">
     <file alias="about.png">@VBOX_ABOUT_PNG@</file>
-    <file alias="about_x2.png">@VBOX_ABOUT_HIDPI_PNG@</file>
+    <file alias="about_x2.png">@VBOX_ABOUT_X2_PNG@</file>
+    <file alias="about_x3.png">@VBOX_ABOUT_X3_PNG@</file>
+    <file alias="about_x4.png">@VBOX_ABOUT_X4_PNG@</file>
     <file alias="about_16px.png">@VBOX_ABOUT_16PX_PNG@</file>
-    <file alias="about_16px_x2.png">@VBOX_ABOUT_16PX_HIDPI_PNG@</file>
+    <file alias="about_16px_x2.png">@VBOX_ABOUT_16PX_X2_PNG@</file>
+    <file alias="about_16px_x3.png">@VBOX_ABOUT_16PX_X3_PNG@</file>
+    <file alias="about_16px_x4.png">@VBOX_ABOUT_16PX_X4_PNG@</file>
     <file alias="VirtualBox_16px.png">@VBOX_VBOX_16PX_PNG@</file>
     <file alias="VirtualBox_20px.png">@VBOX_VBOX_20PX_PNG@</file>