Commit Graph

1446 Commits

Author SHA1 Message Date
Rainer Kottenhoff
7bf1aba7d6 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2019-05-30 07:50:29 +02:00
Derick Payne
8243449f44 Updated Afrikaans Translation 2019-05-29 21:26:47 +02:00
Rainer Kottenhoff
57e408c133 Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA 2019-05-29 18:56:50 +02:00
Rainer Kottenhoff
9d0de4bac7 + fix: some format strings for dialogs displaying long integers (DocPos) converted to int 2019-05-29 16:10:04 +02:00
Rainer Kottenhoff
926546eeed + fix: previous commit 2019-05-29 14:48:27 +02:00
Rainer Kottenhoff
0c33fe74bc + upd: version text only 2019-05-29 14:20:42 +02:00
Rainer Kottenhoff
8abdc939c0 + fix: keep main selection on multi-select all 2019-05-29 14:17:48 +02:00
Rainer Kottenhoff
841bca1d66 + add: Multi-Select all occurrences (or selected if MO is off) (Ctrl+Shift+Spc) 2019-05-29 13:04:32 +02:00
Rainer Kottenhoff
d63311fbfd Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA
# Conflicts:
#	Versions/build.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2019-05-29 09:01:41 +02:00
Rainer Kottenhoff
c23fd336e0 + fix: Load external Toolbars (clear config on error, path relative to be portable) 2019-05-29 08:45:15 +02:00
Rainer Kottenhoff
286ae652a9 + ver: update 2019-05-28 10:38:24 +02:00
Rainer Kottenhoff
61b8b78385 + add: extent multi-selection (Ctrl + Up/Down/Left/Right) 2019-05-28 10:30:29 +02:00
Rainer Kottenhoff
68a74f7db9 + fix: "thin selection" restore 2019-05-28 00:49:07 +02:00
Rainer Kottenhoff
71a35e053a Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA 2019-05-27 22:47:02 +02:00
Rainer Kottenhoff
bb3e8aa484 + fix: selecting external toolbar from config 2019-05-27 22:29:17 +02:00
Rainer Kottenhoff
366ac5eed1 + add: Multi-Selection with selection restore on undo 2019-05-27 20:47:15 +02:00
Rainer Kottenhoff
c250b9e79d Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA
# Conflicts:
#	src/Notepad3.c
2019-05-27 15:01:02 +02:00
Rainer Kottenhoff
7b04e73a39 + fix: Match Case and Match Visible Only on Mark Occurrences 2019-05-27 14:30:09 +02:00
Rainer Kottenhoff
87ccc7356e Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA
# Conflicts:
#	src/Notepad3.c
2019-05-27 00:48:16 +02:00
Rainer Kottenhoff
5f7edbe5af + xxx: intermediate version 2019-05-27 00:47:31 +02:00
Rainer Kottenhoff
f18255266f + fix: mark occurrences match word under cursor only if flagged 2019-05-27 00:35:00 +02:00
Rainer Kottenhoff
b5fdff3e16 + chg: revert FocusView on closing F/R dialog in any case 2019-05-27 00:04:19 +02:00
Rainer Kottenhoff
0df2c715ae + xxx: intermediate version 2019-05-26 23:31:19 +02:00
Rainer Kottenhoff
1d6384360f Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-26 20:44:53 +02:00
Rainer Kottenhoff
267f1f4784 + fix: FV preserved on closing F/R dialog (add last(?) missing check) 2019-05-26 20:33:52 +02:00
Rainer Kottenhoff
5fcbd8822d + xxx: intermediate multi-selection undo/redo stack version 2019-05-26 20:28:14 +02:00
Rainer Kottenhoff
d29b4ed33c Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-26 19:48:55 +02:00
Rainer Kottenhoff
9cf05effff + fix: updates for Hyperlink Indicator 2019-05-26 19:42:47 +02:00
Rainer Kottenhoff
d3f8e108c0 Merge branch 'Dev_RC' into Dev_ONIGURUMA
# Conflicts:
#	src/Edit.c
2019-05-26 18:53:20 +02:00
Rainer Kottenhoff
5eb8ef936d + xxx: intermediate version 2019-05-26 18:20:13 +02:00
Rainer Kottenhoff
c51458558b +fix: FocusView preserved on closing Find/Replacce dialog (add missing checks) 2019-05-26 18:17:35 +02:00
Rainer Kottenhoff
cfc216a17f Merge branch 'Dev_RC' into Dev_ONIGURUMA
# Conflicts:
#	src/Notepad3.c
2019-05-26 13:19:25 +02:00
Rainer Kottenhoff
86bd9e4125 + fix: preserve FV on closing F/R dialog only, if search mode and MrarkOcc mode are eq. 2019-05-26 13:08:41 +02:00
Rainer Kottenhoff
4d6da9fcb7 + fix: FocusView preserved on closing Find/Replacce dialog 2019-05-26 12:47:19 +02:00
Rainer Kottenhoff
771024cb69 + chg: restore multi-selection on revert (1st draft) 2019-05-26 12:06:48 +02:00
Rainer Kottenhoff
481c495a1d Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-26 02:40:23 +02:00
Rainer Kottenhoff
81edad20ad + upd: version info 2019-05-26 02:35:30 +02:00
Rainer Kottenhoff
4bb59f4e1d + fix: switching Find/Replace ON/OFF <-> MarkOccurrences 2019-05-26 02:33:01 +02:00
Rainer Kottenhoff
fd9921de51 Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-26 01:20:12 +02:00
Rainer Kottenhoff
deeac1fa3c +upd: version info 2019-05-26 01:14:28 +02:00
Rainer Kottenhoff
39d7bef462 + fix: restore occurrence marker on Find/Replace closing 2019-05-26 01:13:26 +02:00
Rainer Kottenhoff
016b47001c Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA
# Conflicts:
#	src/Edit.c
2019-05-25 22:48:44 +02:00
Rainer Kottenhoff
96a48a2fae + fix: initialt mark occ, if Find/Replace dialog receives focus again 2019-05-25 22:35:25 +02:00
Rainer Kottenhoff
deb69eb342 + fix: small bugfixes 2019-05-25 22:30:07 +02:00
Rainer Kottenhoff
1d2e5bd96d Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-25 22:20:04 +02:00
Rainer Kottenhoff
fb631c1b2a + cln: code cleanup 2019-05-25 21:56:19 +02:00
Rainer Kottenhoff
0709e1d841 +fix: Find/Replace dialog is master of MarkOccurrences until closed 2019-05-25 21:33:20 +02:00
Rainer Kottenhoff
2bcd7eec67 + fix: Occurrences Counter 2019-05-25 21:11:13 +02:00
Rainer Kottenhoff
98d2e063e8 + fix: disable FocusView if MarkOccurrences is disabled 2019-05-25 20:54:04 +02:00
Rainer Kottenhoff
25e5ab5679 Merge branch 'Dev_RC' into Dev_ONIGURUMA
# Conflicts:
#	src/Notepad3.c
2019-05-25 20:52:20 +02:00