Author: vince Date: Tue Mar 22 17:37:02 2011 New Revision: 12125 URL: http://source.netsurf-browser.org?rev=12125&view=rev Log: Improve icon resource to contain all standard sizes and depths Added: trunk/netsurf/windows/res/NetSurf.ico (with props) Removed: trunk/netsurf/windows/res/NetSurf16.ico trunk/netsurf/windows/res/NetSurf32.ico Modified: trunk/netsurf/windows/gui.c trunk/netsurf/windows/res/resource.rc trunk/netsurf/windows/resourceid.h Modified: trunk/netsurf/windows/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/gui.c?rev=12125&a... ============================================================================== --- trunk/netsurf/windows/gui.c (original) +++ trunk/netsurf/windows/gui.c Tue Mar 22 17:37:02 2011 @@ -1638,12 +1638,12 @@ w.cbClsExtra = 0; w.cbWndExtra = 0; w.hInstance = hinstance; - w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF32_ICON)); /* -> NetSurf */ + w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); w.hCursor = NULL; w.hbrBackground = (HBRUSH)(COLOR_MENU + 1); w.lpszMenuName = NULL; w.lpszClassName = windowclassname_main; - w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF16_ICON)); /* -> NetSurf */ + w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); RegisterClassEx(&w); /* drawable area */ Added: trunk/netsurf/windows/res/NetSurf.ico URL: http://source.netsurf-browser.org/trunk/netsurf/windows/res/NetSurf.ico?r... ============================================================================== Binary file - no diff available. Propchange: trunk/netsurf/windows/res/NetSurf.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/netsurf/windows/res/NetSurf16.ico URL: http://source.netsurf-browser.org/trunk/netsurf/windows/res/NetSurf16.ico... ============================================================================== Binary file - no diff available. Removed: trunk/netsurf/windows/res/NetSurf32.ico URL: http://source.netsurf-browser.org/trunk/netsurf/windows/res/NetSurf32.ico... ============================================================================== Binary file - no diff available. Modified: trunk/netsurf/windows/res/resource.rc URL: http://source.netsurf-browser.org/trunk/netsurf/windows/res/resource.rc?r... ============================================================================== --- trunk/netsurf/windows/res/resource.rc (original) +++ trunk/netsurf/windows/res/resource.rc Tue Mar 22 17:37:02 2011 @@ -5,8 +5,7 @@ #include "../resourceid.h" -IDR_NETSURF32_ICON ICON DISCARDABLE "NetSurf32.ico" -IDR_NETSURF16_ICON ICON DISCARDABLE "NetSurf16.ico" +IDR_NETSURF_ICON ICON DISCARDABLE "NetSurf.ico" IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp" IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp" IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp" @@ -118,15 +117,15 @@ END END -IDD_DLG_ABOUT DIALOGEX 10,10,309,180 +IDD_DLG_ABOUT DIALOGEX 10,10,206,180 CAPTION "About NetSurf" FONT 8,"MS Sans Serif",0,0,0 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME BEGIN - CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP,0,0,308,86 - CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,93,288,63 - CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,246,160,54,15 + CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP|0x40L /*SS_REALSIZECONTROL*/,0,0,205,53 + CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,60,185,63 + CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,160,54,15 CONTROL "&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,160,54,15 CONTROL "&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,160,54,15 END Modified: trunk/netsurf/windows/resourceid.h URL: http://source.netsurf-browser.org/trunk/netsurf/windows/resourceid.h?rev=... ============================================================================== --- trunk/netsurf/windows/resourceid.h (original) +++ trunk/netsurf/windows/resourceid.h Tue Mar 22 17:37:02 2011 @@ -23,8 +23,7 @@ #define IDC_STATIC (-1) #endif -#define IDR_NETSURF32_ICON 100 -#define IDR_NETSURF16_ICON 101 +#define IDR_NETSURF_ICON 100 #define IDR_TOOLBAR_BITMAP 102 #define IDR_TOOLBAR_BITMAP_GREY 103 #define IDR_TOOLBAR_BITMAP_HOT 104