Commit Graph

3237 Commits

Author SHA1 Message Date
Rainer Kottenhoff
ece5ccfa3a + fix: Only (manually) revert file on request, if text has changed (save needed). 2019-05-15 10:51:15 +02:00
Rainer Kottenhoff
c8cbc21efc + upd: compiler version (VS2017) and Scintilla (current GitHub mirror) 2019-05-15 09:52:48 +02:00
Pairi Daiza
c72799bb8c
Merge pull request #1208 from hpwamr/mui_dev
MUI - Translation of "Always On Top" (copy text from "menu_xx_yy.rc")
2019-05-14 23:10:15 +02:00
Pairi Daiza
95cfc58d31 MUI - Translation of "Always On Top" (copy text from "menu_xx_yy.rc") 2019-05-14 22:45:56 +02:00
Rainer Kottenhoff
2da452c92c
Merge pull request #1207 from RaiKoHoff/Dev_NewFeatures
Undo/Redo buffer beyond FileRevert/AutoReload
2019-05-14 13:24:16 +02:00
Rainer Kottenhoff
d18c083388 + fix: Dirty state on FileRevert
+ fix: Tooltip for "Always On top" button
2019-05-14 11:45:27 +02:00
Rainer Kottenhoff
441453abad Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_NewFeatures 2019-05-14 10:26:52 +02:00
Pairi Daiza
260a5c15c6
Merge pull request #1206 from hpwamr/master
Merge remote-tracking branch 'NP3_rizonesoft/master'
2019-05-14 10:13:16 +02:00
Pairi Daiza
2e46f2da94 Merge remote-tracking branch 'NP3_rizonesoft/master' 2019-05-14 09:52:44 +02:00
Pairi Daiza
3c02b46395
Merge pull request #1205 from xsak/master
Chasing doctail added
2019-05-14 09:50:29 +02:00
Akos Keresztes
9efdfc79d3 Chasing doctail added 2019-05-14 08:43:33 +02:00
Pairi Daiza
d498c541e7 Merge remote-tracking branch 'NP3_rizonesoft/master' 2019-05-14 06:04:26 +02:00
Pairi Daiza
ceb3811d0f
Merge pull request #1204 from hpwamr/mui_dev
MUI - Rename "Doc Tail Chasing" => "Monitoring Log"
2019-05-14 06:03:52 +02:00
Pairi Daiza
b7242192a8 Merge remote-tracking branch 'NP3_rizonesoft/master' into mui_dev 2019-05-14 05:48:21 +02:00
Pairi Daiza
6458e8a14f Merge remote-tracking branch 'NP3_rizonesoft/master' 2019-05-14 05:47:49 +02:00
Pairi Daiza
5e15d21cc2 MUI - Rename "Doc Tail Chasing" => "Monitoring Log" 2019-05-14 05:43:51 +02:00
Rainer Kottenhoff
ad13a3217e Merge branch 'Dev_RC' into Dev_NewFeatures
# Conflicts:
#	Versions/build.txt
#	language/np3_hu_hu/strings_hu_hu.rc
#	res/Notepad3.exe.manifest.conf
#	src/Edit.c
#	src/Notepad3.c
#	src/VersionEx.h
2019-05-14 02:52:30 +02:00
Rainer Kottenhoff
01494b6fe9 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_RC 2019-05-14 02:39:25 +02:00
Rainer Kottenhoff
44c3ebf742
Merge pull request #1203 from RaiKoHoff/Dev_RC
Always On Top toolbar button
2019-05-14 02:38:37 +02:00
Rainer Kottenhoff
f64e5fcb22 + chg: "Always on top" default button position (factory settings) 2019-05-14 02:31:06 +02:00
Rainer Kottenhoff
41b40d2dae + chg: version info only 2019-05-14 02:13:02 +02:00
Rainer Kottenhoff
1ad6981660 + add: Toolbar button (Pin) for "Always on Top" indicator 2019-05-14 02:11:50 +02:00
Rainer Kottenhoff
77d1531c29 + add: binary file detection (by zufuliu) 2019-05-14 00:25:02 +02:00
Pairi Daiza
584fa1aa44
Merge pull request #1202 from hpwamr/mui_dev
MUI - Translation in Hungarian (hu-HU) of Notepad3 (Partial_1)
2019-05-13 23:25:54 +02:00
Pairi Daiza
4df81ff8b6 MUI - Translation in Hungarian (hu-HU) of Notepad3 (Partial_1) 2019-05-13 23:10:34 +02:00
Pairi Daiza
60693ad659
Merge pull request #1201 from xsak/master
Hungarian translation
2019-05-13 21:19:16 +02:00
Pairi Daiza
c8112b9416
Merge branch 'master' into master 2019-05-13 21:19:05 +02:00
Akos Keresztes
9c165234b8 encoding change 2019-05-13 13:01:45 +02:00
Akos Keresztes
d4c7667160 MiniPath done(?) 2019-05-13 12:54:02 +02:00
Rainer Kottenhoff
0460c7bc28 + fix: ignoring "encrypted raw" loading for inconsisteny checks (typedefs missing) 2019-05-13 01:46:39 +02:00
Rainer Kottenhoff
056779bc7b + fix: ignoring "encrypted raw" loading for inconsisteny checks 2019-05-13 01:45:30 +02:00
Rainer Kottenhoff
2965dd8d21 Merge branch 'Dev_RC' into Dev_NewFeatures
# Conflicts:
#	src/Edit.c
#	src/Notepad3.c
2019-05-13 01:18:41 +02:00
Akos Keresztes
2bb6bbac35 minipath translation 2019-05-13 00:24:08 +02:00
Akos Keresztes
249866138a Hunting for strings to translate 2019-05-12 23:30:11 +02:00
Rainer Kottenhoff
f67c10df48
Merge pull request #1199 from RaiKoHoff/Dev_RC
Bugfixes:
2019-05-12 14:21:50 +02:00
Rainer Kottenhoff
af7e142814 + fix: [Suppressed Messages], understand old settings files 2019-05-12 14:08:05 +02:00
Rainer Kottenhoff
eb09b90b62 + fix: no inconsistency (line-breaks, indentation) checks for files with unknown extensions 2019-05-12 12:41:43 +02:00
Rainer Kottenhoff
41f09008ea + fix: caret mode: block,ovrblck 2019-05-12 12:02:26 +02:00
Rainer Kottenhoff
406b8c3634 + chg: version info files 2019-05-12 02:52:49 +02:00
Rainer Kottenhoff
d99af6513d + chg: adapt warning dialog according to new FileRevert / AutoReload undo/redo history 2019-05-12 02:38:25 +02:00
Rainer Kottenhoff
f57dace64f Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures 2019-05-12 02:12:05 +02:00
Rainer Kottenhoff
4b890eaf4c + fix. cleanup some refactorings for undo/redo beyont FileRevert / AutoReload 2019-05-12 02:11:18 +02:00
Akos Keresztes
3e0bd96238 even more Hungarian 2019-05-11 21:32:48 +02:00
Pairi Daiza
dc72f8351e
Merge pull request #1195 from hpwamr/mui_dev
MUI - Translation  "Monitoring Log"
2019-05-11 20:09:17 +02:00
Pairi Daiza
63df7b4db5 MUI - Rename "Doc Tail Chasing" => "Monitoring Log" 2019-05-11 19:55:39 +02:00
Pairi Daiza
8af4ca238f MUI - Translation "Monitoring Log" 2019-05-11 19:53:01 +02:00
Rainer Kottenhoff
789b80c318 + chg: enable Undo on FileRevert / AutoReload 2019-05-11 16:35:39 +02:00
Rainer Kottenhoff
69cd94da4e + experimental: enable undo on File revert 2019-05-11 12:38:38 +02:00
Pairi Daiza
42a220eb63
Merge pull request #1194 from hpwamr/mui_dev
MUI - Rename "Doc Tail Chasing" => "Monitoring Log"
2019-05-11 09:55:37 +02:00
Pairi Daiza
c0922ce371 Merge branch 'master' into mui_dev 2019-05-11 09:41:11 +02:00