From cd45afc0208f92c21afd286ce3f691f6f32d1989 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Fri, 11 Oct 2024 04:26:53 +0200 Subject: [PATCH] Improve GUI for commands for the system tray in Preferences --- .../installer/nativeLang/abkhazian.xml | 1 - .../installer/nativeLang/afrikaans.xml | 2 -- PowerEditor/installer/nativeLang/albanian.xml | 2 -- PowerEditor/installer/nativeLang/arabic.xml | 1 - .../installer/nativeLang/aragonese.xml | 2 -- PowerEditor/installer/nativeLang/aranese.xml | 2 -- .../installer/nativeLang/azerbaijani.xml | 2 -- PowerEditor/installer/nativeLang/basque.xml | 1 - .../installer/nativeLang/belarusian.xml | 1 - PowerEditor/installer/nativeLang/bengali.xml | 2 -- PowerEditor/installer/nativeLang/bosnian.xml | 2 -- .../nativeLang/brazilian_portuguese.xml | 1 - PowerEditor/installer/nativeLang/breton.xml | 1 - .../installer/nativeLang/bulgarian.xml | 1 - PowerEditor/installer/nativeLang/catalan.xml | 2 -- .../nativeLang/chineseSimplified.xml | 1 - PowerEditor/installer/nativeLang/corsican.xml | 1 - PowerEditor/installer/nativeLang/croatian.xml | 1 - PowerEditor/installer/nativeLang/czech.xml | 2 -- PowerEditor/installer/nativeLang/danish.xml | 1 - PowerEditor/installer/nativeLang/dutch.xml | 1 - PowerEditor/installer/nativeLang/english.xml | 8 +++-- .../nativeLang/english_customizable.xml | 8 +++-- .../installer/nativeLang/esperanto.xml | 2 -- PowerEditor/installer/nativeLang/estonian.xml | 2 -- .../installer/nativeLang/extremaduran.xml | 2 -- PowerEditor/installer/nativeLang/farsi.xml | 2 -- PowerEditor/installer/nativeLang/finnish.xml | 1 - PowerEditor/installer/nativeLang/french.xml | 7 +++- PowerEditor/installer/nativeLang/friulian.xml | 2 -- PowerEditor/installer/nativeLang/galician.xml | 1 - PowerEditor/installer/nativeLang/georgian.xml | 2 -- PowerEditor/installer/nativeLang/german.xml | 1 - PowerEditor/installer/nativeLang/greek.xml | 1 - PowerEditor/installer/nativeLang/gujarati.xml | 2 -- PowerEditor/installer/nativeLang/hindi.xml | 1 - .../nativeLang/hongKongCantonese.xml | 1 - .../installer/nativeLang/hungarian.xml | 1 - .../installer/nativeLang/indonesian.xml | 1 - PowerEditor/installer/nativeLang/irish.xml | 1 - PowerEditor/installer/nativeLang/italian.xml | 1 - PowerEditor/installer/nativeLang/japanese.xml | 1 - PowerEditor/installer/nativeLang/kabyle.xml | 4 --- PowerEditor/installer/nativeLang/kannada.xml | 2 -- PowerEditor/installer/nativeLang/kazakh.xml | 2 -- PowerEditor/installer/nativeLang/korean.xml | 1 - PowerEditor/installer/nativeLang/kurdish.xml | 2 -- PowerEditor/installer/nativeLang/kyrgyz.xml | 2 -- PowerEditor/installer/nativeLang/latvian.xml | 2 -- PowerEditor/installer/nativeLang/ligurian.xml | 2 -- .../installer/nativeLang/lithuanian.xml | 2 -- .../installer/nativeLang/luxembourgish.xml | 2 -- .../installer/nativeLang/macedonian.xml | 2 -- PowerEditor/installer/nativeLang/malay.xml | 2 -- PowerEditor/installer/nativeLang/marathi.xml | 2 -- .../installer/nativeLang/mongolian.xml | 2 -- PowerEditor/installer/nativeLang/nepali.xml | 1 - .../installer/nativeLang/norwegian.xml | 1 - PowerEditor/installer/nativeLang/nynorsk.xml | 2 -- PowerEditor/installer/nativeLang/occitan.xml | 2 -- PowerEditor/installer/nativeLang/piglatin.xml | 2 -- PowerEditor/installer/nativeLang/polish.xml | 2 -- .../installer/nativeLang/portuguese.xml | 1 - PowerEditor/installer/nativeLang/punjabi.xml | 2 -- PowerEditor/installer/nativeLang/romanian.xml | 1 - PowerEditor/installer/nativeLang/russian.xml | 1 - .../installer/nativeLang/sardinian.xml | 2 -- PowerEditor/installer/nativeLang/serbian.xml | 2 -- .../installer/nativeLang/serbianCyrillic.xml | 2 -- PowerEditor/installer/nativeLang/sinhala.xml | 2 -- PowerEditor/installer/nativeLang/slovak.xml | 1 - .../installer/nativeLang/slovenian.xml | 1 - PowerEditor/installer/nativeLang/spanish.xml | 1 - .../installer/nativeLang/spanish_ar.xml | 2 -- PowerEditor/installer/nativeLang/swedish.xml | 1 - PowerEditor/installer/nativeLang/tagalog.xml | 2 -- .../nativeLang/taiwaneseMandarin.xml | 8 +++-- .../installer/nativeLang/tajikCyrillic.xml | 2 -- PowerEditor/installer/nativeLang/tamil.xml | 1 - PowerEditor/installer/nativeLang/tatar.xml | 2 -- PowerEditor/installer/nativeLang/telugu.xml | 2 -- PowerEditor/installer/nativeLang/thai.xml | 2 -- PowerEditor/installer/nativeLang/turkish.xml | 1 - .../installer/nativeLang/ukrainian.xml | 1 - PowerEditor/installer/nativeLang/uyghur.xml | 2 -- PowerEditor/installer/nativeLang/uzbek.xml | 2 -- .../installer/nativeLang/uzbekCyrillic.xml | 2 -- PowerEditor/installer/nativeLang/venetian.xml | 1 - .../installer/nativeLang/vietnamese.xml | 1 - PowerEditor/installer/nativeLang/welsh.xml | 2 -- PowerEditor/installer/nativeLang/zulu.xml | 2 -- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/NppBigSwitch.cpp | 4 +-- PowerEditor/src/Parameters.cpp | 32 +++++++------------ PowerEditor/src/Parameters.h | 4 +-- .../src/WinControls/Preference/preference.rc | 18 ++++++----- .../WinControls/Preference/preferenceDlg.cpp | 25 +++++++++------ .../WinControls/Preference/preference_rc.h | 4 +-- 98 files changed, 68 insertions(+), 190 deletions(-) diff --git a/PowerEditor/installer/nativeLang/abkhazian.xml b/PowerEditor/installer/nativeLang/abkhazian.xml index ced10fe59..d7090d92c 100644 --- a/PowerEditor/installer/nativeLang/abkhazian.xml +++ b/PowerEditor/installer/nativeLang/abkhazian.xml @@ -1060,7 +1060,6 @@ Updated to v8.2.1: - diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml index 42b137113..257574057 100644 --- a/PowerEditor/installer/nativeLang/afrikaans.xml +++ b/PowerEditor/installer/nativeLang/afrikaans.xml @@ -458,8 +458,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml index 13a49230a..5f2b5786f 100644 --- a/PowerEditor/installer/nativeLang/albanian.xml +++ b/PowerEditor/installer/nativeLang/albanian.xml @@ -798,8 +798,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml index 0f1ea6a47..fe3f78639 100644 --- a/PowerEditor/installer/nativeLang/arabic.xml +++ b/PowerEditor/installer/nativeLang/arabic.xml @@ -931,7 +931,6 @@ - diff --git a/PowerEditor/installer/nativeLang/aragonese.xml b/PowerEditor/installer/nativeLang/aragonese.xml index a03a96f27..406485e04 100644 --- a/PowerEditor/installer/nativeLang/aragonese.xml +++ b/PowerEditor/installer/nativeLang/aragonese.xml @@ -697,8 +697,6 @@ By Chesús D. Trigo [xuxinho7@gmail.com] & softaragones [softaragones@soft - - diff --git a/PowerEditor/installer/nativeLang/aranese.xml b/PowerEditor/installer/nativeLang/aranese.xml index bd0fb2a5c..46fdbea3f 100644 --- a/PowerEditor/installer/nativeLang/aranese.xml +++ b/PowerEditor/installer/nativeLang/aranese.xml @@ -341,8 +341,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml index 871eb3dba..efe1be246 100644 --- a/PowerEditor/installer/nativeLang/azerbaijani.xml +++ b/PowerEditor/installer/nativeLang/azerbaijani.xml @@ -531,8 +531,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index 290e7c480..15a1daa14 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -1142,7 +1142,6 @@ Zutabe-markatzaile anitz zehaztu ditzakezu zenbakiak zuriuneen bidez banatuta."/ - diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml index 087b4215d..dba216e48 100644 --- a/PowerEditor/installer/nativeLang/belarusian.xml +++ b/PowerEditor/installer/nativeLang/belarusian.xml @@ -1196,7 +1196,6 @@ The comments are here for explanation, it's not necessary to translate them. - diff --git a/PowerEditor/installer/nativeLang/bengali.xml b/PowerEditor/installer/nativeLang/bengali.xml index 6cd59ed51..08db1db58 100644 --- a/PowerEditor/installer/nativeLang/bengali.xml +++ b/PowerEditor/installer/nativeLang/bengali.xml @@ -757,8 +757,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml index f456e59a6..5d53c64ba 100644 --- a/PowerEditor/installer/nativeLang/bosnian.xml +++ b/PowerEditor/installer/nativeLang/bosnian.xml @@ -514,8 +514,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index 23fe17505..7c2200786 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -1311,7 +1311,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/breton.xml b/PowerEditor/installer/nativeLang/breton.xml index 3c2b8efb1..d2535982b 100644 --- a/PowerEditor/installer/nativeLang/breton.xml +++ b/PowerEditor/installer/nativeLang/breton.xml @@ -924,7 +924,6 @@ - diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml index bba69278e..72ef4c7b0 100644 --- a/PowerEditor/installer/nativeLang/bulgarian.xml +++ b/PowerEditor/installer/nativeLang/bulgarian.xml @@ -1245,7 +1245,6 @@ - diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index 35b8493d7..f17877e02 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -906,7 +906,6 @@ By Hiro5 - @@ -914,7 +913,6 @@ By Hiro5 - diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 0b9f43e8f..1fdeb662a 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -1299,7 +1299,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/corsican.xml b/PowerEditor/installer/nativeLang/corsican.xml index 65321784b..447a72827 100644 --- a/PowerEditor/installer/nativeLang/corsican.xml +++ b/PowerEditor/installer/nativeLang/corsican.xml @@ -1338,7 +1338,6 @@ Additionnal information about Corsican localization: - diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml index c561720e4..0d9dad4e5 100644 --- a/PowerEditor/installer/nativeLang/croatian.xml +++ b/PowerEditor/installer/nativeLang/croatian.xml @@ -1324,7 +1324,6 @@ - diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index c25a7677f..24ec9e186 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -1232,8 +1232,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index 67a86848a..93bab7e06 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1240,7 +1240,6 @@ Brug mellemrum til at angive flere markører."/> - diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml index e4caac46e..6ea9b32ba 100644 --- a/PowerEditor/installer/nativeLang/dutch.xml +++ b/PowerEditor/installer/nativeLang/dutch.xml @@ -1308,7 +1308,6 @@ Last modified on 2024-06-06 by Thomas De Rocker (RockyTDR). - diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 5a15aea21..c6dbfc639 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1311,8 +1311,12 @@ Translation note: - - + + + + + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 89c42d0ae..0c9210c87 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1310,8 +1310,12 @@ Translation note: - - + + + + + + diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml index e78a25d84..e7aef7195 100644 --- a/PowerEditor/installer/nativeLang/esperanto.xml +++ b/PowerEditor/installer/nativeLang/esperanto.xml @@ -743,8 +743,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/estonian.xml b/PowerEditor/installer/nativeLang/estonian.xml index 5de26673a..007dcb497 100644 --- a/PowerEditor/installer/nativeLang/estonian.xml +++ b/PowerEditor/installer/nativeLang/estonian.xml @@ -854,8 +854,6 @@ https://github.com/AndresTraks/ - - diff --git a/PowerEditor/installer/nativeLang/extremaduran.xml b/PowerEditor/installer/nativeLang/extremaduran.xml index 03ab06b61..2296b23cb 100644 --- a/PowerEditor/installer/nativeLang/extremaduran.xml +++ b/PowerEditor/installer/nativeLang/extremaduran.xml @@ -389,8 +389,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index c101ef40b..d9aec461d 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -834,8 +834,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index dc08ea81e..3317b53fb 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -1200,7 +1200,6 @@ Updated to v8.6 fixed version - diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 19772a204..910a5bca4 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1309,7 +1309,12 @@ Translation note: - + + + + + + diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml index 55a896f0e..a1b358152 100644 --- a/PowerEditor/installer/nativeLang/friulian.xml +++ b/PowerEditor/installer/nativeLang/friulian.xml @@ -520,8 +520,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/galician.xml b/PowerEditor/installer/nativeLang/galician.xml index 2296c8259..e6aa8b222 100644 --- a/PowerEditor/installer/nativeLang/galician.xml +++ b/PowerEditor/installer/nativeLang/galician.xml @@ -1310,7 +1310,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml index 01252829f..c6b38195a 100644 --- a/PowerEditor/installer/nativeLang/georgian.xml +++ b/PowerEditor/installer/nativeLang/georgian.xml @@ -552,8 +552,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index de3372ec8..225821924 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1320,7 +1320,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml index c525ee721..d5c91befb 100644 --- a/PowerEditor/installer/nativeLang/greek.xml +++ b/PowerEditor/installer/nativeLang/greek.xml @@ -1068,7 +1068,6 @@ - diff --git a/PowerEditor/installer/nativeLang/gujarati.xml b/PowerEditor/installer/nativeLang/gujarati.xml index 2f2ab3786..0d010d1fd 100644 --- a/PowerEditor/installer/nativeLang/gujarati.xml +++ b/PowerEditor/installer/nativeLang/gujarati.xml @@ -755,8 +755,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/hindi.xml b/PowerEditor/installer/nativeLang/hindi.xml index dc266bf65..6fdd4b4d3 100644 --- a/PowerEditor/installer/nativeLang/hindi.xml +++ b/PowerEditor/installer/nativeLang/hindi.xml @@ -928,7 +928,6 @@ - diff --git a/PowerEditor/installer/nativeLang/hongKongCantonese.xml b/PowerEditor/installer/nativeLang/hongKongCantonese.xml index bf2c97ceb..37278a2bb 100644 --- a/PowerEditor/installer/nativeLang/hongKongCantonese.xml +++ b/PowerEditor/installer/nativeLang/hongKongCantonese.xml @@ -1338,7 +1338,6 @@ - diff --git a/PowerEditor/installer/nativeLang/hungarian.xml b/PowerEditor/installer/nativeLang/hungarian.xml index 3cd39c983..92e5dc87f 100644 --- a/PowerEditor/installer/nativeLang/hungarian.xml +++ b/PowerEditor/installer/nativeLang/hungarian.xml @@ -1158,7 +1158,6 @@ Több margó is megadható, különböző számok használatával szóközzel el - diff --git a/PowerEditor/installer/nativeLang/indonesian.xml b/PowerEditor/installer/nativeLang/indonesian.xml index e2a567eb5..015ba5f22 100644 --- a/PowerEditor/installer/nativeLang/indonesian.xml +++ b/PowerEditor/installer/nativeLang/indonesian.xml @@ -1231,7 +1231,6 @@ Anda dapat mendefinisikan beberapa penanda kolom dengan menggunakan spasi putih - diff --git a/PowerEditor/installer/nativeLang/irish.xml b/PowerEditor/installer/nativeLang/irish.xml index 861a9efc5..bc7f31b7f 100644 --- a/PowerEditor/installer/nativeLang/irish.xml +++ b/PowerEditor/installer/nativeLang/irish.xml @@ -996,7 +996,6 @@ You can define several column markers by using white space to separate the diffe - diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index ea1a4f085..d3d7457b7 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1316,7 +1316,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml index 9f757e524..512553e73 100644 --- a/PowerEditor/installer/nativeLang/japanese.xml +++ b/PowerEditor/installer/nativeLang/japanese.xml @@ -1317,7 +1317,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/kabyle.xml b/PowerEditor/installer/nativeLang/kabyle.xml index 4362faab3..f966387cc 100644 --- a/PowerEditor/installer/nativeLang/kabyle.xml +++ b/PowerEditor/installer/nativeLang/kabyle.xml @@ -752,10 +752,6 @@ - - - - diff --git a/PowerEditor/installer/nativeLang/kannada.xml b/PowerEditor/installer/nativeLang/kannada.xml index 48ea16a5b..fc94a943c 100644 --- a/PowerEditor/installer/nativeLang/kannada.xml +++ b/PowerEditor/installer/nativeLang/kannada.xml @@ -770,8 +770,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/kazakh.xml b/PowerEditor/installer/nativeLang/kazakh.xml index 5137a089b..995f688b3 100644 --- a/PowerEditor/installer/nativeLang/kazakh.xml +++ b/PowerEditor/installer/nativeLang/kazakh.xml @@ -461,8 +461,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml index c9352249c..253a1638c 100644 --- a/PowerEditor/installer/nativeLang/korean.xml +++ b/PowerEditor/installer/nativeLang/korean.xml @@ -1314,7 +1314,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/kurdish.xml b/PowerEditor/installer/nativeLang/kurdish.xml index 774123cf5..99ec1921a 100644 --- a/PowerEditor/installer/nativeLang/kurdish.xml +++ b/PowerEditor/installer/nativeLang/kurdish.xml @@ -858,8 +858,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml index 139db3540..e02a5a250 100644 --- a/PowerEditor/installer/nativeLang/kyrgyz.xml +++ b/PowerEditor/installer/nativeLang/kyrgyz.xml @@ -503,8 +503,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/latvian.xml b/PowerEditor/installer/nativeLang/latvian.xml index 1b1f5f29b..391f44114 100644 --- a/PowerEditor/installer/nativeLang/latvian.xml +++ b/PowerEditor/installer/nativeLang/latvian.xml @@ -785,8 +785,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/ligurian.xml b/PowerEditor/installer/nativeLang/ligurian.xml index c87afca41..5cf48eb63 100644 --- a/PowerEditor/installer/nativeLang/ligurian.xml +++ b/PowerEditor/installer/nativeLang/ligurian.xml @@ -516,8 +516,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/lithuanian.xml b/PowerEditor/installer/nativeLang/lithuanian.xml index b81c5f981..9bae518f0 100644 --- a/PowerEditor/installer/nativeLang/lithuanian.xml +++ b/PowerEditor/installer/nativeLang/lithuanian.xml @@ -884,8 +884,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/luxembourgish.xml b/PowerEditor/installer/nativeLang/luxembourgish.xml index a1ee0ecfc..44cc1459f 100644 --- a/PowerEditor/installer/nativeLang/luxembourgish.xml +++ b/PowerEditor/installer/nativeLang/luxembourgish.xml @@ -408,8 +408,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/macedonian.xml b/PowerEditor/installer/nativeLang/macedonian.xml index a5d8268a8..93c3ee858 100644 --- a/PowerEditor/installer/nativeLang/macedonian.xml +++ b/PowerEditor/installer/nativeLang/macedonian.xml @@ -458,8 +458,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/malay.xml b/PowerEditor/installer/nativeLang/malay.xml index 41375a084..c5986cb85 100644 --- a/PowerEditor/installer/nativeLang/malay.xml +++ b/PowerEditor/installer/nativeLang/malay.xml @@ -421,8 +421,6 @@ Desc: Malay translation for Notepad++ - - diff --git a/PowerEditor/installer/nativeLang/marathi.xml b/PowerEditor/installer/nativeLang/marathi.xml index d7cfdb390..ee8802511 100644 --- a/PowerEditor/installer/nativeLang/marathi.xml +++ b/PowerEditor/installer/nativeLang/marathi.xml @@ -532,8 +532,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/mongolian.xml b/PowerEditor/installer/nativeLang/mongolian.xml index 145d5941c..a2e58c0e8 100644 --- a/PowerEditor/installer/nativeLang/mongolian.xml +++ b/PowerEditor/installer/nativeLang/mongolian.xml @@ -770,8 +770,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/nepali.xml b/PowerEditor/installer/nativeLang/nepali.xml index 9ba965b49..528d0a531 100644 --- a/PowerEditor/installer/nativeLang/nepali.xml +++ b/PowerEditor/installer/nativeLang/nepali.xml @@ -930,7 +930,6 @@ - diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml index 6eab5c858..127d45090 100644 --- a/PowerEditor/installer/nativeLang/norwegian.xml +++ b/PowerEditor/installer/nativeLang/norwegian.xml @@ -1305,7 +1305,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml index 0544c4cab..054c92c0e 100644 --- a/PowerEditor/installer/nativeLang/nynorsk.xml +++ b/PowerEditor/installer/nativeLang/nynorsk.xml @@ -569,8 +569,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/occitan.xml b/PowerEditor/installer/nativeLang/occitan.xml index 8218a82e8..adca139d1 100644 --- a/PowerEditor/installer/nativeLang/occitan.xml +++ b/PowerEditor/installer/nativeLang/occitan.xml @@ -888,8 +888,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/piglatin.xml b/PowerEditor/installer/nativeLang/piglatin.xml index 069f34216..bf44397da 100644 --- a/PowerEditor/installer/nativeLang/piglatin.xml +++ b/PowerEditor/installer/nativeLang/piglatin.xml @@ -900,8 +900,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml index f10020bab..aa96fd2ce 100644 --- a/PowerEditor/installer/nativeLang/polish.xml +++ b/PowerEditor/installer/nativeLang/polish.xml @@ -1313,8 +1313,6 @@ Translation note: - - diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index 04bc25629..b44fb90d6 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -1311,7 +1311,6 @@ Nota de tradução: - diff --git a/PowerEditor/installer/nativeLang/punjabi.xml b/PowerEditor/installer/nativeLang/punjabi.xml index bb3836af4..d702bd184 100644 --- a/PowerEditor/installer/nativeLang/punjabi.xml +++ b/PowerEditor/installer/nativeLang/punjabi.xml @@ -798,8 +798,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index 749126cc4..2f38b8f11 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -1316,7 +1316,6 @@ - diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index a50e2e135..dd42ef873 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -1250,7 +1250,6 @@ Updated to v8.7.0: - diff --git a/PowerEditor/installer/nativeLang/sardinian.xml b/PowerEditor/installer/nativeLang/sardinian.xml index a3255d786..a83dc87e6 100644 --- a/PowerEditor/installer/nativeLang/sardinian.xml +++ b/PowerEditor/installer/nativeLang/sardinian.xml @@ -569,8 +569,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/serbian.xml b/PowerEditor/installer/nativeLang/serbian.xml index 3c9ca8080..5306ed61d 100644 --- a/PowerEditor/installer/nativeLang/serbian.xml +++ b/PowerEditor/installer/nativeLang/serbian.xml @@ -380,8 +380,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/serbianCyrillic.xml b/PowerEditor/installer/nativeLang/serbianCyrillic.xml index ae3f09752..b081153f4 100644 --- a/PowerEditor/installer/nativeLang/serbianCyrillic.xml +++ b/PowerEditor/installer/nativeLang/serbianCyrillic.xml @@ -553,8 +553,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/sinhala.xml b/PowerEditor/installer/nativeLang/sinhala.xml index ff6d16066..7933ad9bd 100644 --- a/PowerEditor/installer/nativeLang/sinhala.xml +++ b/PowerEditor/installer/nativeLang/sinhala.xml @@ -607,8 +607,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml index 73651edc2..e12b1ac1c 100644 --- a/PowerEditor/installer/nativeLang/slovak.xml +++ b/PowerEditor/installer/nativeLang/slovak.xml @@ -1309,7 +1309,6 @@ - diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml index e7998117e..93b4a020a 100644 --- a/PowerEditor/installer/nativeLang/slovenian.xml +++ b/PowerEditor/installer/nativeLang/slovenian.xml @@ -1299,7 +1299,6 @@ - diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml index 46a77c827..28ca62f79 100644 --- a/PowerEditor/installer/nativeLang/spanish.xml +++ b/PowerEditor/installer/nativeLang/spanish.xml @@ -1310,7 +1310,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index 3e009ee44..20431364e 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -743,8 +743,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index 4024e40c7..f06861584 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -1311,7 +1311,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml index 20c1d0ded..7501df35f 100644 --- a/PowerEditor/installer/nativeLang/tagalog.xml +++ b/PowerEditor/installer/nativeLang/tagalog.xml @@ -458,8 +458,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml index c0450575d..fa27b4c65 100644 --- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml +++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml @@ -1250,8 +1250,12 @@ - - + + + + + + diff --git a/PowerEditor/installer/nativeLang/tajikCyrillic.xml b/PowerEditor/installer/nativeLang/tajikCyrillic.xml index 3597a85c5..23af37a34 100644 --- a/PowerEditor/installer/nativeLang/tajikCyrillic.xml +++ b/PowerEditor/installer/nativeLang/tajikCyrillic.xml @@ -791,8 +791,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/tamil.xml b/PowerEditor/installer/nativeLang/tamil.xml index 4bd7e52c5..b5c88281f 100644 --- a/PowerEditor/installer/nativeLang/tamil.xml +++ b/PowerEditor/installer/nativeLang/tamil.xml @@ -1115,7 +1115,6 @@ - diff --git a/PowerEditor/installer/nativeLang/tatar.xml b/PowerEditor/installer/nativeLang/tatar.xml index 23cd81bc1..fb0b69558 100644 --- a/PowerEditor/installer/nativeLang/tatar.xml +++ b/PowerEditor/installer/nativeLang/tatar.xml @@ -752,8 +752,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/telugu.xml b/PowerEditor/installer/nativeLang/telugu.xml index 05c4c59cd..9fd8a396a 100644 --- a/PowerEditor/installer/nativeLang/telugu.xml +++ b/PowerEditor/installer/nativeLang/telugu.xml @@ -507,8 +507,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml index 54fcefe5c..41d00d7c1 100644 --- a/PowerEditor/installer/nativeLang/thai.xml +++ b/PowerEditor/installer/nativeLang/thai.xml @@ -526,8 +526,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index 025bb58bb..9a1f9192d 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -1315,7 +1315,6 @@ - diff --git a/PowerEditor/installer/nativeLang/ukrainian.xml b/PowerEditor/installer/nativeLang/ukrainian.xml index b46a52dae..844a60b3e 100644 --- a/PowerEditor/installer/nativeLang/ukrainian.xml +++ b/PowerEditor/installer/nativeLang/ukrainian.xml @@ -1310,7 +1310,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml index c0f126e8d..146e9167f 100644 --- a/PowerEditor/installer/nativeLang/uyghur.xml +++ b/PowerEditor/installer/nativeLang/uyghur.xml @@ -535,8 +535,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml index 080599c78..d3b6c5ebc 100644 --- a/PowerEditor/installer/nativeLang/uzbek.xml +++ b/PowerEditor/installer/nativeLang/uzbek.xml @@ -910,8 +910,6 @@ Siz bir necha marker ustunlarini probellar orqali belgilashingiz mumkin."/> - - diff --git a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml index dc0a6a5f7..a8831e40a 100644 --- a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml +++ b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml @@ -464,8 +464,6 @@ - - diff --git a/PowerEditor/installer/nativeLang/venetian.xml b/PowerEditor/installer/nativeLang/venetian.xml index 21b190dd0..819b84dbb 100644 --- a/PowerEditor/installer/nativeLang/venetian.xml +++ b/PowerEditor/installer/nativeLang/venetian.xml @@ -1317,7 +1317,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/vietnamese.xml b/PowerEditor/installer/nativeLang/vietnamese.xml index fcf3b8fac..612ec9d4b 100644 --- a/PowerEditor/installer/nativeLang/vietnamese.xml +++ b/PowerEditor/installer/nativeLang/vietnamese.xml @@ -1196,7 +1196,6 @@ Bạn có thể định nghĩa một vài mốc đánh dấu bằng cách sử d - diff --git a/PowerEditor/installer/nativeLang/welsh.xml b/PowerEditor/installer/nativeLang/welsh.xml index 3916ec020..d4a7bb9b3 100644 --- a/PowerEditor/installer/nativeLang/welsh.xml +++ b/PowerEditor/installer/nativeLang/welsh.xml @@ -770,8 +770,6 @@ gan/by Aled Powell - - diff --git a/PowerEditor/installer/nativeLang/zulu.xml b/PowerEditor/installer/nativeLang/zulu.xml index 37bc7bcf4..e183d717d 100644 --- a/PowerEditor/installer/nativeLang/zulu.xml +++ b/PowerEditor/installer/nativeLang/zulu.xml @@ -899,8 +899,6 @@ - - diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 6eeb7f7a6..bcc76e146 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -448,7 +448,7 @@ LRESULT Notepad_plus::init(HWND hwnd) _dockingManager.init(_pPublicInterface->getHinst(), hwnd, &_pMainWindow); - if ((nppGUI._isMinimizedToTray || nppGUI._isClosedToTray) && _pTrayIco == nullptr) + if ((nppGUI._isMinimizedToTray == sta_minimize || nppGUI._isMinimizedToTray == sta_close) && _pTrayIco == nullptr) { HICON icon = nullptr; Notepad_plus_Window::loadTrayIcon(_pPublicInterface->getHinst(), &icon); diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 3df7cf16e..759f9ce4c 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -2852,8 +2852,8 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case WM_SYSCOMMAND: { const NppGUI & nppgui = (nppParam.getNppGUI()); - if (((nppgui._isMinimizedToTray || _pPublicInterface->isPrelaunch()) && (wParam == SC_MINIMIZE)) || - (nppgui._isClosedToTray && wParam == SC_CLOSE) + if (((nppgui._isMinimizedToTray == sta_minimize || _pPublicInterface->isPrelaunch()) && (wParam == SC_MINIMIZE)) || + (nppgui._isMinimizedToTray == sta_close && wParam == SC_CLOSE) ) { if (nullptr == _pTrayIco) diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index eb925aae5..ff5d81bf9 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -5014,19 +5014,12 @@ void NppParameters::feedGUIParameters(TiXmlNode *node) const wchar_t* val = n->Value(); if (val) { - _nppGUI._isMinimizedToTray = (lstrcmp(val, L"yes") == 0); - } - } - } - else if (!lstrcmp(nm, L"CloseToTray")) - { - TiXmlNode *n = childNode->FirstChild(); - if (n) - { - const wchar_t* val = n->Value(); - if (val) - { - _nppGUI._isClosedToTray = (lstrcmp(val, L"yes") == 0); + if (lstrcmp(val, L"no") == 0 || lstrcmp(val, L"0") == 0) + _nppGUI._isMinimizedToTray = sta_none; + else if (lstrcmp(val, L"yes") == 0|| lstrcmp(val, L"1") == 0) + _nppGUI._isMinimizedToTray = sta_minimize; + else if (lstrcmp(val, L"2") == 0) + _nppGUI._isMinimizedToTray = sta_close; } } } @@ -7389,14 +7382,13 @@ void NppParameters::createXmlTreeFromGUIParams() insertGUIConfigBoolNode(newGUIRoot, L"CheckHistoryFiles", _nppGUI._checkHistoryFiles); } - // no - { - insertGUIConfigBoolNode(newGUIRoot, L"TrayIcon", _nppGUI._isMinimizedToTray); - } - - // no + // 0 { - insertGUIConfigBoolNode(newGUIRoot, L"CloseToTray", _nppGUI._isClosedToTray); + wchar_t szStr[12] { '\0' }; + _itow(_nppGUI._isMinimizedToTray, szStr, 10); + TiXmlElement* GUIConfigElement = (newGUIRoot->InsertEndChild(TiXmlElement(L"GUIConfig")))->ToElement(); + GUIConfigElement->SetAttribute(L"name", L"TrayIcon"); + GUIConfigElement->InsertEndChild(TiXmlText(szStr)); } // yes diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 6c16b75fc..12b31c869 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -121,6 +121,7 @@ enum urlMode {urlDisable = 0, urlNoUnderLineFg, urlUnderLineFg, urlNoUnderLineBg urlMax = urlUnderLineBg}; enum AutoIndentMode { autoIndent_none = 0, autoIndent_advanced = 1, autoIndent_basic = 2 }; +enum SysTrayAction { sta_none = 0, sta_minimize = 1, sta_close = 2 }; const int LANG_INDEX_INSTR = 0; const int LANG_INDEX_INSTR2 = 1; @@ -821,8 +822,7 @@ struct NppGUI final bool _findWindowLessMode = false; bool _isMaximized = false; - bool _isMinimizedToTray = false; - bool _isClosedToTray = false; + int _isMinimizedToTray = sta_none; bool _rememberLastSession = true; // remember next session boolean will be written in the settings bool _keepSessionAbsentFileEntries = false; bool _isCmdlineNosessionActivated = false; // used for if -nosession is indicated on the launch time diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 05b83c95f..9ce09b03d 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -596,15 +596,17 @@ BEGIN CONTROL "Peek on tab",IDC_CHECK_ENABLEDOCPEEKER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,58,140,10 CONTROL "Peek on document map",IDC_CHECK_ENABLEDOCPEEKONMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,71,140,10 + COMBOBOX IDC_COMBO_SYSTRAY_ACTION_HOICE,37,77,94,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "system tray",IDC_SYSTRAY_STATIC,137,78,88,8 + // "Enable Notepad++ auto-updater" should be always the 1st item, because it'll be hidden if GUP.exe is absent - CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,94,210,10 - CONTROL "Mute all sounds",IDC_CHECK_MUTE_SOUNDS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,108,190,10 - CONTROL "Autodetect character encoding",IDC_CHECK_DETECTENCODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,122,217,10 - CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,136,217,10 - CONTROL "Close to system tray",IDC_CHECK_CLOSE2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,150,217,10 - CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,164,217,10 - CONTROL "Use DirectWrite (May improve rendering special characters, need to restart Notepad++)",IDC_CHECK_DIRECTWRITE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,178,377,10 - CONTROL "Enable Save All confirm dialog",IDC_CHECK_SAVEALLCONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,192,217,10 + CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,109,210,10 + CONTROL "Mute all sounds",IDC_CHECK_MUTE_SOUNDS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,124,190,10 + CONTROL "Autodetect character encoding",IDC_CHECK_DETECTENCODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,139,217,10 + CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,154,217,10 + CONTROL "Use DirectWrite (May improve rendering special characters, need to restart Notepad++)",IDC_CHECK_DIRECTWRITE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,169,377,10 + CONTROL "Enable Save All confirm dialog",IDC_CHECK_SAVEALLCONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,184,217,10 + RTEXT "Session file ext.:",IDC_SESSIONFILEEXT_STATIC,270,130,108,8 EDITTEXT IDC_EDIT_SESSIONFILEEXT,380,127,34,12,ES_AUTOHSCROLL diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index af598d3d5..ffd1bb21a 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -2416,8 +2416,15 @@ intptr_t CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) bCheck = (nppGUI._fileAutoDetection & cdGo2end) ? true : false; ::SendDlgItemMessage(_hSelf, IDC_CHECK_UPDATEGOTOEOF, BM_SETCHECK, bCheck ? BST_CHECKED : BST_UNCHECKED, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_MIN2SYSTRAY, BM_SETCHECK, nppGUI._isMinimizedToTray, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_CLOSE2SYSTRAY, BM_SETCHECK, nppGUI._isClosedToTray, 0); + ::SendDlgItemMessage(_hSelf, IDC_COMBO_SYSTRAY_ACTION_HOICE, CB_ADDSTRING, 0, reinterpret_cast(L"No action to")); + ::SendDlgItemMessage(_hSelf, IDC_COMBO_SYSTRAY_ACTION_HOICE, CB_ADDSTRING, 0, reinterpret_cast(L"Minimize to")); + ::SendDlgItemMessage(_hSelf, IDC_COMBO_SYSTRAY_ACTION_HOICE, CB_ADDSTRING, 0, reinterpret_cast(L"Close to")); + + if (nppGUI._isMinimizedToTray < 0 || nppGUI._isMinimizedToTray > sta_close) + nppGUI._isMinimizedToTray = sta_none; + + ::SendDlgItemMessage(_hSelf, IDC_COMBO_SYSTRAY_ACTION_HOICE, CB_SETCURSEL, nppGUI._isMinimizedToTray, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_DETECTENCODING, BM_SETCHECK, nppGUI._detectEncoding, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_SAVEALLCONFIRM, BM_SETCHECK, nppGUI._saveAllConfirm, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_AUTOUPDATE, BM_SETCHECK, nppGUI._autoUpdateOpt._doAutoUpdate, 0); @@ -2519,14 +2526,6 @@ intptr_t CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) nppGUI._autoUpdateOpt._doAutoUpdate = isCheckedOrNot(static_cast(wParam)); return TRUE; - case IDC_CHECK_MIN2SYSTRAY: - nppGUI._isMinimizedToTray = isCheckedOrNot(static_cast(wParam)); - return TRUE; - - case IDC_CHECK_CLOSE2SYSTRAY: - nppGUI._isClosedToTray = isCheckedOrNot(static_cast(wParam)); - return TRUE; - case IDC_CHECK_DETECTENCODING: nppGUI._detectEncoding = isCheckedOrNot(static_cast(wParam)); return TRUE; @@ -2630,6 +2629,12 @@ intptr_t CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) return TRUE; } + + else if (LOWORD(wParam) == IDC_COMBO_SYSTRAY_ACTION_HOICE) + { + int index = static_cast(::SendDlgItemMessage(_hSelf, IDC_COMBO_SYSTRAY_ACTION_HOICE, CB_GETCURSEL, 0, 0)); + nppGUI._isMinimizedToTray = index; + } } } } diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index 372ae6eb0..e6f0d1353 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -215,7 +215,8 @@ #define IDC_HISTORY_GB_STATIC (IDD_PREFERENCE_SUB_MISC + 4) #define IDC_CHECK_DONTCHECKHISTORY (IDD_PREFERENCE_SUB_MISC + 5) #define IDC_MAXNBFILE_STATIC (IDD_PREFERENCE_SUB_MISC + 6) - #define IDC_CHECK_MIN2SYSTRAY (IDD_PREFERENCE_SUB_MISC + 8) + #define IDC_COMBO_SYSTRAY_ACTION_HOICE (IDD_PREFERENCE_SUB_MISC + 7) + #define IDC_SYSTRAY_STATIC (IDD_PREFERENCE_SUB_MISC + 8) #define IDC_CHECK_REMEMBERSESSION (IDD_PREFERENCE_SUB_MISC + 9) #define IDC_INDENTUSING_STATIC (IDD_PREFERENCE_SUB_MISC + 10) #define IDC_RADIO_USINGTAB (IDD_PREFERENCE_SUB_MISC + 11) @@ -265,7 +266,6 @@ #define IDC_SMARTHILITEMATCHING_STATIC (IDD_PREFERENCE_SUB_MISC + 54) #define IDC_CHECK_MUTE_SOUNDS (IDD_PREFERENCE_SUB_MISC + 60) #define IDC_CHECK_SAVEALLCONFIRM (IDD_PREFERENCE_SUB_MISC + 61) - #define IDC_CHECK_CLOSE2SYSTRAY (IDD_PREFERENCE_SUB_MISC + 62) #define IDD_PREFERENCE_SUB_NEWDOCUMENT 6400 //(IDD_PREFERENCE_BOX + 400) #define IDC_FORMAT_GB_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 1)