Changeset 50092 in vbox for trunk

Timestamp:

Jan 17, 2014 1:03:16 PM (11 years ago)

Author:

vboxsync

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

91616

Message:

FE/Qt: 7090: Providing x11 platforms with virtualbox.svg icon: 1st step: Adding icon.

Location:

trunk

Files:

trunk/Config.kmk

r50053	r50092
836	836	VBOX_BRAND_GUI_VBOX_48PX_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_48px.png
837	837	VBOX_BRAND_GUI_VBOX_64PX_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_64px.png
	838	VBOX_BRAND_GUI_VBOX_SVG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox.svg
838	839	VBOX_BRAND_WIN_INST_DLGJPG := $(PATH_ROOT)/src/VBox/Installer/win/Binary/Dialog.jpg
839	840	VBOX_BRAND_WIN_INST_EXT :=

r49791	r50092
862	862	-e 's;@VBOX_VBOX_64PX_PNG@;$(VBOX_BRAND_GUI_VBOX_64PX_PNG);g' \
863	863	-e 's;@VBOX_CUBE_42PX_PNG@;$(VBOX_BRAND_GUI_CUBE_42PX_PNG);g' \
	864	-e 's;@VBOX_CUBE_SVG@;$(VBOX_BRAND_GUI_VBOX_SVG);g' \
864	865	--output $@ \
865	866	$<

r26198	r50092
9	9	<file alias="VirtualBox_48px.png">@VBOX_VBOX_48PX_PNG@</file>
10	10	<file alias="VirtualBox_64px.png">@VBOX_VBOX_64PX_PNG@</file>
	11	<file alias="VirtualBox.svg">@VBOX_CUBE_SVG@</file>
11	12	</qresource>
12	13	</RCC>

-              r50081
+              r50092
     /* Prepare application icon: */
 #if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+    /* On Win32, it's built-in to the executable.
+     * On Mac OS X the icon referenced in info.plist is used. */
+    setWindowIcon(QIcon(":/VirtualBox_48px.png"));
+    /* On Win host it's built-in to the executable.
+     * On Mac OS X the icon referenced in info.plist is used.
+     * On X11 we will provide as much icons as we can.. */
+    QIcon icon(":/VirtualBox.svg");
+    icon.addFile(":/VirtualBox_48px.png");
+    icon.addFile(":/VirtualBox_64px.png");
+    setWindowIcon(icon);
 #endif
+}

Note: See TracChangeset for help on using the changeset viewer.