mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 13:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve icon resource to contain all standard sizes and depths

Browse Source 
svn path=/trunk/netsurf/; revision=12125
This commit is contained in:
Vincent Sanders 2011-03-22 22:37:02 +00:00
parent 1a47f49bdc
commit 7d978f46fd
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/gui.c
View File

@ -1638,12 +1638,12 @@ static void create_local_windows_classes(void) {
w.cbClsExtra = 0; w.cbClsExtra = 0;
w.cbWndExtra = 0; w.cbWndExtra = 0;
w.hInstance = hinstance; w.hInstance = hinstance;
w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF32_ICON)); /* -> NetSurf */ w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON));
w.hCursor = NULL; w.hCursor = NULL;
w.hbrBackground = (HBRUSH)(COLOR_MENU + 1); w.hbrBackground = (HBRUSH)(COLOR_MENU + 1);
w.lpszMenuName = NULL; w.lpszMenuName = NULL;
w.lpszClassName = windowclassname_main; w.lpszClassName = windowclassname_main;
w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF16_ICON)); /* -> NetSurf */ w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON));
RegisterClassEx(&w); RegisterClassEx(&w);
/* drawable area */ /* drawable area */

BIN
windows/res/NetSurf.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
windows/res/NetSurf16.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
windows/res/NetSurf32.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

11
windows/res/resource.rc
View File

@ -5,8 +5,7 @@
#include "../resourceid.h" #include "../resourceid.h"
IDR_NETSURF32_ICON ICON DISCARDABLE "NetSurf32.ico" IDR_NETSURF_ICON ICON DISCARDABLE "NetSurf.ico"
IDR_NETSURF16_ICON ICON DISCARDABLE "NetSurf16.ico"
IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp" IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp"
IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp" IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp"
IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp" IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp"
@ -118,15 +117,15 @@ BEGIN
END END
END END
IDD_DLG_ABOUT DIALOGEX 10,10,309,180 IDD_DLG_ABOUT DIALOGEX 10,10,206,180
CAPTION "About NetSurf" CAPTION "About NetSurf"
FONT 8,"MS Sans Serif",0,0,0 FONT 8,"MS Sans Serif",0,0,0
STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU
EXSTYLE WS_EX_DLGMODALFRAME EXSTYLE WS_EX_DLGMODALFRAME
BEGIN BEGIN
CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP,0,0,308,86 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,93,288,63 CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,60,185,63
CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,246,160,54,15 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 "&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 CONTROL "&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,160,54,15
END END

3
windows/resourceid.h
View File

@ -23,8 +23,7 @@
#define IDC_STATIC (-1) #define IDC_STATIC (-1)
#endif #endif
#define IDR_NETSURF32_ICON 100 #define IDR_NETSURF_ICON 100
#define IDR_NETSURF16_ICON 101
#define IDR_TOOLBAR_BITMAP 102 #define IDR_TOOLBAR_BITMAP 102
#define IDR_TOOLBAR_BITMAP_GREY 103 #define IDR_TOOLBAR_BITMAP_GREY 103
#define IDR_TOOLBAR_BITMAP_HOT 104 #define IDR_TOOLBAR_BITMAP_HOT 104