Permalink
Browse files

Beta 5 changes: toolbar minor refresh, fix dlg problem, prep for new …

…window toolbar btn in future
  • Loading branch information...
1 parent 1d41b71 commit b4c399f58a37af19625fdd3f74ce994d83f79b5e @alexd committed Mar 26, 2011
Showing with 15 additions and 6 deletions.
  1. +8 −2 metapad.c
  2. +6 −4 metapad.rc
  3. +1 −0 resource.h
  4. BIN toolbar.bmp
View
@@ -143,9 +143,9 @@ extern atoi(const char*);
#endif
#else
#ifdef USE_RICH_EDIT
-#define STR_ABOUT_NORMAL _T("metapad 3.6 beta 4")
+#define STR_ABOUT_NORMAL _T("metapad 3.6 beta 5")
#else
-#define STR_ABOUT_NORMAL _T("metapad LE 3.6 beta 4")
+#define STR_ABOUT_NORMAL _T("metapad LE 3.6 beta 5")
#endif
#endif
@@ -953,6 +953,7 @@ void CreateToolbar(void)
TBBUTTON tbButtons [] = {
{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},
+ //{CUSTOMBMPBASE+6, ID_NEW_INSTANCE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0},
{STD_FILENEW, ID_MYFILE_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0},
{STD_FILEOPEN, ID_MYFILE_OPEN, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0},
{STD_FILESAVE, ID_MYFILE_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0},
@@ -5299,6 +5300,11 @@ LONG WINAPI MainWndProc(HWND hwndMain, UINT Msg, WPARAM wParam, LPARAM lParam)
case TTN_NEEDTEXT: {
LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT)lParam;
switch (lpttt->hdr.idFrom) {
+ /*
+ case ID_NEW_INSTANCE:
+ lpttt->lpszText = GetString(IDS_NEW_INSTANCE);
+ break;
+ */
case ID_MYFILE_NEW:
lpttt->lpszText = GetString(IDS_TB_NEWFILE);
break;
View
@@ -283,10 +283,11 @@ BEGIN
CONTROL "&Use system colours",IDC_SYSTEM_COLOURS,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,16,62,76,9
LTEXT "Window colour:",IDC_STAT_WIND,16,76,50,9
- CONTROL "window",IDC_COLOUR_BACK,"Button",BS_OWNERDRAW,74,75,25,
+ CONTROL "window",IDC_COLOUR_BACK,"Button",BS_OWNERDRAW,74,75,26,
11,WS_EX_STATICEDGE
LTEXT "Font colour:",IDC_STAT_FONT,16,92,45,9
- CONTROL "font",IDC_COLOUR_FONT,"Button",BS_OWNERDRAW,74,91,26,11
+ CONTROL "font",IDC_COLOUR_FONT,"Button",BS_OWNERDRAW,74,91,26,
+ 11,WS_EX_STATICEDGE
GROUPBOX "Secondary font",IDC_STATIC,117,7,101,102,WS_GROUP
CONTROL "ANSI fi&xed width",IDC_FONT_SECONDARY,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,126,19,75,10
@@ -300,7 +301,7 @@ BEGIN
26,11,WS_EX_STATICEDGE
LTEXT "Font colour:",IDC_STAT_FONT2,126,92,45,9
CONTROL "font",IDC_COLOUR_FONT2,"Button",BS_OWNERDRAW,183,91,26,
- 11
+ 11,WS_EX_STATICEDGE
GROUPBOX "Window",IDC_STATIC,7,113,211,47
LTEXT "&Selection margin width:",IDC_STATIC,15,128,82,16
EDITTEXT IDC_EDIT_SM_WIDTH,94,127,24,12,ES_CENTER |
@@ -645,7 +646,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Launch"
BEGIN
- MENUITEM "New &Instance\tCtrl+I", ID_NEW_INSTANCE
+ MENUITEM "New W&indow\tCtrl+I", ID_NEW_INSTANCE
MENUITEM SEPARATOR
MENUITEM "&Primary Viewer\tCtrl+L", ID_FILE_LAUNCHVIEWER
MENUITEM "&Secondary Viewer\tCtrl+J", ID_LAUNCH_SECONDARY_VIEWER
@@ -1077,6 +1078,7 @@ BEGIN
IDS_DEFAULT_FILTER_TEXT "Text (*.*)|*.*"
IDS_NEW_FILE "new file"
IDS_MACRO_LENGTH_ERROR "Selection is larger than maximum quick buffer length."
+ IDS_NEW_INSTANCE "New Window"
END
#endif // English (U.S.) resources
View
@@ -110,6 +110,7 @@
#define IDR_ACCELERATOR 104
#define ID_ABOUT_PLUGIN 104
#define IDS_MACRO_LENGTH_ERROR 104
+#define IDS_NEW_INSTANCE 105
#define IDI_PAD 109
#define IDI_EYE 110
#define IDD_PROPPAGE_GENERAL 112
View
Binary file not shown.

0 comments on commit b4c399f

Please sign in to comment.