Commit Graph

5017 Commits

Author SHA1 Message Date
Rainer Kottenhoff
5b622b404d Merge branch 'RC2_DEV' into NewFeatures 2020-03-10 13:02:21 +01:00
Rainer Kottenhoff
dedc3488b8
Merge pull request #2083 from RaiKoHoff/RC2_DEV
Increased confidence for ANSI encoding detection…
2020-03-10 13:00:38 +01:00
Rainer Kottenhoff
e3fdccdda2 + increase confidence for ANSI encoding detection if current ANSI locale is detected 2020-03-10 12:39:31 +01:00
Rainer Kottenhoff
063eff4975 + fix: remember caret position only possible with file history 2020-03-10 11:45:41 +01:00
Pairi Daiza
639b2452f9
Merge pull request #2082 from hpwamr/mui
Minor correction to sync design files
2020-03-09 22:03:19 +01:00
Pairi Daiza
425a108038 + upd: Versioning files 2020-03-09 21:51:51 +01:00
Pairi Daiza
9beeaef016 Minor correction to sync design file 2020-03-09 21:51:14 +01:00
Rainer Kottenhoff
c27a91789d Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
#	src/Dialogs.c
#	src/Helpers.c
#	src/Helpers.h
#	src/Notepad3.c
2020-03-09 19:43:37 +01:00
Rainer Kottenhoff
a65da3c82c
Merge pull request #2080 from RaiKoHoff/RC2_DEV
AboutBox's RichEdit control DPI scale behavior
2020-03-09 18:51:53 +01:00
Rainer Kottenhoff
eaadd5efee + try: fix AboutBox's RichEdit control DPI scale behavior 2020-03-09 18:36:45 +01:00
Rainer Kottenhoff
a34de8dbdd + try fix: AboutBox's RichEdit ctrl for DPI scaling 2020-03-09 18:22:11 +01:00
Pairi Daiza
9cc4469f44
Merge pull request #2079 from hpwamr/mui
MUI - Minor translation for "es-ES", "fr-FR" an "nl-NL"
2020-03-09 15:26:45 +01:00
Pairi Daiza
2a66ecc629 + upd: Versioning files and Changes.txt 2020-03-09 15:12:57 +01:00
Pairi Daiza
a62dc4e59a MUI - Minor translation for "es-ES", "fr-FR" an "nl-NL" 2020-03-09 15:11:58 +01:00
Pairi Daiza
dfc12ced05 +chg: Add missing "sv-SE" language 2020-03-09 15:10:38 +01:00
Rainer Kottenhoff
271a996927 Merge branch 'RC2_DEV' into NewFeatures 2020-03-09 12:10:35 +01:00
Rainer Kottenhoff
e4997a7e82
Merge pull request #2078 from RaiKoHoff/RC2_DEV
Fix missing DPI scaling selection mode
2020-03-09 12:07:05 +01:00
Rainer Kottenhoff
72fcf979ad + fix: missing DPI scaling selection mode 2020-03-09 12:05:38 +01:00
Rainer Kottenhoff
40a56713e2
Merge pull request #2077 from RaiKoHoff/RC2_DEV
Fix DPI Scaling Toolbar
2020-03-09 11:59:27 +01:00
Rainer Kottenhoff
0aa305cf73 + fix: DPI Scaling Toolbar 2020-03-09 11:50:32 +01:00
Rainer Kottenhoff
56a4788ca1 Merge branch 'RC2_DEV' into NewFeatures 2020-03-08 11:38:08 +01:00
Rainer Kottenhoff
650b97f3fd
Merge pull request #2074 from RaiKoHoff/RC2_DEV
Update Scintilla v432
2020-03-08 11:27:45 +01:00
Rainer Kottenhoff
b50da74dbd + upd: Scintilla v432 (bugfix: that treated all dropped text as rectangular) 2020-03-08 11:07:30 +01:00
Pairi Daiza
1d47fd4420
Merge pull request #2073 from hpwamr/mui
MUI - Update translation in pl-PL
2020-03-08 09:25:36 +01:00
Pairi Daiza
4d7502d822 MUI - Update translation in pl-PL
+ upd: versioning files
2020-03-08 09:18:20 +01:00
Rainer Kottenhoff
ae4fb493b1 + try: alternate bitmap scaling algorithm (pxel artifacts instead of blurr effects) 2020-03-08 00:04:59 +01:00
Pairi Daiza
9bf25e3e1f
Merge pull request #2071 from hpwamr/mui
MUI - Small correction in layout Find/Replace
2020-03-07 23:19:43 +01:00
Pairi Daiza
7103c4c59a
Merge branch 'master' into mui 2020-03-07 23:12:58 +01:00
Pairi Daiza
60314ad5a8 + upd: versioning files (because conflict version !) 2020-03-07 23:10:13 +01:00
Rainer Kottenhoff
6423b18c6f Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures
# Conflicts:
#	src/Config/Config.cpp
#	src/Dialogs.c
#	src/Helpers.c
#	src/Helpers.h
#	src/Notepad3.c
#	src/Styles.c
#	src/TypeDefs.h
2020-03-07 22:52:57 +01:00
Pairi Daiza
882093136b + upd: versioning files 2020-03-07 22:50:04 +01:00
Pairi Daiza
b0ecb9063d MUI - Small correction in layout Find/Replace 2020-03-07 22:49:17 +01:00
Rainer Kottenhoff
a0ad095644
Merge pull request #2070 from RaiKoHoff/RC2_DEV
DPI Scale toolbar menu option
2020-03-07 22:25:42 +01:00
Rainer Kottenhoff
4d78a1d255 + fix: make toolbar DPI scalable (menu option) 2020-03-07 22:18:17 +01:00
Rainer Kottenhoff
3fe81cf90f Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
#	Versions/day.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/Notepad3.c
#	src/VersionEx.h
2020-03-07 13:41:35 +01:00
Rainer Kottenhoff
c8a69f2fcf
Merge pull request #2068 from RaiKoHoff/RC2_DEV
MUI language for common controls
2020-03-07 13:24:45 +01:00
Rainer Kottenhoff
7d6d62a110 + add: MUI langage for common controls fix description 2020-03-07 13:16:34 +01:00
Rainer Kottenhoff
c447bef832 + chg: do not DPI scale tool bar images
+ fix: use preferred/available language for common controls (customize toolbar, etc.)
2020-03-07 13:07:41 +01:00
Pairi Daiza
3dda419270
Merge pull request #2065 from hpwamr/mui
+chg: Remove Leftovers of "Open with Notepad3" after Uninstall All
2020-03-06 12:03:22 +01:00
Pairi Daiza
f341ae7b11 +chg: Remove Leftovers of "Open with Notepad3" after Uninstall All 2020-03-06 11:50:00 +01:00
Rainer Kottenhoff
cb7973ba0d + fix: update infinity loop 2020-03-05 23:50:17 +01:00
Derick Payne
74e6afe7b9 Releasing version 5.20.305.2 RC2 2020-03-05 21:12:11 +02:00
Derick Payne
5d1403ecb7 Updated Afrikaans Translation 2020-03-05 20:39:35 +02:00
Rainer Kottenhoff
8c25f971dc + minor fixes and optimizations 2020-03-05 18:01:14 +01:00
Pairi Daiza
6246cb2f5b
Merge pull request #2060 from hpwamr/mui
+ upd: Versioning files and Changes.txt
2020-03-05 17:20:22 +01:00
Pairi Daiza
56709fdcc9 + upd: Versioning files and Changes.txt 2020-03-05 17:00:20 +01:00
Rainer Kottenhoff
560c3a97b1 + fix: Aboutbox font scaling & Icon handling 2020-03-05 13:28:50 +01:00
Rainer Kottenhoff
3da48eece7 + fix: make DPI scaling window pos dependent 2020-03-05 00:04:39 +01:00
Rainer Kottenhoff
ac591cd09d
Merge pull request #2059 from RaiKoHoff/NewFeatures
First version of better DPI aware NP3
2020-03-04 14:14:18 +01:00
Rainer Kottenhoff
c84b72cccc + upd: versioning files 2020-03-04 14:10:14 +01:00