Commit Graph

2040 Commits

Author SHA1 Message Date
RaiKoHoff
f72c0d1d54 + upd: current master branch dev merged
+ fix: grepWinNP3 language switching
2020-03-27 14:16:50 +01:00
RaiKoHoff
7af705f9a9 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3
# Conflicts:
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/Notepad3.c
#	src/VersionEx.h
2020-03-27 11:59:43 +01:00
RaiKoHoff
ba87480517 + fix: review scroll behavior for context menu 2020-03-27 10:22:39 +01:00
RaiKoHoff
da3d11469e + fix: stop scrolling on context menu click
+ fix: scrolling behavior: normalize view vs. ensure visibility
2020-03-27 09:59:36 +01:00
RaiKoHoff
e7fbdfef0c + changed file and dir naming (grepWin -> grepWinNP3) 2020-03-26 17:25:34 +01:00
RaiKoHoff
aa057d3c99 + add: feature "overlapping search" option 2020-03-26 15:47:31 +01:00
RaiKoHoff
332ba1de24 + upd: current grepWinNP3 version 2020-03-26 12:12:42 +01:00
Rainer Kottenhoff
d86ad0f01c + fix: update grepWinNP3 v1.9.2.605 2020-03-26 02:24:42 +01:00
Rainer Kottenhoff
804bada2f6 + fix: small bug in UnslashQuotes 2020-03-26 00:25:59 +01:00
RaiKoHoff
11f8231ce3 Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-25 17:25:14 +01:00
Pairi Daiza
97b97c54f0 +ver: VS2019 version update - VS 16.5.1 2020-03-25 05:12:20 +01:00
Rainer Kottenhoff
3bbbe99fdc + fix: portable grepwin.ini file handling for grepWinNP3 integration 2020-03-24 22:53:56 +01:00
RaiKoHoff
63ea67385c + fix: grepWinNP3 - language file and naming 2020-03-24 14:30:32 +01:00
RaiKoHoff
4ba01206ba Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
#	src/Config/Config.cpp
#	src/Config/Config.h
#	src/Styles.c
2020-03-23 17:41:27 +01:00
RaiKoHoff
a21903d32c + fix: corrections .ini-file reader/writer locking mechanism 2020-03-23 17:02:30 +01:00
Rainer Kottenhoff
3f5a88478e prototype .ini-file locking 2020-03-23 08:10:12 +01:00
Rainer Kottenhoff
66a764f1fd Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-22 13:49:14 +01:00
Pairi Daiza
f22b11f5df +chg: add "lang" in RC lexer in anticipation of feature grepWin 2020-03-22 09:52:21 +01:00
Rainer Kottenhoff
7cdb3be668 Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
#	scintilla/win32/PlatWin.cxx
#	scintilla/win32/PlatWin.h
#	scintilla/win32/ScintillaWin.cxx
#	src/Dialogs.c
#	src/Helpers.c
#	src/Helpers.h
#	src/Styles.c
2020-03-21 23:09:09 +01:00
Rainer Kottenhoff
56bbc626c6 + fix: refactoring for Scintilla DLL version 2020-03-21 22:20:23 +01:00
Rainer Kottenhoff
e530db85fd Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/TypeDefs.h
#	src/VersionEx.h
2020-03-21 16:55:11 +01:00
Rainer Kottenhoff
1993420596 + fix: concurrency issue on .ini-file access while (nearly) parallel start 2020-03-21 16:27:17 +01:00
Rainer Kottenhoff
dd9bc1fef7 + fix: insert selected language correspondig short & long DateTime format
+ different RegEx search pattern spec for Update TimeStamps
2020-03-21 15:52:01 +01:00
Pairi Daiza
aa2aedf123 MUI - Minor translation for "Polish" language.
+ modify "Environment" of "build_np3portableapp.cmd"
2020-03-21 10:33:34 +01:00
Pairi Daiza
3211eb033f
Merge pull request #2146 from hpwamr/mui
+ upd: Version files for Japanese translation
2020-03-21 05:57:54 +01:00
Pairi Daiza
f97b1379e7 + upd: Version files for Japanese translation 2020-03-21 05:41:18 +01:00
Rainer Kottenhoff
174f129ae4 + enh: integrate language files for grepWin 2020-03-21 01:14:21 +01:00
Rainer Kottenhoff
66a4f7c52d Merge branch 'RC2_DEV' into NewFeatures 2020-03-20 23:48:23 +01:00
Rainer Kottenhoff
ca93ea7ca2 Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV 2020-03-20 23:36:25 +01:00
Pairi Daiza
f2e0633476 + upd: Versioning files 2020-03-20 18:44:21 +01:00
Pairi Daiza
5adb0c9c35 Change Rizonesoft Copyright © to year "2020" (thanks to "grepWin") 2020-03-20 18:42:11 +01:00
RaiKoHoff
ce039f9154 + fix: normalized view position on FileLoad (historic caret pos) 2020-03-20 17:00:59 +01:00
RaiKoHoff
ca450c558a Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	src/VersionEx.h
2020-03-20 14:54:44 +01:00
RaiKoHoff
a264f6bce2 + chg: Normalized ScrollToLine View (JumpTo, Find Fwrd/Backw, etc.), 2020-03-20 14:41:39 +01:00
Pairi Daiza
0e3813e402 +ver: VS2019 version update - VS 16.5.0 2020-03-20 10:14:20 +01:00
RaiKoHoff
673f0f63b8 + rfc: get application directory refactoring 2020-03-19 17:30:55 +01:00
RaiKoHoff
ca9ece5b7a + enh: move grepWin fixed cmdline options to grepwi.ini file 2020-03-19 15:34:27 +01:00
Pairi Daiza
77ac8a8a98 + upd: Version files for Belarusian and Russian translations 2020-03-19 00:25:45 +01:00
Pairi Daiza
0eb0ffcb5f + upd: Version files for Hungarian translation 2020-03-18 23:42:08 +01:00
Rainer Kottenhoff
f9734b8689 + add: grepWin integration part 2 2020-03-18 01:32:17 +01:00
RaiKoHoff
b2ddb08f54 + add: grepWin integration: multi file search 2020-03-17 18:39:13 +01:00
RaiKoHoff
ca3c946e51 Merge branch 'RC2_DEV' into NewFeatures 2020-03-17 11:07:54 +01:00
RaiKoHoff
f51fafda10 + chg: optional scroll to caret position 2020-03-17 09:43:55 +01:00
RaiKoHoff
f3ee0029c7 + fix: Focused-View scrolling 2020-03-17 08:45:28 +01:00
Pairi Daiza
1ab41ce1fe + upd: Versioning files 2020-03-16 21:32:27 +01:00
Pairi Daiza
1c44eb1966 +upd: Minor update in "KeyboardShortcuts.txt"
- add "Oniguruma_RE.txt" in Installer and NotepadPortable doc
2020-03-16 17:22:05 +01:00
RaiKoHoff
e69e45c2f2 Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	src/Edit.c
#	src/Notepad3.c
#	src/Notepad3.h
2020-03-16 17:03:50 +01:00
RaiKoHoff
6be020d7b5 + chg: try "hardening" selection undo/redo behavior 2020-03-16 16:33:08 +01:00
RaiKoHoff
1704659b48 Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-03-16 09:31:57 +01:00
RaiKoHoff
2e4bed6668 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-16 09:31:04 +01:00