wordpad: Split toolbar into tool- and formatbar.

.gitignore

@@ -899,8 +899,8 @@ programs/winhelp/macro.lex.yy.c
 programs/winhelp/rsrc.res
 programs/winhelp/winhelp
 programs/winver/winver
+programs/wordpad/formatbar.bmp
 programs/wordpad/rsrc.res
-programs/wordpad/toolbar.bmp
 programs/wordpad/wordpad
 programs/wordpad/wordpad.ico
 programs/xcopy/rsrc.res

programs/wordpad/De.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "F&ormat"

programs/wordpad/En.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "F&ormat"

programs/wordpad/Fr.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "Forma&t"

programs/wordpad/Hu.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "F&ormtum"

programs/wordpad/Ko.rc

@@ -56,6 +56,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "형식(&O)"

programs/wordpad/Makefile.in

@@ -15,7 +15,7 @@ C_SRCS = \
 RC_SRCS = rsrc.rc
 RC_BINSRC = rsrc.rc
 RC_BINARIES = \
-	toolbar.bmp \
+	formatbar.bmp \
 	wordpad.ico
 
 @MAKE_PROG_RULES@

programs/wordpad/Nl.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "&Opmaak"

programs/wordpad/No.rc

@@ -55,6 +55,7 @@ BEGIN
     POPUP "&Vis"
     BEGIN
         MENUITEM "Verk&tylinje",     ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatlinje",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statuslinje",      ID_TOGGLE_STATUSBAR
     END
     POPUP "F&ormat"

programs/wordpad/Pl.rc

@@ -56,6 +56,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "F&ormat"

programs/wordpad/Ru.rc

@@ -53,6 +53,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "&"

programs/wordpad/Tr.rc

@@ -57,6 +57,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
+        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
     END
     POPUP "&Biim"

programs/wordpad/resource.h

@@ -54,17 +54,20 @@
 #define ID_FORMAT_UNDERLINE 1402
 
 #define ID_TOGGLE_TOOLBAR 1500
-#define ID_TOGGLE_STATUSBAR 1501
+#define ID_TOGGLE_FORMATBAR 1501
+#define ID_TOGGLE_STATUSBAR 1502
 
 #define BANDID_TOOLBAR 0
+#define BANDID_FORMATBAR 1
 
 #define IDC_STATUSBAR 2000
 #define IDC_EDITOR 2001
 #define IDC_TOOLBAR 2002
-#define IDC_REBAR 2003
-#define IDC_COMBO 2004
+#define IDC_FORMATBAR 2003
+#define IDC_REBAR 2004
+#define IDC_COMBO 2005
 
-#define IDB_TOOLBAR 100
+#define IDB_FORMATBAR 100
 
 #define IDI_WORDPAD 101
 

programs/wordpad/rsrc.rc

@@ -39,8 +39,8 @@ BEGIN
     "S",          ID_FILE_SAVE,       VIRTKEY, CONTROL    
 END
 
-/* BINRES toolbar.bmp */
-IDB_TOOLBAR BITMAP "toolbar.bmp"
+/* BINRES formatbar.bmp */
+IDB_FORMATBAR BITMAP "formatbar.bmp"
 /* {
  '42 4d 3e 03 00 00 00 00 00 00 3e 00 00 00 28 00'
  '00 00 60 00 00 00 10 00 00 00 01 00 04 00 00 00'