From 7d978f46fdcb60480f843f19bf3fb8d885faee5b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 22 Mar 2011 22:37:02 +0000 Subject: Improve icon resource to contain all standard sizes and depths svn path=/trunk/netsurf/; revision=12125 --- windows/gui.c | 4 ++-- windows/res/NetSurf.ico | Bin 0 -> 18614 bytes windows/res/NetSurf16.ico | Bin 1406 -> 0 bytes windows/res/NetSurf32.ico | Bin 4286 -> 0 bytes windows/res/resource.rc | 11 +++++------ windows/resourceid.h | 3 +-- 6 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 windows/res/NetSurf.ico delete mode 100644 windows/res/NetSurf16.ico delete mode 100644 windows/res/NetSurf32.ico (limited to 'windows') diff --git a/windows/gui.c b/windows/gui.c index 6abb64f42..e6c196d9b 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -1638,12 +1638,12 @@ static void create_local_windows_classes(void) { 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 */ diff --git a/windows/res/NetSurf.ico b/windows/res/NetSurf.ico new file mode 100644 index 000000000..e0c3d01e6 Binary files /dev/null and b/windows/res/NetSurf.ico differ diff --git a/windows/res/NetSurf16.ico b/windows/res/NetSurf16.ico deleted file mode 100644 index 1cb432828..000000000 Binary files a/windows/res/NetSurf16.ico and /dev/null differ diff --git a/windows/res/NetSurf32.ico b/windows/res/NetSurf32.ico deleted file mode 100644 index 28198ccb6..000000000 Binary files a/windows/res/NetSurf32.ico and /dev/null differ diff --git a/windows/res/resource.rc b/windows/res/resource.rc index c79ebc090..5b620596d 100644 --- a/windows/res/resource.rc +++ b/windows/res/resource.rc @@ -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 @@ BEGIN 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 diff --git a/windows/resourceid.h b/windows/resourceid.h index 84076a653..57b2b938d 100644 --- a/windows/resourceid.h +++ b/windows/resourceid.h @@ -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 -- cgit v1.2.3