Permalink
Browse files

Changes for 3.6

  • Loading branch information...
1 parent d49b22f commit 009703fccf623d0ebab05f951411bf0246fd6fe1 @alexd committed Feb 28, 2011
Showing with 43 additions and 37 deletions.
  1. +4 −0 .gitignore
  2. +34 −35 metapad.rc
  3. +1 −1 mpad_lang.c
  4. +4 −1 resource.h
View
@@ -0,0 +1,4 @@
+
+Release/*
+Debug/*
+ipch/*
View
@@ -7,7 +7,9 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
+#include <windows.h>
+#define IDC_STATIC (-1)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -49,9 +51,10 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,87,24,35,14
END
+
IDD_PROPPAGE_A1_LE DIALOGEX 0, 0, 225, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Advanced 1"
+CAPTION "Advanced"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "&Separate recent files menu",IDC_RECENT,"Button",
@@ -86,8 +89,7 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,119,84,99,8
CONTROL "D&on't auto-select on find",IDC_NO_FIND_SELECT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,119,97,99,8
- PUSHBUTTON "Sa&ve Window Position",IDC_BUTTON_STICK,119,111,99,13,
- WS_GROUP,WS_EX_STATICEDGE
+ PUSHBUTTON "Sa&ve Window Position",IDC_BUTTON_STICK,119,111,99,13
PUSHBUTTON "Clear &Recent Files...",IDC_BUTTON_CLEAR_RECENT,7,127,
83,14
PUSHBUTTON "Clear &Find History...",IDC_BUTTON_CLEAR_FIND,7,146,83,
@@ -142,11 +144,11 @@ BEGIN
LTEXT "Fi&nd what:",IDC_STATIC,7,9,45,8
COMBOBOX ID_DROP_FIND,54,7,99,112,CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
+ LTEXT "Re&place with:",IDC_STATIC,7,26,45,8
COMBOBOX ID_DROP_REPLACE,54,24,99,111,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON ">",IDC_ESCAPE,156,7,11,12,BS_BITMAP | BS_NOTIFY
PUSHBUTTON ">",IDC_ESCAPE2,156,24,11,12,BS_BITMAP | BS_NOTIFY
- LTEXT "Re&place with:",IDC_STATIC,7,26,45,8
CONTROL "Match &whole word only",1040,"Button",BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP,7,43,87,12
CONTROL "Match &case",1041,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -249,47 +251,44 @@ BEGIN
BS_AUTORADIOBUTTON | WS_GROUP,16,19,77,10
CONTROL "&Custom:",IDC_FONT_PRIMARY_2,"Button",
BS_AUTORADIOBUTTON,16,30,77,10
- PUSHBUTTON "Font &1",IDC_BTN_FONT1,16,42,83,14,WS_GROUP,
- WS_EX_CLIENTEDGE
+ PUSHBUTTON "Font &1",IDC_BTN_FONT1,16,42,83,14
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,
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,
- WS_EX_STATICEDGE
+ CONTROL "font",IDC_COLOUR_FONT,"Button",BS_OWNERDRAW,74,91,26,11
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
CONTROL "Cust&om:",IDC_FONT_SECONDARY_2,"Button",
BS_AUTORADIOBUTTON,126,30,75,10
- PUSHBUTTON "Font &2",IDC_BTN_FONT2,126,42,83,14,WS_GROUP,
- WS_EX_CLIENTEDGE
+ PUSHBUTTON "Font &2",IDC_BTN_FONT2,126,42,83,14
CONTROL "Us&e system colours",IDC_SYSTEM_COLOURS2,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,126,62,76,9
LTEXT "Window colour:",IDC_STAT_WIND2,126,76,50,9
CONTROL "window",IDC_COLOUR_BACK2,"Button",BS_OWNERDRAW,183,75,
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,WS_EX_STATICEDGE
+ 11
GROUPBOX "Window",IDC_STATIC,7,113,211,47
- LTEXT "&Selection margin width:",IDC_STATIC,15,124,52,15
- EDITTEXT IDC_EDIT_SM_WIDTH,79,126,24,12,ES_CENTER |
+ LTEXT "&Selection margin width:",IDC_STATIC,15,128,82,16
+ EDITTEXT IDC_EDIT_SM_WIDTH,94,127,24,12,ES_CENTER |
ES_AUTOHSCROLL
- LTEXT "&Transparency %: (Win2K or later)",IDC_STAT_TRANS,120,
- 124,58,16
- EDITTEXT IDC_EDIT_TRANSPARENT,184,126,24,12,ES_CENTER |
+ LTEXT "&Transparency %:",IDC_STAT_TRANS,129,
+ 128,58,16
+ EDITTEXT IDC_EDIT_TRANSPARENT,185,127,24,12,ES_CENTER |
ES_AUTOHSCROLL
- CONTROL "Use cl&assic toolbar (preferable in WinXP)",
+ CONTROL "Use def&ault toolbar style",
IDC_FLAT_TOOLBAR,"Button",BS_AUTOCHECKBOX | BS_MULTILINE |
- WS_TABSTOP,16,145,176,9
+ WS_TABSTOP,16,143,176,9
END
IDD_PROPPAGE_A1 DIALOGEX 0, 0, 225, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Advanced 1"
+CAPTION "Advanced"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "&Separate recent files menu",IDC_RECENT,"Button",
@@ -326,8 +325,7 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,119,84,99,8
CONTROL "D&on't auto-select on find",IDC_NO_FIND_SELECT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,119,97,99,8
- PUSHBUTTON "Sa&ve Window Position",IDC_BUTTON_STICK,119,111,99,13,
- WS_GROUP,WS_EX_STATICEDGE
+ PUSHBUTTON "Sa&ve Window Position",IDC_BUTTON_STICK,119,111,99,13
PUSHBUTTON "Clear &Recent Files...",IDC_BUTTON_CLEAR_RECENT,7,127,
83,14
PUSHBUTTON "Clear &Find History...",IDC_BUTTON_CLEAR_FIND,7,146,83,
@@ -342,10 +340,10 @@ END
IDD_PROPPAGE_A2 DIALOG DISCARDABLE 0, 0, 225, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Advanced 2"
+CAPTION "Buffers && Language"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "Quick buffers (settable with Alt + Shift + number)",
+ GROUPBOX "Quick buffers (select text and set with Alt + Shift + number)",
IDC_STATIC,7,7,211,102
LTEXT "Alt + &1:",IDC_STATIC,17,22,25,8
EDITTEXT IDC_MACRO_1,48,20,59,12,ES_AUTOHSCROLL
@@ -367,7 +365,7 @@ BEGIN
EDITTEXT IDC_MACRO_9,150,71,59,12,ES_AUTOHSCROLL
LTEXT "Alt + &0:",IDC_STATIC,118,90,28,8
EDITTEXT IDC_MACRO_10,150,88,59,12,ES_AUTOHSCROLL
- GROUPBOX "Language",IDC_STATIC,7,113,211,47
+ GROUPBOX "Language for menus, dialogs and messages",IDC_STATIC,7,113,211,47
CONTROL "&Default (English)",IDC_RADIO_LANG_DEFAULT,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,17,128,72,10
CONTROL "&Language plugin:",IDC_RADIO_LANG_PLUGIN,"Button",
@@ -377,6 +375,7 @@ BEGIN
PUSHBUTTON "...",IDC_BUTTON_BROWSE,194,141,14,12
END
+
IDD_ABOUT_PLUGIN DIALOGEX 0, 0, 189, 97
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Language Plugin"
@@ -397,7 +396,6 @@ BEGIN
ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
END
-
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@@ -502,6 +500,7 @@ BEGIN
HORZGUIDE, 75
HORZGUIDE, 92
END
+
END
#endif // APSTUDIO_INVOKED
@@ -576,6 +575,7 @@ BEGIN
MENUITEM "&UNIX Text (LF)\tCtrl+2", ID_UNIX_FILE
MENUITEM "Un&icode\tCtrl+3", ID_UNICODE_FILE
MENUITEM "Unicode (&Big Endian)\tCtrl+4", ID_UNICODE_BE_FILE
+ MENUITEM "UTF-&8 w/BOM (CR+LF)\tCtrl+5", ID_UTF_8_FILE
END
MENUITEM "&Refresh/Revert\tF5", ID_RELOAD_CURRENT
MENUITEM "&Calculate Size\tF12", ID_SHOWFILESIZE
@@ -708,7 +708,6 @@ BEGIN
END
END
-
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
@@ -730,7 +729,7 @@ BEGIN
"4", ID_UNICODE_BE_FILE, VIRTKEY, CONTROL, NOINVERT
"4", ID_MACRO_4, VIRTKEY, ALT, NOINVERT
"4", ID_SET_MACRO_4, VIRTKEY, SHIFT, ALT, NOINVERT
- "5", IDI_EYE, VIRTKEY, CONTROL, NOINVERT
+ "5", ID_UTF_8_FILE, VIRTKEY, CONTROL, NOINVERT
"5", ID_MACRO_5, VIRTKEY, ALT, NOINVERT
"5", ID_SET_MACRO_5, VIRTKEY, SHIFT, ALT, NOINVERT
"6", ID_MACRO_6, VIRTKEY, ALT, NOINVERT
@@ -801,6 +800,7 @@ BEGIN
VK_MULTIPLY, ID_HACKER, VIRTKEY, CONTROL, NOINVERT
VK_RETURN, ID_VIEW_OPTIONS, VIRTKEY, ALT, NOINVERT
VK_RETURN, ID_SHIFT_ENTER, VIRTKEY, SHIFT, NOINVERT
+ VK_RETURN, ID_CONTROL_SHIFT_ENTER, VIRTKEY, CONTROL, SHIFT, NOINVERT
VK_RIGHT, ID_SCROLLRIGHT, VIRTKEY, ALT, NOINVERT
VK_SPACE, ID_EDIT_SELECTWORD, VIRTKEY, CONTROL, NOINVERT
VK_TAB, ID_INDENT, VIRTKEY, NOINVERT
@@ -822,11 +822,11 @@ END
STRINGTABLE DISCARDABLE
BEGIN
- IDS_VERSION_SYNCH "3.5"
+ IDS_VERSION_SYNCH "3.6"
IDS_PLUGIN_LANGUAGE "English (Plugin Template)"
- IDS_PLUGIN_RELEASE "1"
- IDS_PLUGIN_TRANSLATOR "Alex Davidson"
- IDS_PLUGIN_EMAIL "metapad@canada.com"
+ IDS_PLUGIN_RELEASE "3.6 release 1"
+ IDS_PLUGIN_TRANSLATOR "Alexander Davidson"
+ IDS_PLUGIN_EMAIL "metapad-feedback@liquidninja.com"
IDS_RESERVED2 "-"
IDS_RESERVED3 "-"
IDS_DEFAULT_FILTER "All File Types|*.txt;*.htm;*.html;*.c;*.cpp;*.h;*.java|Text Files (*.txt)|*.txt|HTML (*.html; *.htm)|*.html;*.htm|Source Code (*.c; *.cpp; *.h; *.java)|*.c;*.cpp;*.h;*.java|All Files (*.*)|*.*"
@@ -937,11 +937,10 @@ BEGIN
IDS_RICHED_MISSING_ERROR
"metapad requires RICHED20.DLL to be installed on your system.\n\nSee the FAQ on the website for further information."
IDS_COMMAND_LINE_OPTIONS
- "Usage: metapad [/v | /s] [/p | /g row:col | /e] [filename]\n\nOption descriptions:\n\n\t/g row:col - goto position at row and column\n\t/e - goto end of file\n\t/p - print file\n\t/v - disable plugin version checking\n\t/s - skip loading language plugin"
+ "Usage: metapad [/i | /m | /v | /s] [/p | /g row:col | /e] [filename]\n\nOption descriptions:\n\n\t/i - force INI mode for settings\n\t/m - migrate all registry settings to INI file\n\t/g row:col - goto position at row and column\n\t/e - goto end of file\n\t/p - print file\n\t/v - disable plugin version checking\n\t/s - skip loading language plugin"
IDS_GLOBALLOCK_ERROR "GlobalLock failed"
IDS_CLIPBOARD_UNLOCK_ERROR
"There was an error unlocking the clipboard memory."
- IDS_CLIPBOARD_OPEN_ERROR "Can't open clipboard"
IDS_FILE_READ_ERROR "Error reading file."
IDS_RESTART_HIDE_SB "The change in ""Hide scrollbars when possible"" will be reflected upon restarting the program."
IDS_RESTART_FAVES "The change in ""Disable Favourites"" will be reflected upon restarting the program."
@@ -955,7 +954,7 @@ BEGIN
IDS_BAD_STRING_PLUGIN_ERROR
"Error fetching version string resource from plugin DLL. It is probably not a valid metapad language plugin."
IDS_PLUGIN_MISMATCH_ERROR
- "This language plugin is for metapad version %s, but you are running metapad version %s. Check the metapad website for language plugin updates."
+ "Your language plugin is for metapad %s, but you are running metapad %s.\n\nSome menu or dialog features may be missing or not work correctly.\n\nRun metapad /v to skip this message."
IDS_ALLRIGHTS "All Rights Reserved"
IDS_OK_BUTTON "OK"
IDS_DEFAULT_FILTER_TEXT "Text (*.*)|*.*"
View
@@ -11,7 +11,7 @@
#include <windows.h>
-#pragma comment(linker, "/OPT:NOWIN98" )
+//#pragma comment(linker, "/OPT:NOWIN98" )
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
View
@@ -2,6 +2,7 @@
// Microsoft Developer Studio generated include file.
// Used by metapad.rc
//
+
#define IDS_VERSION_SYNCH 1
#define IDS_PLUGIN_LANGUAGE 2
#define IDS_PLUGIN_RELEASE 3
@@ -114,7 +115,7 @@
#define IDD_PROPPAGE_GENERAL 112
#define IDD_ABORT_PRINT 113
#define IDD_GOTO 114
-#define IDC_HAND 122
+#define IDC_MYHAND 122
#define IDD_PROPPAGE_VIEW 124
#define IDB_TOOLBAR 126
#define IDD_FAV_NAME 128
@@ -307,6 +308,8 @@
#define ID_SCROLLLEFT 40106
#define ID_SCROLLRIGHT 40107
#define ID_SAVE_AND_QUIT 40108
+#define ID_UTF_8_FILE 40109
+#define ID_CONTROL_SHIFT_ENTER 40110
#define ID_MRU_BASE 44000
#define ID_MRU_1 44001
#define ID_MRU_2 44002

0 comments on commit 009703f

Please sign in to comment.