Commit Graph

6374 Commits

Author SHA1 Message Date
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
0d42609224
Merge pull request #1250 from RaiKoHoff/Dev_RC
FV preserved on closing F/R dialog (add last(?) missing check)
2019-05-26 20:44:01 +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
5866d845d7
Merge pull request #1249 from RaiKoHoff/Dev_RC
FV preserved on closing F/R dialog (add missing checks)
2019-05-26 19:52:08 +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
f07a052ac0
Merge pull request #1248 from RaiKoHoff/Dev_RC
FocusView preserved on closing Find/Replacce dialog (same mode)
2019-05-26 13:28:08 +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
Pairi Daiza
5e61923f7b
Merge pull request #1247 from hpwamr/mui_dev
+ cln: code cleanup (temporary added rmdir code)
2019-05-26 09:52:00 +02:00
Pairi Daiza
3ea1c232ab + cln: code cleanup (temporary added rmdir code) 2019-05-26 09:31:23 +02:00
Pairi Daiza
5879ddfe53
Merge pull request #1246 from maboroshin/master
Translation >JP :DOCTAIL,CALLTIP,STYLEEDIT
2019-05-26 09:25:36 +02:00
maboroshin
40dd0c6bb7 Translation >JP :DOCTAIL,CALLTIP,STYLEEDIT 2019-05-26 14:46:19 +09:00
Rainer Kottenhoff
c81f437a4b
Merge pull request #1245 from RaiKoHoff/Dev_RC
Restore occurrence marker on Find/Replace closing
2019-05-26 02:47:38 +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
d0589dcf18
Merge pull request #1244 from RaiKoHoff/Dev_RC
Find/Replace: do mark occurrences on receiving focus again
2019-05-25 22:47:27 +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
22029313df
Merge pull request #1243 from RaiKoHoff/Dev_RC
Fixes:  Occurrences Counter
2019-05-25 22:19:22 +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
Rainer Kottenhoff
0145be2307
Merge pull request #1242 from RaiKoHoff/Dev_RC
Fix: FocusView cooperate with Find/Replace
2019-05-25 20:29:58 +02:00
Rainer Kottenhoff
abf2cfde7c + fix: Problem with FocusView and partial find from find/replace dialog 2019-05-25 20:19:08 +02:00
Rainer Kottenhoff
a45f1e713a + fix: optimizazion : Undo/Redo Selection 2019-05-24 23:28:34 +02:00
Rainer Kottenhoff
953a076982 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA 2019-05-24 22:58:12 +02:00
Rainer Kottenhoff
23ef2df24b + 1st draft version of editable "Multi-Selection" 2019-05-24 22:53:30 +02:00
Pairi Daiza
e65c551c1c
Merge pull request #1241 from hpwamr/mui_dev
+ Current Build Information - VS2019 v16.1.(0-1)
2019-05-24 19:31:17 +02:00
Pairi Daiza
c6cb2f6ed6 + Current Build Information - VS2019 v16.1.(0-1) 2019-05-24 19:22:56 +02:00
Rainer Kottenhoff
985024c562 Merge branch 'Dev_RC' into Dev_ONIGURUMA 2019-05-24 09:39:40 +02:00
Pairi Daiza
86e29893a6
Merge pull request #1239 from hpwamr/mui_dev
Remove empty and not used dir "themes" and rename current dir themes to Themes
2019-05-24 00:06:57 +02:00
Pairi Daiza
cdbc63b914 Remove empty and not used dir "themes" and rename current dir themes to Themes 2019-05-23 23:56:35 +02:00
Pairi Daiza
d492735b7d
Merge pull request #1238 from hpwamr/mui_dev
Change script to remove unnecessary themes directories
2019-05-23 20:16:03 +02:00
Pairi Daiza
8a26e8fe33 Change script to remove unnecessary themes directories 2019-05-23 19:58:56 +02:00