From c41bcf0b283b20294042f695568bbde75f31bbca Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 4 Feb 2010 21:05:44 +0000
Subject: Cleanup toolbar usage Fix font sizing

svn path=/trunk/netsurf/; revision=9954
---
 windows/res/back.bmp     | Bin 406 -> 0 bytes
 windows/res/forward.bmp  | Bin 406 -> 0 bytes
 windows/res/home.bmp     | Bin 406 -> 0 bytes
 windows/res/reload.bmp   | Bin 406 -> 0 bytes
 windows/res/resource.rc  |  27 +++++++++++++++++----------
 windows/res/stop.bmp     | Bin 406 -> 0 bytes
 windows/res/toolbar.bmp  | Bin 0 -> 8694 bytes
 windows/res/toolbarg.bmp | Bin 0 -> 8694 bytes
 windows/res/toolbarh.bmp | Bin 0 -> 8694 bytes
 9 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 windows/res/back.bmp
 delete mode 100644 windows/res/forward.bmp
 delete mode 100644 windows/res/home.bmp
 delete mode 100644 windows/res/reload.bmp
 delete mode 100644 windows/res/stop.bmp
 create mode 100644 windows/res/toolbar.bmp
 create mode 100644 windows/res/toolbarg.bmp
 create mode 100644 windows/res/toolbarh.bmp

(limited to 'windows/res')

diff --git a/windows/res/back.bmp b/windows/res/back.bmp
deleted file mode 100644
index c0088c9e8..000000000
Binary files a/windows/res/back.bmp and /dev/null differ
diff --git a/windows/res/forward.bmp b/windows/res/forward.bmp
deleted file mode 100644
index e9ff4079c..000000000
Binary files a/windows/res/forward.bmp and /dev/null differ
diff --git a/windows/res/home.bmp b/windows/res/home.bmp
deleted file mode 100644
index 80bddfd84..000000000
Binary files a/windows/res/home.bmp and /dev/null differ
diff --git a/windows/res/reload.bmp b/windows/res/reload.bmp
deleted file mode 100644
index 0809a6763..000000000
Binary files a/windows/res/reload.bmp and /dev/null differ
diff --git a/windows/res/resource.rc b/windows/res/resource.rc
index 5e9f4a285..8c09f133b 100644
--- a/windows/res/resource.rc
+++ b/windows/res/resource.rc
@@ -9,10 +9,22 @@
 
 
 
+//
+// Bitmap resources
+//
+NSWS_ID_TOOLBAR_BITMAP BITMAP         "toolbar.bmp"
+
+
+NSWS_ID_TOOLBAR_GREY_BITMAP BITMAP         "toolbarg.bmp"
+
+
+NSWS_ID_TOOLBAR_HIGHL_BITMAP BITMAP         "toolbarh.bmp"
+
+
+
 //
 // Menu resources
 //
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 NSWS_ID_CTXMENU MENU
 {
     POPUP "Context"
@@ -32,7 +44,6 @@ NSWS_ID_CTXMENU MENU
 
 
 
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 NSWS_ID_MAINMENU MENU
 {
     POPUP "&File"
@@ -118,20 +129,18 @@ NSWS_ID_MAINMENU MENU
 //
 // Dialog resources
 //
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-NSWS_ID_ABOUT_DIALOG DIALOG 0, 0, 400, 400
+NSWS_ID_ABOUT_DIALOG DIALOG 0, 0, 400, 350
 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
 CAPTION "About NetSurf"
 FONT 8, "MS Sans Serif"
 {
-    DEFPUSHBUTTON   "&OK", IDOK, 350, 365, 30, 20
-    GROUPBOX        "About NetSurf", IDC_STATIC, 10, 10, 380, 380
-    CTEXT           "content", NSWS_ID_ABOUT_CONTENT, 20, 20, 350, 330, SS_CENTER
+    DEFPUSHBUTTON   "&OK", IDOK, 345, 317, 41, 16
+    GROUPBOX        "About NetSurf", IDC_STATIC, 10, 10, 380, 328
+    CTEXT           "content", NSWS_ID_ABOUT_CONTENT, 20, 20, 361, 292, SS_CENTER
 }
 
 
 
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 NSWS_ID_DOWNLOAD_DIALOG DIALOG 0, 0, 200, 100
 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
 CAPTION "download"
@@ -145,7 +154,6 @@ FONT 8, "MS Sans Serif"
 
 
 
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 NSWS_ID_PREFS_DIALOG DIALOG 0, 0, 388, 205
 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
 CAPTION "Edit preferences"
@@ -213,5 +221,4 @@ FONT 8, "MS Sans Serif"
 //
 // Icon resources
 //
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 ID                 ICON           "NetSurf32.ico"
diff --git a/windows/res/stop.bmp b/windows/res/stop.bmp
deleted file mode 100644
index 01ae930a1..000000000
Binary files a/windows/res/stop.bmp and /dev/null differ
diff --git a/windows/res/toolbar.bmp b/windows/res/toolbar.bmp
new file mode 100644
index 000000000..4087878a6
Binary files /dev/null and b/windows/res/toolbar.bmp differ
diff --git a/windows/res/toolbarg.bmp b/windows/res/toolbarg.bmp
new file mode 100644
index 000000000..9a59e8d43
Binary files /dev/null and b/windows/res/toolbarg.bmp differ
diff --git a/windows/res/toolbarh.bmp b/windows/res/toolbarh.bmp
new file mode 100644
index 000000000..81e666f03
Binary files /dev/null and b/windows/res/toolbarh.bmp differ
-- 
cgit v1.2.3