mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-14 21:09:05 +08:00
Merge remote-tracking branch 'Notepad3_upstream_Rizone/master'
This commit is contained in:
Rainer Kottenhoff
commit
a355a7d05a
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1404,10 +1404,10 @@ BOOL FileMRUDlg(HWND hwnd,LPWSTR lpstrFile)
|
||||
//
|
||||
// ChangeNotifyDlgProc()
|
||||
//
|
||||
// Controls: 100 Radio Button
|
||||
// 101 Radio Button
|
||||
// 102 Radio Button
|
||||
// 103 Check Box
|
||||
// Controls: 100 Radio Button (None)
|
||||
// 101 Radio Button (Display Message)
|
||||
// 102 Radio Button (Auto-Reload)
|
||||
// 103 Check Box (Reset on New)
|
||||
//
|
||||
extern int iFileWatchingMode;
|
||||
extern BOOL bResetFileWatching;
|
||||
@ -1474,7 +1474,7 @@ BOOL ChangeNotifyDlg(HWND hwnd)
|
||||
//
|
||||
// ColumnWrapDlgProc()
|
||||
//
|
||||
// Controls: 100 Edit
|
||||
// Controls: Edit IDC_COLUMNWRAP
|
||||
//
|
||||
INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
|
||||
{
|
||||
@ -1489,8 +1489,8 @@ INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar
|
||||
|
||||
piNumber = (int*)lParam;
|
||||
|
||||
SetDlgItemInt(hwnd,100,*piNumber,FALSE);
|
||||
SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,15,0);
|
||||
SetDlgItemInt(hwnd, IDC_COLUMNWRAP,*piNumber,FALSE);
|
||||
SendDlgItemMessage(hwnd, IDC_COLUMNWRAP,EM_LIMITTEXT,15,0);
|
||||
|
||||
CenterDlgInParent(hwnd);
|
||||
|
||||
@ -1507,7 +1507,7 @@ INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar
|
||||
|
||||
BOOL fTranslated;
|
||||
|
||||
int iNewNumber = GetDlgItemInt(hwnd,100,&fTranslated,FALSE);
|
||||
int iNewNumber = GetDlgItemInt(hwnd, IDC_COLUMNWRAP,&fTranslated,FALSE);
|
||||
|
||||
if (fTranslated)
|
||||
{
|
||||
@ -1517,7 +1517,7 @@ INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar
|
||||
}
|
||||
|
||||
else
|
||||
PostMessage(hwnd,WM_NEXTDLGCTL,(WPARAM)(GetDlgItem(hwnd,100)),1);
|
||||
PostMessage(hwnd,WM_NEXTDLGCTL,(WPARAM)(GetDlgItem(hwnd, IDC_COLUMNWRAP)),1);
|
||||
|
||||
}
|
||||
break;
|
||||
|
||||
1173
src/Edit.c
1173
src/Edit.c
File diff suppressed because it is too large
Load Diff
@ -133,10 +133,11 @@ void EditApplyLexerStyle(HWND, int, int);
|
||||
void EditFinalizeStyling(HWND,int);
|
||||
|
||||
void EditMarkAllOccurrences();
|
||||
void EditUpdateVisibleUrlHotspot();
|
||||
void EditUpdateVisibleUrlHotspot(BOOL);
|
||||
|
||||
BOOL EditEnterTargetTransaction();
|
||||
BOOL EditLeaveTargetTransaction();
|
||||
void EditEnterTargetTransaction();
|
||||
void EditLeaveTargetTransaction();
|
||||
BOOL EditIsInTargetTransaction();
|
||||
|
||||
//void SciInitThemes(HWND);
|
||||
//LRESULT CALLBACK SciThemedWndProc(HWND,UINT,WPARAM,LPARAM);
|
||||
|
||||
593
src/Notepad3.c
593
src/Notepad3.c
File diff suppressed because it is too large
Load Diff
@ -150,10 +150,10 @@ void UpdateUI();
|
||||
|
||||
|
||||
void InvalidateSelections();
|
||||
int BeginSelUndoAction();
|
||||
void EndSelUndoAction(int);
|
||||
void RestoreSelectionAction(int,DoAction);
|
||||
int UndoRedoSelectionMap(int,UndoRedoSelection_t*);
|
||||
int BeginUndoAction();
|
||||
void EndUndoAction(int);
|
||||
void RestoreAction(int,DoAction);
|
||||
int UndoRedoActionMap(int,UndoRedoSelection_t*);
|
||||
void OpenHotSpotURL(int, BOOL);
|
||||
|
||||
|
||||
@ -181,6 +181,9 @@ LRESULT MsgSysCommand(HWND, UINT, WPARAM, LPARAM);
|
||||
LRESULT MsgCommand(HWND, WPARAM, LPARAM);
|
||||
LRESULT MsgNotify(HWND, WPARAM, LPARAM);
|
||||
|
||||
void IgnoreNotifyChangeEvent();
|
||||
void ObserveNotifyChangeEvent();
|
||||
BOOL CheckNotifyChangeEvent();
|
||||
|
||||
#endif //_NP3_NOTEPAD3_H_
|
||||
/// End of Notepad3.h \\\
|
||||
|
||||
@ -1832,7 +1832,7 @@ BEGIN
|
||||
63192 "XML Comment"
|
||||
63193 "XML Entity"
|
||||
63194 "Tag-Class"
|
||||
63195 "Tag-Id"
|
||||
63195 "Tag-ID"
|
||||
63196 "Tag-Attribute"
|
||||
63197 "Pseudo-Class"
|
||||
63198 "Unknown Pseudo-Class"
|
||||
@ -1924,6 +1924,8 @@ BEGIN
|
||||
63264 "Hyperlink Hotspots"
|
||||
63265 "2nd Hyperlink Hotspots"
|
||||
63266 "2nd Default Text"
|
||||
63267 "Variable within String"
|
||||
63268 "Ordered List"
|
||||
END
|
||||
|
||||
#endif // Englisch (USA) resources
|
||||
|
||||
@ -327,6 +327,7 @@
|
||||
<ClInclude Include="VersionEx.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\Build\Notepad3.ini" />
|
||||
<None Include="..\res\Copy.cur" />
|
||||
<None Include="..\res\Encoding.bmp" />
|
||||
<None Include="..\res\Next.bmp" />
|
||||
|
||||
@ -136,6 +136,9 @@
|
||||
<None Include="..\Versions\VersionEx.h.tpl">
|
||||
<Filter>templates</Filter>
|
||||
</None>
|
||||
<None Include="..\Build\Notepad3.ini">
|
||||
<Filter>Resource Files</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="..\res\Notepad3.ico">
|
||||
|
||||
@ -82,21 +82,27 @@ __forceinline LRESULT SciCall_##fn(type1 var1, type2 var2) { \
|
||||
// Selection, positions and information
|
||||
//
|
||||
//
|
||||
DeclareSciCallR0(IsDocModified, GETMODIFY, BOOL);
|
||||
DeclareSciCallR0(IsSelectionEmpty, GETSELECTIONEMPTY, BOOL);
|
||||
DeclareSciCallR0(IsSelectionRectangle, SELECTIONISRECTANGLE, BOOL);
|
||||
DeclareSciCallR0(GetCurrentPos, GETCURRENTPOS, int);
|
||||
DeclareSciCallR0(GetAnchor, GETANCHOR, int);
|
||||
DeclareSciCallR0(IsSelectionEmpty, GETSELECTIONEMPTY, BOOL);
|
||||
DeclareSciCallR0(GetSelectionMode, GETSELECTIONMODE, int);
|
||||
DeclareSciCallR0(GetSelectionStart, GETSELECTIONSTART, int);
|
||||
DeclareSciCallR0(GetSelectionEnd, GETSELECTIONEND, int);
|
||||
DeclareSciCallR1(GetLineSelStartPosition, GETLINESELSTARTPOSITION, int, Sci_Position, line);
|
||||
DeclareSciCallR1(GetLineSelEndPosition, GETLINESELENDPOSITION, int, Sci_Position, line);
|
||||
|
||||
DeclareSciCallV2(SetSel, SETSEL, int, anchorPos, int, currentPos);
|
||||
DeclareSciCallV2(SetSel, SETSEL, Sci_Position, anchorPos, Sci_Position, currentPos);
|
||||
DeclareSciCallV2(ScrollRange, SCROLLRANGE, Sci_Position, secondaryPos, Sci_Position, primaryPos);
|
||||
DeclareSciCallV0(Clear, CLEAR);
|
||||
DeclareSciCallV2(SetTargetRange, SETTARGETRANGE, int, start, int, end);
|
||||
DeclareSciCallV0(TargetFromSelection, TARGETFROMSELECTION);
|
||||
|
||||
DeclareSciCallV1(GotoPos, GOTOPOS, int, position);
|
||||
DeclareSciCallV1(GotoLine, GOTOLINE, int, line);
|
||||
DeclareSciCallV1(SetAnchor, SETANCHOR, Sci_Position, position);
|
||||
DeclareSciCallV1(SetCurrentPos, SETCURRENTPOS, Sci_Position, position);
|
||||
DeclareSciCallV1(GotoPos, GOTOPOS, Sci_Position, position);
|
||||
DeclareSciCallV1(GotoLine, GOTOLINE, Sci_Position, line);
|
||||
DeclareSciCallR1(PositionBefore, POSITIONBEFORE, int, Sci_Position, position);
|
||||
DeclareSciCallR1(PositionAfter, POSITIONAFTER, int, Sci_Position, position);
|
||||
DeclareSciCallR1(GetCharAt, GETCHARAT, char, Sci_Position, position);
|
||||
@ -113,7 +119,7 @@ DeclareSciCallR0(GetFirstVisibleLine, GETFIRSTVISIBLELINE, int);
|
||||
DeclareSciCallR1(DocLineFromVisible, DOCLINEFROMVISIBLE, int, Sci_Position, line);
|
||||
|
||||
DeclareSciCallR2(GetRangePointer, GETRANGEPOINTER, LPCCH, Sci_Position, start, Sci_Position, length);
|
||||
|
||||
DeclareSciCallR0(GetCharacterPointer, GETCHARACTERPOINTER, LPCCH);
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
|
||||
@ -349,7 +349,7 @@ EDITLEXER lexCSS = { SCLEX_CSS, 63003, L"CSS Style Sheets", L"css; less; sass; s
|
||||
{ SCE_CSS_COMMENT, 63127, L"Comment", L"fore:#646464", L"" },
|
||||
{ SCE_CSS_TAG, 63136, L"HTML Tag", L"bold; fore:#0A246A", L"" },
|
||||
{ SCE_CSS_CLASS, 63194, L"Tag-Class", L"fore:#648000", L"" },
|
||||
{ SCE_CSS_ID, 63195, L"Tag-Id", L"fore:#648000", L"" },
|
||||
{ SCE_CSS_ID, 63195, L"Tag-ID", L"fore:#648000", L"" },
|
||||
{ SCE_CSS_ATTRIBUTE, 63196, L"Tag-Attribute", L"italic; fore:#648000", L"" },
|
||||
{ MULTI_STYLE(SCE_CSS_PSEUDOCLASS,SCE_CSS_EXTENDED_PSEUDOCLASS,0,0), 63197, L"Pseudo-Class", L"fore:#B000B0", L"" },
|
||||
{ MULTI_STYLE(SCE_CSS_PSEUDOELEMENT,SCE_CSS_EXTENDED_PSEUDOELEMENT,0,0), 63361, L"Pseudo-Element", L"fore:#B00050", L"" },
|
||||
@ -2429,7 +2429,7 @@ EDITLEXER lexCmake = { SCLEX_CMAKE, 63038, L"Cmake Script", L"cmake; ctest", L""
|
||||
{ SCE_CMAKE_FOREACHDEF, 63326, L"For Each Def", L"fore:#00007F", L"" },
|
||||
{ SCE_CMAKE_IFDEFINEDEF, 63327, L"If Def", L"fore:#00007F", L"" },
|
||||
{ SCE_CMAKE_MACRODEF, 63328, L"Macro Def", L"fore:#00007F", L"" },
|
||||
{ SCE_CMAKE_STRINGVAR, 63329, L"Variable within string", L"back:#EEEEEE; fore:#CC3300", L"" },
|
||||
{ SCE_CMAKE_STRINGVAR, 63267, L"Variable within String", L"back:#EEEEEE; fore:#CC3300", L"" },
|
||||
{ SCE_CMAKE_NUMBER, 63130, L"Number", L"fore:#008080", L"" },
|
||||
//{ SCE_CMAKE_USERDEFINED, 63106, L"User Defined", L"fore:#800020", L"" },
|
||||
{ -1, 00000, L"", L"", L"" } } };
|
||||
@ -2544,7 +2544,7 @@ EDITLEXER lexMARKDOWN = { SCLEX_MARKDOWN, 63040, L"Markdown", L"md; markdown; md
|
||||
{ SCE_MARKDOWN_HEADER6, 63346, L"Header 6", L"fore:#FF0088; bold", L"" },
|
||||
{ SCE_MARKDOWN_PRECHAR, 63347, L"Pre Char", L"fore:#00007F", L"" },
|
||||
{ SCE_MARKDOWN_ULIST_ITEM, 63348, L"Unordered List", L"fore:#0080FF; bold", L"" },
|
||||
{ SCE_MARKDOWN_OLIST_ITEM, 63349, L"Ordered list", L"fore:#0080FF; bold", L"" },
|
||||
{ SCE_MARKDOWN_OLIST_ITEM, 63268, L"Ordered List", L"fore:#0080FF; bold", L"" },
|
||||
{ SCE_MARKDOWN_BLOCKQUOTE, 63350, L"Block Quote", L"fore:#00007F", L"" },
|
||||
{ SCE_MARKDOWN_STRIKEOUT, 63351, L"Strikeout", L"", L"" },
|
||||
{ SCE_MARKDOWN_HRULE, 63352, L"Horizontal Rule", L"bold", L"" },
|
||||
|
||||
@ -84,7 +84,10 @@ Return
|
||||
CHECK_ABOUT_BOX:
|
||||
; check About DlgBox
|
||||
WinActivate, ahk_pid %v_Notepad3_PID%
|
||||
Send {F1}
|
||||
|
||||
; This will select File->Open in Notepad:
|
||||
WinMenuSelectItem, ahk_pid %v_Notepad3_PID%, , ?, About...
|
||||
|
||||
WinWait, About %v_NP3Name%, , 1
|
||||
v_ErrLevel = %ErrorLevel%
|
||||
if (v_ErrLevel != 0)
|
||||
|
||||
@ -34,7 +34,7 @@ for %%i in (*.ahk) do (
|
||||
echo +++ Run Testsuite %%~nxi +++ >> "%TEST_LOG%"
|
||||
start "testing" /B /Wait "%AHK_EXE%" /ErrorStdOut "%%~nxi" >> "%TEST_LOG%" 2>&1
|
||||
if errorlevel 1 (
|
||||
set EXITCODE=%ERRORLEVEL%
|
||||
set EXITCODE=1
|
||||
echo *** Testsuite %%~nxi failed! ***
|
||||
echo *** ERROR: Testsuite %%~nxi failed! *** >> "%TEST_LOG%"
|
||||
) else (
|
||||
|
||||
Loading…
Reference in New Issue
Block a user