[SHELL32]

* Add shell browser bitmaps (toolbar, brand icon, go button). Patch by Robert Naumann (gonzoMD).
CORE-8249 #resolve #comment Commited into shell-experiments. Thanks a lot.

svn path=/branches/shell-experiments/; revision=63432

diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc
index 02b9896..7190055 100644 (file)
--- a/dll/win32/shell32/bitmap_res.rc
+++ b/dll/win32/shell32/bitmap_res.rc
@@ -1,15 +1,21 @@
 IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp"
-
-/*
-IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204+205.bmp"
-IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206+207.bmp"
-IDB_SHELL_EXPLORER_LG BITMAP "res/bitmaps/214+215.bmp"
-IDB_SHELL_EXPLORER_SM BITMAP "res/bitmaps/216+217.bmp"
-IDB_SHELL_UNKNOWN1 BITMAP "res/bitmaps/225.bmp"
-IDB_SHELL_UNKNOWN2 BITMAP "res/bitmaps/226.bmp"
-IDB_SHELL_UNKNOWN3 BITMAP "res/bitmaps/227.bmp"
-IDB_SHELL_UNKNOWN4 BITMAP "res/bitmaps/228.bmp"
-IDB_SHELL_UNKNOWN5 BITMAP "res/bitmaps/230.bmp"
-IDB_SHELL_UNKNOWN6 BITMAP "res/bitmaps/231.bmp"
-IDB_SHELL_UNKNOWN7 BITMAP "res/bitmaps/245.bmp"
-*/
+IDB_SHELL_IEXPLORE_LG        BITMAP "res/bitmaps/204.bmp"
+IDB_SHELL_IEXPLORE_LG_HOT    BITMAP "res/bitmaps/205.bmp"
+IDB_SHELL_IEXPLORE_SM        BITMAP "res/bitmaps/206.bmp"
+IDB_SHELL_IEXPLORE_SM_HOT    BITMAP "res/bitmaps/207.bmp"
+IDB_SHELL_EXPLORER_LG        BITMAP "res/bitmaps/214.bmp"
+IDB_SHELL_EXPLORER_LG_HOT    BITMAP "res/bitmaps/215.bmp"
+IDB_SHELL_EXPLORER_SM        BITMAP "res/bitmaps/216.bmp"
+IDB_SHELL_EXPLORER_SM_HOT    BITMAP "res/bitmaps/217.bmp"
+IDB_SHELL_EDIT_LG            BITMAP "res/bitmaps/225.bmp"
+IDB_SHELL_EDIT_LG_HOT        BITMAP "res/bitmaps/226.bmp"
+IDB_SHELL_EDIT_SM            BITMAP "res/bitmaps/227.bmp"
+IDB_SHELL_EDIT_SM_HOT        BITMAP "res/bitmaps/228.bmp"
+IDB_SHELL_GO                 BITMAP "res/bitmaps/230.bmp"
+IDB_SHELL_GO_HOT             BITMAP "res/bitmaps/231.bmp"
+IDB_SHELL_BRANDBAND_SM_HI    BITMAP "res/bitmaps/240.bmp"
+/*IDB_SHELL_BRANDBAND_MD_HI    BITMAP "res/bitmaps/241.bmp"
+IDB_SHELL_BRANDBAND_LG_HI    BITMAP "res/bitmaps/242.bmp"
+IDB_SHELL_BRANDBAND_SM_LO    BITMAP "res/bitmaps/245.bmp"
+IDB_SHELL_BRANDBAND_MD_LO    BITMAP "res/bitmaps/246.bmp"
+IDB_SHELL_BRANDBAND_LG_LO    BITMAP "res/bitmaps/247.bmp"*/
\ No newline at end of file

diff --git a/dll/win32/shell32/res/bitmaps/214.bmp b/dll/win32/shell32/res/bitmaps/214.bmp
new file mode 100644 (file)
index 0000000..aa1cd71
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/214.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/215.bmp b/dll/win32/shell32/res/bitmaps/215.bmp
new file mode 100644 (file)
index 0000000..44ef654
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/215.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/216.bmp b/dll/win32/shell32/res/bitmaps/216.bmp
new file mode 100644 (file)
index 0000000..1d7bdce
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/216.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/217.bmp b/dll/win32/shell32/res/bitmaps/217.bmp
new file mode 100644 (file)
index 0000000..3c8cdb0
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/217.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/230.bmp b/dll/win32/shell32/res/bitmaps/230.bmp
new file mode 100644 (file)
index 0000000..99c4e6d
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/230.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/231.bmp b/dll/win32/shell32/res/bitmaps/231.bmp
new file mode 100644 (file)
index 0000000..6a7182a
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/231.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/240.bmp b/dll/win32/shell32/res/bitmaps/240.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/240.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/241.bmp b/dll/win32/shell32/res/bitmaps/241.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/241.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/242.bmp b/dll/win32/shell32/res/bitmaps/242.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/242.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/245.bmp b/dll/win32/shell32/res/bitmaps/245.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/245.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/246.bmp b/dll/win32/shell32/res/bitmaps/246.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/246.bmp differ

diff --git a/dll/win32/shell32/res/bitmaps/247.bmp b/dll/win32/shell32/res/bitmaps/247.bmp
new file mode 100644 (file)
index 0000000..5d3c99b
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/247.bmp differ

diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 94459f5..d94b1b3 100644 (file)
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -24,7 +24,27 @@
 #define IDA_SHELLVIEW 1
 
 /* Bitmaps */
-#define IDB_REACTOS 131
+#define IDB_REACTOS                 131
+#define IDB_SHELL_IEXPLORE_LG       204
+#define IDB_SHELL_IEXPLORE_LG_HOT   205
+#define IDB_SHELL_IEXPLORE_SM       206
+#define IDB_SHELL_IEXPLORE_SM_HOT   207
+#define IDB_SHELL_EXPLORER_LG       214
+#define IDB_SHELL_EXPLORER_LG_HOT   215
+#define IDB_SHELL_EXPLORER_SM       216
+#define IDB_SHELL_EXPLORER_SM_HOT   217
+#define IDB_SHELL_EDIT_LG           225
+#define IDB_SHELL_EDIT_LG_HOT       226
+#define IDB_SHELL_EDIT_SM           227
+#define IDB_SHELL_EDIT_SM_HOT       228
+#define IDB_SHELL_GO                230
+#define IDB_SHELL_GO_HOT            231
+#define IDB_SHELL_BRANDBAND_SM_HI   240
+/*#define IDB_SHELL_BRANDBAND_MD_HI   241
+#define IDB_SHELL_BRANDBAND_LG_HI   242
+#define IDB_SHELL_BRANDBAND_SM_LO   245
+#define IDB_SHELL_BRANDBAND_MD_LO   246
+#define IDB_SHELL_BRANDBAND_LG_LO   247*/
 
 /* Strings */