Changeset 34737 in vbox

Timestamp:

Dec 6, 2010 11:21:23 AM (14 years ago)

Author:

vboxsync

Message:

Main;FE/Qt4-OSX: change the icon on the password dialog

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Installer/darwin/Makefile.kmk (modified) (1 diff)
• Main/VBoxExtPackHelperApp.cpp (modified) (1 diff)

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

@@ -861 +861 @@
         $(PATH_VirtualBox.app)/Info.plist \
         $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
+        $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
         $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
         $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
         $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
-        $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
-        $(PATH_ROOT)/src/VBox/Resources/other/virtualbox-vbox-128px.png=>Resources/virtualbox-vbox-128px.png
-
+        $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns
+
+#$(call VBOX_EDIT_VERSION_RULE_FN,src/platform/darwin/Info.plist)
 $$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
         $(call MSG_GENERATE,VirtualBox.app,$<,$@)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -655 +655 @@
         PkgInfo \
         Resources/virtualbox.icns \
+        Resources/virtualbox.png \
         Resources/virtualbox-vbox.icns \
         Resources/virtualbox-vbox-extpack.icns \
         Resources/virtualbox-ovf.icns \
         Resources/virtualbox-ova.icns \
-        Resources/virtualbox-vbox-128px.png \
         MacOS/components/VBoxXPCOMBase.xpt \
         MacOS/components/VirtualBox_XPCOM.xpt

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -1551 +1551 @@
     int rc = RTPathAppPrivateArch(szIconName, sizeof(szIconName));
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szIconName, sizeof(szIconName), "../Resources/virtualbox-vbox-128px.png");
+        rc = RTPathAppend(szIconName, sizeof(szIconName), "../Resources/virtualbox.png");
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct icon path: %Rrc", rc);