Add "Make the selected text foreground a single color" option on GUI

and remove the usage of zero length enableSelectFgColor.xml file.

Close #16391
This commit is contained in:
Don Ho 2025-04-06 20:58:53 +02:00
parent 673c3ee6cf
commit dba2a9890e
61 changed files with 111 additions and 105 deletions

View File

@ -897,7 +897,6 @@ Updated to v8.2.1:
<Item id="6219" name="Алацәҟәра алассы-лассра :"/>
<Item id="6221" name="Ч"/>
<Item id="6222" name="Р"/>
<Item id="6225" name="Амульти-Редакциазура (Ctrl + Ақәыӷә. / Алкаара)"/>
<Item id="6227" name="Ацәаҳәа Аиагара Астиль"/>
<Item id="6228" name="Истандарту"/>
<Item id="6229" name="Еиҟаратәу"/>

View File

@ -627,7 +627,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Rregullimet Multi-korrigjim"/>
<Item id="6225" name="Aftëso (Ctrl+klikim miu/zgjedhje)"/>
<Item id="6201" name="Stili i margjinës së dosjes"/>
<Item id="6202" name="Thjeshtë"/>
<Item id="6203" name="Shigjetë"/>

View File

@ -730,7 +730,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="إعدادات التعديل المتعدد"/>
<Item id="6225" name="تفعيل (Ctrl + الفأرة نقر / تحديد)"/>
<Item id="6201" name="نمط هامش المجلد"/>
<Item id="6202" name="بسيط"/>
<Item id="6203" name="سهم"/>

View File

@ -587,7 +587,6 @@ By Chesús D. Trigo [xuxinho7@gmail.com] & softaragones [softaragones@soft
<Item id="6221" name="R"/><!--rapedo-->
<Item id="6222" name="P"/><!--pando-->
<Item id="6224" name="Multi-edición"/>
<Item id="6225" name="Habilitar (Ctrl+zorz)"/>
<Item id="6201" name="Estilo de agrupación"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Trianglo"/>

View File

@ -437,7 +437,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Multi-Redaktə nizamları"/>
<Item id="6225" name="İcazə ver (Ctrl+Mouse klik/Seçmək)"/>
<Item id="6201" name="Blokun qıraqlarının stili"/>
<Item id="6202" name="Sadə"/>
<Item id="6203" name="Oxlar"/>

View File

@ -872,7 +872,6 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="6219" name="Kliskatze-ratioa:"/>
<Item id="6221" name="Azkar"/>
<Item id="6222" name="Mantso"/>
<Item id="6225" name="Gaitu Editatze-Anitza (Ctrl+sagu klika/hautapena)"/>
<Item id="6227" name="Lerro-itzulbiraketa"/>
<Item id="6228" name="Lehenetsitakoa"/>
<Item id="6229" name="Lerrokatuta"/>

View File

@ -903,7 +903,6 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="6221" name="+"/>
<Item id="6222" name="-"/>
<Item id="6246" name="Пераключаць каманды згортвання/разгортвання бягучага ўзроўню"/>
<Item id="6225" name="Уключыць мульты-рэдагаванне (Ctrl+націск мышы/выбар)"/>
<Item id="6227" name="Перанос радкоў"/>
<Item id="6228" name="Прадвызначана"/>
<Item id="6229" name="Выраўнены"/>

View File

@ -599,7 +599,6 @@
<Item id="6221" name="ফল(F)"/>
<Item id="6222" name="এস(S)"/>
<Item id="6224" name="মাল্টি সম্পাদনা সেটিংস"/>
<Item id="6225" name="সক্রিয় করুন (Ctrl + মাউস ক্লিক / নির্বাচন)"/>
<Item id="6201" name="শৈলী ফোল্ডার মার্জিন"/>
<Item id="6202" name="সহজ"/>
<Item id="6203" name="তীর"/>

View File

@ -720,7 +720,6 @@
<Item id="6221" name="Herrek"/>
<Item id="6222" name="Gorrek"/>
<Item id="6224" name="Arventennoù lies-aozañ"/>
<Item id="6225" name="Enaouiñ (Ktrl+Klik diuzañ)"/>
<Item id="6201" name="Stil bevennoù doser"/>
<Item id="6202" name="Simpl"/>
<Item id="6203" name="Bir"/>

View File

@ -722,7 +722,6 @@ By Hiro5 <groccat at gmail>
<Item id="6221" name="R"/>
<Item id="6222" name="L"/>
<Item id="6224" name="Multi-edició"/>
<Item id="6225" name="Habilita (Ctrl+Ratolí)"/>
<Item id="6201" name="Estil d'agrupació"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Triangle"/>

View File

@ -1005,7 +1005,6 @@ Translation note:
<Item id="6221" name="快"/>
<Item id="6222" name="慢"/>
<Item id="6246" name="让当前级别的折叠/展开指令可以切换"/>
<Item id="6225" name="几个位置同时更改东西Ctrl+按/按住鼠标左键)"/>
<Item id="6227" name="折行"/>
<Item id="6228" name="默认"/>
<Item id="6229" name="对齐"/>

View File

@ -931,7 +931,6 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="6221" name="H"/>
<Item id="6222" name="L"/>
<Item id="6246" name="Tillad kommando at folde/udfolde aktuelt niveau"/>
<Item id="6225" name="Multiredigering (Ctrl+klik for at markere flere)"/>
<Item id="6227" name="Ombryd"/>
<Item id="6228" name="Standard"/>
<Item id="6229" name="Justeret"/>

View File

@ -632,7 +632,6 @@
<Item id="6221" name="R"/>
<Item id="6222" name="M"/>
<Item id="6224" name="Agordoj pri plurredaktado"/>
<Item id="6225" name="Ŝaltu (Ctrl+Musklako/Elektado)"/>
<Item id="6201" name="Simbolo de blokgrupoj"/>
<Item id="6202" name="Simpla"/>
<Item id="6203" name="Sagforma"/>

View File

@ -656,7 +656,6 @@ https://github.com/AndresTraks/
<Item id="6221" name="+"/>
<Item id="6222" name="-"/>
<Item id="6224" name="Mitmik-redigeerimise sätted"/>
<Item id="6225" name="Võimalda (Ctrl+hiireklikk/valik)"/>
<Item id="6201" name="Voltimisnuppude stiil"/>
<Item id="6202" name="Lihtne"/>
<Item id="6203" name="Nooled"/>

View File

@ -641,7 +641,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="تنظیمات چند-ویرایشی"/>
<Item id="6225" name="فعال کردن (Ctrl+کلیک ماوس/انتخاب)"/>
<Item id="6201" name="سبک حاشیه تاکننده"/>
<Item id="6202" name="ساده"/>
<Item id="6203" name="پیکان"/>

View File

@ -883,7 +883,6 @@ Updated to v8.6 fixed version
<Item id="6221" name="+"/>
<Item id="6222" name="-"/>
<Item id="6224" name="Monimuokkaus"/>
<Item id="6225" name="Käytä (Ctrl+Napsaus/valinta)"/>
<Item id="6227" name="Rivitys"/>
<Item id="6228" name="Oletus"/>
<Item id="6229" name="Tasattu"/>

View File

@ -431,7 +431,6 @@
<Item id="6221" name="V"/>
<Item id="6222" name="P"/>
<Item id="6224" name="Impostazions multi editing"/>
<Item id="6225" name="Ative (Ctrl+Clic dal mouse/selezion)"/>
<Item id="6201" name="Stîl margjin cartele"/>
<Item id="6202" name="Sempliç"/>
<Item id="6203" name="Frece"/>

View File

@ -463,7 +463,6 @@
<Item id="6221" name="+"/>
<Item id="6222" name="-"/>
<Item id="6224" name="მრავალი ჩასწორების რეჟიმი"/>
<Item id="6225" name="ჩართვა (Ctrl+მარც. ღილაკი/მონიშვნა)"/>
<Item id="6201" name="ასაკეცის სტილი"/>
<Item id="6202" name="მარტივი"/>
<Item id="6203" name="ისარი"/>

View File

@ -836,7 +836,6 @@
<Item id="6219" name="Ρυθμός Αναλαμπής: "/>
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6225" name="Ενεργοποίηση (Ctrl+Κλικ Ποντικιού/επιλογή)"/>
<Item id="6227" name="Αναδίπλωση γραμμών"/>
<Item id="6228" name="Εξ΄ ορισμού"/>
<Item id="6229" name="Ευθυγράμμιση"/>

View File

@ -597,7 +597,6 @@
<Item id="6221" name="એફ(F)"/>
<Item id="6222" name="એસ(S)"/>
<Item id="6224" name="મલ્ટી-એડીટીંગ સેટીંગઝ"/>
<Item id="6225" name="સક્રિય કરો (Ctrl+માઉસ ક્લીક/સિલેકશન)"/>
<Item id="6201" name="ફોલ્ડર માર્જિન સ્ટાઈલ"/>
<Item id="6202" name="સિમ્પલ"/>
<Item id="6203" name="એરો"/>

View File

@ -725,7 +725,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="मल्टी-एडिटिंग सेटिंग्स"/>
<Item id="6225" name="सक्रिय (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="फोंल्डर मार्जिन स्टाइल"/>
<Item id="6202" name="आसान (Simple)"/>
<Item id="6203" name="तीर (Arrow)"/>

View File

@ -1024,7 +1024,6 @@
<Item id="6221" name="快"/>
<Item id="6222" name="慢"/>
<Item id="6246" name="「摺埋呢層」同「展開呢層」命令改為「切換」"/><!-- #new v8.4.2 -->
<Item id="6225" name="幾個位置同時改嘢Ctrl + 撳/撳著滑鼠掣)"/>
<Item id="6227" name="自動換行"/><!-- #moved in v7.9.2 -->
<Item id="6228" name="預設"/><!-- #moved in v7.9.2 -->
<Item id="6229" name="對齊"/><!-- #moved in v7.9.2 -->

View File

@ -922,7 +922,6 @@ Last modified by Sahid A.Z. on 3/3/2023
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6246" name="Jadikan perintah pelipatan/pembukaan level ini sebagai sakelar"/>
<Item id="6225" name="Aktifkan Multipengeditan (Ctrl+Klik/pilihan)"/>
<Item id="6227" name="Penggal Baris"/>
<Item id="6228" name="Baku"/>
<Item id="6229" name="Diratakan"/>

View File

@ -787,7 +787,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Multi-Editing Settings"/>
<Item id="6225" name="Cumasaigh (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="Folder Margin Style"/>
<Item id="6202" name="Simplí"/>
<Item id="6203" name="Saighead"/>

View File

@ -594,7 +594,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Multi-Editing Settings"/>
<Item id="6225" name="Enable (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="Folder Margin Style"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Arrow"/>

View File

@ -599,7 +599,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="ಮಲ್ಟೀ-ಎಡಿಟಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಸ್"/>
<Item id="6225" name="ಎನೇಬಲ್ (ಕ್ಟ್ರ್ಲ್+ಮೌಸ್ ಕ್ಲಿಕ್/ಸೆಲೆಕ್ಶನ್)"/>
<Item id="6201" name="ಫೋಲ್ಡರ್ ಮಾರ್ಜಿನ್ ಸ್ಟೈಲ್"/>
<Item id="6202" name="ಸಿಂಪಲ್"/>
<Item id="6203" name="ಆರೋ"/>

View File

@ -660,7 +660,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Multi-Editing Settings"/>
<Item id="6225" name="Enable (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="Folder Margin Style"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Arrow"/>

View File

@ -434,7 +434,6 @@
<Item id="6222" name="Ж."/>
<Item id="6223" name="Өзгөртүлгөн саптарды сызыкча менен белгиле"/>
<Item id="6224" name="Мульти-оңдоо"/>
<Item id="6225" name="Ctrl+Чычкан чертүү/тандоо"/>
</Scintillas>
<NewDoc title="Жаңы документ">
<Item id="6419" name="Жаңы документ"/>

View File

@ -614,7 +614,6 @@
<Item id="6221" name="Ā"/>
<Item id="6222" name="L"/>
<Item id="6224" name="Uzlabotās rediģēšanas iestatījumi"/>
<Item id="6225" name="Ieslēgt (Ctrl+peles klikšķis/iezīme)"/>
<Item id="6201" name="Faila struktūras atzīmju stils (kreisā mala)"/>
<Item id="6202" name="Vienkāršs"/>
<Item id="6203" name="Bultveida"/>

View File

@ -442,7 +442,6 @@
<Item id="6213" name="Modalitæ &apos;sfondo&apos;"/>
<Item id="6214" name="Evidensia a riga atoale"/>
<Item id="6224" name="Inpostaçioin seleçion multipla"/>
<Item id="6225" name="Abilita (Ctrl+Click/seleçion)"/>
<Item id="6226" name="Nisciun"/>
<Item id="6227" name="A cappo outomatico"/>
<Item id="6228" name="Predefinio"/>

View File

@ -686,7 +686,6 @@
<Item id="6221" name="G"/>
<Item id="6222" name="L"/>
<Item id="6224" name="Daugybinis redagavimas"/>
<Item id="6225" name="Įgalinti (Ctrl+Pelės pažymėjimas)"/>
<Item id="6201" name="Suskleidimo paraštė"/>
<Item id="6202" name="Paprasta"/>
<Item id="6203" name="Rodyklės"/>

View File

@ -443,7 +443,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="बहु-संपादन संरचना"/>
<Item id="6225" name="सक्रिय (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="फोंल्डर मार्जिन शैली"/>
<Item id="6202" name="साधा (Simple)"/>
<Item id="6203" name="बाण (Arrow)"/>

View File

@ -599,7 +599,6 @@
<Item id="6221" name="Х"/>
<Item id="6222" name="У"/>
<Item id="6224" name="Давхар-Засах тохиргоо"/>
<Item id="6225" name="Идэвхижүүлэх (Ctrl+Хулгана)"/>
<Item id="6201" name="Хавтасны загвар"/>
<Item id="6202" name="Энгийн"/>
<Item id="6203" name="Сум"/>

View File

@ -726,7 +726,6 @@
<Item id="6221" name="एफ"/>
<Item id="6222" name="S"/>
<Item id="6224" name="बहु-सम्पादन सेटिंग्स"/>
<Item id="6225" name="सक्षम गर्नुहोस् (Ctrl + माउस क्लिक / चयन)"/>
<Item id="6201" name="फोल्डर मार्जिन शैली"/>
<Item id="6202" name="सरल"/>
<Item id="6203" name="एर्रो"/>

View File

@ -466,7 +466,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Multiredigering"/>
<Item id="6225" name="Bruk (Ctrl+museklikk/merking)"/>
<Item id="6201" name="Blokkinnstillingar"/>
<Item id="6202" name="Enkel"/>
<Item id="6203" name="Pil"/>

View File

@ -694,7 +694,6 @@
<Item id="6221" name="R"/>
<Item id="6222" name="L"/>
<Item id="6224" name="Paramètres de multi-edicion"/>
<Item id="6225" name="Activar (Ctrl + clic/seleccion)"/>
<Item id="6201" name="Estil d'agropament"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Sageta"/>

View File

@ -708,7 +708,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Ultimay-Editingyay Ettingssay"/>
<Item id="6225" name="Enableyay (Ctrl+mouse ickclay/electionsay)"/>
<Item id="6201" name="Olderfay Arginmay Ylestay"/>
<Item id="6202" name="Implesay"/>
<Item id="6203" name="Arrowyay"/>

View File

@ -630,7 +630,6 @@
<Item id="6221" name="ਫਾਰੇਨਹਾਇਟ"/>
<Item id="6222" name="S"/>
<Item id="6224" name="ਮਲਟੀ-ਸੋਧ ਸੈਟਿੰਗ"/>
<Item id="6225" name="ਯੋਗ (Ctrl + ਮਾਉਸ ਨੂੰ ਕਲਿੱਕ ਕਰੋ / ਚੋਣ)"/>
<Item id="6201" name="ਫੋਲਡਰ ਅੰਤਰ ਸ਼ੈਲੀ"/>
<Item id="6202" name="ਸਧਾਰਨ"/>
<Item id="6203" name="ਤੀਰ"/>

View File

@ -1001,7 +1001,6 @@
<Item id="6222" name="0"/>
<Item id="6224" name="Setări pentru editare multiplă"/>
<Item id="6246" name="Se fac comutabile comenzilor de pliere/desfășurare la nivelul actual"/>
<Item id="6225" name="Activare (Ctrl+clic mouse pe selecție)"/>
<Item id="6227" name="Limitează linia"/>
<Item id="6228" name="Implicit"/>
<Item id="6229" name="Aliniat"/>

View File

@ -490,7 +490,6 @@
<Item id="6213" name="Modalidade 'isfundu'"/>
<Item id="6214" name="Evidèntzia custa riga"/>
<Item id="6224" name="Impostatziones sèberu mùltiplu"/>
<Item id="6225" name="Abìlita (Ctrl+Click/seletzione)"/>
<Item id="6226" name="Perunu"/>
<Item id="6227" name="A capu automàticu"/>
<Item id="6228" name="Default"/>

View File

@ -506,7 +506,6 @@
<Item id="6221" name="වේගයෙන්"/>
<Item id="6222" name="සෙමින්"/>
<Item id="6224" name="බහු සංස්කාරක සිටවුම්"/>
<Item id="6225" name="සබල කරනවා (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="ගොනු දාර විදිය"/>
<Item id="6202" name="සරල"/>
<Item id="6203" name="ඊතලය"/>

View File

@ -590,7 +590,6 @@
<Item id="6221" name="R"/>
<Item id="6222" name="L"/>
<Item id="6224" name="Multiedición"/>
<Item id="6225" name="Habilita (Ctrl+Ratón)"/>
<Item id="6201" name="Estilo visual de los niveles"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Flechas"/>

View File

@ -620,7 +620,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Танзимоти чанд-вироишӣ"/>
<Item id="6225" name="Фаъолсозӣ (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="Сабки ҳошияи пӯша"/>
<Item id="6202" name="Сода"/>
<Item id="6203" name="Пайкон"/>

View File

@ -858,7 +858,6 @@
<Item id="6216" name="புகுத்துகுறி அமைப்பு"/>
<Item id="6217" name="அகலம் :"/>
<Item id="6219" name="சிமிட்டு வீதம் :"/>
<Item id="6225" name="பல்-தொகுத்தலை செயல்படுத்து (Ctrl+Mouse click/selection)"/>
<Item id="6227" name="வரியை திரையகலத்திற்கேர்ப்ப போர்த்து"/>
<Item id="6228" name="இயல்புநிலை"/>
<Item id="6229" name="ஒத்திசைந்த"/>

View File

@ -646,7 +646,6 @@
<Item id="6221" name="Еш"/>
<Item id="6222" name="Сир"/>
<Item id="6224" name="Мульти-үзгәртү"/>
<Item id="6225" name="Каб. (Ctrl + Тычкан чиртү/сайлау)"/>
<Item id="6226" name="Сүндерелгән"/>
<Item id="6227" name="Юлларны Күчерү стиле"/>
<Item id="6228" name="Стандарт"/>

View File

@ -421,7 +421,6 @@
<Item id="6221" name="ఎఫ్"/>
<Item id="6222" name="ఎస్"/>
<Item id="6224" name="మల్టీ-ఎడిటింగ్ సెట్టింగ్స్"/>
<Item id="6225" name="ఎనేబల్ (కంట్రోల్+మౌస్ క్లిక్/సెలెక్షన్)"/>
<Item id="6201" name="ఫోల్డర్ మార్జిన్ స్టైల్"/>
<Item id="6202" name="సింపుల్"/>
<Item id="6203" name="యారో"/>

View File

@ -437,7 +437,6 @@
<Item id="6221" name="เร็ว"/>
<Item id="6222" name="ช้า"/>
<Item id="6224" name="ตั้งค่าหลายการแก้ไข"/>
<Item id="6225" name="เปิดใช้ (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="สไตล์ของตัวแบ่งโฟลเดอร์"/>
<Item id="6202" name="เรียบง่าย"/>
<Item id="6203" name="ลูกศร"/>

View File

@ -446,7 +446,6 @@
<Item id="6221" name="تېز"/>
<Item id="6222" name="ئاستا"/>
<Item id="6224" name="كۆپ ئىستونلۇق تەھرىرلەش"/>
<Item id="6225" name="قوزغىتىش (Ctrl+Mouse click/selection)"/>
<Item id="6201" name="كود قاتلاش ئۇسلوبى"/>
<Item id="6202" name="ئاددىي"/>
<Item id="6203" name="ئىستىرېلكا"/>

View File

@ -758,7 +758,6 @@ Updater: Shamsiddinov Zafar
<Item id="6221" name="S"/>
<Item id="6222" name="T"/>
<Item id="6224" name="Multitahrirlamoq"/>
<Item id="6225" name="Yoq. (Ctrl + Bosish / Ajratish)"/>
<Item id="6226" name="Faol emas"/>
<Item id="6227" name="Satr Koʻchirish uslubi"/>
<Item id="6228" name="Standart"/>

View File

@ -602,7 +602,6 @@ gan/by Aled Powell
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Gosodiadau Aml-golygu"/>
<Item id="6225" name="Galluogi (Ctrl+Clic llygoden/dewis)"/>
<Item id="6201" name="Arddull Ymyl Ffolder"/>
<Item id="6202" name="Syml"/>
<Item id="6203" name="Saeth"/>

View File

@ -701,7 +701,6 @@
<Item id="6221" name="F"/>
<Item id="6222" name="S"/>
<Item id="6224" name="Izilungiselelo eziningi zokuhlela"/>
<Item id="6225" name="Nika amandla (ctrl + chofoza umouse / ukukhetha)"/>
<Item id="6201" name="Isitayela seMargin isilawuli"/>
<Item id="6202" name="Okulula"/>
<Item id="6203" name="Umcibisholo"/>

View File

@ -1841,6 +1841,46 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
return TRUE;
}
case NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND:
{
StyleArray& stylers = nppParam.getMiscStylerArray();
COLORREF selectColorFore = black;
const Style* pStyle = stylers.findByName(L"Selected text colour");
if (pStyle)
{
selectColorFore = pStyle->_fgColor;
}
if ((nppParam.getSVP())._selectedTextForegroundSingleColor)
{
_mainEditView.setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore);
_mainEditView.setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore);
_mainEditView.setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore);
_subEditView.setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore);
_subEditView.setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore);
_subEditView.setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore);
}
else
{
_mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_TEXT);
_mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_INACTIVE_TEXT);
_mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_ADDITIONAL_TEXT);
_subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_TEXT);
_subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_INACTIVE_TEXT);
_subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_ADDITIONAL_TEXT);
}
if (_configStyleDlg.isCreated())
{
_configStyleDlg.syncWithSelFgSingleColorCtrl();
}
return TRUE;
}
case NPPM_INTERNAL_SETWORDCHARS:
{
_mainEditView.setWordChars();

View File

@ -1655,20 +1655,6 @@ bool NppParameters::load()
delete _pXmlExternalLexerDoc[i];
}
//-------------------------------------------------------------//
// enableSelectFgColor.xml : for per user //
// This empty xml file is optional - user adds this empty file //
// manually in order to set selected text's foreground color. //
//-------------------------------------------------------------//
std::wstring enableSelectFgColorPath = _userPath;
pathAppend(enableSelectFgColorPath, L"enableSelectFgColor.xml");
if (doesFileExist(enableSelectFgColorPath.c_str()))
{
_isSelectFgColorEnabled = true;
}
std::wstring filePath, filePath2, issueFileName;
//-------------------------------------------------------------//
// nppLogNetworkDriveIssue.xml //
@ -6650,6 +6636,16 @@ void NppParameters::feedScintillaParam(TiXmlNode *node)
_svp._rightClickKeepsSelection = false;
}
// Make selected text foreground single color
nm = element->Attribute(L"selectedTextForegroundSingleColor");
if (nm)
{
if (!lstrcmp(nm, L"yes"))
_svp._selectedTextForegroundSingleColor = true;
else if (!lstrcmp(nm, L"no"))
_svp._selectedTextForegroundSingleColor = false;
}
// Disable Advanced Scrolling
nm = element->Attribute(L"disableAdvancedScrolling");
if (nm)
@ -7194,6 +7190,7 @@ bool NppParameters::writeScintillaParams()
(scintNode->ToElement())->SetAttribute(L"virtualSpace", _svp._virtualSpace ? L"yes" : L"no");
(scintNode->ToElement())->SetAttribute(L"scrollBeyondLastLine", _svp._scrollBeyondLastLine ? L"yes" : L"no");
(scintNode->ToElement())->SetAttribute(L"rightClickKeepsSelection", _svp._rightClickKeepsSelection ? L"yes" : L"no");
(scintNode->ToElement())->SetAttribute(L"selectedTextForegroundSingleColor", _svp._selectedTextForegroundSingleColor ? L"yes" : L"no");
(scintNode->ToElement())->SetAttribute(L"disableAdvancedScrolling", _svp._disableAdvancedScrolling ? L"yes" : L"no");
(scintNode->ToElement())->SetAttribute(L"wrapSymbolShow", _svp._wrapSymbolShow ? L"show" : L"hide");
(scintNode->ToElement())->SetAttribute(L"Wrap", _svp._doWrap ? L"yes" : L"no");

View File

@ -994,6 +994,7 @@ struct ScintillaViewParams
bool _virtualSpace = false;
bool _scrollBeyondLastLine = true;
bool _rightClickKeepsSelection = false;
bool _selectedTextForegroundSingleColor = false;
bool _disableAdvancedScrolling = false;
bool _doSmoothFont = false;
bool _showBorderEdge = true;
@ -1941,7 +1942,6 @@ public:
void setAdminMode(bool isAdmin) { _isAdminMode = isAdmin; }
bool isAdmin() const { return _isAdminMode; }
bool regexBackward4PowerUser() const { return _findHistory._regexBackward4PowerUser; }
bool isSelectFgColorEnabled() const { return _isSelectFgColorEnabled; };
bool isRegForOSAppRestartDisabled() const { return _isRegForOSAppRestartDisabled; };
private:
@ -2008,7 +2008,6 @@ private:
bool _isElevationRequired = false;
bool _isAdminMode = false;
bool _isSelectFgColorEnabled = false;
bool _isRegForOSAppRestartDisabled = false;
bool _doNppLogNetworkDriveIssue = false;

View File

@ -3068,10 +3068,9 @@ void ScintillaEditView::performGlobalStyles()
}
setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_BACK, selectMultiSelectColorBack);
if (nppParams.isSelectFgColorEnabled())
if (svp._selectedTextForegroundSingleColor)
{
//execute(SCI_SETSELFORE, 1, selectColorFore);
setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore); // SCI_SETSELFORE is deprecated
setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore);
setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore);
setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore);
}

View File

@ -214,7 +214,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM
// Selected text colour style
if (style._styleDesc == L"Selected text colour")
{
isTextEnabled = NppParameters::getInstance().isSelectFgColorEnabled();
isTextEnabled = NppParameters::getInstance().getSVP()._selectedTextForegroundSingleColor;
}
}
else if (dlgCtrlID == IDC_BG_STATIC)
@ -1176,6 +1176,20 @@ std::pair<intptr_t, intptr_t> WordStyleDlg::goToPreferencesSettings()
return result;
}
void WordStyleDlg::syncWithSelFgSingleColorCtrl()
{
const Style& style = getCurrentStyler();
// Selected text colour style
if (style._styleDesc == L"Selected text colour")
{
// Only in case that dialog is on "Selected text colour":
// Switch to a section then switch back for refresh current state of "Selected text colour"
goToSection(L"Global Styles:Default Style");
goToSection(L"Global Styles:Selected text colour");
}
}
void WordStyleDlg::setVisualFromStyleList()
{
showGlobalOverrideCtrls(false);
@ -1240,7 +1254,7 @@ void WordStyleDlg::setVisualFromStyleList()
{
isEnable = false; // disable by default for "Selected text colour" style
if (NppParameters::getInstance().isSelectFgColorEnabled())
if (NppParameters::getInstance().getSVP()._selectedTextForegroundSingleColor)
isEnable = true;
}
::EnableWindow(_pFgColour->getHSelf(), isEnable);

View File

@ -87,6 +87,7 @@ public :
void restoreGlobalOverrideValues();
void addLastThemeEntry();
bool selectThemeByName(const wchar_t* themeName);
void syncWithSelFgSingleColorCtrl();
bool goToSection(const wchar_t* sectionNames); // sectionNames is formed as following: "Language name:Style name"
// ex: "Global Styles:EOL custom color" will set Language on "Global Styles", then set Style on "EOL custom color" if both are found.

View File

@ -102,9 +102,10 @@ BEGIN
CONTROL "Enable virtual space",IDC_CHECK_VIRTUALSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,28,270,10
CONTROL "Make current level folding/unfolding commands toggleable",IDC_CHECK_FOLDINGTOGGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,43,270,10
CONTROL "Keep selection when right-click outside of selection",IDC_CHECK_RIGHTCLICKKEEPSSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,58,270,10
CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,73,270,10
CONTROL "Disable advanced scrolling feature due to touchpad issue",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,88,270,10
CONTROL "Enable Copy/Cut Line without selection",IDC_CHECK_LINECUTCOPYWITHOUTSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,103,270,10
CONTROL "Enable Copy/Cut Line without selection",IDC_CHECK_LINECUTCOPYWITHOUTSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,73,270,10
CONTROL "Apply custom color to selected text foreground",IDC_CHECK_SELECTEDTEXTSINGLECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,88,270,10
CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,103,270,10
CONTROL "Disable advanced scrolling feature due to touchpad issue",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,118,270,10
END
IDD_PREFERENCE_SUB_EDITING2 DIALOGEX 115, 10, 460, 205

View File

@ -690,14 +690,14 @@ intptr_t CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case IDC_CHECK_HIDEMENUBAR :
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDEMENUBAR, BM_GETCHECK, 0, 0));
bool isChecked = isCheckedOrNot(IDC_CHECK_HIDEMENUBAR);
::SendMessage(::GetParent(_hParent), NPPM_HIDEMENU, 0, isChecked?TRUE:FALSE);
}
return TRUE;
case IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR:
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR, BM_GETCHECK, 0, 0));
bool isChecked = isCheckedOrNot(IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR);
nppGUI._hideMenuRightShortcuts = isChecked;
static bool isFirstShow = true;
if (isChecked)
@ -918,7 +918,7 @@ intptr_t CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case IDC_CHECK_HIDE :
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDE, BM_GETCHECK, 0, 0));
bool isChecked = isCheckedOrNot(IDC_CHECK_HIDE);
::SendMessage(::GetParent(_hParent), NPPM_HIDETOOLBAR, 0, isChecked?TRUE:FALSE);
}
return TRUE;
@ -1032,6 +1032,7 @@ void EditingSubDlg::initScintParam()
::SendDlgItemMessage(_hSelf, IDC_CHECK_VIRTUALSPACE, BM_SETCHECK, svp._virtualSpace, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_SETCHECK, svp._scrollBeyondLastLine, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_SETCHECK, svp._rightClickKeepsSelection, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_SELECTEDTEXTSINGLECOLOR, BM_SETCHECK, svp._selectedTextForegroundSingleColor, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_SETCHECK, svp._disableAdvancedScrolling, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_LINECUTCOPYWITHOUTSELECTION, BM_SETCHECK, svp._lineCopyCutWithoutSelection, 0);
}
@ -1255,7 +1256,7 @@ intptr_t CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
switch (wParam)
{
case IDC_CHECK_SMOOTHFONT:
svp._doSmoothFont = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_GETCHECK, 0, 0));
svp._doSmoothFont = isCheckedOrNot(IDC_CHECK_SMOOTHFONT);
::SendMessage(::GetParent(_hParent), NPPM_SETSMOOTHFONT, 0, svp._doSmoothFont);
return TRUE;
@ -1275,29 +1276,34 @@ intptr_t CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
return TRUE;
case IDC_CHECK_VIRTUALSPACE:
svp._virtualSpace = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_VIRTUALSPACE, BM_GETCHECK, 0, 0));
svp._virtualSpace = isCheckedOrNot(IDC_CHECK_VIRTUALSPACE);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_VIRTUALSPACE, 0, 0);
return TRUE;
case IDC_CHECK_SCROLLBEYONDLASTLINE:
svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0));
svp._scrollBeyondLastLine = isCheckedOrNot(IDC_CHECK_SCROLLBEYONDLASTLINE);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0);
return TRUE;
case IDC_CHECK_LINECUTCOPYWITHOUTSELECTION:
{
bool isChecked = BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINECUTCOPYWITHOUTSELECTION, BM_GETCHECK, 0, 0);
bool isChecked = isCheckedOrNot(IDC_CHECK_LINECUTCOPYWITHOUTSELECTION);
svp._lineCopyCutWithoutSelection = isChecked;
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINECUTCOPYWITHOUTSELECTION, 0, 0);
return TRUE;
}
case IDC_CHECK_RIGHTCLICKKEEPSSELECTION:
svp._rightClickKeepsSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_GETCHECK, 0, 0));
svp._rightClickKeepsSelection = isCheckedOrNot(IDC_CHECK_RIGHTCLICKKEEPSSELECTION);
return TRUE;
case IDC_CHECK_SELECTEDTEXTSINGLECOLOR:
svp._selectedTextForegroundSingleColor = isCheckedOrNot(IDC_CHECK_SELECTEDTEXTSINGLECOLOR);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND, 0, 0);
return TRUE;
case IDC_CHECK_DISABLEADVANCEDSCROLL:
svp._disableAdvancedScrolling = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_GETCHECK, 0, 0));
svp._disableAdvancedScrolling = isCheckedOrNot(IDC_CHECK_DISABLEADVANCEDSCROLL);
return TRUE;
case IDC_CHECK_FOLDINGTOGGLE:
@ -1478,7 +1484,7 @@ intptr_t CALLBACK Editing2SubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
{
case IDC_CHECK_MULTISELECTION:
{
svp._multiSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_GETCHECK, 0, 0));
svp._multiSelection = isCheckedOrNot(IDC_CHECK_MULTISELECTION);
if (!svp._multiSelection)
{
::SendDlgItemMessage(_hSelf, IDC_CHECK_COLUMN2MULTIEDITING, BM_SETCHECK, FALSE, 0);
@ -1492,7 +1498,7 @@ intptr_t CALLBACK Editing2SubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
case IDC_CHECK_COLUMN2MULTIEDITING:
{
svp._columnSel2MultiEdit = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_COLUMN2MULTIEDITING, BM_GETCHECK, 0, 0));
svp._columnSel2MultiEdit = isCheckedOrNot(IDC_CHECK_COLUMN2MULTIEDITING);
}
return TRUE;
@ -2385,29 +2391,29 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar
switch (wParam)
{
case IDC_CHECK_LINENUMBERMARGE:
svp._lineNumberMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_GETCHECK, 0, 0));
svp._lineNumberMarginShow = isCheckedOrNot(IDC_CHECK_LINENUMBERMARGE);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_DYNAMIC), svp._lineNumberMarginShow);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CONSTANT), svp._lineNumberMarginShow);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0);
return TRUE;
case IDC_RADIO_DYNAMIC:
svp._lineNumberMarginDynamicWidth = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_RADIO_DYNAMIC, BM_GETCHECK, 0, 0));
svp._lineNumberMarginDynamicWidth = isCheckedOrNot(IDC_RADIO_DYNAMIC);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0);
return TRUE;
case IDC_RADIO_CONSTANT:
svp._lineNumberMarginDynamicWidth = !(BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_RADIO_CONSTANT, BM_GETCHECK, 0, 0));
svp._lineNumberMarginDynamicWidth = !isCheckedOrNot(IDC_RADIO_CONSTANT);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0);
return TRUE;
case IDC_CHECK_BOOKMARKMARGE:
svp._bookMarkMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_BOOKMARKMARGE, BM_GETCHECK, 0, 0));
svp._bookMarkMarginShow = isCheckedOrNot(IDC_CHECK_BOOKMARKMARGE);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SYMBOLMARGIN, 0, 0);
return TRUE;
case IDC_CHECK_CHANGHISTORYMARGIN:
{
bool isMaginJustEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYMARGIN, BM_GETCHECK, 0, 0));
bool isIndicatorAlreadyEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYINDICATOR, BM_GETCHECK, 0, 0));
bool isMaginJustEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYMARGIN);
bool isIndicatorAlreadyEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYINDICATOR);
if (isMaginJustEnabled && !isIndicatorAlreadyEnabled) // In the case that both "in margin" & "in text" were disabled, but "in margin" is just enabled
{
@ -2438,8 +2444,8 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar
case IDC_CHECK_CHANGHISTORYINDICATOR:
{
bool isIndicatorJustEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYINDICATOR, BM_GETCHECK, 0, 0));
bool isMaginAlreadyEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYMARGIN, BM_GETCHECK, 0, 0));
bool isIndicatorJustEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYINDICATOR);
bool isMaginAlreadyEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYMARGIN);
if (isIndicatorJustEnabled && !isMaginAlreadyEnabled) // In the case that both "in margin" & "in text" were disabled, but "in text" is just enabled
{
@ -2469,7 +2475,7 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar
}
case IDC_CHECK_NOEDGE:
svp._showBorderEdge = !(BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_NOEDGE, BM_GETCHECK, 0, 0));
svp._showBorderEdge = !isCheckedOrNot(IDC_CHECK_NOEDGE);
::SendMessage(::GetParent(_hParent), NPPM_SETEDITORBORDEREDGE, 0, svp._showBorderEdge ? TRUE : FALSE);
return TRUE;
@ -3006,7 +3012,7 @@ intptr_t CALLBACK NewDocumentSubDlg::run_dlgProc(UINT message, WPARAM wParam, LP
return TRUE;
case IDC_CHECK_OPENANSIASUTF8 :
ndds._openAnsiAsUtf8 = (BST_CHECKED == ::SendMessage(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), BM_GETCHECK, 0, 0));
ndds._openAnsiAsUtf8 = isCheckedOrNot(IDC_CHECK_OPENANSIASUTF8);
return TRUE;
case IDC_RADIO_OTHERCP :
@ -3985,7 +3991,7 @@ intptr_t CALLBACK LanguageSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
//
case IDC_CHECK_LANGMENUCOMPACT:
{
nppGUI._isLangMenuCompact = (BST_CHECKED == ::SendMessage(::GetDlgItem(_hSelf, IDC_CHECK_LANGMENUCOMPACT), BM_GETCHECK, 0, 0));
nppGUI._isLangMenuCompact = isCheckedOrNot(IDC_CHECK_LANGMENUCOMPACT);
pNativeSpeaker->messageBox("LanguageMenuCompactWarning",
_hSelf,
L"This option will be changed on the next launch.",
@ -4613,7 +4619,7 @@ intptr_t CALLBACK PrintSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
switch (wParam)
{
case IDC_CHECK_PRINTLINENUM:
nppGUI._printSettings._printLineNumber = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_PRINTLINENUM, BM_GETCHECK, 0, 0));
nppGUI._printSettings._printLineNumber = isCheckedOrNot(IDC_CHECK_PRINTLINENUM);
break;
case IDC_RADIO_WYSIWYG:
@ -5308,7 +5314,7 @@ intptr_t CALLBACK AutoCompletionSubDlg::run_dlgProc(UINT message, WPARAM wParam,
case IDD_AUTOCTAG_CHECK :
{
nppGUI._matchedPairConf._doHtmlXmlTag = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDD_AUTOCTAG_CHECK, BM_GETCHECK, 0, 0));
nppGUI._matchedPairConf._doHtmlXmlTag = isCheckedOrNot(IDD_AUTOCTAG_CHECK);
return TRUE;
}
default :
@ -5760,7 +5766,7 @@ intptr_t CALLBACK DelimiterSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
case IDD_SEVERALLINEMODEON_CHECK:
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDD_SEVERALLINEMODEON_CHECK, BM_GETCHECK, 0, 0));
bool isChecked = isCheckedOrNot(IDD_SEVERALLINEMODEON_CHECK);
nppGUI._delimiterSelectionOnEntireDocument = isChecked;
setCtrlsPos(isChecked);
@ -5904,7 +5910,7 @@ intptr_t CALLBACK CloudAndLinkSubDlg::run_dlgProc(UINT message, WPARAM wParam, L
}
else
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_WITHCLOUD_RADIO, BM_GETCHECK, 0, 0));
bool isChecked = isCheckedOrNot(IDC_WITHCLOUD_RADIO);
if (isChecked)
{
wstring errMsg = pNativeSpeaker->getLocalizedStrFromID("cloud-invalid-warning", L"Invalid path.");

View File

@ -121,7 +121,7 @@
#define IDC_CARETBLINKRATE_S_STATIC (IDD_PREFERENCE_SUB_EDITING + 22)
#define IDC_CHECK_CHANGHISTORYMARGIN (IDD_PREFERENCE_SUB_EDITING + 23)
#define IDC_DISTRACTIONFREE_SLIDER (IDD_PREFERENCE_SUB_EDITING + 24)
//#define IDC_CHECK_MULTISELECTION (IDD_PREFERENCE_SUB_EDITING + 25)
#define IDC_CHECK_SELECTEDTEXTSINGLECOLOR (IDD_PREFERENCE_SUB_EDITING + 25)
#define IDC_RADIO_FOLDMARGENONE (IDD_PREFERENCE_SUB_EDITING + 26)

View File

@ -722,7 +722,7 @@
#define NPPM_INTERNAL_DRAWTABBARCLOSEBUTTON (NOTEPADPLUS_USER_INTERNAL + 81)
#define NPPM_INTERNAL_REFRESHTABBAR (NOTEPADPLUS_USER_INTERNAL + 82)
#define NPPM_INTERNAL_REDUCETABBAR (NOTEPADPLUS_USER_INTERNAL + 83)
//#define NPPM_INTERNAL_LOCKTABBAR (NOTEPADPLUS_USER_INTERNAL + 84)
#define NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND (NOTEPADPLUS_USER_INTERNAL + 84)
#define NPPM_INTERNAL_DRAWINACIVETAB (NOTEPADPLUS_USER_INTERNAL + 85)
#define NPPM_INTERNAL_DRAWTABTOPBAR (NOTEPADPLUS_USER_INTERNAL + 86)
//#define NPPM_INTERNAL_TABDBCLK2CLOSE (NOTEPADPLUS_USER_INTERNAL + 87)