From 9dcd6a7645f867dd900bca9bb6ea1c40ff506d6f Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 22 Jul 2023 22:20:28 +0200 Subject: [PATCH] Split minimize action for minimize, close and icon --- .../SysTray-X-app/languages/SysTray-X.bg.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.de.qm | Bin 6652 -> 7021 bytes .../SysTray-X-app/languages/SysTray-X.de.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.el.qm | Bin 6896 -> 7337 bytes .../SysTray-X-app/languages/SysTray-X.el.ts | 138 +- .../languages/SysTray-X.en-US.qm | Bin 6128 -> 6425 bytes .../languages/SysTray-X.en-US.ts | 138 +- .../languages/SysTray-X.es-AR.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.fr.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.hr.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.it.qm | Bin 6698 -> 7051 bytes .../SysTray-X-app/languages/SysTray-X.it.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.nl.qm | Bin 6540 -> 6849 bytes .../SysTray-X-app/languages/SysTray-X.nl.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.pl.ts | 138 +- .../languages/SysTray-X.pt-BR.qm | Bin 6448 -> 6781 bytes .../languages/SysTray-X.pt-BR.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.ru.qm | Bin 6543 -> 6852 bytes .../SysTray-X-app/languages/SysTray-X.ru.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.sk.ts | 138 +- .../SysTray-X-app/languages/SysTray-X.uk.ts | 138 +- .../languages/SysTray-X.zh-CN.ts | 138 +- .../languages/SysTray-X.zh-TW.ts | 138 +- app/SysTray-X/SysTray-X-app/preferences.cpp | 26 + app/SysTray-X/SysTray-X-app/preferences.h | 38 +- app/SysTray-X/SysTray-X-app/preferences.ui | 1554 +++++++++-------- .../SysTray-X-app/preferencesdialog.cpp | 31 +- .../SysTray-X-app/preferencesdialog.h | 12 + app/SysTray-X/SysTray-X-app/systrayx.cpp | 6 + app/SysTray-X/SysTray-X-app/systrayxlink.cpp | 23 + app/SysTray-X/SysTray-X-app/systrayxlink.h | 5 + .../SysTray-X-app/windowctrl-unix.cpp | 103 ++ app/SysTray-X/SysTray-X-app/windowctrl-unix.h | 55 + app/SysTray-X/SysTray-X-app/windowctrl.cpp | 47 +- app/SysTray-X/SysTray-X-app/windowctrl.h | 10 + webext/_locales/de/messages.json | 25 + webext/_locales/el/messages.json | 25 + webext/_locales/en-US/messages.json | 25 + webext/_locales/it/messages.json | 25 + webext/_locales/nl/messages.json | 29 +- webext/_locales/pt-BR/messages.json | 25 + webext/_locales/ru/messages.json | 25 + webext/background.js | 10 + webext/css/options.css | 8 + webext/options.html | 47 +- webext/options.js | 48 +- 46 files changed, 2634 insertions(+), 1776 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts index 00e6acb..fe42b24 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.qm index 08a35767b3f9f4e44f391f489dba81b60bbbb12d..ca07b543459d1c4fb75c115a3d1d2afdd4fc1fdf 100644 GIT binary patch delta 545 zcmexk{MO9eW=D#|srPfHo>i3DpRjQ6-Q^4n46G@s@h+}T3=B*OK%M~*g8-0b5@BEn zInKZ!aCM@toRM%RgLV%K1A~MOkrT)*}~)=b_GcPW~x{= zg@HlzAk*?`M;I8y_cDFTm=1JLPP}WzC0NZW{ZfU2LHOuoSw^>dF*Y{V zKA>ifYi#OzK*L1q+4MQKFfgzSu{o+pGB9vXV4MGTDNtOOZDCj_(CLY6n;UO2FmRt^ zw^((Efr0TI`^j`o1_s{u>}QSU0ref@=;HqhG*5)1S1AstE{x-lCD0rZ8_o{TUqCNU zCfB=Kl-7Sm^5 zSsw;Rh8!SFWl&&n1Cn_R#SA4tx(LY6oSZIbFnPWtr>Kl?W?p7)W>u;}Vor`id1hWp zetGd^M?q!Ay2*@!(u^RLrjsWMn2D*vRpusU<|&lqE0h!^R!+VupuIU(U_K`R1r3q5 delta 324 zcmaEB_QzP%W=D#|srPfHo>i3DpRjQ6T_*+xrhtj^VodyX6V2tggp3%pdsrA4#BNNC z7ZVZ>XYks&oq>VvE`xWVCrrBa9m?k*Gpkw5Yb@M z=h(u)z%In*s3OV0z&U|!{@bMt48qsg7KVi~Fo<)pZEn29z`%Wu-D1@t1_s7=llL>q zc?mt`?C|`>z`!t(>$b2m&?W1+?%cb~z`)zi&7J$0fkBj=Tfe)Gfr0-xci{h(K(|cd ze&@D?fq~^dk5Ec0&>uWJ{xS1_>fcXRXOfc=)8?~1#0>PpWWH38al#gS6>E!u%4SZE UXHsSo@7~ PreferencesDialog - + SysTray-X Preferences SysTray-X Einstellungen - + Default icon Standardsymbol - - + + Icon Symbol - - + + Minimize main to tray, close children + Hauptfenster in Systemleiste verbergen, Kinderfenster schließen + + + + Minimize all windows to tray + Alle Fenster in Systemleiste verbergen + + + + Default Thunderbird Thunderbird Symbol - + Lookthrough icon Unsichtbares Symbol - - + + Custom icon Benutzerdefiniert Symbol - - + + Choose Wählen - + KDE integration (Hide) KDE integration (Verbergen) - + Mail notification icon E-Mail-Benachrichtigung Symbol - + Blank icon Leeres Symbol - + New mail icon Neue Nachricht Symbol - + No icon Kein Symbol - + Theme Thema - + Light Licht - + Dark Dunkel - + Windows Fenster - + Close Schließen - + Restore startup positions Fensterpositionen wiederherstellen beim Start - + Minimize Minimieren - + Default minimize Standard Minimieren @@ -199,27 +209,27 @@ In Systemleiste verbergen, Methode 1 - + Minimize to tray, method 2 In Systemleiste verbergen, Methode 2 - + Default close Standard Schließen - + Minimize main, close children Hauptfenster minimieren, Kinderfenster schließen - + Minimize all windows Alle Fenster minimieren - + Start application minimized Anwendung minimiert starten @@ -228,144 +238,144 @@ Beim Fensterschließen, Minimieren - + Number properties Nummereigenschaften - + Display unread message count Anzahl neuer Nachrichten anzeigen - + Number color Nummerfarbe - + Number size Nummergröße - + Alignment Nummernausrichtung - + Top left Oben links - + Top centre Oben in der Mitte - + Top right Oben rechts - + Middle left Mitte links - + Middle centre Mittleres Zentrum - + Middle right Mitte rechts - + Bottom left Unten links - + Bottom centre Unten in der Mitte - + Bottom right Unten rechts - + Margins (left, top, right, bottom): Ränder (links, oben, rechts, unten): - + Startup delay Startverzögerung - + Count type E-Mail-Benachrichtigungstyp - + Unread Ungelesene Nachrichten - + New Neue Nachrichten - + Mail Nachrichten - + Use the preferences dialog in Thunderbird to select the accounts and folders Verwenden Sie den Einstellungsdialog in Thunderbird, um die Konten und Ordner auszuwählen - + Debug Debug - + Display debug window Debug-Fenster anzeigen - + Save Speichern - + Cancel Annullieren - + Minimize to tray Hauptfenster minimieren - - + + Open Image Bild öffnen - - + + Image Files (*.png *.jpg *.bmp) Bilddateien (*.png *.jpg *.bmp) @@ -373,27 +383,27 @@ SysTrayX - + &Show/Hide &Anzeigen/Verbergen - + &Preferences &Einstellungen - + &About &Über - + &Quit &Beenden - + Close Schließen diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.qm index 56bf11687efd467189cb652a45fa43bc22a18187..80f0b18f3503163f1b63bfc5d1f381204d26a143 100644 GIT binary patch delta 531 zcmexhy3*3zW=D#|srPfHo>i3DpRjQ6-Q^4n46La+@$NxR3=B*OK%M~*g8-0bvSVNf zInKZ!cy*$#oRP?62JIde1_sGO24i7CpbA9>FSDsY?METB zg@HlrJ=5}OM;I6+{xW^am=1J9JTw2hPe3;`PrPf!C6v!9{ZfU2LFD3OSw^>daVs{~ zKA>h!H#T)WpkZS3+4MQKFfg!Nu{o+pGB9w-vCV(G6eu3ZwlFLd==6nbn;UO2F!1ED zTdX<+G+cuHWV$8;1K(!$vqtlP`u=fr@qYz6E{>yDDUN}G`whn-OQ1QT37j3Czkps| z%ynB>8R#`Ot~>WGGZ-`QnR9dJK4xGLZ{pVPt^@jxg*)*7N(KgjzufQKmH@+smq#e2 z6{sPe$3F&Wfk4n?UM4vyi35DLhnRuxG2lxDnJ2oFuVQU6P}!f!u1v~IQgWNKn6~pV zmQ7wLDmwWe7yINx0&0_A3fhXw_-5v1=4Mui3DpRjQ6T_*+xrhtj^VoU;N6V2tgguXCn_pmT9h+mo* zFD4}6%iy(hI|BpTR|fAuQ3eJf{)z2!Tq5<1X4Q)r7zCv!ZkLl14PaV6?Fdju9Mh+a z=|I!snfc#+VqoBZGV#3`m%s&9>6a=D48lf}^%>oqL}#1W{fu&6 z!Us7!Jby7TFf8V}EvyW5Njle^dzTp)_{_Pva~}hZeax-jUB|#6kjfqSe PreferencesDialog - + SysTray-X Preferences Προτιμήσεις SysTray-X - + Default icon Προεπιλεγμένο εικονίδιο - - + + Icon Εικονίδιο - - + + Default Thunderbird Προεπιλογή Thunderbird - + Lookthrough icon Διαφανές εικονίδιο - - + + Custom icon Προσαρμοσμένο εικονίδιο - - + + Choose Επιλέξτε - + KDE integration (Hide) Ενσωμάτωση στον KDE (Απόκρυψη) - + Mail notification icon Εικονίδιο ειδοποίησης αλληλογραφίας - + Blank icon Κενό εικονίδιο - + New mail icon Εικονίδιο νέας αλληλογραφίας - + No icon Χωρίς εικονίδιο - + Theme θέμα - + Light φως - + Dark σκοτάδι - + Windows Παράθυρα - + Minimize Ελαχιστοποίηση - + Default minimize Προεπιλεγμένη ελαχιστοποίηση @@ -189,179 +189,189 @@ Μέθοδος 1 - + Minimize to tray, method 2 Μέθοδος 2 - + Close Κλείσιμο - + Default close Προεπιλεγμένο κλείσιμο - + + Minimize main to tray, close children + Ελαχιστοποίηση κυρίως παραθύρου στην περιοχή ειδοποιήσεων, κλείσιμο θυγατρικών + + + + Minimize all windows to tray + Ελαχιστοποίηση όλων των παραθύρων στην περιοχή ειδοποιήσεων + + + Minimize main, close children Ελαχιστοποίηση κυρίως παραθύρου, κλείσιμο θυγατρικών - + Minimize all windows Ελαχιστοποίηση όλων των παραθύρων - + Start application minimized Ελαχιστοποιημένη εκκίνηση της εφαρμογής - + Restore startup positions Επαναφορά θέσεων παραθύρου κατά την εκκίνηση - + Number properties Ιδιότητες αριθμών - + Display unread message count Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας - + Number color Χρώμα μετρητή - + Number size Μέγεθος μετρητή - + Alignment Ευθυγραμμία - + Top left Κορυφαίο αριστερά - + Top centre Κορυφαίο κέντρο - + Top right Κορυφαίο δεξιά - + Middle left Μέση αριστερά - + Middle centre Μεσαίο κέντρο - + Middle right Μέση δεξιά - + Bottom left Κάτω αριστερά - + Bottom centre Κάτω κέντρο - + Bottom right Κάτω δεξιά - + Margins (left, top, right, bottom): Περιθώρια (αριστερά, Κορυφαίο, δεξιά, Κάτω): - + Startup delay Καθυστέρηση έναρξης - + Count type Τύπος μετρητή μηνυμάτων - + Unread Μη αναγνωσμένα - + New Νέα - + Mail Αλληλογραφία - + Use the preferences dialog in Thunderbird to select the accounts and folders Χρησιμοποιήστε το παράθυρο διαλόγου Προτιμήσεις Thunderbird για να επιλέξετε λογαριασμούς και φακέλους - + Debug Αποσφαλμάτωση - + Display debug window Προβολή παραθύρου αποσφαλμάτωσης - + Minimize to tray Ελαχιστοποίηση στην περιοχή ειδοποιήσεων - + Save Αποθήκευση - + Cancel Άκυρο - - + + Open Image Άνοιγμα εικόνας - - + + Image Files (*.png *.jpg *.bmp) Αρχεία εικόνας (*.png *.jpg *.bmp) @@ -369,27 +379,27 @@ SysTrayX - + &Show/Hide &Εμφάνιση/Απόκρυψη - + &Preferences &Προτιμήσεις - + &About &Σχετικά - + &Quit &Έξοδος - + Close Κλείσιμο diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.qm index 59c64d9c3705ca7063726d5039f564985fb57c30..834ecf49052a245a71eec5bba448465156fff1b7 100644 GIT binary patch delta 556 zcmeyMKhwzEW=D#|srPfHo>i3DpRjQ6-Q^4n46Lbn@u9&^3=B*OK%M~*g8-0b5@28m zInKbqA2?B0&PZ@KgLV%K1B2*q24i7CpbA9>FSDsY?XeJAEQ!Hu=XM4LHh%{1Kv4z; zflm`_<-CN&81;GfF);9!GMZH{0*Z1lUitT(fr0%3liI};1_tg^OzvS<7#Mg2nJSh| zVPFtG%d~vj5uh#IOrJ8Q1KnWA%>V8a0|VdPiFeJo_|LLRzf@sh5PUmXmeH+VgpZB2 z52%^Lh)rD&Xqa$6n?A=Dpc7iy991NN;`i9*zg-Fx_hwrd7RtaNrp~sx@fHIE*E@EL zRfiZD7+i3DpRjQ6T_*+xrhtj^VoZEa6V2tg1lBNU_pmT9h`gB? zFD4`!%;2?iI|BooKZAFmC<6okpGs#JbIP%#ZVg`C)HD4;oIKf4H6>E!uj#i%>&!o&G QTEDr4=|9irNdoO004?KM{Qv*} diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts index 6d8602d..ea0aebc 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts @@ -96,106 +96,116 @@ PreferencesDialog - + SysTray-X Preferences SysTray-X Preferences - + Default icon Default icon - - + + Icon Icon - - + + Minimize main to tray, close children + Minimize main to tray, close children + + + + Minimize all windows to tray + Minimize all windows to tray + + + + Default Thunderbird Default Thunderbird - + Lookthrough icon Lookthrough icon - - + + Custom icon Custom icon - - + + Choose Choose - + KDE integration (Hide) KDE integration (Hide) - + Mail notification icon Mail notification icon - + Blank icon Blank icon - + New mail icon New mail icon - + No icon No icon - + Theme Theme - + Light Light - + Dark Dark - + Windows Windows - + Close Close - + Restore startup positions Restore window positions on startup - + Minimize Minimize - + Default minimize Default minimize @@ -204,27 +214,27 @@ Minimize to tray, method 1 - + Minimize to tray, method 2 Minimize to tray, method 2 - + Default close Default close - + Minimize main, close children Minimize main, close children - + Minimize all windows Minimize all windows - + Start application minimized Start application minimized @@ -233,144 +243,144 @@ Minimize on close - + Number properties Number properties - + Display unread message count Display unread message count - + Number color Number color - + Number size Number size - + Alignment Alignment - + Top left Top left - + Top centre Top centre - + Top right Top right - + Middle left Middle left - + Middle centre Middle centre - + Middle right Middle right - + Bottom left Bottom left - + Bottom centre Bottom centre - + Bottom right Bottom right - + Margins (left, top, right, bottom): Margins (left, top, right, bottom): - + Startup delay Startup delay - + Count type Count type - + Unread Unread - + New New - + Mail Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug Debug - + Display debug window Display debug window - + Save Save - + Cancel Cancel - + Minimize to tray Minimize to tray - - + + Open Image Open Image - - + + Image Files (*.png *.jpg *.bmp) Image Files (*.png *.jpg *.bmp) @@ -378,27 +388,27 @@ SysTrayX - + &Show/Hide &Show/Hide - + &Preferences &Preferences - + &About &About - + &Quit &Quit - + Close Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts index 85d5bc2..b15e29c 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts index 8b176c7..ac3ee64 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts index 0be5fd3..0b5a6a4 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm index b624d982c502aea8461903882a469989c28ddd62..1dd88c912d874a7a7bda428d98e500273e5e5e7e 100644 GIT binary patch delta 551 zcmZ2w(rs>Tvm-^~)cZM8&nn97PguD3?s5hO2G-1yc+U_g1_q`CAkP4ZK>$cIxiK(= z9A{t<_&HHm&PaGUgLV%K1A|07gR!t6P=zvsm)TUH_KOf&;u3?`&g~2gY!4Z{14S7a zg!WCWmGcr6W7Ox_$H2gMmeH(w5d(wZ3C1h`zB4dz%wbZyn8Luo^MJ`c>j4cDoz14tv4w$wU5w39MG`1}h;9Dcr9g2{wuND#K&N-JZEn29z`*^A z-D1@tpy49yC(|{7jnj5vCg;(+SfI1X6?%@K*lO|o!b&%*l_a*rL+Py zWb^pP04?Benas;1Cndg&&-M^A&^-!#sUY)2*78-XEe3jvW3nrgGLt03M_An^z0e Ga{>U`l#p-$ delta 324 zcmeA+Uu7a{vm-^~)cZM8&nn97PguD3t`h?TQ@})dF(&>^6V2tggc2CEdsrA4#3d%i ziwTK$GkERX&cML-kik1plz~C8d}6yCm+*N;v+6|*3<8Z4x64V1EMr`^3P&Z!+<{8JB<+tMp411_q%ill2+hoJ78|vG!eIVBln9Q`bvjU=Rsm z)92X2z`!oX=BOeG6hFi^|LszsI1}5#uuz~gT-Y`@-eO?je#LIF>JZRyk;(fR<-CLi zIXgUmF)%P}=DIDc40Op^t~>WGGcfR;<>tl^w^9a>*0ssnZS0n%c diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts index 588cbe7..3c5473b 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts @@ -92,101 +92,101 @@ PreferencesDialog - + SysTray-X Preferences Preferenze di SysTray-X - + Default icon Icona predefinita - - + + Icon Icona - - + + Default Thunderbird Predefinita di Thunderbird - + Lookthrough icon Icona trasparente - - + + Custom icon Icona personalizzata - - + + Choose Scegli - + KDE integration (Hide) Integrazione KDE (Nascondi) - + Mail notification icon Icona notifica posta - + Blank icon Icona vuota - + New mail icon Icona nuova posta - + No icon Nessuna icona - + Theme Tema - + Light Leggero - + Dark Scuro - + Windows Finestre - + Minimize Minimizza - + Close Chiudi - + Default minimize Minimizzazione predefinita @@ -195,174 +195,184 @@ Minimizza nel vassoio, metodo 1 - + Minimize to tray, method 2 Minimizza nel vassoio, metodo 2 - + Default close Chiusura predefinita - + + Minimize main to tray, close children + Minimizza principale nel vassoio, chiudi sottofinestre + + + + Minimize all windows to tray + Minimizza tutte le finestre nel vassoio + + + Minimize main, close children Minimizza principale, chiudi sottofinestre - + Minimize all windows Minimizza tutte le finestre - + Start application minimized Avvia applicazione minimizzata - + Restore startup positions Ripristina le posizioni della finestra all'avvio - + Number properties Proprietà numero - + Display unread message count Mostra numero di messaggi non letti - + Number color Colore numero - + Number size Dimensione numero - + Alignment Allineamento - + Top left A sinistra in alto - + Top centre In alto al centro - + Top right In alto a destra - + Middle left Al centro a sinistra - + Middle centre Centro centrale - + Middle right In mezzo a destra - + Bottom left In basso a sinistra - + Bottom centre In basso al centro - + Bottom right In basso a destra - + Margins (left, top, right, bottom): Margini (sinistra, in alto, destra, in basso): - + Startup delay Ritardo all'avvio - + Count type Tipo conteggio - + Unread Non letti - + New Nuovi - + Mail Messaggi - + Use the preferences dialog in Thunderbird to select the accounts and folders Usa la finestra di dialogo delle preferenze in Thunderbird per selezionare account e cartelle - + Debug Debug - + Display debug window Mostra finestra di debug - + Minimize to tray Minimizza nel vassoio - + Save Salva - + Cancel Annulla - - + + Open Image Apri immagine - - + + Image Files (*.png *.jpg *.bmp) File immagine (*.png *.jpg *.bmp) @@ -370,27 +380,27 @@ SysTrayX - + &Show/Hide &Mostra/Nascondi - + &Preferences &Preferenze - + &About &Informazioni - + &Quit &Esci - + Close Chiudi diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.qm index ccf87456d203922d8b6e3f039d185c60ae3a2ea2..4527094c2af8903f62654c0472564a78d3a1cd01 100644 GIT binary patch delta 499 zcmeA%K4@xgvm-^~)cZM8&nn97PguD3?s5hO2G+csct0N}1_q`CAkP4ZK>$cI2{15( z9A{t<=$)u5XC$o2pxwj5z#!hqU@R;MRH4Y=Wi}P4y%<7EurYY;+|Izj*3aM_D9XSf z6g06`&P!whqdw0*1_nNVMziWg3=D!u=vFT}iH)@n zsF`C1o4Ov*Fi~zceU2?aCmdmORFPz0;EZFN|8^+@gUC^~g<+vUL-(_7ZoI|7z`c&$ zV$~rA2F6$HC(|_<7eo1_qYxJVGh0 zz_4KD@s9yo!1rY`FO!^<*b6?}L(D+;1o5SU%o8!?t5{nMRJLHUE0Z#lgxTgSrn|h8 zZ}QuT%J^pHW#(p9r79%m%D^CKKCxYnOSqKLta=dxgMk0U?Q&8gMoi169Rcd#V)~RZ z9cY>%Gyl6!3=DivCcZc05@2JMeyPI1Amlb#pV7@pq@0bl?+OD0#|$=gy%Yup;SX&3 z99w`E9AR@*kz`=tjANVsb}3MN72CqFP@thp*fuxbVqoB2$8NFe5Ca3_tI7Kr<-CNB za&~zBVqjpH$aPy-8R(LkTzBqWW?>ZeSs(xa diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts index 3ab9545..8f37b82 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts @@ -95,106 +95,116 @@ PreferencesDialog - + SysTray-X Preferences SysTray-X Opties - + Default icon Standaard pictogram - - + + Icon Pictogram - - + + Minimize main to tray, close children + Minimaliseer hoofdvenster, sluit kindvensters + + + + Minimize all windows to tray + Minimaliseer alle vensters + + + + Default Thunderbird Standaard Thunderbird - + Lookthrough icon Doorzichtig pictogram - - + + Custom icon Aangepast pictogram - - + + Choose Kies - + KDE integration (Hide) KDE integratie (Verbergen) - + Mail notification icon Berichten notificatie pictogram - + Blank icon Leeg pictogram - + New mail icon Nieuw bericht pictogram - + No icon Geen pictogram - + Theme Thema - + Light Licht - + Dark Donker - + Windows Vensters - + Close Sluiten - + Restore startup positions Herstel vensterposities bij opstarten - + Minimize Minimaliseren - + Default minimize Standaard minimalisatie @@ -203,27 +213,27 @@ Minimaliseer naar systeemvak, methode 1 - + Minimize to tray, method 2 Minimaliseer naar systeemvak, methode 2 - + Default close Standaard sluiting - + Minimize main, close children Minimaliseer hoofdvenster, sluit kindvensters - + Minimize all windows Minimaliseer alle vensters - + Start application minimized Start programma geminimaliseerd @@ -232,144 +242,144 @@ Minimaliseren bij sluiten - + Number properties Nummer opties - + Display unread message count Aantal ongelezen berichten weergeven - + Number color Nummer kleur - + Number size Nummer grootte - + Alignment Uitlijning - + Top left Linksboven - + Top centre Middenboven - + Top right Rechtsboven - + Middle left Midden links - + Middle centre Midden midden - + Middle right Midden rechts - + Bottom left Linksonder - + Bottom centre Middenonder - + Bottom right Rechtsonder - + Margins (left, top, right, bottom): Marges (links, boven, rechts, onder): - + Startup delay Opstartvertraging - + Count type Type berichttelling - + Unread Ongelezen - + New Nieuw - + Mail Berichten - + Use the preferences dialog in Thunderbird to select the accounts and folders Gebruik het voorkeurenvenster in Thunderbird om de accounts en mappen te selecteren - + Debug Debug - + Display debug window Toon debug venster - + Save Bewaren - + Cancel Annnuleren - + Minimize to tray Minimaliseer naar systeemvak - - + + Open Image Open afbeelding - - + + Image Files (*.png *.jpg *.bmp) Afbeeldingsbestanden (*.png *.jpg *.bmp) @@ -377,27 +387,27 @@ SysTrayX - + &Show/Hide &Tonen/Verbergen - + &Preferences &Opties - + &About O&ver - + &Quit &Afsluiten - + Close Sluiten diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts index 450bea8..b04dfe6 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm index 0a97bb421cfa258da6bb16c5791963363530570b..a1a47c331d7cbbebefb7ccba509cf1360ca505b2 100644 GIT binary patch delta 586 zcmdmB^w-4PW=D#|srPfHo>i3DpRjQ6-Q^4n46Fqu@lHWb3=B*OK%M~*g8-0bT*1H) za-4yI|NBH;IU}L94B9;`3=HDI493EOKoyD%US?An7+8KnXz?QqUOTrlFtG75cn69y zFbJNRSS#lxqQa=pvyXv+_dcUp^&$oafm4iE{(Wa)U|+?gb}@y4frpRDJ?sjQj%2D> zHidyfl#yxqv?B}*Vh@=r#pb9Y2^7D>HvjEXpm;dj!mv=F)9cwbH{N1k;Fe;y zSak?!coX}{bWNb+g4xd+%>z1$iKC1EE0Ff#=v9hiVBp%uamW&Aj&KZThvzS#m#1^x z7FGs&O^oZ#y~_;73_Q=dxpN-_T|J9izq=0TJ1y?O|0{v6mE?Zswgeb9$~;0Ttw0Tx zJpM623;5b5^D@aviLKzXJ;V%jj{sjP$UNb_d=+bpf!-3C?8>CfB>ri07E?Gcqu1mx zexu3h0*azCzL|NMxtUd|3W+&63gwx3Df#8alP3x&yT>s2GGsF30dX!6S23hAC@|y$ zaREajkPo4YfNTXYP6Cp73@JcWSwNN!P&5t5PG-oMe1Ts~o&yx`Y(T6Ew=Op^Gf$x; TU!kNZv2wDefcEBt{P~;!4Lp(* delta 324 zcmexsvcX8yW=D#|srPfHo>i3DpRjQ6T_*+xrhtj^VoZETCYsA}305&^_pmT9h$&2r z7ZVbj$l$eeI|Bn7FN1fWCGxLr<4_#D&nX-60sMAtEW z%9zf;z<83G|J^4B20pim@6EXQgIJ|ssxUAJZkVjk=;kD%$;R4ug@J)XicMWFg@Hl1 zh)thk3(x{DHb)gnp!glO`EQp3#Z}lAhJ^y1;lsAM@fHIEw-md@szX4-nNWMJTZ#{JH1 z2?GO*GLKM7E6^WqJpM8Bfa1ZE)tTg^L`(T>4>1G1aF;I?WSmeJU&Y#Dpt6UP|YiSkC|e diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts index 5709f62..3e28044 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts @@ -93,106 +93,116 @@ PreferencesDialog - + SysTray-X Preferences SysTray-X Preferências - + Default icon Ícone padrão - - + + Icon Ícone - - + + Minimize main to tray, close children + Minimize o pai para a bandeja, feche os filhos + + + + Minimize all windows to tray + Minimize todas as janelas para a tray + + + + Default Thunderbird Padrão do Thunderbird - + Lookthrough icon Ícone transparente - - + + Custom icon Ícone personalizado - - + + Choose Escolher - + KDE integration (Hide) Integração com o KDE (oculta o ícone) - + Mail notification icon Ícone de notificação - + Blank icon Ícone branco - + New mail icon Ícone de novo e-mail - + No icon Nenhum ícone - + Theme Tema - + Light Claro - + Dark Escuro - + Windows Janela - + Close Fechar - + Restore startup positions Restaurar posições da janela na inicialização - + Minimize Miminizar - + Default minimize Comportamento padrão @@ -202,28 +212,28 @@ Minimizar para a tray, método 1 - + Minimize to tray, method 2 Minimizar para à área de notificações? (muito grande) Minimizar para a tray, método 2 - + Default close Fechamento padrão - + Minimize main, close children Minimize os filhos principais e próximos - + Minimize all windows Minimize todas as janelas - + Start application minimized Iniciar aplicação minimizada @@ -232,144 +242,144 @@ Minimizar ao fechar - + Number properties Propriedades do número - + Display unread message count Exibir contador de mensagens não lidas - + Number color Cor do número - + Number size Tamanho do número - + Alignment Alinhamento - + Top left Canto superior esquerdo - + Top centre Centro superior - + Top right Canto superior direito - + Middle left Meio esquerdo - + Middle centre Centro médio - + Middle right Meio à direita - + Bottom left Canto inferior esquerdo - + Bottom centre Centro inferior - + Bottom right Canto inferior direito - + Margins (left, top, right, bottom): Margens (esquerdo, superior, direito, inferior): - + Startup delay Atraso de inicialização - + Count type Tipo do contador - + Unread Não lidos - + New Novos - + Mail E-mail - + Use the preferences dialog in Thunderbird to select the accounts and folders Use a janela de preferências no Thunderbird para selecionar as contas e pastas - + Debug Depuração - + Display debug window Mostrar janela de depuração - + Save Salvar - + Cancel Cancelar - + Minimize to tray Minimizar para a tray - - + + Open Image Abrir imagem - - + + Image Files (*.png *.jpg *.bmp) Arquivo de imagem (*.png *.jpg *.bmp) @@ -377,27 +387,27 @@ SysTrayX - + &Show/Hide &Exibir/Ocultar - + &Preferences &Preferências - + &About &Sobre - + &Quit &Sair - + Close Fechar diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.qm index 9fcf127993040fe2134e912e98883877303be1b9..f5945dde62e1722a9b123d987e9dcf435343ff81 100644 GIT binary patch delta 594 zcmeA-K4NNavm-^~)cZM8&nn97PguD3?s5hO2G*j|_@GcH1_q`CAkP4ZK>$cI=`k>b z9A{t<(4D9&XC(BSLA!^AfkC{J!B|)js6vs!%WNu8`+5j1{*S?H=XM4Lwu21bfualy zLJ|{e<-A0a81;GfF);AyGn!Q|Vqg%IVZ8G1I|BoU7n9n>6b1&KE++S|D?s`xQ^m3= z3=E>`Ov|So0ouaP^eJOH&<*~~{O>+7F!1l3c-M?eU@xomOBDtNVe`qdjBfR!MQp5n zK+PPR*wpoahKbx~)92U%biyw-M-@p12F?<;`EQp3#iz0@3=0Jsx}9xv<1GdT?iuVB zs}2DT=U_jXuF1f_yO;f}(L4qQ_C*|B{9l3eFOFWNIG{QUjzg9}bA;D%c6j~*dbykH zwy-kL6G>cm?p^`5kbwXI delta 324 zcmX?N+HWjsvm-^~)cZM8&nn97PguD3t`h?TQ@})dF(!VYiRN-#f)5z9dsrA4#PTM_ ziwTK6X7Jj%oq>VvAcJ?HC3^@F);AWoA}<0i+>TT^h*^61|gZr`iyQ)BH?VTeODM5I5x4V>!mO-2p?h7 z=hytiX;OAX9?T PreferencesDialog - + SysTray-X Preferences Настройки SysTray-X - + Default icon Иконка по умолчанию - - + + Icon Иконка - - + + Minimize main to tray, close children + Свернуть главное окно в трей, закрыть остальные + + + + Minimize all windows to tray + Свернуть все окна в трей + + + + Default Thunderbird Стандартная Thunderbird - + Lookthrough icon Прозрачная иконка - - + + Custom icon Своя иконка - - + + Choose Выбрать - + KDE integration (Hide) Интеграция с KDE (Скрыть) - + Mail notification icon Иконка уведомления - + Blank icon Пустая иконка - + New mail icon Иконка "Новые письма" - + No icon Без иконки (только цифры) - + Theme Tема - + Light Светлая - + Dark Темная - + Windows Окна - + Close При закрытии - + Restore startup positions Восстановить положение окон при запуске - + Minimize Свернуть - + Default minimize Need documentation what methods do... Свернуть окно @@ -200,27 +210,27 @@ Свернуть в трей, вариант 1 - + Minimize to tray, method 2 Свернуть в трей, вариант 2 - + Default close Закрыть - + Minimize main, close children Свернуть главное окно, закрыть другие - + Minimize all windows Свернуть все окна - + Start application minimized Запуск приложения свернутым @@ -229,144 +239,144 @@ Сворачивать при закрытии - + Number properties Настройки индикатора кол-ва - + Display unread message count Показывать кол-во непрочитанных писем - + Number color Цвет числа - + Number size Размер числа - + Alignment Выравнивание - + Top left Верхний левый - + Top centre Верхний центр - + Top right Верхний правый - + Middle left Средний левый - + Middle centre Средний центральный - + Middle right Средний правый - + Bottom left Нижний левый - + Bottom centre Нижний центральный - + Bottom right Нижний правый - + Margins (left, top, right, bottom): Отступ (левый, Верхний, правый, Нижний): - + Startup delay Задержка запуска - + Count type Алгоритм подсчета - + Unread Непрочитанные - + New Новые - + Mail Письма - + Use the preferences dialog in Thunderbird to select the accounts and folders Используйте диалоговое окно настроек в Thunderbird, чтобы выбрать учетные записи и папки - + Debug Отладка - + Display debug window Показывать окно отладки - + Save Сохранить - + Cancel Отменить - + Minimize to tray Свернуть в трей - - + + Open Image Открыть изображение - - + + Image Files (*.png *.jpg *.bmp) Файлы изображений (*.png *.jpg *.bmp) @@ -374,27 +384,27 @@ SysTrayX - + &Show/Hide &Показать/Скрыть - + &Preferences &Настройки - + &About &О приложении - + &Quit &Выход - + Close Закрыть diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts index a166245..9961e7b 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts index d2c314a..d12fd9a 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts index 6c78a98..dfe69ef 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts index 4ffcbd5..66409fd 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts @@ -91,273 +91,283 @@ PreferencesDialog - + SysTray-X Preferences - + Default icon - - + + Icon - - + + Default Thunderbird - + Lookthrough icon - - + + Custom icon - - + + Choose - + KDE integration (Hide) - + Mail notification icon - + Blank icon - + New mail icon - + No icon - + Theme - + Light - + Dark - + Windows - + Minimize - + Close - + Default minimize - + Minimize to tray, method 2 - + Default close - + + Minimize main to tray, close children + + + + + Minimize all windows to tray + + + + Minimize main, close children - + Minimize all windows - + Start application minimized - + Restore startup positions - + Number properties - + Display unread message count - + Number color - + Number size - + Alignment - + Top left - + Top centre - + Top right - + Middle left - + Middle centre - + Middle right - + Bottom left - + Bottom centre - + Bottom right - + Margins (left, top, right, bottom): - + Startup delay - + Count type - + Unread - + New - + Mail - + Use the preferences dialog in Thunderbird to select the accounts and folders - + Debug - + Display debug window - + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -365,27 +375,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/SysTray-X-app/preferences.cpp b/app/SysTray-X/SysTray-X-app/preferences.cpp index 0ac2a9c..7230af2 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.cpp +++ b/app/SysTray-X/SysTray-X-app/preferences.cpp @@ -557,6 +557,32 @@ void Preferences::setMinimizeType( MinimizeType minimize_type ) } +/* + * Get the minimize type + */ +Preferences::MinimizeIconType Preferences::getMinimizeIconType() const +{ + return m_minimize_icon_type; +} + + +/* + * Set the minimize type. + */ +void Preferences::setMinimizeIconType( MinimizeIconType minimize_icon_type ) +{ + if( m_minimize_icon_type != minimize_icon_type) + { + m_minimize_icon_type = minimize_icon_type; + + /* + * Tell the world the new preference + */ + emit signalMinimizeIconTypeChange(); + } +} + + /* * Get the start minmized pref. */ diff --git a/app/SysTray-X/SysTray-X-app/preferences.h b/app/SysTray-X/SysTray-X-app/preferences.h index 5d5bc30..9af258b 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.h +++ b/app/SysTray-X/SysTray-X-app/preferences.h @@ -28,6 +28,8 @@ class Preferences : public QObject */ enum CloseType { PREF_DEFAULT_CLOSE_WINDOWS = 0, + PREF_MINIMIZE_MAIN_TRAY_CLOSE_CHILDREN_WINDOWS, + PREF_MINIMIZE_ALL_WINDOWS_TRAY, PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS, PREF_MINIMIZE_ALL_WINDOWS }; @@ -41,6 +43,14 @@ class Preferences : public QObject PREF_MINIMIZE_METHOD_2 }; + /* + * Minimize icon types + */ + enum MinimizeIconType { + PREF_DEFAULT_MINIMIZE_ICON = 0, + PREF_MINIMIZE_TRAY_ICON + }; + enum DefaultIconType { PREF_DEFAULT_ICON_DEFAULT = 0, PREF_DEFAULT_ICON_HIDE, @@ -378,9 +388,23 @@ class Preferences : public QObject /** * @brief setMinimizeType. Set the minimize type. * - * @param icon_type The minimize type. + * @param minimize_type The minimize type. */ - void setMinimizeType( MinimizeType icon_type ); + void setMinimizeType( MinimizeType minimize_type ); + + /** + * @brief getMinimizeIconType. Get the minimize icon type. + * + * @return The minimize icon type. + */ + MinimizeIconType getMinimizeIconType() const; + + /** + * @brief setMinimizeType. Set the minimize icon type. + * + * @param minimize_icon_type The minimize icon type. + */ + void setMinimizeIconType( MinimizeIconType minimize_icon_type ); /** * @brief getStartMinimized. Get the start minimized state. @@ -559,6 +583,11 @@ class Preferences : public QObject */ void signalMinimizeTypeChange(); + /** + * @brief signalMinimizeIconTypeChange. Signal a minimize icon type change. + */ + void signalMinimizeIconTypeChange(); + /** * @brief signalStartMinimizedChange. Signal a start minimized state change. */ @@ -681,6 +710,11 @@ class Preferences : public QObject */ MinimizeType m_minimize_type; + /** + * @brief m_minimize_icon_type. Selected minimize icon type. + */ + MinimizeIconType m_minimize_icon_type; + /** * @brief m_start_minimized. Start TB minimized. */ diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui index ea3c08e..595953b 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.ui +++ b/app/SysTray-X/SysTray-X-app/preferences.ui @@ -6,10 +6,16 @@ 0 0 - 568 - 520 + 555 + 531 + + + 0 + 0 + + SysTray-X Preferences @@ -17,213 +23,264 @@ :/files/icons/SysTray-X.png:/files/icons/SysTray-X.png - + - - - 2 - - - - Windows - - - - - - - - Minimize - - - - - - - - Default minimize - - - false - - - minimizeTypeGroup - - - - - - - Minimize to tray - - - true - - - minimizeTypeGroup - - - - - - - Minimize to tray, method 2 - - - minimizeTypeGroup - - - - - - - - - - - - Close - - - - - - - - Default close - - - closeTypeGroup - - - - - - - Minimize main, close children - - - true - - - closeTypeGroup - - - - - - - Minimize all windows - - - false - - - closeTypeGroup - - - - - - - - - - - - - - Start application minimized - - - - - - - Restore startup positions - - - - - - - - - - - Qt::Horizontal + + + + + 0 + + + + Windows + + + + + 10 + 10 + 215 + 301 + - - - 296 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 198 - - - - - - - - - Icon - - - - - - Default icon - - + - + + + Minimize + + + + + + Default minimize + + + false + + + minimizeTypeGroup + + + + + + + Minimize to tray + + + true + + + minimizeTypeGroup + + + + + + + Minimize to tray, method 2 + + + minimizeTypeGroup + + + + + + + + Icon - + - + + + Default minimize + + + false + + + minimizeIconTypeGroup + + + + + + + Minimize to tray + + + true + + + minimizeIconTypeGroup + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 231 + 10 + 274 + 299 + + + + + + + Close + + + + + + Default close + + + closeTypeGroup + + + + + + + Minimize main to tray, close children + + + true + + + closeTypeGroup + + + + + + + Minimize all windows to tray + + + false + + + closeTypeGroup + + + + + + + Minimize main, close children + + + false + + + closeTypeGroup + + + + + + + Minimize all windows + + + false + + + closeTypeGroup + + + + + + + + + + + + Start application minimized + + + + + + + Restore startup positions + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Icon + + + + + + Default icon + + + + + + Icon + + - - - Default Thunderbird - - - true - - - defaultIconTypeGroup - - - - - - - Lookthrough icon - - - defaultIconTypeGroup - - - - - + - + - Custom icon + Default Thunderbird + + + true defaultIconTypeGroup @@ -231,636 +288,660 @@ - + - + Lookthrough icon + + defaultIconTypeGroup + - - - Choose - - - false - - + + + + + Custom icon + + + defaultIconTypeGroup + + + + + + + + + + + + + + Choose + + + false + + + + - - - - - - - - KDE integration (Hide) - - - false - - - - - - - - - - - - Number properties - - - - + + + + - Display unread message count + KDE integration (Hide) - true + false - - - - + + + + + + + + + Number properties + + + + + + Display unread message count + + + true + + + + + - - - Number color - - + + + + + Number color + + + + + + + Qt::NoFocus + + + + + + + - - - Qt::NoFocus - - - - - + + + + + Number size + + + + + + + 1 + + + 999 + + + 10 + + + + + + + + + + + Alignment + + + + + + + 4 + + + + Top left + + + + + Top centre + + + + + Top right + + + + + Middle left + + + + + Middle centre + + + + + Middle right + + + + + Bottom left + + + + + Bottom centre + + + + + Bottom right + + + + + - - + + - + - Number size + Margins (left, top, right, bottom): - + + + + + 999 + + + + + + + 999 + + + + + + + 999 + + + + + + + 999 + + + + + + + + + + + + + Startup delay + + + + + - 1 + 0 - 999 + 99 - 10 + 5 + + + + + + + Count type + + - + - + - Alignment + Unread + + true + + + countTypeGroup + - - - 4 + + + New - - - Top left - - - - - Top centre - - - - - Top right - - - - - Middle left - - - - - Middle centre - - - - - Middle right - - - - - Bottom left - - - - - Bottom centre - - - - - Bottom right - - + + countTypeGroup + - - - - - - - Margins (left, top, right, bottom): - - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Theme + + + + - - - 999 + + + Light + + true + + + themeGroup + - - - 999 + + + Dark - - - - - - 999 - - - - - - - 999 + + false + + themeGroup + - - - + + + + + + + + Mail notification icon + + + + + + QLayout::SetFixedSize + - + - Startup delay + Blank icon + + + true + + + iconTypeGroup + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QLayout::SetFixedSize + + + + + New mail icon + + + iconTypeGroup + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QLayout::SetMaximumSize + + + + + Custom icon + + + iconTypeGroup + + + + + + + - - - 0 + + + Choose - - 99 - - - 5 + + false + + + + + + No icon + + + iconTypeGroup + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Default Thunderbird + + + iconTypeGroup + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + - - - Count type + + + Qt::Horizontal - - - - - - - Unread - - - true - - - countTypeGroup - - - - - - - New - - - countTypeGroup - - - - - - - + + + 1 + 20 + + + - - + + Qt::Vertical 20 - 40 + 0 - - - - Theme + + + + + Mail + + + + + + Use the preferences dialog in Thunderbird to select the accounts and folders + + + true + + + + + + + Qt::Horizontal + + + + 265 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 464 + + + + + + + + + Debug + + + + + + Display debug window + + + + + + + Qt::Horizontal + + + + 358 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 485 + + + + + + + + + + + + + + Qt::Horizontal + + + + 369 + 20 + + + + + + + + + + Cancel + + + + + + + Save - - - - - - - Light - - - true - - - themeGroup - - - - - - - Dark - - - false - - - themeGroup - - - - - - - - - - Mail notification icon - - - - - - QLayout::SetFixedSize - - - - - Blank icon - - - true - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QLayout::SetFixedSize - - - - - New mail icon - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QLayout::SetMaximumSize - - - - - Custom icon - - - iconTypeGroup - - - - - - - - - - - - - - Choose - - - false - - - - - - - - - - - No icon - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Default Thunderbird - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Qt::Horizontal - - - - 1 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - Mail - - - - - - Use the preferences dialog in Thunderbird to select the accounts and folders - - - true - - - - - - - Qt::Horizontal - - - - 265 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 464 - - - - - - - - - Debug - - - - - - Display debug window - - - - - - - Qt::Horizontal - - - - 358 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 485 - - - - - - - - - - - - - - Qt::Horizontal - - - - 369 - 20 - - - - - - - - - - Cancel - - - - - - - Save - - - @@ -872,11 +953,12 @@ + - - + + diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp index 617e856..314d71f 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp @@ -43,6 +43,8 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->closeTypeGroup->setId( m_ui->defaultCloseWindowsRadioButton, Preferences::PREF_DEFAULT_CLOSE_WINDOWS); m_ui->closeTypeGroup->setId( m_ui->minimizeMainCloseChildrenWindowsRadioButton, Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS ); m_ui->closeTypeGroup->setId( m_ui->minimizeAllWindowsRadioButton, Preferences::PREF_MINIMIZE_ALL_WINDOWS ); + m_ui->closeTypeGroup->setId( m_ui->minimizeMainTrayCloseChildrenWindowsRadioButton, Preferences::PREF_MINIMIZE_MAIN_TRAY_CLOSE_CHILDREN_WINDOWS ); + m_ui->closeTypeGroup->setId( m_ui->minimizeAllTrayWindowsRadioButton, Preferences::PREF_MINIMIZE_ALL_WINDOWS_TRAY ); /* * Set minimize type button Ids @@ -53,6 +55,12 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->minimizeMethod2RadioButton->hide(); + /* + * Set minimize type button Ids + */ + m_ui->minimizeIconTypeGroup->setId( m_ui->defaultMinimizeIconRadioButton, Preferences::PREF_DEFAULT_MINIMIZE_ICON); + m_ui->minimizeIconTypeGroup->setId( m_ui->minimizeTrayIconRadioButton, Preferences::PREF_MINIMIZE_TRAY_ICON ); + #ifdef Q_OS_WIN m_ui->hideDefaultIconCheckBox->hide(); @@ -144,12 +152,14 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi /* * Dialog on top */ +/* Qt::WindowFlags flags = windowFlags(); flags |= Qt::WindowStaysOnTopHint; #ifdef Q_OS_UNIX flags |= Qt::X11BypassWindowManagerHint; #endif setWindowFlags( flags ); +*/ } @@ -190,7 +200,6 @@ void PreferencesDialog::keyPressEvent( QKeyEvent *event ) } - /* * Set the debug state */ @@ -209,6 +218,15 @@ void PreferencesDialog::setMinimizeType( Preferences::MinimizeType minimize_t } +/* + * Set the minimize icon type + */ +void PreferencesDialog::setMinimizeIconType( Preferences::MinimizeIconType minimize_icon_type ) +{ + ( m_ui->minimizeIconTypeGroup->button( minimize_icon_type ) )->setChecked( true ); +} + + /* * Set the start minimized state */ @@ -438,6 +456,7 @@ void PreferencesDialog::slotAccept() m_pref->setIconData( m_tmp_icon_data ); m_pref->setMinimizeType( static_cast< Preferences::MinimizeType >( m_ui->minimizeTypeGroup->checkedId() ) ); + m_pref->setMinimizeIconType( static_cast< Preferences::MinimizeIconType >( m_ui->minimizeIconTypeGroup->checkedId() ) ); m_pref->setStartMinimized( m_ui->startMinimizedCheckBox->isChecked() ); m_pref->setRestoreWindowPositions( m_ui->restorePositionscheckBox->isChecked() ); m_pref->setCloseType( static_cast< Preferences::CloseType >( m_ui->closeTypeGroup->checkedId() ) ); @@ -505,6 +524,7 @@ void PreferencesDialog::slotReject() slotIconDataChange(); setMinimizeType( m_pref->getMinimizeType() ); + setMinimizeIconType( m_pref->getMinimizeIconType() ); setStartMinimized( m_pref->getStartMinimized() ); setRestoreWindowPositions( m_pref->getRestoreWindowPositions() ); setCloseType( m_pref->getCloseType() ); @@ -621,6 +641,15 @@ void PreferencesDialog::slotMinimizeTypeChange() } +/* + * Handle the minimize icon type change signal + */ +void PreferencesDialog::slotMinimizeIconTypeChange() +{ + setMinimizeIconType( m_pref->getMinimizeIconType() ); +} + + /* * Handle the start minimized change signal */ diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.h b/app/SysTray-X/SysTray-X-app/preferencesdialog.h index 6d0ae22..ca54b56 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.h +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.h @@ -71,6 +71,13 @@ class PreferencesDialog : public QDialog */ void setMinimizeType( Preferences::MinimizeType minimize_type ); + /** + * @brief setMinimizeIconType. Set the minimize icon type. + * + * @param minimize_icon_type The minimize icon type. + */ + void setMinimizeIconType( Preferences::MinimizeIconType minimize_icon_type ); + /** * @brief setStartMinimized. Set the start minimized state. * @@ -233,6 +240,11 @@ class PreferencesDialog : public QDialog */ void slotMinimizeTypeChange(); + /** + * @brief slotMinimizeIconTypeChange. Slot for handling minimize icon type change signals. + */ + void slotMinimizeIconTypeChange(); + /** * @brief slotStartMinimizedChange. Slot for handling start minimized change signals. */ diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index 6561c50..914ec41 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -109,6 +109,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) * Connect preferences signals */ connect( m_preferences, &Preferences::signalMinimizeTypeChange, m_win_ctrl, &WindowCtrl::slotMinimizeTypeChange ); + connect( m_preferences, &Preferences::signalMinimizeIconTypeChange, m_win_ctrl, &WindowCtrl::slotMinimizeIconTypeChange ); + connect( m_preferences, &Preferences::signalCloseTypeChange, m_win_ctrl, &WindowCtrl::slotCloseTypeChange ); connect( m_preferences, &Preferences::signalStartMinimizedChange, m_win_ctrl, &WindowCtrl::slotStartMinimizedChange ); connect( m_preferences, &Preferences::signalBrowserVersion, m_pref_dialog, &PreferencesDialog::slotBrowserVersion ); @@ -125,6 +127,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalCountTypeChange, m_pref_dialog, &PreferencesDialog::slotCountTypeChange ); connect( m_preferences, &Preferences::signalStartupDelayChange, m_pref_dialog, &PreferencesDialog::slotStartupDelayChange ); connect( m_preferences, &Preferences::signalMinimizeTypeChange, m_pref_dialog, &PreferencesDialog::slotMinimizeTypeChange ); + connect( m_preferences, &Preferences::signalMinimizeIconTypeChange, m_pref_dialog, &PreferencesDialog::slotMinimizeIconTypeChange ); connect( m_preferences, &Preferences::signalStartMinimizedChange, m_pref_dialog, &PreferencesDialog::slotStartMinimizedChange ); connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_pref_dialog, &PreferencesDialog::slotRestoreWindowPositionsChange ); connect( m_preferences, &Preferences::signalCloseTypeChange, m_pref_dialog, &PreferencesDialog::slotCloseTypeChange ); @@ -143,6 +146,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalNumberMarginsChange, m_link, &SysTrayXLink::slotNumberMarginsChange ); connect( m_preferences, &Preferences::signalCountTypeChange, m_link, &SysTrayXLink::slotCountTypeChange ); connect( m_preferences, &Preferences::signalMinimizeTypeChange, m_link, &SysTrayXLink::slotMinimizeTypeChange ); + connect( m_preferences, &Preferences::signalMinimizeIconTypeChange, m_link, &SysTrayXLink::slotMinimizeIconTypeChange ); connect( m_preferences, &Preferences::signalStartupDelayChange, m_link, &SysTrayXLink::slotStartupDelayChange ); connect( m_preferences, &Preferences::signalStartMinimizedChange, m_link, &SysTrayXLink::slotStartMinimizedChange ); connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_link, &SysTrayXLink::slotRestoreWindowPositionsChange ); @@ -609,6 +613,8 @@ void SysTrayX::slotShutdown() case Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS: case Preferences::PREF_MINIMIZE_ALL_WINDOWS: + case Preferences::PREF_MINIMIZE_MAIN_TRAY_CLOSE_CHILDREN_WINDOWS: + case Preferences::PREF_MINIMIZE_ALL_WINDOWS_TRAY: { m_link->sendShutdown(); break; diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp index 1b10a11..dbfefa6 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp @@ -713,6 +713,16 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref ) m_pref->setMinimizeType( minimize_type ); } + if( pref.contains( "minimizeIconType" ) && pref[ "minimizeIconType" ].isString() ) + { + Preferences::MinimizeIconType minimize_icon_type = static_cast< Preferences::MinimizeIconType >( pref[ "minimizeIconType" ].toString().toInt() ); + + /* + * Store the new minimize type + */ + m_pref->setMinimizeIconType( minimize_icon_type ); + } + if( pref.contains( "startMinimized" ) && pref[ "startMinimized" ].isString() ) { bool start_minimized = pref[ "startMinimized" ].toString() == "true"; @@ -806,6 +816,7 @@ void SysTrayXLink::EncodePreferences( const Preferences& pref ) QJsonObject prefObject; prefObject.insert("debug", QJsonValue::fromVariant( QString( pref.getDebug() ? "true" : "false" ) ) ); prefObject.insert("minimizeType", QJsonValue::fromVariant( QString::number( pref.getMinimizeType() ) ) ); + prefObject.insert("minimizeIconType", QJsonValue::fromVariant( QString::number( pref.getMinimizeIconType() ) ) ); prefObject.insert("startMinimized", QJsonValue::fromVariant( QString( pref.getStartMinimized() ? "true" : "false" ) ) ); prefObject.insert("restorePositions", QJsonValue::fromVariant( QString( pref.getRestoreWindowPositions() ? "true" : "false" ) ) ); prefObject.insert("closeType", QJsonValue::fromVariant( QString::number( pref.getCloseType() ) ) ); @@ -887,6 +898,18 @@ void SysTrayXLink::slotMinimizeTypeChange() } +/* + * Handle the minimize icon type change signal + */ +void SysTrayXLink::slotMinimizeIconTypeChange() +{ + if( m_pref->getAppPrefChanged() ) + { + sendPreferences(); + } +} + + /* * Handle a start minimized state change signal */ diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.h b/app/SysTray-X/SysTray-X-app/systrayxlink.h index 24e381b..981ff87 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.h +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.h @@ -253,6 +253,11 @@ class SysTrayXLink : public QObject */ void slotMinimizeTypeChange(); + /** + * @brief slotMinimizeIconTypeChange. Slot for handling minimize icon type change signals. + */ + void slotMinimizeIconTypeChange(); + /** * @brief slotStartMinimizedChange. Handle a change in start minimized state. */ diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp index 2a54945..de70510 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp @@ -235,6 +235,42 @@ Preferences::MinimizeType WindowCtrlUnix::getMinimizeType() const } +/* + * Set the minimize icon type + */ +void WindowCtrlUnix::setMinimizeIconType( Preferences::MinimizeIconType type ) +{ + m_minimize_icon_type = type; +} + + +/* + * Get the minimize icon type + */ +Preferences::MinimizeIconType WindowCtrlUnix::getMinimizeIconType() const +{ + return m_minimize_icon_type; +} + + +/* + * Set the minimize type + */ +void WindowCtrlUnix::setCloseType( Preferences::CloseType type ) +{ + m_close_type = type; +} + + +/* + * Get the close type + */ +Preferences::CloseType WindowCtrlUnix::getCloseType() const +{ + return m_close_type; +} + + /* * Get the parent pid of SysTray-X, TB hopefully */ @@ -744,6 +780,73 @@ void WindowCtrlUnix::minimizeWindow( quint64 window ) } +/* + * Minimize a window + */ +void WindowCtrlUnix::minimizeWindow( quint64 window, TargetType targetType ) +{ +#ifdef DEBUG_DISPLAY_ACTIONS + emit signalConsole( "Minimize" ); +#endif + + /* + * Save the hints + */ + GetWMNormalHints( m_display, window, &m_tb_window_hints[ window ] ); + + /* + * Minimize the window + */ + IconifyWindow( m_display, window ); + + /* + * Sync the events + */ + Sync( m_display ); + + if( targetType == TargetType::TYPE_WINDOW_TO_SYSTEMTRAY ) + { +#ifdef DEBUG_DISPLAY_ACTIONS + emit signalConsole( "Withdraw window" ); +#endif + + /* + * Set the flags (GNOME, Wayland?) + */ + SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_SKIP_TASKBAR ); + SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_SKIP_PAGER ); + + Flush( m_display ); + + /* + * Remove from taskbar and task switchers + */ + WithdrawWindow( m_display, window ); + + /* + * Store the window state + */ + m_tb_window_states[ window ] = Preferences::STATE_DOCKED; + } + else + { + /* + * Store the window state + */ + m_tb_window_states[ window ] = Preferences::STATE_MINIMIZED; + } + + /* + * Flush the pipes + */ + Sync( m_display ); + +#ifdef DEBUG_DISPLAY_ACTIONS_END + emit signalConsole( "Minimize done" ); +#endif +} + + /* * Normalize a window */ diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h index 138013c..38ad699 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h +++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h @@ -40,6 +40,15 @@ class WindowCtrlUnix : public QObject public: + /* + * Target types + */ + enum TargetType + { + TYPE_WINDOW_TO_TASKBAR = 0, + TYPE_WINDOW_TO_SYSTEMTRAY + }; + /* * Window types */ @@ -152,6 +161,34 @@ class WindowCtrlUnix : public QObject */ Preferences::MinimizeType getMinimizeType() const; + /** + * @brief setMinimizeIconType + * + * @param type Set the minimize icon type. + */ + void setMinimizeIconType( Preferences::MinimizeIconType type ); + + /** + * @brief getMinimizeIconType + * + * @return The minimize icon type. + */ + Preferences::MinimizeIconType getMinimizeIconType() const; + + /** + * @brief setCloseType + * + * @param type Set the close type. + */ + void setCloseType( Preferences::CloseType type ); + + /** + * @brief getCloseType + * + * @return The close type. + */ + Preferences::CloseType getCloseType() const; + /** * @brief getPpid. Get the parent process id. * @@ -244,6 +281,14 @@ class WindowCtrlUnix : public QObject */ void minimizeWindow( quint64 window ); + /** + * @brief minimizeWindow. Minimize window. + * + * @param window The window. + * @param targetType Where to minimize. + */ + void minimizeWindow( quint64 window, TargetType targetType ); + /** * @brief normalizeWindow. Normalize window. * @@ -345,6 +390,16 @@ class WindowCtrlUnix : public QObject * @brief m_minimize_type. Minimize type. */ Preferences::MinimizeType m_minimize_type; + + /** + * @brief m_minimize_icon_type. Minimize icon type. + */ + Preferences::MinimizeIconType m_minimize_icon_type; + + /** + * @brief m_close_type. Close type. + */ + Preferences::CloseType m_close_type; }; #endif // WINDOWCTRLUNIX_H diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp index a729491..1dc45a1 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp @@ -38,6 +38,8 @@ WindowCtrl::WindowCtrl( Preferences* pref, QObject *parent ) * Initialize */ setMinimizeType( m_pref->getMinimizeType() ); + setMinimizeIconType( m_pref->getMinimizeIconType() ); + setCloseType( m_pref->getCloseType() ); m_show_hide_active = false; /* @@ -179,6 +181,22 @@ void WindowCtrl::slotMinimizeTypeChange() setMinimizeType( m_pref->getMinimizeType() ); } +/* + * Handle change in minimize icon type change + */ +void WindowCtrl::slotMinimizeIconTypeChange() +{ + setMinimizeIconType( m_pref->getMinimizeIconType() ); +} + +/* + * Handle change in close type change + */ +void WindowCtrl::slotCloseTypeChange() +{ + setCloseType( m_pref->getCloseType() ); +} + /* * Handle change in start minimized state @@ -224,9 +242,22 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state ) QList< quint64 > win_ids = getWinIds(); - if( state == Preferences::STATE_MINIMIZED || state == Preferences::STATE_MINIMIZED_ALL ) + /* + * Minimize on startup always to the tray + */ + TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY; + if( state == Preferences::STATE_MINIMIZED_ALL ) { updatePositions(); + + /* + * Minimize target on close depends on preference + */ + Preferences::CloseType closeType = getCloseType(); + if( closeType == Preferences::PREF_MINIMIZE_ALL_WINDOWS || closeType == Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS ) + { + targetType = TargetType::TYPE_WINDOW_TO_TASKBAR; + } } /* @@ -240,11 +271,7 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state ) .arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) ); #endif - if( ( getWindowState( win_ids.at( i ) ) != Preferences::STATE_MINIMIZED && getMinimizeType() == Preferences::PREF_DEFAULT_MINIMIZE ) || - ( getWindowState( win_ids.at( i ) ) != Preferences::STATE_DOCKED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) ) - { - minimizeWindow( win_ids.at( i ) ); - } + minimizeWindow( win_ids.at( i ), targetType ); } } else @@ -322,6 +349,12 @@ void WindowCtrl::slotShowHide() */ updatePositions(); + TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY; + if( getMinimizeIconType() == Preferences::PREF_DEFAULT_MINIMIZE_ICON ) + { + targetType = TargetType::TYPE_WINDOW_TO_TASKBAR; + } + /* * Get the window ids */ @@ -342,7 +375,7 @@ void WindowCtrl::slotShowHide() } else { - minimizeWindow( win_ids.at( i ) ); + minimizeWindow( win_ids.at( i ), targetType ); } } diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.h b/app/SysTray-X/SysTray-X-app/windowctrl.h index d60200d..9dd2945 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.h +++ b/app/SysTray-X/SysTray-X-app/windowctrl.h @@ -81,6 +81,16 @@ class WindowCtrl : public QObject */ void slotMinimizeTypeChange(); + /** + * @brief slotMinimizeIconTypeChange. Handle the minimize icon type signal. + */ + void slotMinimizeIconTypeChange(); + + /** + * @brief slotCloseTypeChange. Handle the close type signal. + */ + void slotCloseTypeChange(); + /** * @brief slotStartMinimizedChange. Handle the start minimized signal. */ diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json index 0805b64..7221578 100644 --- a/webext/_locales/de/messages.json +++ b/webext/_locales/de/messages.json @@ -64,6 +64,21 @@ "description": "Minimize option 1" }, + "windows_min_icon_options": { + "message": "Symbol", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Standard Minimieren", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "In Systemleiste verbergen", + "description": "Minimize option 1" + }, + "windows_min_to_tray_1": { "message": "In Systemleiste verbergen, Methode 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Hauptfenster in Systemleiste verbergen, Kinderfenster schließen", + "description": "Close option 3" + }, + + "windows_close_tray_2": { + "message": "Alle Fenster in Systemleiste verbergen", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Anwendung minimiert starten", "description": "Start minimized" diff --git a/webext/_locales/el/messages.json b/webext/_locales/el/messages.json index 8278ad0..a44c7ed 100644 --- a/webext/_locales/el/messages.json +++ b/webext/_locales/el/messages.json @@ -64,6 +64,21 @@ "description": "Minimize to tray" }, + "windows_min_icon_options": { + "message": "Εικονίδιο", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Προεπιλεγμένη ελαχιστοποίηση", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Ελαχιστοποίηση στην περιοχή ειδοποιήσεων", + "description": "Minimize to tray" + }, + "windows_min_to_tray_1": { "message": "Μέθοδος 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Ελαχιστοποίηση κυρίως παραθύρου στην περιοχή ειδοποιήσεων, κλείσιμο θυγατρικών", + "description": "Close option 3" + }, + + "windows_tray_2": { + "message": "Ελαχιστοποίηση όλων των παραθύρων στην περιοχή ειδοποιήσεων", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Ελαχιστοποιημένη εκκίνηση της εφαρμογής", "description": "Start minimized" diff --git a/webext/_locales/en-US/messages.json b/webext/_locales/en-US/messages.json index 0cd82e8..38a468f 100644 --- a/webext/_locales/en-US/messages.json +++ b/webext/_locales/en-US/messages.json @@ -64,6 +64,21 @@ "description": "Minimize to tray" }, + "windows_min_icon_options": { + "message": "Icon", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Default minimize", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Minimize to tray", + "description": "Minimize to tray" + }, + "windows_min_to_tray_1": { "message": "Minimize to tray, method 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Minimize main to tray, close children", + "description": "Close option 3" + }, + + "windows_close_tray_2": { + "message": "Minimize all windows to tray", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Start application minimized", "description": "Start minimized" diff --git a/webext/_locales/it/messages.json b/webext/_locales/it/messages.json index 467f6c2..04bce52 100644 --- a/webext/_locales/it/messages.json +++ b/webext/_locales/it/messages.json @@ -64,6 +64,21 @@ "description": "Minimize to tray" }, + "windows_min_icon_options": { + "message": "Icona", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Minimizzazione predefinita", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Minimizza nel vassoio", + "description": "Minimize to tray" + }, + "windows_min_to_tray_1": { "message": "Minimizza nel vassoio, metodo 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Minimizza principale nel vassoio, chiudi sottofinestre", + "description": "Close option 3" + }, + + "windows_close_tray_2": { + "message": "Minimizza tutte le finestre nel vassoio", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Avvia applicazione minimizzata", "description": "Start minimized" diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json index eb8f8e8..bad4550 100644 --- a/webext/_locales/nl/messages.json +++ b/webext/_locales/nl/messages.json @@ -64,6 +64,21 @@ "description": "Minimize option" }, + "windows_min_icon_options": { + "message": "Pictogrammen", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Standaard minimalisatie", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Minimaliseer naar systeemvak", + "description": "Minimize option" + }, + "windows_min_to_tray_1": { "message": "Minimaliseer naar systeemvak, methode 1", "description": "Minimize option 1" @@ -85,15 +100,25 @@ }, "windows_close_1": { - "message": "Minimaliseer hoofdvenster, sluit kindvensters", + "message": "Minimaliseer hoofdvenster naar systeemvak, sluit kindvensters", "description": "Close option 1" }, "windows_close_2": { - "message": "Minimaliseer alle vensters", + "message": "Minimaliseer alle vensters naar systeemvak", "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Minimaliseer hoofdvenster, sluit kindvensters", + "description": "Close option 3" + }, + + "windows_close_tray_2": { + "message": "Minimaliseer alle vensters", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Start programma geminimaliseerd", "description": "Start minimized" diff --git a/webext/_locales/pt-BR/messages.json b/webext/_locales/pt-BR/messages.json index be89b4d..c24b0b5 100644 --- a/webext/_locales/pt-BR/messages.json +++ b/webext/_locales/pt-BR/messages.json @@ -64,6 +64,21 @@ "description": "Minimize" }, + "windows_min_icon_options": { + "message": "Ícone", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Comportamento padrão", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Minimizar para a tray", + "description": "Minimize" + }, + "windows_min_to_tray_1": { "message": "Minimizar para a tray, método 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Minimize o pai para a bandeja, feche os filhos", + "description": "Close option 3" + }, + + "windows_close_tray_2": { + "message": "Minimize todas as janelas para a tray", + "description": "Close option 4" + }, + "windows_start_min": { "message": "Iniciar aplicação minimizada", "description": "Start minimized" diff --git a/webext/_locales/ru/messages.json b/webext/_locales/ru/messages.json index 8a65ce3..ab8c34c 100644 --- a/webext/_locales/ru/messages.json +++ b/webext/_locales/ru/messages.json @@ -64,6 +64,21 @@ "description": "Minimize" }, + "windows_min_icon_options": { + "message": "Иконка", + "description": "Caption for Icon options" + }, + + "windows_min_default_icon": { + "message": "Свернуть окно", + "description": "Minimize option 0" + }, + + "windows_min_to_tray_icon": { + "message": "Свернуть в трей", + "description": "Minimize" + }, + "windows_min_to_tray_1": { "message": "Свернуть в трей, вариант 1", "description": "Minimize option 1" @@ -94,6 +109,16 @@ "description": "Close option 2" }, + "windows_close_tray_1": { + "message": "Свернуть главное окно в трей, закрыть остальные", + "description": "Close option 1" + }, + + "windows_close_tray_2": { + "message": "Свернуть все окна в трей", + "description": "Close option 2" + }, + "windows_start_min": { "message": "Запуск приложения свернутым", "description": "Start minimized" diff --git a/webext/background.js b/webext/background.js index 003f879..badfa69 100644 --- a/webext/background.js +++ b/webext/background.js @@ -580,6 +580,7 @@ SysTrayX.Messaging = { .get([ "debug", "minimizeType", + "minimizeIconType", "closeType", "startMinimized", "restorePositions", @@ -608,6 +609,7 @@ SysTrayX.Messaging = { sendPreferencesStorage: function (result) { const debug = result.debug || "false"; const minimizeType = result.minimizeType || "1"; + const minimizeIconType = result.minimizeIconType || "1"; const closeType = result.closeType || "1"; const startMinimized = result.startMinimized || "false"; const restorePositions = result.restorePositions || "false"; @@ -643,6 +645,7 @@ SysTrayX.Messaging = { preferences: { debug, minimizeType, + minimizeIconType, closeType, startMinimized, restorePositions, @@ -838,6 +841,13 @@ SysTrayX.Link = { }); } + const minimizeIconType = response["preferences"].minimizeIconType; + if (minimizeIconType) { + await storage().set({ + minimizeIconType: minimizeIconType, + }); + } + const closeType = response["preferences"].closeType; if (closeType) { await storage().set({ diff --git a/webext/css/options.css b/webext/css/options.css index 0b880c9..9f11706 100644 --- a/webext/css/options.css +++ b/webext/css/options.css @@ -82,6 +82,14 @@ body { padding: 10px 10px 10px 10px; } +#minimizeiconselect { + width: 25em; + border-style: solid; + border-width: 1px; + margin: 10px 10px 10px 10px; + padding: 10px 10px 10px 10px; +} + #closeselect { width: 25em; border-style: solid; diff --git a/webext/options.html b/webext/options.html index b0c80c2..00b87e1 100644 --- a/webext/options.html +++ b/webext/options.html @@ -80,9 +80,25 @@ > - + + + + + + + + + + + + + @@ -90,7 +106,7 @@ - + @@ -98,6 +114,33 @@ + + + + + + + + +
+ __MSG_windows_min_icon_options__ +
+ + +
+ + +
+