Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] Fix uncomment block bug.

Browse Source 
[ENHANCED] Enlarge some strings displayed zone for the translation.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@433 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2009-03-03 23:09:47 +00:00
parent 06301c159f
commit b006afab7d
7 changed files with 48 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/installer/nppSetup.nsi
View File

@ -409,11 +409,11 @@ GLOBAL_INST:
IfFileExists "$INSTDIR\plugins\HexEditorPlugin.dll" 0 +3 IfFileExists "$INSTDIR\plugins\HexEditorPlugin.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditorPlugin.dll is about to be deleted." MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditorPlugin.dll is about to be deleted."
Delete "$INSTDIR\plugins\HexEditorPlugin.dll" Delete "$INSTDIR\plugins\HexEditorPlugin.dll"
/*
IfFileExists "$INSTDIR\plugins\HexEditor.dll" 0 +3 IfFileExists "$INSTDIR\plugins\HexEditor.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditor.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it." MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditor.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\HexEditor.dll" Delete "$INSTDIR\plugins\HexEditor.dll"
*/
IfFileExists "$INSTDIR\plugins\MultiClipboard.dll" 0 +3 IfFileExists "$INSTDIR\plugins\MultiClipboard.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nMultiClipboard.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it." MessageBox MB_OK "Due to the problem of compability with this version,$\nMultiClipboard.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\MultiClipboard.dll" Delete "$INSTDIR\plugins\MultiClipboard.dll"

32
PowerEditor/src/Notepad_plus.cpp
View File

@ -6429,7 +6429,6 @@ bool Notepad_plus::doBlockComment(comment_mode currCommentMode)
generic_string comment(commentLineSybol); generic_string comment(commentLineSybol);
comment += TEXT(" "); comment += TEXT(" ");
generic_string long_comment = comment;
const int linebufferSize = 1000; const int linebufferSize = 1000;
TCHAR linebuf[linebufferSize]; TCHAR linebuf[linebufferSize];
@ -6447,6 +6446,7 @@ bool Notepad_plus::doBlockComment(comment_mode currCommentMode)
if ((lines > 0) && (selectionEnd == static_cast<size_t>(_pEditView->execute(SCI_POSITIONFROMLINE, selEndLine)))) if ((lines > 0) && (selectionEnd == static_cast<size_t>(_pEditView->execute(SCI_POSITIONFROMLINE, selEndLine))))
selEndLine--; selEndLine--;
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
for (int i = selStartLine; i <= selEndLine; i++) for (int i = selStartLine; i <= selEndLine; i++)
{ {
int lineStart = _pEditView->execute(SCI_POSITIONFROMLINE, i); int lineStart = _pEditView->execute(SCI_POSITIONFROMLINE, i);
@ -6458,42 +6458,32 @@ bool Notepad_plus::doBlockComment(comment_mode currCommentMode)
lineIndent = _pEditView->execute(SCI_GETLINEINDENTPOSITION, i); lineIndent = _pEditView->execute(SCI_GETLINEINDENTPOSITION, i);
_pEditView->getGenericText(linebuf, lineIndent, lineEnd); _pEditView->getGenericText(linebuf, lineIndent, lineEnd);
generic_string linebufStr = linebuf;
// empty lines are not commented // empty lines are not commented
if (lstrlen(linebuf) < 1) if (lstrlen(linebuf) < 1)
continue; continue;
if (currCommentMode != cm_comment) if (currCommentMode != cm_comment)
{ {
if (memcmp(linebuf, comment.c_str(), comment_length - 1) == 0) if (linebufStr.substr(0, comment_length - 1) == comment.substr(0, comment_length - 1))
{
if (memcmp(linebuf, long_comment.c_str(), comment_length) == 0)
{ {
// removing comment with space after it int len = (linebufStr.substr(0, comment_length) == comment)?comment_length:comment_length - 1;
_pEditView->execute(SCI_SETSEL, lineIndent, lineIndent + comment_length);
_pEditView->replaceSelWith("");
if (i == selStartLine) // is this the first selected line? _pEditView->execute(SCI_SETSEL, lineIndent, lineIndent + len);
selectionStart -= comment_length;
selectionEnd -= comment_length; // every iteration
continue;
}
else
{
// removing comment _without_ space
_pEditView->execute(SCI_SETSEL, lineIndent, lineIndent + comment_length - 1);
_pEditView->replaceSelWith(""); _pEditView->replaceSelWith("");
if (i == selStartLine) // is this the first selected line? if (i == selStartLine) // is this the first selected line?
selectionStart -= (comment_length - 1); selectionStart -= len;
selectionEnd -= (comment_length - 1); // every iteration selectionEnd -= len; // every iteration
continue; continue;
} }
} }
}
if ((currCommentMode == cm_toggle) || (currCommentMode == cm_comment)) if ((currCommentMode == cm_toggle) || (currCommentMode == cm_comment))
{ {
if (i == selStartLine) // is this the first selected line? if (i == selStartLine) // is this the first selected line?
selectionStart += comment_length; selectionStart += comment_length;
selectionEnd += comment_length; // every iteration selectionEnd += comment_length; // every iteration
_pEditView->insertGenericTextFrom(lineIndent, long_comment.c_str()); _pEditView->insertGenericTextFrom(lineIndent, comment.c_str());
} }
} }
// after uncommenting selection may promote itself to the lines // after uncommenting selection may promote itself to the lines
@ -7660,7 +7650,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
case NPPM_GETCURRENTWORD : case NPPM_GETCURRENTWORD :
{ {
const int strSize = MAX_PATH; const int strSize = MAX_PATH*4;
TCHAR str[strSize]; TCHAR str[strSize];
_pEditView->getGenericSelectedText((TCHAR *)str, strSize); _pEditView->getGenericSelectedText((TCHAR *)str, strSize);

14
PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
View File

@ -45,10 +45,10 @@ BEGIN
RTEXT "Dir&ectory :",IDD_FINDINFILES_DIR_STATIC,7,76,40,8 RTEXT "Dir&ectory :",IDD_FINDINFILES_DIR_STATIC,7,76,40,8
COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,74,141,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,74,141,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,74,15,13 PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,74,15,13
CONTROL "In all su&b-folders",IDD_FINDINFILES_RECURSIVE_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,73,80,15 CONTROL "In all su&b-folders",IDD_FINDINFILES_RECURSIVE_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,73,94,15
CONTROL "In &hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,87,80,15 CONTROL "In &hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,87,94,15
CONTROL "Match &whole word only",IDWHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,88,104,15 CONTROL "Match &whole word only",IDWHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,88,140,15
CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,100,82,15 CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,100,140,15
CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,112,110,15 CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,112,110,15
GROUPBOX "Search mode",IDC_MODE_STATIC,6,126,138,48 GROUPBOX "Search mode",IDC_MODE_STATIC,6,126,138,48
CONTROL "&Normal",IDNORMAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,138,126,10 CONTROL "&Normal",IDNORMAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,138,126,10
@ -68,9 +68,9 @@ BEGIN
PUSHBUTTON "&Replace in files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14 PUSHBUTTON "&Replace in files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14
PUSHBUTTON "Close",IDCANCEL,217,98,90,14 PUSHBUTTON "Close",IDCANCEL,217,98,90,14
GROUPBOX "",IDC_TRANSPARENT_GRPBOX,222,126,85,48 GROUPBOX "",IDC_TRANSPARENT_GRPBOX,222,126,85,48
CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,218,126,57,10 CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,218,126,80,10
CONTROL "On lose focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,138,65,10 CONTROL "On lose focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,138,70,10
CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,150,63,10 CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,150,70,10
CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,235,161,53,10 CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,235,161,53,10
END END

6
PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
View File

@ -247,11 +247,11 @@ BEGIN
PUSHBUTTON "Remove",IDC_REMOVELANG_BUTTON,243,40,62,14 PUSHBUTTON "Remove",IDC_REMOVELANG_BUTTON,243,40,62,14
PUSHBUTTON "Save As...",IDC_SAVEAS_BUTTON,104,40,62,14 PUSHBUTTON "Save As...",IDC_SAVEAS_BUTTON,104,40,62,14
LTEXT "User Language : ",IDC_LANGNAME_STATIC,5,24,63,8,0,WS_EX_RIGHT LTEXT "User Language : ",IDC_LANGNAME_STATIC,5,24,63,8,0,WS_EX_RIGHT
EDITTEXT IDC_EXT_EDIT,284,23,40,14,ES_AUTOHSCROLL EDITTEXT IDC_EXT_EDIT,291,23,33,14,ES_AUTOHSCROLL
LTEXT "Ext :",IDC_EXT_STATIC,247,25,33,8,0,WS_EX_RIGHT RTEXT "Ext :",IDC_EXT_STATIC,257,25,33,8,0,WS_EX_RIGHT
CONTROL "Transparency",IDC_UD_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,3,66,10 CONTROL "Transparency",IDC_UD_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,3,66,10
CONTROL "",IDC_UD_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,209,3,53,10 CONTROL "",IDC_UD_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,209,3,53,10
CONTROL "Ignore case",IDC_LANGNAME_IGNORECASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,175,24,71,10 CONTROL "Ignore case",IDC_LANGNAME_IGNORECASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,175,24,76,10
END END
IDD_STRING_DLG DIALOGEX 0, 0, 151, 52 IDD_STRING_DLG DIALOGEX 0, 0, 151, 52

4
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc
View File

@ -34,13 +34,13 @@ BEGIN
LTEXT "Foreground color",IDC_FG_STATIC,203,48,59,8,0, WS_EX_RIGHT LTEXT "Foreground color",IDC_FG_STATIC,203,48,59,8,0, WS_EX_RIGHT
LTEXT "Background color",IDC_BG_STATIC,203,75,59,8,0, WS_EX_RIGHT LTEXT "Background color",IDC_BG_STATIC,203,75,59,8,0, WS_EX_RIGHT
COMBOBOX IDC_FONT_COMBO,371,44,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FONT_COMBO,371,44,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_FONTSIZE_COMBO,435,71,40,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FONTSIZE_COMBO,442,71,33,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Bold",IDC_BOLD_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,64,63,10 CONTROL "Bold",IDC_BOLD_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,64,63,10
CONTROL "Italic",IDC_ITALIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,76,62,10 CONTROL "Italic",IDC_ITALIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,76,62,10
GROUPBOX "Font style",IDC_FONTGROUP_STATIC,311,28,169,77 GROUPBOX "Font style",IDC_FONTGROUP_STATIC,311,28,169,77
GROUPBOX "Colour style",IDC_COLOURGROUP_STATIC,191,28,111,77 GROUPBOX "Colour style",IDC_COLOURGROUP_STATIC,191,28,111,77
LTEXT "Font Name :",IDC_FONTNAME_STATIC,315,47,52,8,0, WS_EX_RIGHT LTEXT "Font Name :",IDC_FONTNAME_STATIC,315,47,52,8,0, WS_EX_RIGHT
LTEXT "Font size :",IDC_FONTSIZE_STATIC,381,73,51,8,0, WS_EX_RIGHT LTEXT "Font size :",IDC_FONTSIZE_STATIC,388,73,51,8,0, WS_EX_RIGHT
LTEXT "Style :",IDC_STYLEDESC_STATIC,87,10,68,8 LTEXT "Style :",IDC_STYLEDESC_STATIC,87,10,68,8
//LTEXT "Attention : The definition of this style will be the default definition for all non defined styles", IDC_STYLEDEFAULT_WARNING_STATIC,190,6,295,22 //LTEXT "Attention : The definition of this style will be the default definition for all non defined styles", IDC_STYLEDEFAULT_WARNING_STATIC,190,6,295,22
LTEXT " ", IDC_STYLEDESCRIPTION_STATIC,190,6,295,22 LTEXT " ", IDC_STYLEDESCRIPTION_STATIC,190,6,295,22

40
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -104,32 +104,32 @@ IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 370, 180
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,15,4,150,39,BS_CENTER GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,15,4,155,39,BS_CENTER
RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,18,14,112,8 RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,18,14,112,8
LTEXT "0",IDC_MAXNBFILEVAL_STATIC,137,14,15,8 LTEXT "0",IDC_MAXNBFILEVAL_STATIC,137,14,15,8
CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,133,10 CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,140,10
GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,15,48,150,39,BS_CENTER GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,15,48,155,39,BS_CENTER
CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,59,69,10 CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,59,69,10
CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,72,134,10 CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,72,140,10
CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,94,150,10 CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,94,150,10
CONTROL "Smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,136,141,10 CONTROL "Smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,136,150,10
CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,108,130,10 CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,108,150,10
CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,122,130,10 CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,122,150,10
CONTROL "Show only filename in titlebar",IDC_CHECK_SHORTTITLE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,150,217,10 CONTROL "Show only filename in titlebar",IDC_CHECK_SHORTTITLE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,150,217,10
CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,164,217,10 CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,164,217,10
GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,4,150,39,BS_CENTER GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,4,155,39,BS_CENTER
CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,15,98,10 CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,15,140,10
CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,28,119,10 CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,28,140,10
GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,193,47,150,50,BS_CENTER GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,193,47,155,50,BS_CENTER
CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,57,98,10 CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,57,140,10
CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,69,103,10 CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,69,140,10
CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,81,141,10 CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,81,140,10
GROUPBOX "Highlight matching tags",IDC_TAGMATCHEDHILITE_STATIC,193,101,150,50,BS_CENTER GROUPBOX "Highlight matching tags",IDC_TAGMATCHEDHILITE_STATIC,193,101,155,50,BS_CENTER
CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,201,111,131,10 CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,201,111,140,10
CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,123,131,10 CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,123,140,10
CONTROL "Highlight php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,136,131,10 CONTROL "Highlight php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,136,140,10
LTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,300,152,66,8 RTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,205,160,108,8
EDITTEXT IDC_EDIT_SESSIONFILEEXT,298,164,67,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_SESSIONFILEEXT,315,157,34,14,ES_AUTOHSCROLL
END END
IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 370, 180 IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 370, 180

6
PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
View File

@ -31,11 +31,11 @@ FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "&Run",IDOK,27,82,50,14 DEFPUSHBUTTON "&Run",IDOK,27,82,50,14
PUSHBUTTON "&Cancel",IDCANCEL,91,82,50,14 PUSHBUTTON "&Cancel",IDCANCEL,91,82,50,14
CONTROL "Run",IDC_M_RUN_MULTI,"Button",BS_AUTORADIOBUTTON,21,38,39,10 CONTROL "Run",IDC_M_RUN_MULTI,"Button",BS_AUTORADIOBUTTON,21,38,47,10
CONTROL "Run until &end of file", IDC_M_RUN_EOF,"Button", BS_AUTORADIOBUTTON,21,56,85,10 CONTROL "Run until &end of file", IDC_M_RUN_EOF,"Button", BS_AUTORADIOBUTTON,21,56,140,10
EDITTEXT IDC_M_RUN_TIMES,68,35,25,14,ES_AUTOHSCROLL | ES_NUMBER | WS_EX_DLGMODALFRAME EDITTEXT IDC_M_RUN_TIMES,68,35,25,14,ES_AUTOHSCROLL | ES_NUMBER | WS_EX_DLGMODALFRAME
COMBOBOX IDC_MACRO_COMBO,67,10,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_MACRO_COMBO,67,10,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Macro to run :",IDC_MACRO2RUN_STATIC,5,12,59,8 RTEXT "Macro to run :",IDC_MACRO2RUN_STATIC,5,12,59,8
LTEXT "times",IDC_TIMES_STATIC,97,38,36,8 LTEXT "times",IDC_TIMES_STATIC,97,38,65,8
END END
#endif // RUN_MACRO_DLG_RC #endif // RUN_MACRO_DLG_RC