From 03d47fd172a1cabdef4e15e9f70eff354a5fdae6 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Tue, 14 Nov 2023 22:43:51 +0100 Subject: [PATCH] Update translations --- .../SysTray-X-app/languages/SysTray-X.de.qm | Bin 8494 -> 8787 bytes .../SysTray-X-app/languages/SysTray-X.de.ts | 169 ++++++++++-------- .../SysTray-X-app/languages/SysTray-X.el.qm | Bin 8884 -> 9207 bytes .../SysTray-X-app/languages/SysTray-X.el.ts | 169 ++++++++++-------- .../languages/SysTray-X.en-US.qm | Bin 7838 -> 8117 bytes .../languages/SysTray-X.en-US.ts | 169 ++++++++++-------- .../SysTray-X-app/languages/SysTray-X.it.qm | Bin 8608 -> 8905 bytes .../SysTray-X-app/languages/SysTray-X.it.ts | 169 ++++++++++-------- .../SysTray-X-app/languages/SysTray-X.nl.qm | Bin 8324 -> 8603 bytes .../SysTray-X-app/languages/SysTray-X.nl.ts | 169 ++++++++++-------- .../languages/SysTray-X.pt-BR.qm | Bin 8294 -> 8591 bytes .../languages/SysTray-X.pt-BR.ts | 169 ++++++++++-------- .../SysTray-X-app/languages/SysTray-X.ru.qm | Bin 8369 -> 8658 bytes .../SysTray-X-app/languages/SysTray-X.ru.ts | 169 ++++++++++-------- app/SysTray-X/SysTray-X-app/preferences.cpp | 24 +-- app/SysTray-X/SysTray-X-app/preferences.h | 37 ++-- app/SysTray-X/SysTray-X-app/preferences.ui | 104 +++++++---- .../SysTray-X-app/preferencesdialog.cpp | 23 ++- .../SysTray-X-app/preferencesdialog.h | 10 +- app/SysTray-X/SysTray-X-app/systrayx.cpp | 5 +- app/SysTray-X/SysTray-X-app/systrayxlink.cpp | 121 ++++++------- app/SysTray-X/SysTray-X-app/systrayxlink.h | 4 +- app/SysTray-X/SysTray-X-app/windowctrl.cpp | 70 ++------ app/SysTray-X/SysTray-X-app/windowctrl.h | 11 -- webext/_locales/de/messages.json | 19 +- webext/_locales/el/messages.json | 21 ++- webext/_locales/en-US/messages.json | 19 +- webext/_locales/it/messages.json | 19 +- webext/_locales/nl/messages.json | 21 ++- webext/_locales/pt-BR/messages.json | 19 +- webext/_locales/ru/messages.json | 19 +- webext/background.js | 66 +++---- webext/css/options.css | 1 + webext/js/defaults.js | 10 +- webext/js/windowEvent.js | 12 +- webext/options.html | 50 +++++- webext/options.js | 39 ++-- 37 files changed, 1064 insertions(+), 843 deletions(-) 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 792b49a708c4f05eca02075612032dd8e1050cc4..8dade02bb7a95453f7e84ede53188b5a8968cc67 100644 GIT binary patch delta 768 zcmX|9X-E`d7=C8mnLTEAR^3+J9bFfbBE*BrBSG=X(4aKS2twP^(pcAR4-+CqC^E}) z%8Wos$};F;qr)Hl5QF*=9coaCQ6XZ`ri-FkSg%t4_~sjU-{+jUlQo>vW@e__BSSaL zLw?2u$QvPFECJM`V3U6X+7z%|&j7;$V$REfhy(4VA@vcTkZ;=!C|Z&K;QlT6y$CNbVsmn@;VUGfs-B40M9e=nx{Zu50iAF7g!U^q;<~He3a=fI0XcJ zW=59gNxfRO?oAmWypwG!9wD9xS#941z~qt}ZBX||p^PS+P67Fj89tz*Vc^f`ZDbvy`CZs+vNbz!GH=wFfHtFW*9#S?( zQFq!}<-iXgwUe$K+(LB5UR6>b?P)}nD<+jpC#o9r7D>Ndb?X@Ig_+bhue8x#x%#7i zEw$oNkBtvg>VBTD`U;4xeEhjOO4ZC4{^_T%Jb$-k7d9a@n}7fFHDK2BzT9g7JF5vU zJ52;{H5tQA^f8}ncJ3$PpbCx6KTb7omRe<@#YeRhU$TMF7lQnu7YO$X3BQ~~pCP0T z22e^-C||Z=oD*tq(=TBt73w-4liggMCbflPjOixaZemZ=&G-^YwYU<9OpyXvgCu87 z-k5+nm6WdL;;gWv3|2Vl>4JOZ&8;LNaCCGz<%g{vo7>`YTb*u?Lz+>DUW;}~%VbHB zqCpxDw#2NWP!9Vl(pa>Nuvi@qTje3EyRzDDskBQ8dW&Qhk4FWf=)V?X;elfnr&z)L KQ@SW#X8!`tp~&?B delta 603 zcmWlXYe-XJ9LAq>wsUqlXXmJMb2l&8Fl^95*doDEnG20->#``KAPfrZLnc5Yyn!JOB(Ma2!^os6*HOkP-UkYNjC=18pr2&wqB(l+W(ItR z0L2tDG4q3T6>QauWdpSA=J*-n~cH3!yZB@vbEKpPtQ88{y z=`d%^OXPc=v!*G}RK{&dQ@&IaS;u&4EpvEPsuB=be)e3lH(%tP>RW`LS@gYpxLGFlfTnBrVdq7SGsC-;#-E=@Tiju z$i{R^GRAJ4sjaSo=;ti`uHvzMmYYmNp2&j!%H)fZ#mR zN%S7U|91o^92IW#ucCHx!kb^u5kx63WW2)wmlKPcyU5_6xNy9WmiACwxsd`3&0T^sMw&FCV$ZFf9j HJInn82&SRP diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts index a05eaae..2ca7876 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts @@ -102,15 +102,15 @@ SysTray-X Einstellungen - + Default icon Standardsymbol - - - - + + + + Icon Symbol @@ -125,50 +125,50 @@ 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 @@ -195,23 +195,23 @@ Schließen - + Restore startup positions Fensterpositionen wiederherstellen beim Start - + Minimize Minimieren - - + + Default minimize Standard Minimieren - + Minimize to tray, method 2 In Systemleiste verbergen, Methode 2 @@ -231,17 +231,17 @@ Alle Fenster minimieren - + Start application minimized Anwendung minimiert starten - + Invert icon Symbol umkehren - + Number properties Nummereigenschaften @@ -250,213 +250,228 @@ 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 + Start-up + + + + Default startup + Standardstart + + + + Start application in tray + Anwendung in Systemleiste starten + + + Count Zähler - + Show message count Anzahl Nachrichten anzeigen - + Show new indicator Indikator für neue Nachrichten anzeigen - + Startup delay Startverzögerung - + Count type E-Mail-Benachrichtigungstyp - + Unread Ungelesene Nachrichten - + New Neue Nachrichten - + New indicator Neu Indikator - + Icon round Symbol rund - + Icon star Symbol Stern - + Shade Schattierung - + Special options Sonderoptionen - + API count method API-Zählmethode - + Apps Anwendungen - + Close application Stopanwendung - - + + Browse... Durchsuche... - - + + Arguments: Argumente: - + Start application Startanwendung - + 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) - - + + Select application Anwendung auswählen @@ -464,27 +479,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 d18570c5f6786985d244badb78e9bffedba446b5..cb18ac613da9c43e32234ad1a500c4455ae7d229 100644 GIT binary patch delta 810 zcmX|9Ye*DP7(KIhcXoDncGlLw!L4fGV2af^J*Yb;(lZ;j1Lxm7JKO7kgm}~g!pDEqn&EH5$1OoNE>-Yc_Wk7k&$t9kF+Mbowl=ekc!TB5Ve>cZ;?Cywj#m#rhydv&K{XGp(BcQ==C<}LdAYvqLN z)_?R~MDE-4gF}6E>l%aM;0W3KWC%T14EQ`TB>cHUmvtB(lti-B(clPOb+TsI=-zY4rAY9{IoV5#N z6g&;{&N)S!Jtrs2alr0$9LlyivTe>h`%x`LJ(WUPRyJD8ECQ<_oo?3fKT|uO`Oj;w Hbwu+Q3X0zI delta 604 zcmWlXZAep59LAq}w|jTDdw1{J=4y9s1CxYFE{YZzMp-Hu)s!-_l@LY+7L-y(_dx2v09=1`*h%(=RD8v`Ja<1A1uA%V%~MQ zZ63=PXwNqQ+8DIieSqi!xB4$&90GTJ6tE>xa7ha|`#WlFL6-*=^*aFFTU5Mw1_)!= zQkg?4Ew){V0*nNISt+3W!tU97z`_=s>C7Y78pbOP0}DG`h;!jy$U#%vG==P!vg18Hht(C!1igBR2r~^!aByM zy3L#|D+AV1&XJ@%dkMEcN%@Kz-o>mday0R}L@r?r@cD&guYTse!XThG^BeN)v_H?^ z`bu)OoxfeZlgdu>k(LjDd@4N6*n*~E-Pnq5l1~Y3%1@&7372zeR>q7F{g$F>Gz%kZ z$i_ad_w|xaYSlLs6cJ>tzIAgJz+HXcG14uXHGH%zq4oj8r`QBwDiOsaaccKU^j>Tx z`Wmrv{vnkT#Qsnf=?lg8zuzDTS3pda^#J@P$y|4i42Goj6Kw#eO4|bzXx=N;r(-nE zeCZ}b+{}zL6-^NENn`2OBmu>ZiJ6UL*ePqDMu5e0^722&DNvD%M>N#;sC?i*nCg+6 z9?@s8Rmsg=&k4Ltk%~gp%(zEMG&a&Z-B7-#R#EW4VZi-3V%0n_M4WQB9QHfgBUV?O F`v)#*q4od( diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts index 38eef01..32a4eef 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts @@ -102,63 +102,63 @@ Προτιμήσεις 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 Χωρίς εικονίδιο @@ -180,18 +180,18 @@ Παράθυρα - + Minimize Ελαχιστοποίηση - - + + Default minimize Προεπιλεγμένη ελαχιστοποίηση - + Minimize to tray, method 2 Μέθοδος 2 @@ -226,22 +226,22 @@ Ελαχιστοποίηση όλων των παραθύρων - + Start application minimized Ελαχιστοποιημένη εκκίνηση της εφαρμογής - + Restore startup positions Επαναφορά θέσεων παραθύρου κατά την εκκίνηση - + Invert icon Αντιστρέψτε εικονίδιο - + Number properties Ιδιότητες αριθμών @@ -250,213 +250,228 @@ Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας - + 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 + Αρχή + + + + Default startup + Προεπιλεγμένη εκκίνηση + + + + Start application in tray + Εκκινήστε την εφαρμογή στο δίσκο συστήματος + + + Count Μετρητής - + Show message count Προβολή μετρητή αλληλογραφίας - + Show new indicator Εμφάνιση νέας ένδειξης - + Startup delay Καθυστέρηση έναρξης - + Count type Τύπος μετρητή μηνυμάτων - + Unread Μη αναγνωσμένα - + New Νέα - + New indicator Νέος δείκτης - + Icon round Στρογγυλό εικονίδιο - + Icon star Αστέρι εικονίδιο - + Shade Απόχρωση - + Special options Ειδικές επιλογές - + API count method Μέθοδος καταμέτρησης API - + Close application Κλείσιμο αίτησης - - + + Browse... ξεφυλλίζω... - - + + Arguments: Επιχειρήματα: - + Mail Αλληλογραφία - + Use the preferences dialog in Thunderbird to select the accounts and folders Χρησιμοποιήστε το παράθυρο διαλόγου Προτιμήσεις Thunderbird για να επιλέξετε λογαριασμούς και φακέλους - + Debug Αποσφαλμάτωση - + Display debug window Προβολή παραθύρου αποσφαλμάτωσης - - + + Minimize to tray Ελαχιστοποίηση στην περιοχή ειδοποιήσεων - + Apps Εφαρμογές - + Start application Εφαρμογή εκκίνησης - + Save Αποθήκευση - + Cancel Άκυρο - - + + Open Image Άνοιγμα εικόνας - - + + Image Files (*.png *.jpg *.bmp) Αρχεία εικόνας (*.png *.jpg *.bmp) - - + + Select application επιλέξτε εφαρμογή @@ -464,27 +479,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 d9d7a3bd3f9c5df0d88beb26d5c6d3a6520d29e3..1e9625a4edbb5f08205bc99bbcc3207913bc8594 100644 GIT binary patch delta 727 zcmXYvT}V@57{~wTY&-ipo@1_kIa$NBGQpLSk+EuIh6bjYMkK}3iHkW+k2R5$peU`D zc0@}-DavvrU93+px{$1^sL-1%>cODH%J}EiAyO&J-|5m$AH+zWH(;}5`2uS`x~9VWBQ9u z0g5qZ;`a|g`;1-nsuGBsVt1BJ5GR!l4t4>S+w9HmComxK2)j_-1F(LD7+nD3=VdjM zotPx5OfiAD87kW>`I(-o4$qQ*T&KK`*-~JcmkG$p<9$Mi$wiROZ#0nyUH>Q_sDz delta 603 zcmWlXeMnPb6vm%>w|jT5_wL@cxx2Q7fteM9w4z0WSys-nFO5y(dyDH}GDPi99 z&b2KvL*L#C=$oN0>;}Y1a4UWTvK8EwalrBnt}Z=bPxbE6LXI`4^KSp^ zZgcVdjXMB`fsdb=q7X(R(~K5U9vWUOjgdSlbf`awvP9@ErL5#yA@L;#@KeIrN@}B> z6x{=)lT2c(%R`V$#Pb^pluAS#Iz~F{U{T64kEY*S^e#O?DeaP^!ykazFcZ`ds$s)3k;e zxsM@k=C(YU$PjS5v1W6YfSQb%_iG8DQPJOv(=scS%9-P2Sgm-+bad`h_WuXdo+`m% z`V5wJN?Y^+f%{b16Q;?e$7&`JAVa76HMg8Vw1a^2YP?t%6ywu!SdOIaC*nPh`P@H) CL7o-> 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 091fc9d..89ee09f 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 @@ -107,15 +107,15 @@ SysTray-X Preferences - + Default icon Default icon - - - - + + + + Icon Icon @@ -130,50 +130,50 @@ 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 @@ -200,23 +200,23 @@ Close - + Restore startup positions Restore window positions on startup - + Minimize Minimize - - + + Default minimize Default minimize - + Minimize to tray, method 2 Minimize to tray, method 2 @@ -236,17 +236,17 @@ Minimize all windows - + Start application minimized Start application minimized - + Invert icon Invert icon - + Number properties Number properties @@ -255,213 +255,228 @@ 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 + Startup + + + + Default startup + Default startup + + + + Start application in tray + Start application in tray + + + Count Count - + Show message count Show message count - + Show new indicator Show new messages indicator - + Startup delay Startup delay - + Count type Count type - + Unread Unread - + New New - + New indicator New indicator - + Icon round Icon round - + Icon star Icon star - + Shade Shade - + Special options Special options - + API count method API count method - + Apps Apps - + Close application Close application - - + + Browse... Browse... - - + + Arguments: Arguments: - + Start application Start application - + 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) - - + + Select application Select application @@ -469,27 +484,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.it.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm index d9b31e57b623d595c807abebf033d59d49ac5117..64bc6af8791836b8209f6d6caf22fd8df55b687d 100644 GIT binary patch delta 728 zcmX|ojiSg#Vjh!Xt~77F1D{!t7OY}F_t6YXn+9LI6o_xU`}^Znh8 z8|=u|19}%S&-4L|8ChwmfYy(FQ@2PRMCJJyq8?{#!V4fYma(6_2`u+8iS0iCqmAjv zsw4MMW@P>spdOX2{7^vp&9d!zBlK*ORdinfESa*~?E}yuB1INFatV<2glGdnAZ%Dt zGIn#6PGOi8iMvK&nI=Ee2F1Z?@)xJ1z0B4O%QaT%kER%}*_bJiO)a}>E!mjoSR40{ zYRs{Y7!x3HY`G&H2!F(0|3Y$e58Iiyhsw{ezM3(@ZIgx=WA#PlyZ8=3HNZ7$e-bU6 zYl^1TX(qY8uK`-l39f$&(M&TcdpFGqEhN{6kY3_k~ zT(^S4zf@054gFZF@y09s=~S%bpfnh z2rD>6r(h70h8t;{^TMwEWE?snxPy~)3iVQp%$PT(@qbFDoiB*;$37~h6xaPJC48Nj z*dIdgHDcjn46{S5xJQ44-X~VIKc%=iS|OpC>h09}yyw>G8lu(QnVwR*hHQg2y_)Ty-iYBduYCP^C7B}q*>mEN>_ t@tf6IQsQR2oR7_GOyc z&=%{9w4$tpkhsyuhyqcfAStvkCq~7HVJ#e4G|hVY_k9oN{LbNd;lEnY?qo(f=9(87 z(oiBrawZz=)lBfG9_n0&l!UH3V_=3{R~`eB598Jns)53oH7eKG|Y4u@5Y$L3@? zb6Nt7Z@KIQDfoRtUubAaXyu=(vFP}QMo}u*z=jny%gN18wmc0 zQ1bTizQ#5g6i&-cKrvl=1FyT z=@v}oQbXhsftTt6Xs?%*jsfl; DeHx^l 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 d79b66d..587595c 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 @@ -103,63 +103,63 @@ 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 @@ -181,7 +181,7 @@ Finestre - + Minimize Minimizza @@ -191,13 +191,13 @@ Chiudi - - + + Default minimize Minimizzazione predefinita - + Minimize to tray, method 2 Minimizza nel vassoio, metodo 2 @@ -227,22 +227,22 @@ Minimizza tutte le finestre - + Start application minimized Avvia applicazione minimizzata - + Restore startup positions Ripristina le posizioni della finestra all'avvio - + Invert icon Icona inverti - + Number properties Proprietà numero @@ -251,213 +251,228 @@ 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 + Avviare + + + + Default startup + Avvio predefinito + + + + Start application in tray + Minimizza principale nel vassoio + + + Count Conteggio - + Show message count Mostra numero di messaggi - + Show new indicator Mostra nuovo indicatore - + Startup delay Ritardo all'avvio - + Count type Tipo conteggio - + Unread Non letti - + New Nuovi - + New indicator Nuovo indicatore - + Icon round Icona rotonda - + Icon star Stella icona - + Shade Sfumatura - + Special options Opzioni speciali - + API count method Metodo di conteggio API - + Close application Applicazione alla chiusura - - + + Browse... Sfogliare... - - + + Arguments: Argomenti: - + 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 - + Apps Applicazioni - + Start application Applicazione di avvio - + Save Salva - + Cancel Annulla - - + + Open Image Apri immagine - - + + Image Files (*.png *.jpg *.bmp) File immagine (*.png *.jpg *.bmp) - - + + Select application Selezionare l'applicazione @@ -465,27 +480,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 a84f5558e494ed1d77fd159c665e423323e4c77c..d3b1f24a3c691abb0f5daf7aff88d465ebd8a488 100644 GIT binary patch delta 753 zcmZ{iT}V@L7{;G-+|D+4cIM~SrslArq@aD^Lc>rjMTOKXLn>pbeavc*Ecw;%EiOMoU8^7D^@;9H1kk^!L?+V<*d!}Q3sZwC|ykon*q zpv*#6ZZHruj;*H#0DMPI+7>`tfP%@ZfG!Qk+Rfzpk%{9U0)7pQrRow8ILjn;e4+D7 zrYol&@bNNZKflpjE*ts07!Zco^!zdM(XbUgX8~g&d#z&#fe5v*bEW41w%SKKJqHBD zOA5wf44aYb76tO{m4{3bZ$+tm-xTqMqtZ@hQ>O7Ur|?Dq>Nw6kNhwwHTvRM!jGEO*JAVh2AK^U5U(!^WM_y}S$b%WSE$@Ei4=OR>SV?u@!M244%3{z&$qX; zm2i{3uL4)m7B~97o*1Rp-D>rrcNFi9I_`80wMtj#{<;qMKT-ELZ^L@%yz23V5g;sG zJ)L$1kPq_##SLW8#3zq7(q;DX*}DnsAI;n6Cg>7BNG+^Bzfj|Sn@ZSSg6ysb2w4!; z{BY3@=Y^y}A8J`7lq|6ZwO5^6f`Q`|HypV&+_hP7T%B=-dE>~uU)lWoAt zI?ocjsFD(SU33|oa6^O@E_#>1p(HUldbFEM_FK#CqRA~l^%FHZ4C{udJ!vPb?K DH#+Z2p) zr8pNW8W@FHMjzltAG_#6>aH)@=)=N788NC=qt6xA+tqvX{-5XfJnui+IMgs!%Df1z zG_C1@>bMV3^+T243ursQR{sISB-pbLfTB)Ro>BqUXsFv5u$j^9?EusV(0uncz_*~K zy$CS)v2{2B;3wK#O@OqFUGFZ@>-RW1UQViGj9t736s%<&M=k>T2vZyR3K&b7iMAm? znPyVUKLE{l#p*dXz4s_Kb){&|DEg*O1D0;Z<;Z>LVXao=dd>ifex;nv0W0RiYQ|A) z`^*~i66vl49IcyqYV>8=j4O(H=5)8NEvmdlljD_EVW_aXKP5t zT%mDH(VlQkQ`mOQl*(p)`6d!`-QSNc^%`BwXSAqmJXK{&WXIE#Y)q#r2! zAhiFTrchqt=IC~6Cn&u9^%McvHVawTB)~ov3*E=4?kcf98Kk4#5V!3n!-6NGH@84_ zkBH|O;%4IFvqYNmE$NzCGjvR)F1^@D0FYF-VnA_TTL1en8AherStaFlOZ)$Wnfs-_ z>+~564<&!(4uQL5(K$-VM4z1Q?Ipt+`Ac>qfz*3|lEIiknb*WTx*1(~z#53v+4ivi E0H1fE^8f$< 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 66ce79b..177f886 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 @@ -106,15 +106,15 @@ SysTray-X Opties - + Default icon Standaard pictogram - - - - + + + + Icon Pictogram @@ -129,50 +129,50 @@ 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 @@ -199,23 +199,23 @@ Sluiten - + Restore startup positions Herstel vensterposities bij opstarten - + Minimize Minimaliseren - - + + Default minimize Standaard minimalisatie - + Minimize to tray, method 2 Minimaliseer naar systeemvak, methode 2 @@ -235,17 +235,17 @@ Minimaliseer alle vensters - + Start application minimized Start programma geminimaliseerd - + Invert icon Inverteer pictogram - + Number properties Nummer opties @@ -254,213 +254,228 @@ 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 + Opstarten + + + + Default startup + Standaard opstarten + + + + Start application in tray + Start in systeemvak + + + Count Teller - + Show message count Aantal berichten weergeven - + Show new indicator Indicator voor nieuwe berichten - + Startup delay Opstartvertraging - + Count type Type berichttelling - + Unread Ongelezen - + New Nieuw - + New indicator Nieuw indicator - + Icon round Rond icoon - + Icon star Ster icoon - + Shade Tint - + Special options Speciale opties - + API count method API tel methode - + Apps Apps - + Close application Stop programma - - + + Browse... Bestand zoeken... - - + + Arguments: Argumenten: - + Start application Start programma - + 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) - - + + Select application Selecteer programma @@ -468,27 +483,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.pt-BR.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm index c34eba490e3a00f657413bcc1210ef114c1cbef1..00c57cfd30f4f75cc3fed99306436b3b6853726c 100644 GIT binary patch delta 774 zcmYjPTS!xJ82_EQon6lH%%P-yt-P-|n3i%Ja0r@j* zDAWQmCD?qb2f%w2aWD6Qk+Sm z)$!Aco=+iKPNSl46|u!WSEhH-9OqY7rC7=HQ{~CL8Io^P-r7%d`c&18i_J7As@_J= zC-YZS@5Y7z^#YD7pPY&d@><86fLTP}s!38Av0<#jg(y$nL z@W6#KDjVF?579e`39*hdM5)(0_S&l5K691NR_Uwuik)m+z{!t9YFGbgpTvE|m zX4ztkJ{W}>X3>ZBcSVR)6cr?{Se6FmihXF-D55#4r?2mOIOlf`&*`eqm1l~$c-M6E z?A$ms$D084186c^09_pXf-Jzcfj|EkFpZ(KLj%}+U0cmQ+c(sB*8@TlHTUiS+UHnV zmk$`TSaTu@U;?%7YC!g5)0bW#zXgZRmH>LjIoLx$8RVP?F9UfQt|Ih<{;zS}wMQvk z;bMP&QF^0l=5PaGm{cwI#K^~`YVA7*Sm&s&gdV{Nn?aRs3 zB)1$9E_pUk*#RNaK1w4@1wU{FzH;r$vTjljiUH*(LF&a*#WWQQi_ysxjnN?vEhLwM z`#NVI>7;U9Q>lv>pXvN7GBiq9cXc1>%&+zDj5BB~xBmV32$g#(Nqaw0xhIn2WE;WP zOLc$yft-wVqjMeU?b6%duK=IDNJ_bT0N%y&8jg`cKdT%G&}vz>b~6R$>|);ZIIU@9 z7dXP^RSysTray-X Preferências - + Default icon Ícone padrão - - - - + + + + Icon Ícone @@ -128,50 +128,50 @@ 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 @@ -198,23 +198,23 @@ Fechar - + Restore startup positions Restaurar posições da janela na inicialização - + Minimize Miminizar - - + + Default minimize Comportamento padrão - + Minimize to tray, method 2 Minimizar para à área de notificações? (muito grande) Minimizar para a tray, método 2 @@ -235,17 +235,17 @@ Minimize todas as janelas - + Start application minimized Iniciar aplicação minimizada - + Invert icon Ícone inverter - + Number properties Propriedades do número @@ -254,213 +254,228 @@ 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 + Comece + + + + Default startup + Inicialização padrão + + + + Start application in tray + Inicie o aplicativo na bandeja + + + Count Contador - + Show message count Exibir contador de mensagens - + Show new indicator Mostrar novo indicador - + Startup delay Atraso de inicialização - + Count type Tipo do contador - + Unread Não lidos - + New Novos - + New indicator Novo indicador - + Icon round Ícone redondo - + Icon star Ícone de estrela - + Shade Matiz - + Special options Opções especiais - + API count method Método de contagem de API - + Apps Aplicativos - + Close application Fechando aplicativo - - + + Browse... Procurar... - - + + Arguments: Argumentos: - + Start application Aplicativo de inicialização - + 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) - - + + Select application Selecione o aplicativo @@ -468,27 +483,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 745278d08855fcb94c70e57221a3166254f5295d..b3a19b5baeb5397134af87e2a8da401cb7cbbd9c 100644 GIT binary patch delta 743 zcmYk4Sx8h-9LB#pp1HH#xz}~Z8Fd=etT0j(rxGkj%h1BDQX(-d6@^hpXDmTfgd%fG zyJ1pc3uX&N$+T(IgOv0VE&7laJ``d;WF?lQw)~BV9u9}gIsfnXec!qL_E*Ur7VdNB z3genOu%j-3^?)tp1KKet*DnG3Y$&^*00Cza*~)<6r=9x@4Iv3gbL;|C50Ex+4^X#Z zdsYD8KY;XOg8=4`nX(m-T-Y;p2{71DcOo3nNnDih2=H#;Y_%5wzlU5x*BqT!a6Ora z0k0q2=+AkgS1KZ276Rh9Vq4BA>8w=L^qmCE#fr;akKu>lbj57RDL~QTCC$tNz8YD@ z*~}J`(y$Tns|Xu<^E~ni;Z$Fw<*os&#NXw$;Mtje2QFZ4g9KggfUzADD`cM zG0fY;O?2MNAGD_e#zp?zM;bSc@)vS;Q}}PZr*WK0`5-^%3=Q6T)w7r$KvS-6mcG(H ztZoaX?(|LS!A~>PPM&&bBgvVp8e1RT6Jj;4$apfHp=nB8AbyMHS|!~xc5APk=^(dL z+Bbe-)S{R6?ZgPB?$_zc-jls~T~tdwrQ&p1zpes4cXT(~vk?o!m~QO*3m~LSH-+W&8Ys&`~?|< HPAh){8CAYo delta 603 zcmWksTS${(7=He3|G$6xPs^R%ELg(`F)M1-V3Eic8l^@~3Nw%eRu+_A2;oLil-fj_ ztngxXTozQ+MhAleDK844RKhe2iWOeCXc*EuzFob1AJ6xk-fz6(UU~0QW~y(Qb)^fM zGp&Fo0ZqOU(1*cp_yvfIU@yJ^%;hLKrvV(#`u15O&UL72*#&5ypz85MfRAEZtr;*i zVn^pNfCbb9{D5M^?l0Hr^$a@ByNNZ;l!;FPgPZXjzXBMW7+-t=u$Y)c%_%_ro0zNt!QJ?a6+?zE^c4{v1X){Hk2@1whrSRFX9v)OAO;${>=Tax80Vx{$z*r*6eeKxV1fV;@cPZa#j`C3#btRSZ!(X%1Mgu>xiD+zAohL~+ zVM^Cp;w6*Sy0eveYNcCu>nP!@KK+bwIk_Ctzn`6;mV$zC_!HU53T544pdcyK{=G?| z_6T=-c2YZG;oXndh`<>VvVm&=$BPA_(^R)v+%nNcOPdy}8%WSFCbr~esqPMOfFa+^ zxcGKBLqНастройки SysTray-X - + Default icon Иконка по умолчанию - - - - + + + + Icon Иконка @@ -125,50 +125,50 @@ Свернуть все окна в трей - - + + Default Thunderbird Стандартная Thunderbird - + Lookthrough icon Прозрачная иконка - - + + Custom icon Своя иконка - - + + Choose Выбрать - + KDE integration (Hide) Интеграция с KDE (Скрыть) - + Mail notification icon Иконка уведомления - + Blank icon Пустая иконка - + New mail icon Иконка "Новые письма" - + No icon Без иконки (только цифры) @@ -195,24 +195,24 @@ При закрытии - + Restore startup positions Восстановить положение окон при запуске - + Minimize Свернуть - - + + Default minimize Need documentation what methods do... Свернуть окно - + Minimize to tray, method 2 Свернуть в трей, вариант 2 @@ -232,17 +232,17 @@ Свернуть все окна - + Start application minimized Запуск приложения свернутым - + Invert icon Инвертировать значок - + Number properties Настройки индикатора кол-ва @@ -251,213 +251,228 @@ Показывать кол-во непрочитанных писем - + 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 + Запуск + + + + Default startup + Запуск по умолчанию + + + + Start application in tray + Запустить приложение в трее + + + Count счетчик - + Show message count Показать количество писем - + Show new indicator Показать новый индикатор - + Startup delay Задержка запуска - + Count type Алгоритм подсчета - + Unread Непрочитанные - + New Новые - + New indicator Новый индикатор - + Icon round Круглый значок - + Icon star Значок звезды - + Shade Оттенок - + Special options Специальные опции - + API count method Метод подсчета API - + Apps Программы - + Close application Заявление о закрытии - - + + Browse... просматривать... - - + + Arguments: аргументы: - + Start application Приложение при запуске - + 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) - - + + Select application выберите приложение @@ -465,27 +480,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 36c472a..aa73b14 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.cpp +++ b/app/SysTray-X/SysTray-X-app/preferences.cpp @@ -22,8 +22,8 @@ const QString Preferences::STATE_MINIMIZED_STR = "minimized"; const QString Preferences::STATE_MAXIMIZED_STR = "maximized"; const QString Preferences::STATE_FULLSCREEN_STR = "fullscreen"; const QString Preferences::STATE_DOCKED_STR = "docked"; -const QString Preferences::STATE_MINIMIZED_ALL_STR = "minimized_all"; -const QString Preferences::STATE_MINIMIZED_ALL_STARTUP_STR = "minimized_all_startup"; +const QString Preferences::STATE_MINIMIZED_STARTUP_STR = "minimized_startup"; +const QString Preferences::STATE_DOCKED_STARTUP_STR = "docked_startup"; const QStringList Preferences::WindowStateString = { "Unknown", @@ -32,8 +32,8 @@ const QStringList Preferences::WindowStateString = { STATE_MAXIMIZED_STR, STATE_FULLSCREEN_STR, STATE_DOCKED_STR, - STATE_MINIMIZED_ALL_STR, - STATE_MINIMIZED_ALL_STARTUP_STR + STATE_MINIMIZED_STARTUP_STR, + STATE_DOCKED_STARTUP_STR }; /** @@ -50,7 +50,7 @@ Preferences::Preferences( QObject *parent ) : QObject( parent ) m_close_type = PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS; m_minimize_icon_type = PREF_MINIMIZE_TRAY_ICON; - m_start_minimized = false; + m_startup_type = PREF_START_DOCKED; m_restore_window_positions = false; m_default_icon_type = PREF_DEFAULT_ICON_DEFAULT; @@ -304,25 +304,25 @@ void Preferences::setMinimizeIconType( MinimizeIconType minimize_icon_type ) /* * Get the start minmized pref. */ -bool Preferences::getStartMinimized() const +Preferences::StartupType Preferences::getStartupType() const { - return m_start_minimized; + return m_startup_type; } /* - * Set the start minimized pref. + * Set the startup type pref. */ -void Preferences::setStartMinimized( bool state ) +void Preferences::setStartupType( Preferences::StartupType startup_type ) { - if( m_start_minimized != state ) + if( m_startup_type != startup_type ) { - m_start_minimized = state; + m_startup_type = startup_type; /* * Tell the world the new preference */ - emit signalStartMinimizedChange(); + emit signalStartupTypeChange(); } } diff --git a/app/SysTray-X/SysTray-X-app/preferences.h b/app/SysTray-X/SysTray-X-app/preferences.h index 642019d..c3dc36a 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.h +++ b/app/SysTray-X/SysTray-X-app/preferences.h @@ -51,6 +51,15 @@ class Preferences : public QObject PREF_MINIMIZE_TRAY_ICON }; + /* + * Startup types + */ + enum StartupType { + PREF_START_DEFAULT = 0, + PREF_START_MINIMIZED, + PREF_START_DOCKED + }; + enum DefaultIconType { PREF_DEFAULT_ICON_DEFAULT = 0, PREF_DEFAULT_ICON_HIDE, @@ -95,8 +104,8 @@ class Preferences : public QObject STATE_MAXIMIZED, STATE_FULLSCREEN, STATE_DOCKED, - STATE_MINIMIZED_ALL, - STATE_MINIMIZED_ALL_STARTUP, + STATE_MINIMIZED_STARTUP, + STATE_DOCKED_STARTUP, }; static const QString STATE_NORMAL_STR; @@ -104,8 +113,8 @@ class Preferences : public QObject static const QString STATE_MAXIMIZED_STR; static const QString STATE_FULLSCREEN_STR; static const QString STATE_DOCKED_STR; - static const QString STATE_MINIMIZED_ALL_STR; - static const QString STATE_MINIMIZED_ALL_STARTUP_STR; + static const QString STATE_MINIMIZED_STARTUP_STR; + static const QString STATE_DOCKED_STARTUP_STR; static const QStringList WindowStateString; @@ -187,18 +196,18 @@ class Preferences : public QObject void setBrowserBuildID( const QString buildID ); /** - * @brief getStartMinimized. Get the start minimized state. + * @brief getStartupType. Get the startup type. * - * @return The state. + * @return The startup type. */ - bool getStartMinimized() const; + StartupType getStartupType() const; /** - * @brief setStartMinimized. Set the start minimized state. + * @brief setStartupType. Set the startup type. * - * @param state The state. + * @param startup_type The startup type. */ - void setStartMinimized( bool state ); + void setStartupType( StartupType startup_type ); /** * @brief getRestoreWindowPositions. Get the restore window positions state. @@ -645,9 +654,9 @@ class Preferences : public QObject void signalMinimizeIconTypeChange(); /** - * @brief signalStartMinimizedChange. Signal a start minimized state change. + * @brief signalStartupTypeChange. Signal a startup type change. */ - void signalStartMinimizedChange(); + void signalStartupTypeChange(); /** * @brief signalRestoreWindowPositionsChange. Signal a restore window positions state change. @@ -831,9 +840,9 @@ class Preferences : public QObject MinimizeIconType m_minimize_icon_type; /** - * @brief m_start_minimized. Start TB minimized. + * @brief m_startup_type. Startup TB preference. */ - bool m_start_minimized; + StartupType m_startup_type; /** * @brief m_restore_window_positions. Force the same window positions on startup as recorded on the last hide. diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui index 2a743e4..e08b1ff 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.ui +++ b/app/SysTray-X/SysTray-X-app/preferences.ui @@ -7,7 +7,7 @@ 0 0 556 - 424 + 468 @@ -27,7 +27,7 @@ - 2 + 0 @@ -35,7 +35,7 @@ - + @@ -108,22 +108,66 @@ - - - - - Start application minimized - - - - - - - Restore startup positions - - - - + + + Startup + + + + + + Default startup + + + startupTypeGroup + + + + + + + Start application minimized + + + startupTypeGroup + + + + + + + Start application in tray + + + true + + + startupTypeGroup + + + + + + + + + + Restore startup positions + + + + + + + Qt::Vertical + + + + 20 + 40 + + + @@ -140,19 +184,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1183,12 +1214,13 @@ - - - - + + + + + diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp index 88700d6..3e61e7b 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp @@ -61,6 +61,13 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->minimizeIconTypeGroup->setId( m_ui->defaultMinimizeIconRadioButton, Preferences::PREF_DEFAULT_MINIMIZE_ICON); m_ui->minimizeIconTypeGroup->setId( m_ui->minimizeTrayIconRadioButton, Preferences::PREF_MINIMIZE_TRAY_ICON ); + /* + * Set startup type button Ids + */ + m_ui->startupTypeGroup->setId( m_ui->startDefaultRadioButton, Preferences::PREF_START_DEFAULT); + m_ui->startupTypeGroup->setId( m_ui->startMinimizedRadioButton, Preferences::PREF_START_MINIMIZED); + m_ui->startupTypeGroup->setId( m_ui->startDockedRadioButton, Preferences::PREF_START_DOCKED ); + #ifdef Q_OS_WIN m_ui->hideDefaultIconCheckBox->hide(); @@ -252,11 +259,11 @@ void PreferencesDialog::setMinimizeIconType( Preferences::MinimizeIconType mi /* - * Set the start minimized state + * Set the startup type */ -void PreferencesDialog::setStartMinimized( bool state ) +void PreferencesDialog::setStartupType( Preferences::StartupType startup_type ) { - m_ui->startMinimizedCheckBox->setChecked( state ); + ( m_ui->startupTypeGroup->button( startup_type ) )->setChecked( true ); } @@ -577,7 +584,7 @@ void PreferencesDialog::slotAccept() 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->setStartupType( static_cast< Preferences::StartupType >( m_ui->startupTypeGroup->checkedId() ) ); m_pref->setRestoreWindowPositions( m_ui->restorePositionscheckBox->isChecked() ); m_pref->setCloseType( static_cast< Preferences::CloseType >( m_ui->closeTypeGroup->checkedId() ) ); m_pref->setInvertIcon( m_ui->invertIconCheckBox->isChecked() ); @@ -643,7 +650,7 @@ void PreferencesDialog::slotReject() setMinimizeType( m_pref->getMinimizeType() ); setMinimizeIconType( m_pref->getMinimizeIconType() ); - setStartMinimized( m_pref->getStartMinimized() ); + setStartupType( m_pref->getStartupType() ); setRestoreWindowPositions( m_pref->getRestoreWindowPositions() ); setCloseType( m_pref->getCloseType() ); setInvertIcon( m_pref->getInvertIcon() ); @@ -786,11 +793,11 @@ void PreferencesDialog::slotDebugChange() /* - * Handle the start minimized change signal + * Handle the startup type change signal */ -void PreferencesDialog::slotStartMinimizedChange() +void PreferencesDialog::slotStartupTypeChange() { - setStartMinimized( m_pref->getStartMinimized() ); + setStartupType( m_pref->getStartupType() ); } diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.h b/app/SysTray-X/SysTray-X-app/preferencesdialog.h index 546a44b..67edba0 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.h +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.h @@ -79,11 +79,11 @@ class PreferencesDialog : public QDialog void setMinimizeIconType( Preferences::MinimizeIconType minimize_icon_type ); /** - * @brief setStartMinimized. Set the start minimized state. + * @brief setStartupType. Set the startup type. * - * @param state The state. + * @param startup_type The startup type. */ - void setStartMinimized( bool state ); + void setStartupType( Preferences::StartupType startup_type ); /** * @brief setRestoreWindowPositions. Set the restore window positions state. @@ -302,9 +302,9 @@ class PreferencesDialog : public QDialog void slotMinimizeIconTypeChange(); /** - * @brief slotStartMinimizedChange. Slot for handling start minimized change signals. + * @brief slotStartupTypeChange. Slot for handling startup type change signals. */ - void slotStartMinimizedChange(); + void slotStartupTypeChange(); /** * @brief slotRestoreWindowPositionsChange. Slot for handling restore window positions change signals. diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index d3be0e1..6178c49 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -113,7 +113,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) 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::signalDefaultIconTypeChange, m_pref_dialog, &PreferencesDialog::slotDefaultIconTypeChange ); connect( m_preferences, &Preferences::signalDefaultIconDataChange, m_pref_dialog, &PreferencesDialog::slotDefaultIconDataChange ); @@ -122,7 +121,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalIconDataChange, m_pref_dialog, &PreferencesDialog::slotIconDataChange ); 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::signalStartupTypeChange, m_pref_dialog, &PreferencesDialog::slotStartupTypeChange ); connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_pref_dialog, &PreferencesDialog::slotRestoreWindowPositionsChange ); connect( m_preferences, &Preferences::signalCloseTypeChange, m_pref_dialog, &PreferencesDialog::slotCloseTypeChange ); connect( m_preferences, &Preferences::signalInvertIconChange, m_pref_dialog, &PreferencesDialog::slotInvertIconChange ); @@ -150,7 +149,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalIconDataChange, m_link, &SysTrayXLink::slotIconDataChange ); connect( m_preferences, &Preferences::signalMinimizeTypeChange, m_link, &SysTrayXLink::slotMinimizeTypeChange ); connect( m_preferences, &Preferences::signalMinimizeIconTypeChange, m_link, &SysTrayXLink::slotMinimizeIconTypeChange ); - connect( m_preferences, &Preferences::signalStartMinimizedChange, m_link, &SysTrayXLink::slotStartMinimizedChange ); + connect( m_preferences, &Preferences::signalStartupTypeChange, m_link, &SysTrayXLink::slotStartupTypeChange ); connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_link, &SysTrayXLink::slotRestoreWindowPositionsChange ); connect( m_preferences, &Preferences::signalCloseTypeChange, m_link, &SysTrayXLink::slotCloseTypeChange ); connect( m_preferences, &Preferences::signalInvertIconChange, m_link, &SysTrayXLink::slotInvertIconChange ); diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp index 32f77a7..314f7b6 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp @@ -358,66 +358,67 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message ) emit signalAddOnShutdown(); } - if( jsonObject.contains( "window" ) && jsonObject[ "window" ].isObject() ) + if( jsonObject.contains( "startup" ) && jsonObject[ "startup" ].isString() ) { - QJsonObject window = jsonObject[ "window" ].toObject(); - - QString window_state_str; - if( window.contains( "state" ) && window[ "state" ].isString() ) - { - window_state_str = window[ "state" ].toString(); - } - - int window_id = 0; - if( window.contains( "id" ) && window[ "id" ].isDouble() ) - { - window_id = window[ "id" ].toInt(); - } + QString state_str = jsonObject[ "startup" ].toString(); Preferences::WindowState window_state; - if( window_state_str == Preferences::STATE_NORMAL_STR ) + if( state_str == Preferences::STATE_MINIMIZED_STR ) { - window_state = Preferences::STATE_NORMAL; - } - else - if( window_state_str == Preferences::STATE_MINIMIZED_STR ) - { - window_state = Preferences::STATE_MINIMIZED; - } - else - if( window_state_str == Preferences::STATE_MAXIMIZED_STR ) - { - window_state = Preferences::STATE_MAXIMIZED; - } - else - if( window_state_str == Preferences::STATE_FULLSCREEN_STR ) - { - window_state = Preferences::STATE_FULLSCREEN; - } - else - if( window_state_str == Preferences::STATE_DOCKED_STR ) - { - window_state = Preferences::STATE_DOCKED; - } - else - if( window_state_str == Preferences::STATE_MINIMIZED_ALL_STR ) - { - window_state = Preferences::STATE_MINIMIZED_ALL; - } - else - if( window_state_str == Preferences::STATE_MINIMIZED_ALL_STARTUP_STR ) - { - window_state = Preferences::STATE_MINIMIZED_ALL_STARTUP; - } - else - { - /* - * Unknown state - */ - window_state = Preferences::STATE_NORMAL; + window_state = Preferences::STATE_MINIMIZED_STARTUP; } - emit signalWindowState( window_state, window_id ); + if( state_str == Preferences::STATE_DOCKED_STR ) + { + window_state = Preferences::STATE_DOCKED_STARTUP; + } + + emit signalWindowState( window_state, 0 ); + } + + if( jsonObject.contains( "windows" ) && jsonObject[ "windows" ].isArray() ) + { + QJsonArray windows = jsonObject[ "windows" ].toArray(); + + for( int i = 0 ; i < windows.count() ; ++i ) + { + QJsonObject window = windows[ i ].toObject(); + + int window_id = 0; + if( window.contains( "id" ) && window[ "id" ].isDouble() ) + { + window_id = window[ "id" ].toInt(); + } + + QString window_state_str; + if( window.contains( "state" ) && window[ "state" ].isString() ) + { + window_state_str = window[ "state" ].toString(); + } + + Preferences::WindowState window_state; + if( window_state_str == Preferences::STATE_NORMAL_STR ) + { + window_state = Preferences::STATE_NORMAL; + } + else + if( window_state_str == Preferences::STATE_MINIMIZED_STR ) + { + window_state = Preferences::STATE_MINIMIZED; + } + else + { + /* + * Unknown state + */ + window_state = Preferences::STATE_NORMAL; + } + + if( window_id != 0 ) + { + emit signalWindowState( window_state, window_id ); + } + } } if( jsonObject.contains( "hideDefaultIcon" ) && jsonObject[ "hideDefaultIcon" ].isBool() ) @@ -815,14 +816,14 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref ) m_pref->setMinimizeIconType( minimize_icon_type ); } - if( pref.contains( "startMinimized" ) && pref[ "startMinimized" ].isString() ) + if( pref.contains( "startupType" ) && pref[ "startupType" ].isString() ) { - bool start_minimized = pref[ "startMinimized" ].toString() == "true"; + Preferences::StartupType startup_type = static_cast< Preferences::StartupType >( pref[ "startupType" ].toString().toInt() ); /* * Store the new start minimized state */ - m_pref->setStartMinimized( start_minimized ); + m_pref->setStartupType( startup_type ); } if( pref.contains( "restorePositions" ) && pref[ "restorePositions" ].isString() ) @@ -959,7 +960,7 @@ void SysTrayXLink::EncodePreferences( const Preferences& pref ) 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("startupType", QJsonValue::fromVariant( QString::number( pref.getStartupType() ) ) ); prefObject.insert("restorePositions", QJsonValue::fromVariant( QString( pref.getRestoreWindowPositions() ? "true" : "false" ) ) ); prefObject.insert("closeType", QJsonValue::fromVariant( QString::number( pref.getCloseType() ) ) ); prefObject.insert("defaultIconType", QJsonValue::fromVariant( QString::number( pref.getDefaultIconType() ) ) ); @@ -1069,9 +1070,9 @@ void SysTrayXLink::slotMinimizeIconTypeChange() /* - * Handle a start minimized state change signal + * Handle a startup type change signal */ -void SysTrayXLink::slotStartMinimizedChange() +void SysTrayXLink::slotStartupTypeChange() { if( m_pref->getAppPrefChanged() ) { diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.h b/app/SysTray-X/SysTray-X-app/systrayxlink.h index 121b2e8..459b69d 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.h +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.h @@ -294,9 +294,9 @@ class SysTrayXLink : public QObject void slotMinimizeIconTypeChange(); /** - * @brief slotStartMinimizedChange. Handle a change in start minimized state. + * @brief slotStartupTypeChange. Handle a change in startup type. */ - void slotStartMinimizedChange(); + void slotStartupTypeChange(); /** * @brief slotCloseTypeChange. Slot for handling close type change signals. diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp index 9e6b359..ae7f632 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp @@ -140,15 +140,6 @@ void WindowCtrl::slotCloseTypeChange() } -/* - * Handle change in start minimized state - */ -void WindowCtrl::slotStartMinimizedChange() -{ - m_start_minimized = m_pref->getStartMinimized(); -} - - /* * Handle change in window state */ @@ -162,10 +153,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state, int id ) return; } -//#ifdef DEBUG_DISPLAY_ACTIONS +#ifdef DEBUG_DISPLAY_ACTIONS emit signalConsole( QString( "State: %1" ).arg( Preferences::WindowStateString.at( state ) ) ); emit signalConsole( QString( "Id: %1" ).arg( id ) ); -//#endif +#endif /* * Update the TB windows and states @@ -173,9 +164,9 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state, int id ) findWindows( m_ppid ); /* - * Minimize all? + * Minimize/dock all? */ - if( state == Preferences::STATE_MINIMIZED_ALL || state == Preferences::STATE_MINIMIZED_ALL_STARTUP ) + if( state == Preferences::STATE_MINIMIZED_STARTUP || state == Preferences::STATE_DOCKED_STARTUP ) { #ifdef DEBUG_DISPLAY_ACTIONS emit signalConsole( QString( "Minimize all" ) ); @@ -183,44 +174,21 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state, int id ) QList< quint64 > win_ids = getWinIds(); - /* - * Minimize on startup always to the tray - */ - TargetType target_type = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY; - if( state == Preferences::STATE_MINIMIZED_ALL ) - { - #ifdef Q_OS_UNIX - /* - * Update window positions - */ - updatePositions(); + /* + * Update window positions + */ + updatePositions(); #endif - /* - * Minimize target on close depends on preference - */ - Preferences::CloseType close_type = getCloseType(); - if( close_type == Preferences::PREF_MINIMIZE_ALL_WINDOWS || close_type == Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS ) - { - target_type = TargetType::TYPE_WINDOW_TO_TASKBAR; - } - } - /* - * Close pressed on one of the windows, minimize them all + * Minimize/dock all */ for( int i = 0 ; i < win_ids.length() ; ++i ) { -#ifdef DEBUG_DISPLAY_ACTIONS - emit signalConsole( QString( "Window state: %1, %2" ) - .arg( win_ids.at( i ) ) - .arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) ); -#endif - - if( target_type == TargetType::TYPE_WINDOW_TO_TASKBAR ) + if( state == Preferences::STATE_MINIMIZED_STARTUP ) { minimizeWindowToTaskbar( win_ids.at( i ) ); } @@ -413,8 +381,6 @@ void WindowCtrl::slotNewWindow( int id ) * Try to find a corresponding x11 window */ identifyWindow( id ); - - displayRefs(); } @@ -429,8 +395,6 @@ void WindowCtrl::slotCloseWindow( int id, bool quit ) * Window is closed by TB */ removeRefId( id ); - - displayRefs(); return; } @@ -448,18 +412,4 @@ void WindowCtrl::slotCloseWindow( int id, bool quit ) minimizeWindowToTaskbar( ref_list[ id ] ); } } - - displayRefs(); -} - -void WindowCtrl::displayRefs() -{ - QMap< int, quint64 > ref_list = getRefIds(); - - QMapIterator it( ref_list ); - while (it.hasNext()) { - it.next(); - - emit signalConsole( QString( "Ref: %1, %2" ).arg( it.key() ).arg( it.value(), 16 ) ); - } } diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.h b/app/SysTray-X/SysTray-X-app/windowctrl.h index ede7959..6aeda44 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.h +++ b/app/SysTray-X/SysTray-X-app/windowctrl.h @@ -98,11 +98,6 @@ class WindowCtrl : public QObject */ void slotCloseTypeChange(); - /** - * @brief slotStartMinimizedChange. Handle the start minimized signal. - */ - void slotStartMinimizedChange(); - /** * @brief slotWindowState. Handle the window state change signal. * @@ -141,8 +136,6 @@ class WindowCtrl : public QObject */ void slotCloseWindow( int id, bool quit ); - void displayRefs(); - private: /** @@ -170,10 +163,6 @@ class WindowCtrl : public QObject */ QWindow* m_tb_window; - /** - * @brief m_start_minimized. State of start minimized. - */ - bool m_start_minimized; }; diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json index 372fea4..6897555 100644 --- a/webext/_locales/de/messages.json +++ b/webext/_locales/de/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { + "windows_startup_options": { + "message": "Start-up", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Standardstart", + "description": "Default startup" + }, + + "windows_minimized_startup": { "message": "Anwendung minimiert starten", - "description": "Start minimized" + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Anwendung in Systemleiste starten", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/el/messages.json b/webext/_locales/el/messages.json index c833f8e..9070200 100644 --- a/webext/_locales/el/messages.json +++ b/webext/_locales/el/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { - "message": "Ελαχιστοποιημένη εκκίνηση της εφαρμογής", - "description": "Start minimized" + "windows_startup_options": { + "message": "Αρχή", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Προεπιλεγμένη εκκίνηση", + "description": "Default startup" + }, + + "windows_minimized_startup": { + "message": "Ελαχιστοποιήθηκε η εκκίνηση της εφαρμογής", + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Εκκινήστε την εφαρμογή στο δίσκο συστήματος", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/en-US/messages.json b/webext/_locales/en-US/messages.json index 56b1eca..dcf9483 100644 --- a/webext/_locales/en-US/messages.json +++ b/webext/_locales/en-US/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { + "windows_startup_options": { + "message": "Startup", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Default startup", + "description": "Default startup" + }, + + "windows_minimized_startup": { "message": "Start application minimized", - "description": "Start minimized" + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Start application in tray", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/it/messages.json b/webext/_locales/it/messages.json index 8d8f244..0ded23c 100644 --- a/webext/_locales/it/messages.json +++ b/webext/_locales/it/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { + "windows_startup_options": { + "message": "Avviare", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Avvio predefinito", + "description": "Default startup" + }, + + "windows_minimized_startup": { "message": "Avvia applicazione minimizzata", - "description": "Start minimized" + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Minimizza principale nel vassoio", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json index 681f35f..483251e 100644 --- a/webext/_locales/nl/messages.json +++ b/webext/_locales/nl/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { - "message": "Start programma geminimaliseerd", - "description": "Start minimized" + "windows_startup_options": { + "message": "Opstarten", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Standaard opstarten", + "description": "Default startup" + }, + + "windows_minimized_startup": { + "message": "Start geminimaliseerd", + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Start in systeemvak", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/pt-BR/messages.json b/webext/_locales/pt-BR/messages.json index 813df5b..b1d5d8f 100644 --- a/webext/_locales/pt-BR/messages.json +++ b/webext/_locales/pt-BR/messages.json @@ -129,9 +129,24 @@ "description": "Close option 4" }, - "windows_start_min": { + "windows_startup_options": { + "message": "Comece", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Inicialização padrão", + "description": "Default startup" + }, + + "windows_minimized_startup": { "message": "Iniciar aplicação minimizada", - "description": "Start minimized" + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Inicie o aplicativo na bandeja", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/_locales/ru/messages.json b/webext/_locales/ru/messages.json index 4820685..8df3ec4 100644 --- a/webext/_locales/ru/messages.json +++ b/webext/_locales/ru/messages.json @@ -129,9 +129,24 @@ "description": "Close option 2" }, - "windows_start_min": { + "windows_startup_options": { + "message": "Запуск", + "description": "Startup" + }, + + "windows_default_startup": { + "message": "Запуск по умолчанию", + "description": "Default startup" + }, + + "windows_minimized_startup": { "message": "Запуск приложения свернутым", - "description": "Start minimized" + "description": "Start application minimized" + }, + + "windows_docked_startup": { + "message": "Запустить приложение в трее", + "description": "Start application in tray" }, "restore_positions_on_startup": { diff --git a/webext/background.js b/webext/background.js index 83e8bba..cb9eb55 100644 --- a/webext/background.js +++ b/webext/background.js @@ -6,7 +6,7 @@ var SysTrayX = { mainWindowId: undefined, windows: undefined, - startupState: undefined, + startupType: undefined, restorePositions: false, startupWindowPositions: [], @@ -52,9 +52,12 @@ SysTrayX.Messaging = { }); } - // Minimize on startup handled by Companion app as backup - if (SysTrayX.startupState === "minimized") { - SysTrayX.Link.postSysTrayXMessage({ window: { state : "minimized_all_startup", id: 0 } }); + // Minimize on startup handled by Companion app + if (SysTrayX.startupType === "1") { + SysTrayX.Link.postSysTrayXMessage({ startup: "minimized" }); + } + if (SysTrayX.startupType === "2") { + SysTrayX.Link.postSysTrayXMessage({ startup: "docked" }); } // Lookout for storage changes @@ -391,11 +394,6 @@ SysTrayX.Messaging = { } if (state !== undefined) { - if (!quit) { - // Block the next focus change event - SysTrayX.Window.blockFocusChange = id; - } - // Send new state to the companion SysTrayX.Link.postSysTrayXMessage({ closeWindow: { id: id, quit: quit } }); } @@ -609,7 +607,7 @@ SysTrayX.Messaging = { "minimizeType", "minimizeIconType", "closeType", - "startMinimized", + "startupType", "restorePositions", "defaultIconType", "defaultIconMime", @@ -646,7 +644,7 @@ SysTrayX.Messaging = { const minimizeType = result.minimizeType || "1"; const minimizeIconType = result.minimizeIconType || "1"; const closeType = result.closeType || "1"; - const startMinimized = result.startMinimized || "false"; + const startupType = result.startupType || "2"; const restorePositions = result.restorePositions || "false"; const defaultIconType = result.defaultIconType || "0"; const defaultIconMime = result.defaultIconMime || "image/png"; @@ -684,7 +682,7 @@ SysTrayX.Messaging = { minimizeType, minimizeIconType, closeType, - startMinimized, + startupType, restorePositions, defaultIconType, defaultIconMime, @@ -711,17 +709,6 @@ SysTrayX.Messaging = { closeAppArgs, }, }); - - if (SysTrayX.startupState) { - // Send startup state after the prefs - // so the hide is handled conform the prefs - if (SysTrayX.startupState === "minimized") { - SysTrayX.Link.postSysTrayXMessage({ window: { state: "minimized_all", id: 0 } } ); - //SysTrayX.Link.postSysTrayXMessage({ window: SysTrayX.startupState }); - } - - SysTrayX.startupState = undefined; - } }, onSendIconStorageError: function (error) { @@ -802,10 +789,10 @@ SysTrayX.Link = { }); } - const startMinimized = response["preferences"].startMinimized; - if (startMinimized) { + const startupType = response["preferences"].startupType; + if (startupType) { await storage().set({ - startMinimized: startMinimized, + startupType: startupType, }); } @@ -989,22 +976,15 @@ SysTrayX.Link = { }; SysTrayX.Window = { - blockFocusChange: 0, + focusChanged: async function (windowId) { - focusChanged: function (windowId) { - browser.windows.getCurrent().then((win) => { - - //console.debug("focusChanged Id: " + win.id); - //console.debug("focusChanged state: " + win.state); - //console.debug("focusChanged block: " + SysTrayX.Window.blockFocusChange); + const windows_all = await browser.windows.getAll(); + //console.debug("focusChanged windows: " + JSON.stringify(windows_all)); - if( win.id !== SysTrayX.Window.blockFocusChange) { - SysTrayX.Link.postSysTrayXMessage({ window: { state: win.state, id: win.id } } ); - } else { - // Reset block - SysTrayX.Window.blockFocusChange = 0; - } - }); + const windows = windows_all.map( (win) => { return {id: win.id, state: win.state} }); + //console.debug("focusChanged windows: " + JSON.stringify(windows)); + + SysTrayX.Link.postSysTrayXMessage({ windows: windows } ); }, folderChanged: function (tab, displayedFolder) { @@ -1096,9 +1076,9 @@ async function start() { SysTrayX.Window.folderChanged ); - // Get the prefered start state - const state = await getStartupState(); - SysTrayX.startupState = state; + // Get the prefered startup type + const startupType = await getStartupType(); + SysTrayX.startupType = startupType; // Restore window positions const restorePositions = await getRestorePositionsState(); diff --git a/webext/css/options.css b/webext/css/options.css index 9a5a6cc..85a78eb 100644 --- a/webext/css/options.css +++ b/webext/css/options.css @@ -77,6 +77,7 @@ body { #minimizeselect, #minimizeiconselect, #closeselect, +#startupselect, #defaulticonselect, #iconselect, #numberprops, diff --git a/webext/js/defaults.js b/webext/js/defaults.js index f030c8e..e23785a 100644 --- a/webext/js/defaults.js +++ b/webext/js/defaults.js @@ -25,17 +25,17 @@ async function getApiCountMethod() { // // Get window startup state // -async function getStartupState() { +async function getStartupType() { function resolve(result) { - const startMinimized = result.startMinimized || "false"; - return startMinimized === "true" ? "minimized" : "normal"; + const startupType = result.startupType || "2"; + return startupType; } function reject() { - return "normal"; + return "2"; } - return await storage().get("startMinimized").then(resolve, reject); + return await storage().get("startupType").then(resolve, reject); } // diff --git a/webext/js/windowEvent.js b/webext/js/windowEvent.js index 2293e1c..e3904d0 100644 --- a/webext/js/windowEvent.js +++ b/webext/js/windowEvent.js @@ -104,7 +104,7 @@ windowListener.emit("new-window", id); - console.log("New window added: " + id); + //console.log("New window added: " + id); } }); } @@ -124,7 +124,7 @@ // Get current window id const id = context.extension.windowManager.getWrapper(window).id; - console.log("New window removed: " + id); + //console.log("New window removed: " + id); } } ExtensionSupport.unregisterWindowListener( this.listenerIdNewWindow ); @@ -176,11 +176,11 @@ // Pre TB115 close menu, now same as close button window.close = () => onCloseButton(null); - console.log("Close listener added for: " + id); + //console.log("Close listener added for: " + id); } else { function onCloseButton2(event) { - console.log("Real Close clicked: " + id); + //console.log("Real Close clicked: " + id); windowListener.emit("close-clicked", id, true); @@ -205,6 +205,8 @@ // Pre TB115 close menu, now same as close button window.close = () => onCloseButton2(null); + + //console.log("Real Close listener added for: " + id); } }, }); @@ -241,7 +243,7 @@ // Clean the storage delete windowListener.activeWindows[id]; - console.log("Close listener removed for: " + id); + //console.log("Close listener removed for: " + id); } } } diff --git a/webext/options.html b/webext/options.html index 03eb0cd..7411397 100644 --- a/webext/options.html +++ b/webext/options.html @@ -143,12 +143,50 @@ -
- - -
+ + + + + + + + + + + +
+ __MSG_windows_startup_options__ +
+ + +
+ + +
+ + +
+