Commit Graph

2911 Commits

Author SHA1 Message Date
Rainer Kottenhoff
04e75bb6e0 + add: remember last used theme (if save settings is enabled) 2019-03-18 16:01:34 +01:00
Rainer Kottenhoff
eb1a2ddbc4 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET 2019-03-18 13:43:04 +01:00
Rainer Kottenhoff
b1face37e4 + cln: minor code cleanup 2019-03-18 13:42:44 +01:00
Pairi Daiza
4bca13f6ff
Merge pull request #1062 from hpwamr/MUI_dev
Fine tune cause the *.ini files are copied by "build script"
2019-03-18 12:54:00 +01:00
Pairi Daiza
a84108476a Fine tune cause the *.ini files are copied by "build script" 2019-03-18 12:41:05 +01:00
Rainer Kottenhoff
ab7b413968 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET 2019-03-18 12:20:13 +01:00
Pairi Daiza
ad1c574d59
Merge pull request #1061 from hpwamr/MUI_dev
Mui dev - Remove files that are copied by "build script"
2019-03-18 12:19:36 +01:00
Pairi Daiza
f6d2fdef72 Add directory "settings" to the list .GitIgnore list
- Cause the *.ini files and Themes are copied by "build script"
2019-03-18 12:02:14 +01:00
Pairi Daiza
133d0a2592 Add directory "settings" to the list .GitIgnore list
- Cause the *.ini files and Themes are copied by "build script"
2019-03-18 11:51:10 +01:00
Pairi Daiza
d0098ef96a
Delete minipath.ini 2019-03-18 11:22:12 +01:00
Pairi Daiza
254a5d6e73
Delete Notepad3.ini 2019-03-18 11:22:00 +01:00
Rainer Kottenhoff
ed91513fc1 + upd: uthash macros 2019-03-18 00:02:44 +01:00
Rainer Kottenhoff
f30c469a17
Merge pull request #1057 from RaiKoHoff/Dev_UCHARDET
Polish Language templates (cloned from en-GB)
2019-03-17 23:53:21 +01:00
Rainer Kottenhoff
3b8fc25687 + add: Polish language resources template (en-GB) 2019-03-17 23:42:44 +01:00
Rainer Kottenhoff
405de95041 + fix: merged language file 2019-03-17 22:58:55 +01:00
Rainer Kottenhoff
0e4475ade1 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET
# Conflicts:
#	language/np3_es_es/strings_es_es.rc
#	themes/style_schemata/Dark Theme.ini
#	themes/style_schemata/dark_theme_2nd_default_text.ini
#	themes/style_schemata/dark_theme_default_text.ini
2019-03-17 22:56:17 +01:00
Rainer Kottenhoff
0cab9d4698 fix: Hyperlink Styling for changed Themes 2019-03-17 19:59:09 +01:00
Pairi Daiza
4fcd33b5f6
Merge pull request #1056 from jczanfona/Typo_error
Typo error
2019-03-17 19:58:01 +01:00
josemaria_cr
ff5fc9143a Typo_error 2019-03-17 19:30:52 +01:00
Pairi Daiza
7fbb94f3ec
Merge pull request #1055 from hpwamr/MUI_dev
MUI - Prepare for  Polish  language [pl-PL] (partial)
2019-03-17 18:09:02 +01:00
Pairi Daiza
77bc416b6c MUI - Prepare for Polish language [pl-PL] (partial) 2019-03-17 17:44:08 +01:00
Rainer Kottenhoff
929e99001d Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET 2019-03-17 17:05:10 +01:00
Pairi Daiza
bf1c2e106d
Merge pull request #1053 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx" (adjust.)
2019-03-16 19:15:56 +01:00
Pairi Daiza
f87aa08e84 MUI - Add Code-page tags '// encoding: cpxxx" (adjust.) 2019-03-16 18:36:53 +01:00
Pairi Daiza
465fca75e4
Merge pull request #1052 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx" (adjust.)
2019-03-16 17:35:52 +01:00
Pairi Daiza
fd423dfade MUI - Add Code-page tags '// encoding: cpxxx" (adjust.) 2019-03-16 17:22:34 +01:00
Rainer Kottenhoff
f3df116a66 + chg: Styling current vs. default comparison instead of change flag 2019-03-16 03:30:54 +01:00
Rainer Kottenhoff
beea99aff6 + chg: minor fixes for saving styles ... 2019-03-15 21:30:14 +01:00
Rainer Kottenhoff
4cb6b0e4ec + chg: reworked Styling Import/Export 2019-03-15 21:17:17 +01:00
Rainer Kottenhoff
51fed8c5b9 + chg: draft of Theme changer 2019-03-15 15:31:36 +01:00
Pairi Daiza
78f752b14f
Merge pull request #1051 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx"
2019-03-15 01:13:03 +01:00
Pairi Daiza
98be7ed6d1 MUI - Add Code-page tags '// encoding: cpxxx" 2019-03-15 01:00:51 +01:00
Pairi Daiza
38dbef1ba6
Merge pull request #1050 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx"
2019-03-15 00:56:45 +01:00
Pairi Daiza
820c913f31 MUI - Add Code-page tags '// encoding: cpxxx" 2019-03-15 00:43:07 +01:00
Rainer Kottenhoff
3bc7b66e0b
Merge pull request #1049 from RaiKoHoff/Dev_UCHARDET
Add Theme Menu to load exported styles "on the fly"
2019-03-14 14:50:07 +01:00
Rainer Kottenhoff
c05d53edd4 + fix: wrong test dir 2019-03-14 14:37:24 +01:00
Rainer Kottenhoff
5b8ca9d0d5 + add: Themes menu to load exported styles (e.g. "dark theme" 2019-03-14 14:28:27 +01:00
Rainer Kottenhoff
9c8df4966c Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET 2019-03-14 00:32:29 +01:00
Rainer Kottenhoff
ff987c4fbf + add: dark scheme for 2nd default text 2019-03-14 00:08:35 +01:00
Pairi Daiza
828b923d32
Merge pull request #1048 from hpwamr/MUI_dev
MUI - Remove Code-page tags '// encoding: cpxxx"
2019-03-13 23:55:49 +01:00
Pairi Daiza
ac2d653931 MUI - Remove Code-page tags '// encoding: cpxxx" 2019-03-13 23:42:52 +01:00
Rainer Kottenhoff
32f0e3b6e3
Merge pull request #1047 from RaiKoHoff/Dev_UCHARDET
Fix indentation warning dialog
2019-03-13 23:18:33 +01:00
Rainer Kottenhoff
a4b8d3c834 + fix: indentation warning dialog 2019-03-13 23:06:22 +01:00
Pairi Daiza
2f6dd0eb0b
Merge pull request #1046 from hpwamr/MUI_dev
MUI - Correction little bug after add tags '// encoding: cpxxx" (typo)
2019-03-13 20:37:32 +01:00
Pairi Daiza
e59bdb6d55 MUI - Correction little bug after add tags '// encoding: cpxxx" (typo) 2019-03-13 20:24:25 +01:00
Pairi Daiza
f8fa603c75
Merge pull request #1045 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx
2019-03-13 19:49:24 +01:00
Pairi Daiza
aace818425 MUI - Add Code-page tags '// encoding: cpxxx" 2019-03-13 19:43:09 +01:00
Pairi Daiza
d80a21dbb4 MUI - Add Code-page tags '// encoding: cpxxx" 2019-03-13 19:41:26 +01:00
Rainer Kottenhoff
1cde4f2f6d
Merge pull request #1044 from RaiKoHoff/Dev_UCHARDET
Encoding detection fine-tuning
2019-03-13 18:23:03 +01:00
Rainer Kottenhoff
b5dcd2459d + encoding detection fine-tuning 2019-03-13 18:04:28 +01:00