Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-10-26 07:46:09 +01:00
Code Issues Packages Projects Releases Activity

Refactor for multi window

Browse Source
This commit is contained in:
Ximi1970
2023-11-13 20:14:30 +01:00
parent 13b9e121b6
commit 70dcc83173
59 changed files with 1718 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
View File

@@ -241,7 +241,7 @@
<translation>Symbol umkehren</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Nummereigenschaften</translation>
</message>
@@ -250,67 +250,67 @@
<translation type="vanished">Anzahl neuer Nachrichten anzeigen</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Nummerfarbe</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Nummergröße</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Nummernausrichtung</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Oben links</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Oben in der Mitte</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Oben rechts</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Mitte links</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Mittleres Zentrum</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Mitte rechts</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Unten links</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Unten in der Mitte</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Unten rechts</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Ränder (links, oben, rechts, unten):</translation>
</message>
@@ -350,79 +350,89 @@
<translation>Neue Nachrichten</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Neu Indikator</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Symbol rund</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Symbol Stern</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Schattierung</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Sonderoptionen</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>API-Zählmethode</translation>
</message>
<message>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Anwendungen</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Stopanwendung</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>Durchsuche...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Startanwendung</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Nachrichten</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Verwenden Sie den Einstellungsdialog in Thunderbird, um die Konten und Ordner auszuwählen</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Debug-Fenster anzeigen</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Annullieren</translation>
</message>
@@ -433,20 +443,20 @@
<translation>Hauptfenster minimieren</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Bild öffnen</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Bilddateien (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>Anwendung auswählen</translation>
</message>
@@ -454,27 +464,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Anzeigen/Verbergen</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;Über</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Schließen</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
View File

@@ -241,7 +241,7 @@
<translation>Αντιστρέψτε εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Ιδιότητες αριθμών</translation>
</message>
@@ -250,67 +250,67 @@
<translation type="vanished">Προβολή μετρητή μη-αναγνωσμένης αλληλογραφίας</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Χρώμα μετρητή</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Μέγεθος μετρητή</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Ευθυγραμμία</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Κορυφαίο αριστερά</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Κορυφαίο κέντρο</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Κορυφαίο δεξιά</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Μέση αριστερά</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Μεσαίο κέντρο</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Μέση δεξιά</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Κάτω αριστερά</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Κάτω κέντρο</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Κάτω δεξιά</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Περιθώρια (αριστερά, Κορυφαίο, δεξιά, Κάτω):</translation>
</message>
@@ -350,59 +350,69 @@
<translation>Νέα</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Νέος δείκτης</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Στρογγυλό εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Αστέρι εικονίδιο</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Απόχρωση</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Ειδικές επιλογές</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>Μέθοδος καταμέτρησης API</translation>
</message>
<message>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Κλείσιμο αίτησης</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>ξεφυλλίζω...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Επιχειρήματα:</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Αλληλογραφία</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Χρησιμοποιήστε το παράθυρο διαλόγου Προτιμήσεις Thunderbird για να επιλέξετε λογαριασμούς και φακέλους</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Αποσφαλμάτωση</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Προβολή παραθύρου αποσφαλμάτωσης</translation>
</message>
@@ -413,40 +423,40 @@
<translation>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Εφαρμογές</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Εφαρμογή εκκίνησης</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Αποθήκευση</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Άνοιγμα εικόνας</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Αρχεία εικόνας (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>επιλέξτε εφαρμογή</translation>
</message>
@@ -454,27 +464,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Εμφάνιση/Απόκρυψη</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Προτιμήσεις</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;Σχετικά</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Έξοδος</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Κλείσιμο</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
View File

@@ -246,7 +246,7 @@
<translation>Invert icon</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Number properties</translation>
</message>
@@ -255,67 +255,67 @@
<translation type="vanished">Display unread message count</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Number color</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Number size</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Alignment</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Top left</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Top centre</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Top right</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Middle left</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Middle centre</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Middle right</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Bottom left</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Bottom centre</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Bottom right</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margins (left, top, right, bottom):</translation>
</message>
@@ -355,79 +355,89 @@
<translation>New</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>New indicator</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Icon round</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Icon star</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Shade</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Special options</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>API count method</translation>
</message>
<message>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Apps</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Close application</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>Browse...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Arguments:</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Start application</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Mail</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Use the preferences dialog in Thunderbird to select the accounts and folders</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Display debug window</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Save</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
@@ -438,20 +448,20 @@
<translation>Minimize to tray</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Open Image</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Image Files (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>Select application</translation>
</message>
@@ -459,27 +469,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Show/Hide</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Preferences</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;About</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Quit</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Close</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
View File

@@ -242,7 +242,7 @@
<translation>Icona inverti</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Proprietà numero</translation>
</message>
@@ -251,67 +251,67 @@
<translation type="vanished">Mostra numero di messaggi non letti</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Colore numero</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Dimensione numero</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Allineamento</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>A sinistra in alto</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>In alto al centro</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>In alto a destra</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Al centro a sinistra</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Centro centrale</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>In mezzo a destra</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>In basso a sinistra</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>In basso al centro</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>In basso a destra</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margini (sinistra, in alto, destra, in basso):</translation>
</message>
@@ -351,59 +351,69 @@
<translation>Nuovi</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Nuovo indicatore</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Icona rotonda</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Stella icona</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Sfumatura</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Opzioni speciali</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>Metodo di conteggio API</translation>
</message>
<message>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Applicazione alla chiusura</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>Sfogliare...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Argomenti:</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Messaggi</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Usa la finestra di dialogo delle preferenze in Thunderbird per selezionare account e cartelle</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Mostra finestra di debug</translation>
</message>
@@ -414,40 +424,40 @@
<translation>Minimizza nel vassoio</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Applicazioni</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Applicazione di avvio</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Salva</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Apri immagine</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>File immagine (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>Selezionare l&apos;applicazione</translation>
</message>
@@ -455,27 +465,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Mostra/Nascondi</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Preferenze</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;Informazioni</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Esci</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Chiudi</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
View File

@@ -245,7 +245,7 @@
<translation>Inverteer pictogram</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Nummer opties</translation>
</message>
@@ -254,67 +254,67 @@
<translation type="vanished">Aantal ongelezen berichten weergeven</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Nummer kleur</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Nummer grootte</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Uitlijning</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Linksboven</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Middenboven</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Rechtsboven</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Midden links</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Midden midden</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Midden rechts</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Linksonder</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Middenonder</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Rechtsonder</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Marges (links, boven, rechts, onder):</translation>
</message>
@@ -354,79 +354,89 @@
<translation>Nieuw</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Nieuw indicator</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Rond icoon</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Ster icoon</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Tint</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Speciale opties</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>API tel methode</translation>
</message>
<message>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Apps</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Stop programma</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>Bestand zoeken...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Argumenten:</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Start programma</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Berichten</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Gebruik het voorkeurenvenster in Thunderbird om de accounts en mappen te selecteren</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Toon debug venster</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Bewaren</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Annnuleren</translation>
</message>
@@ -437,20 +447,20 @@
<translation>Minimaliseer naar systeemvak</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Open afbeelding</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Afbeeldingsbestanden (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>Selecteer programma</translation>
</message>
@@ -458,27 +468,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Tonen/Verbergen</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Opties</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>O&amp;ver</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Afsluiten</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
View File

@@ -245,7 +245,7 @@
<translation>Ícone inverter</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Propriedades do número</translation>
</message>
@@ -254,67 +254,67 @@
<translation type="vanished">Exibir contador de mensagens não lidas</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Cor do número</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Tamanho do número</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Alinhamento</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Canto superior esquerdo</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Centro superior</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Canto superior direito</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Meio esquerdo</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Centro médio</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Meio à direita</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Canto inferior esquerdo</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Centro inferior</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Canto inferior direito</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Margens (esquerdo, superior, direito, inferior):</translation>
</message>
@@ -354,79 +354,89 @@
<translation>Novos</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Novo indicador</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Ícone redondo</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Ícone de estrela</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Matiz</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Opções especiais</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>Método de contagem de API</translation>
</message>
<message>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Aplicativos</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Fechando aplicativo</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>Procurar...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>Argumentos:</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Aplicativo de inicialização</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>E-mail</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Use a janela de preferências no Thunderbird para selecionar as contas e pastas</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Depuração</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Mostrar janela de depuração</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Salvar</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -437,20 +447,20 @@
<translation>Minimizar para a tray</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Abrir imagem</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Arquivo de imagem (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>Selecione o aplicativo</translation>
</message>
@@ -458,27 +468,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Exibir/Ocultar</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Preferências</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;Sobre</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Sair</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Fechar</translation>
</message>

BIN
app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.qm
View File

Binary file not shown.

94
app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
View File

@@ -242,7 +242,7 @@
<translation>Инвертировать значок</translation>
</message>
<message>
<location filename="../preferences.ui" line="665"/>
<location filename="../preferences.ui" line="652"/>
<source>Number properties</source>
<translation>Настройки индикатора кол-ва</translation>
</message>
@@ -251,67 +251,67 @@
<translation type="vanished">Показывать кол-во непрочитанных писем</translation>
</message>
<message>
<location filename="../preferences.ui" line="718"/>
<location filename="../preferences.ui" line="705"/>
<source>Number color</source>
<translation>Цвет числа</translation>
</message>
<message>
<location filename="../preferences.ui" line="739"/>
<location filename="../preferences.ui" line="726"/>
<source>Number size</source>
<translation>Размер числа</translation>
</message>
<message>
<location filename="../preferences.ui" line="763"/>
<location filename="../preferences.ui" line="750"/>
<source>Alignment</source>
<translation>Выравнивание</translation>
</message>
<message>
<location filename="../preferences.ui" line="774"/>
<location filename="../preferences.ui" line="761"/>
<source>Top left</source>
<translation>Верхний левый</translation>
</message>
<message>
<location filename="../preferences.ui" line="779"/>
<location filename="../preferences.ui" line="766"/>
<source>Top centre</source>
<translation>Верхний центр</translation>
</message>
<message>
<location filename="../preferences.ui" line="784"/>
<location filename="../preferences.ui" line="771"/>
<source>Top right</source>
<translation>Верхний правый</translation>
</message>
<message>
<location filename="../preferences.ui" line="789"/>
<location filename="../preferences.ui" line="776"/>
<source>Middle left</source>
<translation>Средний левый</translation>
</message>
<message>
<location filename="../preferences.ui" line="794"/>
<location filename="../preferences.ui" line="781"/>
<source>Middle centre</source>
<translation>Средний центральный</translation>
</message>
<message>
<location filename="../preferences.ui" line="799"/>
<location filename="../preferences.ui" line="786"/>
<source>Middle right</source>
<translation>Средний правый</translation>
</message>
<message>
<location filename="../preferences.ui" line="804"/>
<location filename="../preferences.ui" line="791"/>
<source>Bottom left</source>
<translation>Нижний левый</translation>
</message>
<message>
<location filename="../preferences.ui" line="809"/>
<location filename="../preferences.ui" line="796"/>
<source>Bottom centre</source>
<translation>Нижний центральный</translation>
</message>
<message>
<location filename="../preferences.ui" line="814"/>
<location filename="../preferences.ui" line="801"/>
<source>Bottom right</source>
<translation>Нижний правый</translation>
</message>
<message>
<location filename="../preferences.ui" line="673"/>
<location filename="../preferences.ui" line="660"/>
<source>Margins (left, top, right, bottom):</source>
<translation>Отступ (левый, Верхний, правый, Нижний):</translation>
</message>
@@ -351,79 +351,89 @@
<translation>Новые</translation>
</message>
<message>
<location filename="../preferences.ui" line="829"/>
<location filename="../preferences.ui" line="816"/>
<source>New indicator</source>
<translation>Новый индикатор</translation>
</message>
<message>
<location filename="../preferences.ui" line="837"/>
<location filename="../preferences.ui" line="824"/>
<source>Icon round</source>
<translation>Круглый значок</translation>
</message>
<message>
<location filename="../preferences.ui" line="847"/>
<location filename="../preferences.ui" line="834"/>
<source>Icon star</source>
<translation>Значок звезды</translation>
</message>
<message>
<location filename="../preferences.ui" line="859"/>
<location filename="../preferences.ui" line="846"/>
<source>Shade</source>
<translation>Оттенок</translation>
</message>
<message>
<location filename="../preferences.ui" line="926"/>
<location filename="../preferences.ui" line="925"/>
<source>Special options</source>
<translation>Специальные опции</translation>
</message>
<message>
<location filename="../preferences.ui" line="931"/>
<source>API count method</source>
<translation>Метод подсчета API</translation>
</message>
<message>
<location filename="../preferences.ui" line="955"/>
<source>Apps</source>
<translation>Программы</translation>
</message>
<message>
<location filename="../preferences.ui" line="934"/>
<location filename="../preferences.ui" line="963"/>
<source>Close application</source>
<translation>Заявление о закрытии</translation>
</message>
<message>
<location filename="../preferences.ui" line="947"/>
<location filename="../preferences.ui" line="988"/>
<location filename="../preferences.ui" line="976"/>
<location filename="../preferences.ui" line="1017"/>
<source>Browse...</source>
<translation>просматривать...</translation>
</message>
<message>
<location filename="../preferences.ui" line="958"/>
<location filename="../preferences.ui" line="999"/>
<location filename="../preferences.ui" line="987"/>
<location filename="../preferences.ui" line="1028"/>
<source>Arguments:</source>
<translation>аргументы:</translation>
</message>
<message>
<location filename="../preferences.ui" line="975"/>
<location filename="../preferences.ui" line="1004"/>
<source>Start application</source>
<translation>Приложение при запуске</translation>
</message>
<message>
<location filename="../preferences.ui" line="1032"/>
<location filename="../preferences.ui" line="1061"/>
<source>Mail</source>
<translation>Письма</translation>
</message>
<message>
<location filename="../preferences.ui" line="1038"/>
<location filename="../preferences.ui" line="1067"/>
<source>Use the preferences dialog in Thunderbird to select the accounts and folders</source>
<translation>Используйте диалоговое окно настроек в Thunderbird, чтобы выбрать учетные записи и папки</translation>
</message>
<message>
<location filename="../preferences.ui" line="1075"/>
<location filename="../preferences.ui" line="1104"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
<message>
<location filename="../preferences.ui" line="1081"/>
<location filename="../preferences.ui" line="1110"/>
<source>Display debug window</source>
<translation>Показывать окно отладки</translation>
</message>
<message>
<location filename="../preferences.ui" line="1142"/>
<location filename="../preferences.ui" line="1171"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<location filename="../preferences.ui" line="1135"/>
<location filename="../preferences.ui" line="1164"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
@@ -434,20 +444,20 @@
<translation>Свернуть в трей</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Open Image</source>
<translation>Открыть изображение</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="651"/>
<location filename="../preferencesdialog.cpp" line="675"/>
<location filename="../preferencesdialog.cpp" line="669"/>
<location filename="../preferencesdialog.cpp" line="693"/>
<source>Image Files (*.png *.jpg *.bmp)</source>
<translation>Файлы изображений (*.png *.jpg *.bmp)</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="730"/>
<location filename="../preferencesdialog.cpp" line="744"/>
<location filename="../preferencesdialog.cpp" line="748"/>
<location filename="../preferencesdialog.cpp" line="762"/>
<source>Select application</source>
<translation>выберите приложение</translation>
</message>
@@ -455,27 +465,27 @@
<context>
<name>SysTrayX</name>
<message>
<location filename="../systrayx.cpp" line="241"/>
<location filename="../systrayx.cpp" line="243"/>
<source>&amp;Show/Hide</source>
<translation>&amp;Показать/Скрыть</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="245"/>
<location filename="../systrayx.cpp" line="247"/>
<source>&amp;Preferences</source>
<translation>&amp;Настройки</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="249"/>
<location filename="../systrayx.cpp" line="251"/>
<source>&amp;About</source>
<translation>&amp;О приложении</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="253"/>
<location filename="../systrayx.cpp" line="255"/>
<source>&amp;Quit</source>
<translation>&amp;Выход</translation>
</message>
<message>
<location filename="../systrayx.cpp" line="687"/>
<location filename="../systrayx.cpp" line="689"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>

28
app/SysTray-X/SysTray-X-app/preferences.cpp
View File

@@ -85,6 +85,8 @@ Preferences::Preferences( QObject *parent ) : QObject( parent )
m_version_hash = QLatin1String( APP_GITHASH );
m_version_branch = QLatin1String( APP_GITBRANCH );
m_browser_version = "0.0.0";
m_start_app = "";
m_start_app_args = "";
m_close_app = "";
@@ -913,6 +915,32 @@ void Preferences::setCloseAppArgs( QString args )
}
/*
* Get the API count method state.
*/
bool Preferences::getApiCountMethod() const
{
return m_api_count_method;
}
/*
* Set the API count method state.
*/
void Preferences::setApiCountMethod( bool state )
{
if( m_api_count_method != state )
{
m_api_count_method = state;
/*
* Tell the world the new preference
*/
emit signalApiCountMethodChange();
}
}
/*
* Get the debug state.
*/

24
app/SysTray-X/SysTray-X-app/preferences.h
View File

@@ -564,6 +564,20 @@ class Preferences : public QObject
*/
void setCloseAppArgs( QString args );
/**
* @brief getApiCountMethod. Get the API count method state.
*
* @return The state.
*/
bool getApiCountMethod() const;
/**
* @brief setApiCountMethod. Set the API count method state.
*
* @param state The state.
*/
void setApiCountMethod( bool state );
/**
* @brief getDebug. Get the debug windows state.
*
@@ -745,6 +759,11 @@ class Preferences : public QObject
*/
void signalCloseAppArgsChange();
/**
* @brief signalApiCountMethodChange
*/
void signalApiCountMethodChange();
private:
/**
@@ -931,6 +950,11 @@ class Preferences : public QObject
*/
QString m_close_app_args;
/**
* @brief m_api_count_method. The API count method state.
*/
bool m_api_count_method;
/**
* @brief m_debug. Display debug window.
*/

69
app/SysTray-X/SysTray-X-app/preferences.ui
View File

@@ -27,7 +27,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tabWindows">
<attribute name="title">
@@ -646,19 +646,6 @@
</layout>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" rowspan="2" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
@@ -919,6 +906,48 @@
</property>
</spacer>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2" colspan="2">
<widget class="QGroupBox" name="specialOptionsGroupBox">
<property name="title">
<string>Special options</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QCheckBox" name="apiCountMethod">
<property name="text">
<string>API count method</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab">
@@ -1154,12 +1183,12 @@
</resources>
<connections/>
<buttongroups>
<buttongroup name="countTypeGroup"/>
<buttongroup name="iconTypeGroup"/>
<buttongroup name="defaultIconTypeGroup"/>
<buttongroup name="minimizeIconTypeGroup"/>
<buttongroup name="newIndicatorTypeGroup"/>
<buttongroup name="minimizeTypeGroup"/>
<buttongroup name="closeTypeGroup"/>
<buttongroup name="countTypeGroup"/>
<buttongroup name="defaultIconTypeGroup"/>
<buttongroup name="minimizeTypeGroup"/>
<buttongroup name="newIndicatorTypeGroup"/>
<buttongroup name="iconTypeGroup"/>
<buttongroup name="minimizeIconTypeGroup"/>
</buttongroups>
</ui>

41
app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
View File

@@ -41,10 +41,10 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
* Set close type button Ids
*/
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 );
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 );
/*
* Set minimize type button Ids
@@ -145,6 +145,11 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
*/
setStartupDelay( m_pref->getStartupDelay() );
/*
* Set API count method
*/
setApiCountMethod( m_pref->getApiCountMethod() );
/*
* Set number alignment
*/
@@ -519,11 +524,30 @@ void PreferencesDialog::setCloseAppArgs( QString args )
}
/*
* Set the API count method state
*/
void PreferencesDialog::setApiCountMethod( bool state )
{
m_ui->apiCountMethod->setChecked( state );
}
/*
* Handle show dialog signal
*/
void PreferencesDialog::slotShowDialog()
{
QString version = m_pref->getBrowserVersion().split(".")[0];
if( version.toInt() < 115 )
{
m_ui->specialOptionsGroupBox->setVisible( false );
}
else
{
m_ui->specialOptionsGroupBox->setVisible( true );
}
showNormal();
activateWindow();
}
@@ -561,6 +585,7 @@ void PreferencesDialog::slotAccept()
m_pref->setShowNumber( m_ui->showNumberCheckBox->isChecked() );
m_pref->setShowNewIndicator( m_ui->showNewCheckBox->isChecked() );
m_pref->setStartupDelay( m_ui->startupDelaySpinBox->value() );
m_pref->setApiCountMethod( m_ui->apiCountMethod->isChecked() );
m_pref->setCountType( static_cast< Preferences::CountType >( m_ui->countTypeGroup->checkedId() ) );
m_pref->setNumberSize( m_ui->numberSizeSpinBox->value() );
@@ -625,7 +650,8 @@ void PreferencesDialog::slotReject()
setShowNumber( m_pref->getShowNumber() );
setShowNewIndicator( m_pref->getShowNewIndicator() );
setStartupDelay( m_pref->getStartupDelay());
setStartupDelay( m_pref->getStartupDelay() );
setApiCountMethod( m_pref->getApiCountMethod() );
setCountType( m_pref->getCountType() );
setNumberColor( m_pref->getNumberColor() );
setNumberSize( m_pref->getNumberSize());
@@ -994,3 +1020,12 @@ void PreferencesDialog::slotCloseAppArgsChange()
{
setCloseAppArgs( m_pref->getCloseAppArgs() );
}
/*
* Handle the API count method change signal
*/
void PreferencesDialog::slotApiCountMethodChange()
{
setApiCountMethod( m_pref->getApiCountMethod() );
}

11
app/SysTray-X/SysTray-X-app/preferencesdialog.h
View File

@@ -258,6 +258,12 @@ class PreferencesDialog : public QDialog
*/
void setCloseAppArgs( QString args );
/**
* @brief setApiCountMethod. Set the API count method state.
*
* @param state The state.
*/
void setApiCountMethod( bool state );
signals:
@@ -410,6 +416,11 @@ class PreferencesDialog : public QDialog
*/
void slotCloseAppArgsChange();
/**
* @brief slotApiCountMethodChange. Slot for handling the API count methid change.
*/
void slotApiCountMethodChange();
private slots:
/**

6
app/SysTray-X/SysTray-X-app/systrayx.cpp
View File

@@ -140,6 +140,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
connect( m_preferences, &Preferences::signalStartAppArgsChange, m_pref_dialog, &PreferencesDialog::slotStartAppArgsChange );
connect( m_preferences, &Preferences::signalCloseAppChange, m_pref_dialog, &PreferencesDialog::slotCloseAppChange );
connect( m_preferences, &Preferences::signalCloseAppArgsChange, m_pref_dialog, &PreferencesDialog::slotCloseAppArgsChange );
connect( m_preferences, &Preferences::signalApiCountMethodChange, m_pref_dialog, &PreferencesDialog::slotApiCountMethodChange );
connect( m_preferences, &Preferences::signalDebugChange, m_pref_dialog, &PreferencesDialog::slotDebugChange );
connect( m_preferences, &Preferences::signalDefaultIconTypeChange, m_link, &SysTrayXLink::slotDefaultIconTypeChange );
@@ -167,6 +168,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
connect( m_preferences, &Preferences::signalStartAppArgsChange, m_link, &SysTrayXLink::slotStartAppArgsChange );
connect( m_preferences, &Preferences::signalCloseAppChange, m_link, &SysTrayXLink::slotCloseAppChange );
connect( m_preferences, &Preferences::signalCloseAppArgsChange, m_link, &SysTrayXLink::slotCloseAppArgsChange );
connect( m_preferences, &Preferences::signalApiCountMethodChange, m_link, &SysTrayXLink::slotApiCountMethodChange );
connect( m_preferences, &Preferences::signalDebugChange, m_link, &SysTrayXLink::slotDebugChange );
connect( m_preferences, &Preferences::signalHideDefaultIconChange, this, &SysTrayX::slotSelectIconObjectPref );
@@ -178,6 +180,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
connect( m_link, &SysTrayXLink::signalAddOnShutdown, this, &SysTrayX::slotAddOnShutdown );
connect( m_link, &SysTrayXLink::signalErrorAddOnShutdown, this, &SysTrayX::slotErrorAddOnShutdown );
connect( m_link, &SysTrayXLink::signalWindowState, m_win_ctrl, &WindowCtrl::slotWindowState );
connect( m_link, &SysTrayXLink::signalNewWindow, m_win_ctrl, &WindowCtrl::slotNewWindow );
connect( m_link, &SysTrayXLink::signalCloseWindow, m_win_ctrl, &WindowCtrl::slotCloseWindow );
connect( m_link, &SysTrayXLink::signalMailCount, this, &SysTrayX::slotMailCount );
connect( m_link, &SysTrayXLink::signalVersion, this, &SysTrayX::slotVersion );
connect( m_link, &SysTrayXLink::signalKdeIntegration, this, &SysTrayX::slotSelectIconObject );
@@ -204,6 +208,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
getPreferences();
/*
m_preferences->setBrowserVersion( "115.1.0" );
// m_preferences->setBrowserVersion( "102.2.3" );
slotLoadLanguage( "en-US" );
//slotLoadLanguage( "it" );
//slotLoadLanguage( "nl" );

88
app/SysTray-X/SysTray-X-app/systrayxlink.cpp
View File

@@ -329,15 +329,11 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
if( mailCount.contains( "unread" ) && mailCount[ "unread" ].isDouble() )
{
unreadMail = mailCount[ "unread" ].toInt();
emit signalConsole( QString("Unread %1").arg( unreadMail ) );
}
if( mailCount.contains( "new" ) && mailCount[ "new" ].isDouble() )
{
newMail = mailCount[ "new" ].toInt();
emit signalConsole( QString("New %1").arg( newMail ) );
}
emit signalMailCount( unreadMail, newMail );
@@ -362,9 +358,21 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
emit signalAddOnShutdown();
}
if( jsonObject.contains( "window" ) && jsonObject[ "window" ].isString() )
if( jsonObject.contains( "window" ) && jsonObject[ "window" ].isObject() )
{
QString window_state_str = jsonObject[ "window" ].toString();
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();
}
Preferences::WindowState window_state;
if( window_state_str == Preferences::STATE_NORMAL_STR )
@@ -409,7 +417,7 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
window_state = Preferences::STATE_NORMAL;
}
emit signalWindowState( window_state );
emit signalWindowState( window_state, window_id );
}
if( jsonObject.contains( "hideDefaultIcon" ) && jsonObject[ "hideDefaultIcon" ].isBool() )
@@ -474,6 +482,32 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
{
emit signalCloseApp();
}
if( jsonObject.contains( "newWindow" ) && jsonObject[ "newWindow" ].isDouble() )
{
int new_window_id = jsonObject[ "newWindow" ].toInt();
emit signalNewWindow( new_window_id );
}
if( jsonObject.contains( "closeWindow" ) && jsonObject[ "closeWindow" ].isObject() )
{
QJsonObject close_window = jsonObject[ "closeWindow" ].toObject();
int close_window_id = 0;
if( close_window.contains( "id" ) && close_window[ "id" ].isDouble() )
{
close_window_id = close_window[ "id" ].toInt();
}
bool close_quit = false;
if( close_window.contains( "quit" ) && close_window[ "quit" ].isBool() )
{
close_quit = close_window[ "quit" ].toBool();
}
emit signalCloseWindow( close_window_id, close_quit );
}
}
}
@@ -861,6 +895,16 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref )
m_pref->setCloseAppArgs( args );
}
if( pref.contains( "apiCountMethod" ) && pref[ "apiCountMethod" ].isString() )
{
bool api_count_method = pref[ "apiCountMethod" ].toString() == "true";
/*
* Store the new API cont method state
*/
m_pref->setApiCountMethod( api_count_method );
}
if( pref.contains( "debug" ) && pref[ "debug" ].isString() )
{
bool debug = pref[ "debug" ].toString() == "true";
@@ -876,27 +920,27 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref )
/*
* Decode preferences from JSON message
*/
QMargins SysTrayXLink::DecodeMargins( const QJsonObject& marginsJson )
QMargins SysTrayXLink::DecodeMargins( const QJsonObject& margins_json )
{
QMargins margins;
if( marginsJson.contains( "left" ) && marginsJson[ "left" ].isString() )
if( margins_json.contains( "left" ) && margins_json[ "left" ].isString() )
{
margins.setLeft( marginsJson[ "left" ].toString().toInt() );
margins.setLeft( margins_json[ "left" ].toString().toInt() );
}
if( marginsJson.contains( "top" ) && marginsJson[ "top" ].isString() )
if( margins_json.contains( "top" ) && margins_json[ "top" ].isString() )
{
margins.setTop( marginsJson[ "top" ].toString().toInt() );
margins.setTop( margins_json[ "top" ].toString().toInt() );
}
if( marginsJson.contains( "right" ) && marginsJson[ "right" ].isString() )
if( margins_json.contains( "right" ) && margins_json[ "right" ].isString() )
{
margins.setRight( marginsJson[ "right" ].toString().toInt() );
margins.setRight( margins_json[ "right" ].toString().toInt() );
}
if( marginsJson.contains( "bottom" ) && marginsJson[ "bottom" ].isString() )
if( margins_json.contains( "bottom" ) && margins_json[ "bottom" ].isString() )
{
margins.setBottom( marginsJson[ "bottom" ].toString().toInt() );
margins.setBottom( margins_json[ "bottom" ].toString().toInt() );
}
return margins;
@@ -941,6 +985,7 @@ void SysTrayXLink::EncodePreferences( const Preferences& pref )
prefObject.insert("numberMargins", marginsObject );
prefObject.insert("countType", QJsonValue::fromVariant( QString::number( pref.getCountType() ) ) );
prefObject.insert("startupDelay", QJsonValue::fromVariant( QString::number( pref.getStartupDelay() ) ) );
prefObject.insert("apiCountMethod", QJsonValue::fromVariant( QString( pref.getApiCountMethod() ? "true" : "false" ) ) );
prefObject.insert("startApp", QJsonValue::fromVariant( pref.getStartApp() ) );
prefObject.insert("startAppArgs", QJsonValue::fromVariant( pref.getStartAppArgs() ) );
@@ -1287,6 +1332,17 @@ void SysTrayXLink::slotCloseAppArgsChange()
}
/*
* Handle a API count method change signal
*/
void SysTrayXLink::slotApiCountMethodChange()
{
if( m_pref->getAppPrefChanged() )
{
sendPreferences();
}
}
/*
* Handle a debug state change signal
*/

23
app/SysTray-X/SysTray-X-app/systrayxlink.h
View File

@@ -7,7 +7,6 @@
*/
#include "preferences.h"
/*
* Qt includes
*/
@@ -213,7 +212,7 @@ class SysTrayXLink : public QObject
/**
* @brief signalWindowState. Signal a change in the window state.
*/
void signalWindowState( Preferences::WindowState state );
void signalWindowState( Preferences::WindowState state, int id );
/**
* @brief signalKdeIntegration. Signal KDE integration (and use the KStatusNotifierItem icon)
@@ -252,6 +251,21 @@ class SysTrayXLink : public QObject
*/
void signalCloseApp();
/**
* @brief signalNewWindow. Signal the new window id.
*
* @param id TB id of the window.
*/
void signalNewWindow( int id );
/**
* @brief signalCloseWindow. Signal the close window id.
*
* @param id TB id of the window.
* @param quit true if the window is really closed.
*/
void signalCloseWindow( int id, bool quit );
public slots:
/**
@@ -389,6 +403,11 @@ class SysTrayXLink : public QObject
*/
void slotCloseAppArgsChange();
/**
* @brief slotApiCountMethodChange. Slot for handling the API count method change signals.
*/
void slotApiCountMethodChange();
private slots:
/**

161
app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp
View File

@@ -6,10 +6,6 @@
* Local includes
*/
#include "debug.h"
/*
* Local includes
*/
#include "preferences.h"
/*
@@ -38,8 +34,10 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent )
* Initialize
*/
m_tb_windows = QList< quint64 >();
m_tb_window_refs = QMap< int, quint64 >();
m_tb_window_positions = QMap< quint64, QPoint >();
m_tb_window_states = QMap< quint64, Preferences::WindowState >();
m_tb_window_states_x11 = QMap< quint64, QStringList >();
m_tb_window_hints = QMap< quint64, SizeHints >();
/*
@@ -267,15 +265,77 @@ void WindowCtrlUnix::findWindows( qint64 pid )
}
/*
* Try to match the TB window id to a x11 window
*/
void WindowCtrlUnix::identifyWindow( int id )
{
/*
* Get all the windows connected to TB
*/
findWindows( getPpid() );
/*
* Get the list
*/
QList<quint64> win_list = m_tb_windows;
/*
* Remove known ids
*/
QMapIterator<int, quint64> it(m_tb_window_refs);
while (it.hasNext()) {
it.next();
int found = win_list.indexOf( it.value() );
if( found != -1 )
{
win_list.removeAt( found );
}
}
/*
* Should only one remain
*/
if( win_list.length() > 0 )
{
m_tb_window_refs[ id ] = win_list[ 0 ];
}
if( win_list.length() != 1 )
{
// emit signalConsole( QString( "Unexpected Ids: %1" ).arg( win_list.length() ) );
}
}
/*
* Get the Thunderbird window IDs
*/
QList< quint64 > WindowCtrlUnix::getWinIds()
const QList< quint64 >& WindowCtrlUnix::getWinIds() const
{
return m_tb_windows;
}
/*
* Get the reference IDs
*/
const QMap< int, quint64 >& WindowCtrlUnix::getRefIds() const
{
return m_tb_window_refs;
}
/*
* Get the reference IDs
*/
void WindowCtrlUnix::removeRefId( int id )
{
m_tb_window_refs.remove( id );
}
/*
* Get the states of the TB windows.
*/
@@ -299,15 +359,25 @@ void WindowCtrlUnix::updatePositions()
{
quint64 window = m_tb_windows.at( i );
QStringList x11_state = getWindowStateX11( window );
if( x11_state.contains( "_NET_WM_STATE_MAXIMIZED_VERT" ) &&
x11_state.contains( "_NET_WM_STATE_MAXIMIZED_HORZ" ) )
{
/*
* Maximized, skip position store
*/
continue;
}
if( m_tb_window_states[ window ] != Preferences::STATE_MINIMIZED && m_tb_window_states[ window ] != Preferences::STATE_DOCKED )
{
/*
* Get border / title bar sizes
*/
long left;
long top;
long right;
long bottom;
int left;
int top;
int right;
int bottom;
GetWindowFrameExtensions( m_display, window, &left, &top, &right, &bottom );
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
@@ -317,8 +387,8 @@ void WindowCtrlUnix::updatePositions()
/*
* Get the position
*/
long x;
long y;
int x;
int y;
GetWindowPosition( m_display, window, &x, &y );
/*
@@ -367,6 +437,11 @@ void WindowCtrlUnix::minimizeWindowToTaskbar( quint64 window )
*/
GetWMNormalHints( m_display, window, &m_tb_window_hints[ window ] );
/*
* Get and store the X11 window state
*/
m_tb_window_states_x11[ window ] = getWindowStateX11( window );
/*
* Minimize the window
*/
@@ -407,6 +482,11 @@ void WindowCtrlUnix::minimizeWindowToTray( quint64 window )
*/
GetWMNormalHints( m_display, window, &m_tb_window_hints[ window ] );
/*
* Get and store the X11 window state
*/
m_tb_window_states_x11[ window ] = getWindowStateX11( window );;
/*
* Set the flags (GNOME, Wayland?)
*/
@@ -452,14 +532,31 @@ void WindowCtrlUnix::normalizeWindow( quint64 window )
{
MapWindow( m_display, window );
SetWMNormalHints( m_display, window, m_tb_window_hints[ window ] );
/*
* Reset the hide flags
*/
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_REMOVE, _ATOM_SKIP_TASKBAR );
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_REMOVE, _ATOM_SKIP_PAGER );
/*
* Was the window maximized?
*/
if( m_tb_window_states_x11[ window ].contains( "_NET_WM_STATE_MAXIMIZED_VERT" ) &&
m_tb_window_states_x11[ window ].contains( "_NET_WM_STATE_MAXIMIZED_HORZ" ) )
{
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_MAXIMIZED );
}
/*
* Delete the X11 state
*/
m_tb_window_states_x11.remove( window );
/*
* Restore the size hints
*/
SetWMNormalHints( m_display, window, m_tb_window_hints[ window ] );
Flush( m_display );
}
@@ -622,4 +719,42 @@ QList< WindowCtrlUnix::WindowItem > WindowCtrlUnix::listXWindows( void* displa
return windows;
}
/*
* Get the window state from X11
*/
QStringList WindowCtrlUnix::getWindowStateX11( quint64 window )
{
qint32 n_net_wm_state;
void* net_wm_state_ptr = GetWindowProperty( m_display, window, "_NET_WM_STATE", &n_net_wm_state );
/*
* Get the atoms
*/
QStringList atom_list;
if( net_wm_state_ptr != nullptr )
{
for( qint32 i = 0 ; i < n_net_wm_state ; ++i )
{
char* atom_name = GetAtomName( m_display, reinterpret_cast<long *>( net_wm_state_ptr )[ i ] );
atom_list.append( atom_name );
if( atom_name )
{
Free( atom_name );
}
}
Free( net_wm_state_ptr );
}
/*
for( int i = 0 ; i < atom_list.length() ; ++i )
{
emit signalConsole( QString( "Atom: %1").arg( atom_list.at( i ) ) );
}
*/
return atom_list;
}
#endif // Q_OS_UNIX

55
app/SysTray-X/SysTray-X-app/windowctrl-unix.h
View File

@@ -21,6 +21,7 @@
#include <QList>
#include <QMap>
#include <QPoint>
#include <QStringList>
/*
* Predefines
@@ -222,12 +223,33 @@ class WindowCtrlUnix : public QObject
*/
void findWindows( qint64 pid );
/**
* @brief identifyWindow. Try to connect th TB window id to a X11 window.
*
* @param id The TB windows id.
*/
void identifyWindow( int id );
/**
* @brief getWinIds. Get the Thunderbird window IDs.
*
* @return The list of window ID.
*/
QList< quint64 > getWinIds();
const QList< quint64 >& getWinIds() const;
/**
* @brief removeRefId. Remove the TB window Id from the reference list.
*
* @param id The TB window id.
*/
void removeRefId( int id );
/**
* @brief getRefIds. Get the reference IDs.
*
* @return The list of reference IDs.
*/
const QMap< int, quint64 >& getRefIds() const;
/**
* @brief getWindowState. Get the state of a TB windows.
@@ -238,15 +260,6 @@ class WindowCtrlUnix : public QObject
*/
const Preferences::WindowState& getWindowState( const quint64 window );
/**
* @brief getWindowState. Get the state of a TB windows.
*
* @param window Window ID.
*
* @return The window state.
*/
const Preferences::WindowState& getWindowStateX11( const quint64 window );
/**
* @brief updatePositions. Update the window positions.
*/
@@ -287,11 +300,6 @@ class WindowCtrlUnix : public QObject
*/
void setPositions( QList< QPoint > window_positions );
/**
* @brief updateX11WindowStates. Update the x11 window states.
*/
void updateX11WindowStates( CheckType check_type );
private:
/**
@@ -310,6 +318,13 @@ class WindowCtrlUnix : public QObject
*/
QList< WindowItem > listXWindows( void* display, quint64 window, int level = 0 );
/**
* @brief getWindowStateX11. Get the window state from X11
*
* @param window The window.
*/
QStringList getWindowStateX11( quint64 window );
signals:
/**
@@ -338,6 +353,11 @@ class WindowCtrlUnix : public QObject
*/
QList< quint64 > m_tb_windows;
/**
* @brief m_tb_window_refs. The Thunderbird window ids referenced to x11 windows.
*/
QMap< int, quint64 > m_tb_window_refs;
/**
* @brief m_tb_window_positions. The Thunderbird window positions.
*/
@@ -348,6 +368,11 @@ class WindowCtrlUnix : public QObject
*/
QMap< quint64, Preferences::WindowState > m_tb_window_states;
/**
* @brief m_tb_window_states_x11. The Thunderbird window states X11.
*/
QMap< quint64, QStringList > m_tb_window_states_x11;
/**
* @brief m_tb_window_hints. The Thunderbird window hints.
*/

92
app/SysTray-X/SysTray-X-app/windowctrl.cpp
View File

@@ -152,7 +152,7 @@ void WindowCtrl::slotStartMinimizedChange()
/*
* Handle change in window state
*/
void WindowCtrl::slotWindowState( Preferences::WindowState state )
void WindowCtrl::slotWindowState( Preferences::WindowState state, int id )
{
if( m_show_hide_active )
{
@@ -163,7 +163,8 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
}
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( QString( "State change to: %1" ).arg( Preferences::WindowStateString.at( state ) ) );
emit signalConsole( QString( "State: %1" ).arg( Preferences::WindowStateString.at( state ) ) );
emit signalConsole( QString( "Id: %1" ).arg( id ) );
#endif
/*
@@ -185,7 +186,7 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
/*
* Minimize on startup always to the tray
*/
TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
TargetType target_type = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
if( state == Preferences::STATE_MINIMIZED_ALL )
{
@@ -201,10 +202,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
/*
* 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 )
Preferences::CloseType close_type = getCloseType();
if( close_type == Preferences::PREF_MINIMIZE_ALL_WINDOWS || close_type == Preferences::PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS )
{
targetType = TargetType::TYPE_WINDOW_TO_TASKBAR;
target_type = TargetType::TYPE_WINDOW_TO_TASKBAR;
}
}
@@ -219,7 +220,7 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
.arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) );
#endif
if( targetType == TargetType::TYPE_WINDOW_TO_TASKBAR )
if( target_type == TargetType::TYPE_WINDOW_TO_TASKBAR )
{
minimizeWindowToTaskbar( win_ids.at( i ) );
}
@@ -231,20 +232,21 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
}
else
{
if( state == Preferences::STATE_MINIMIZED )
if( state == Preferences::STATE_MINIMIZED || state == Preferences::STATE_DOCKED )
{
Preferences::MinimizeType minimizeType = getMinimizeType();
if( minimizeType != Preferences::PREF_DEFAULT_MINIMIZE )
Preferences::MinimizeType minimize_type = getMinimizeType();
if( minimize_type != Preferences::PREF_DEFAULT_MINIMIZE )
{
QList< quint64 > win_ids = getWinIds();
for( int i = 0 ; i < win_ids.length() ; ++i )
{
/*
* Hide the window
*/
if( getWindowState( win_ids[ i ] ) == Preferences::STATE_MINIMIZED )
QMap< int, quint64 > ref_list = getRefIds();
if( ref_list.contains( id ) )
{
/*
* Hide the window
*/
if( getWindowState( ref_list[ id ] ) == Preferences::STATE_MINIMIZED )
{
minimizeWindowToTray( win_ids.at( i ) );
minimizeWindowToTray( ref_list[ id ] );
}
}
}
@@ -294,10 +296,10 @@ void WindowCtrl::slotShowHide()
#endif
TargetType targetType = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
TargetType target_type = TargetType::TYPE_WINDOW_TO_SYSTEMTRAY;
if( getMinimizeIconType() == Preferences::PREF_DEFAULT_MINIMIZE_ICON )
{
targetType = TargetType::TYPE_WINDOW_TO_TASKBAR;
target_type = TargetType::TYPE_WINDOW_TO_TASKBAR;
}
/*
@@ -319,7 +321,7 @@ void WindowCtrl::slotShowHide()
}
else
{
if( targetType == TargetType::TYPE_WINDOW_TO_TASKBAR )
if( target_type == TargetType::TYPE_WINDOW_TO_TASKBAR )
{
minimizeWindowToTaskbar( win_ids.at( i ) );
}
@@ -395,3 +397,51 @@ void WindowCtrl::slotPositions( QList< QPoint > window_positions )
#endif
}
/*
* Handle the new window id.
*/
void WindowCtrl::slotNewWindow( int id )
{
/*
* Get the windows
*/
findWindows( m_ppid );
/*
* Try to find a corresponding x11 window
*/
identifyWindow( id );
}
/*
* Handle the close window id.
*/
void WindowCtrl::slotCloseWindow( int id, bool quit )
{
if( quit )
{
/*
* Window is closed by TB
*/
removeRefId( id );
return;
}
QMap<int, quint64> ref_list = getRefIds();
if( ref_list.contains( id ) )
{
Preferences::CloseType close_type = getCloseType();
if( close_type == Preferences::PREF_MINIMIZE_MAIN_TRAY_CLOSE_CHILDREN_WINDOWS ||
close_type == Preferences::PREF_MINIMIZE_ALL_WINDOWS_TRAY )
{
minimizeWindowToTray( ref_list[ id ] );
}
else
{
minimizeWindowToTaskbar( ref_list[ id ] );
}
}
}

27
app/SysTray-X/SysTray-X-app/windowctrl.h
View File

@@ -1,8 +1,15 @@
#ifndef WINDOWCTRL_H
#define WINDOWCTRL_H
/*
* Qt includes
*/
#include <QtGlobal>
/*
* Local includes
*/
#ifdef Q_OS_UNIX
#include "windowctrl-unix.h"
#endif // Q_OS_UNIX
@@ -99,9 +106,10 @@ class WindowCtrl : public QObject
/**
* @brief slotWindowState. Handle the window state change signal.
*
* @param state The new state.
* @param state The new state.
* @param id The TB window id.
*/
void slotWindowState( Preferences::WindowState state );
void slotWindowState( Preferences::WindowState state, int id);
/**
* @brief slotShowHide. Slot for handling of the show / hide window signal.
@@ -118,6 +126,21 @@ class WindowCtrl : public QObject
*/
void slotPositions( QList< QPoint > window_positions );
/**
* @brief slotNewWindow. Slot for handling a new window.
*
* @param id The TB window id.
*/
void slotNewWindow( int id );
/**
* @brief slotCloseWindow. Slot for handling a close window.
*
* @param id The TB window id.
* @param quit true if the window is really closed.
*/
void slotCloseWindow( int id, bool quit );
private:
/**

62
app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp
View File

@@ -352,6 +352,25 @@ void SendEvent( void* display, quint64 window, const char* msg_type,
break;
}
case _ATOM_MAXIMIZED_VERT:
{
event.xclient.data.l[1] = XInternAtom( dsp, "_NET_WM_STATE_MAXIMIZED_VERT", False );
break;
}
case _ATOM_MAXIMIZED_HORZ:
{
event.xclient.data.l[1] = XInternAtom( dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False );
break;
}
case _ATOM_MAXIMIZED:
{
event.xclient.data.l[1] = XInternAtom( dsp, "_NET_WM_STATE_MAXIMIZED_VERT", False );
event.xclient.data.l[2] = XInternAtom( dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False );
break;
}
default:
{
return;
@@ -394,7 +413,7 @@ void SendEvent( void* display, quint64 window, const char* msg_type,
/*
* Get the frame extensions
*/
void GetWindowFrameExtensions( void *display, quint64 window, long* left, long* top, long* right, long* bottom )
void GetWindowFrameExtensions( void *display, quint64 window, int* left, int* top, int* right, int* bottom )
{
Display* dsp = (Display*)display;
@@ -424,10 +443,10 @@ void GetWindowFrameExtensions( void *display, quint64 window, long* left, lon
if( list && len == 4 )
{
long* extents = (long*)list;
*left = extents[ 0 ];
*right = extents[ 1 ];
*top = extents[ 2 ];
*bottom = extents[ 3 ];
*left = (int)extents[ 0 ];
*right = (int)extents[ 1 ];
*top = (int)extents[ 2 ];
*bottom = (int)extents[ 3 ];
}
}
@@ -441,7 +460,7 @@ void GetWindowFrameExtensions( void *display, quint64 window, long* left, lon
/*
* Get the window position
*/
void GetWindowPosition( void* display, quint64 window, long* pos_x, long* pos_y )
void GetWindowPosition( void* display, quint64 window, int* pos_x, int* pos_y )
{
Display* dsp = (Display*)display;
@@ -456,6 +475,37 @@ void GetWindowPosition( void* display, quint64 window, long* pos_x, long* pos
}
/*
* Get the window rect
*/
void GetWindowRectangle( void* display, quint64 window, int* win_x, int* win_y, int* win_width, int* win_height )
{
/*
* Get border / title bar sizes
*/
int left;
int top;
int right;
int bottom;
GetWindowFrameExtensions( display, window, &left, &top, &right, &bottom );
/*
* Get position and attributes
*/
Display* dsp = (Display*)display;
int x, y;
Window child;
XWindowAttributes xwa;
XTranslateCoordinates( dsp, window, XDefaultRootWindow( dsp ), 0, 0, &x, &y, &child );
XGetWindowAttributes( dsp, window, &xwa );
*win_x = x - xwa.x - left;
*win_y = y - xwa.y - top;
*win_width = xwa.width + left + right;
*win_height = xwa.height + top + bottom;
}
/*
* Set the window position
*/

22
app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h
View File

@@ -36,10 +36,12 @@ enum StateActions
enum StateAtoms
{
_ATOM_SKIP_TASKBAR = 0,
_ATOM_SKIP_PAGER
_ATOM_SKIP_PAGER,
_ATOM_MAXIMIZED_VERT,
_ATOM_MAXIMIZED_HORZ,
_ATOM_MAXIMIZED
};
/*
* Protocol atoms
*/
@@ -239,7 +241,7 @@ void SendEvent( void* display, quint64 window, const char* msg_type,
* @param right Storage for the right extension size
* @param bottom Storage for the bottom extension size
*/
void GetWindowFrameExtensions( void *display, quint64 window, long* left, long* top, long* right, long* bottom );
void GetWindowFrameExtensions( void *display, quint64 window, int* left, int* top, int* right, int* bottom );
/**
* @brief GetWindowPosition. Get the window position.
@@ -249,7 +251,19 @@ void GetWindowFrameExtensions( void *display, quint64 window, long* left, lon
* @param pos_x Storage for the x coordinate
* @param pos_y Storage for the y coordinate
*/
void GetWindowPosition( void *display, quint64 window, long* pos_x, long* pos_y );
void GetWindowPosition( void *display, quint64 window, int* pos_x, int* pos_y );
/**
* @brief GetWindowRectangle. Get the window rectangle.
*
* @param display The display
* @param window The window
* @param win_x The x coordinate
* @param win_y The y coordinete
* @param win_width The width
* @param win_height The height
*/
void GetWindowRectangle( void* display, quint64 window, int* win_x, int* win_y, int* win_width, int* win_height );
/**
* @brief MoveWindow. Set the window position.

13
create_linux_gnome_installers.sh
View File

@@ -18,7 +18,7 @@ OBS_RPM_PKS=""
OBS_RPM_GNOME_EXT=""
OBS_RPM_ARCHS+="openSUSE_Leap_15.4/x86_64 "
OBS_RPM_PKS+="_ "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="openSUSE_Tumbleweed/i586 "
OBS_RPM_PKS+="tmblwd "
OBS_RPM_GNOME_EXT+="master "
@@ -27,19 +27,19 @@ OBS_RPM_PKS+="tmblwd "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
OBS_RPM_PKS+="fed36 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
OBS_RPM_PKS+="fed38 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_39/x86_64 "
OBS_RPM_PKS+="fed39 "
OBS_RPM_GNOME_EXT+="master "
@@ -121,6 +121,7 @@ create_gnome_extension_tar() {
if [ ${GNOME_EXT} != "v26" ] &&
[ ${GNOME_EXT} != "v34" ] &&
[ ${GNOME_EXT} != "v46" ] &&
[ ${GNOME_EXT} != "v53" ] &&
[ ${GNOME_EXT} != "master" ] ; then
return
fi

13
create_linux_staging_gnome_installers.sh
View File

@@ -18,7 +18,7 @@ OBS_RPM_PKS=""
OBS_RPM_GNOME_EXT=""
OBS_RPM_ARCHS+="openSUSE_Leap_15.4/x86_64 "
OBS_RPM_PKS+="_ "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="openSUSE_Tumbleweed/i586 "
OBS_RPM_PKS+="tmblwd "
OBS_RPM_GNOME_EXT+="master "
@@ -27,19 +27,19 @@ OBS_RPM_PKS+="tmblwd "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_ARCHS+="15.4/x86_64 "
OBS_RPM_PKS+="lp154 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="15.5/x86_64 "
OBS_RPM_PKS+="lp155 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_36/x86_64 "
OBS_RPM_PKS+="fed36 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_37/x86_64 "
OBS_RPM_PKS+="fed37 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
OBS_RPM_PKS+="fed38 "
OBS_RPM_GNOME_EXT+="master "
OBS_RPM_GNOME_EXT+="v53 "
OBS_RPM_ARCHS+="Fedora_39/x86_64 "
OBS_RPM_PKS+="fed39 "
OBS_RPM_GNOME_EXT+="master "
@@ -121,6 +121,7 @@ create_gnome_extension_tar() {
if [ "${GNOME_EXT}" != "v26" ] &&
[ "${GNOME_EXT}" != "v34" ] &&
[ "${GNOME_EXT}" != "v46" ] &&
[ "${GNOME_EXT}" != "v53" ] &&
[ "${GNOME_EXT}" != "master" ] ; then
return
fi

2
dist/SysTray-X-32bit.nsi vendored
View File

@@ -11,7 +11,7 @@ Name "${Name}"
!define PRODUCT_ID "systray-x@Ximi1970"
!define VERSIONMAJOR 0
!define VERSIONMINOR 9
!define VERSIONBUILD 6
!define VERSIONBUILD 7
!define VERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"
CRCCheck On

2
dist/SysTray-X-64bit.nsi vendored
View File

@@ -11,7 +11,7 @@ Name "${Name}"
!define PRODUCT_ID "systray-x@Ximi1970"
!define VERSIONMAJOR 0
!define VERSIONMINOR 9
!define VERSIONBUILD 6
!define VERSIONBUILD 7
!define VERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"
CRCCheck On

7
dist/deb/gnome/debian.changelog vendored
View File

@@ -1,3 +1,10 @@
systray-x-gnome (0.9.7-0) unstable; urgency=low
* Update to 0.9.7
- Added option for new TB115 mail counting (slow with new mails enabled)
- Bugfixes
systray-x-gnome (0.9.6-0) unstable; urgency=low
* Update to 0.9.6

7
dist/deb/kde/debian.changelog vendored
View File

@@ -1,3 +1,10 @@
systray-x (0.9.7-0) unstable; urgency=low
* Update to 0.9.7
- Added option for new TB115 mail counting (slow with new mails enabled)
- Bugfixes
systray-x (0.9.6-0) unstable; urgency=low
* Update to 0.9.6

7
dist/deb/minimal/debian.changelog vendored
View File

@@ -1,3 +1,10 @@
systray-x-minimal (0.9.7-0) unstable; urgency=low
* Update to 0.9.7
- Added option for new TB115 mail counting (slow with new mails enabled)
- Bugfixes
systray-x-minimal (0.9.6-0) unstable; urgency=low
* Update to 0.9.6

6
dist/rpm/VERSION vendored
View File

@@ -1,4 +1,4 @@
VERSION=0.9.6
BUILD_NUMBER=1004
GIT_HASH=98823ee230826fc4e7e6986e42348f0c09de4408
VERSION=0.9.7
BUILD_NUMBER=1032
GIT_HASH=311dacc37cb8101a4b17e44550a92ace0f885715
GIT_BRANCH=develop

4
dist/rpm/gnome/_service vendored
View File

@@ -2,8 +2,8 @@
<service name="obs_scm">
<param name="url">https://github.com/Ximi1970/systray-x.git</param>
<param name="scm">git</param>
<param name="revision">0.9.6</param>
<param name="versionformat">0.9.6</param>
<param name="revision">0.9.7</param>
<param name="versionformat">0.9.7</param>
<param name="filename">systray-x-gnome</param>
<param name="extract">dist/rpm/gnome/systray-x-gnome.changes</param>
<param name="extract">dist/rpm/gnome/systray-x-gnome.spec</param>

9
dist/rpm/gnome/systray-x-gnome.changes vendored
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Nov 12 11:12:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>
* Update to 0.9.7
- Added option for new TB115 mail counting
(slow with new mails enabled)
- Bugfixes
-------------------------------------------------------------------
Sun Oct 28 12:25:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>

4
dist/rpm/kde/_service vendored
View File

@@ -2,8 +2,8 @@
<service name="obs_scm">
<param name="url">https://github.com/Ximi1970/systray-x.git</param>
<param name="scm">git</param>
<param name="revision">0.9.6</param>
<param name="versionformat">0.9.6</param>
<param name="revision">0.9.7</param>
<param name="versionformat">0.9.7</param>
<param name="extract">dist/rpm/kde/systray-x.changes</param>
<param name="extract">dist/rpm/kde/systray-x.spec</param>
<param name="extract">dist/rpm/VERSION</param>

9
dist/rpm/kde/systray-x.changes vendored
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Nov 12 11:12:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>
* Update to 0.9.7
- Added option for new TB115 mail counting
(slow with new mails enabled)
- Bugfixes
-------------------------------------------------------------------
Sun Oct 28 12:25:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>

4
dist/rpm/minimal/_service vendored
View File

@@ -2,8 +2,8 @@
<service name="obs_scm">
<param name="url">https://github.com/Ximi1970/systray-x.git</param>
<param name="scm">git</param>
<param name="revision">0.9.6</param>
<param name="versionformat">0.9.6</param>
<param name="revision">0.9.7</param>
<param name="versionformat">0.9.7</param>
<param name="filename">systray-x-minimal</param>
<param name="extract">dist/rpm/minimal/systray-x-minimal.changes</param>
<param name="extract">dist/rpm/minimal/systray-x-minimal.spec</param>

9
dist/rpm/minimal/systray-x-minimal.changes vendored
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Nov 12 11:12:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>
* Update to 0.9.7
- Added option for new TB115 mail counting
(slow with new mails enabled)
- Bugfixes
-------------------------------------------------------------------
Sun Oct 28 12:25:00 UTC 2023 - Maxime Rijnders <ximi.obs@gmail.com>

5
webext/_locales/de/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "API-Zählmethode",
"description": "API count method"
},
"count_number_options": {
"message": "Nummereigenschaften",
"description": "Caption for Number options"

5
webext/_locales/el/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "Μέθοδος καταμέτρησης API",
"description": "API count method"
},
"count_number_options": {
"message": "Αριθμός",
"description": "Caption for Number options"

5
webext/_locales/en-US/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "API count method",
"description": "API count method"
},
"count_number_options": {
"message": "Number",
"description": "Caption for Number options"

5
webext/_locales/it/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "Metodo di conteggio API",
"description": "API count method"
},
"count_number_options": {
"message": "Proprietà numero",
"description": "Caption for Number options"

5
webext/_locales/nl/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "API tel methode",
"description": "API count method"
},
"count_number_options": {
"message": "Nummer opties",
"description": "Caption for Number options"

5
webext/_locales/pt-BR/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "Método de contagem de API",
"description": "API count method"
},
"count_number_options": {
"message": "Número",
"description": "Caption for Number options"

5
webext/_locales/ru/messages.json
View File

@@ -244,6 +244,11 @@
"description": "Count new mails"
},
"count_api_count_method": {
"message": "Метод подсчета API",
"description": "API count method"
},
"count_number_options": {
"message": "Настройки индикатора кол-ва",
"description": "Caption for Number options"

157
webext/background.js
View File

@@ -1,4 +1,11 @@
var SysTrayX = {
Info: {},
Window: {},
Messaging: {},
mainWindowId: undefined,
windows: undefined,
startupState: undefined,
restorePositions: false,
@@ -27,7 +34,9 @@ SysTrayX.Messaging = {
accounts: [],
folderTree: {},
countType: "0",
showNewIndicator: "false",
closeType: "1",
apiCountMethod: "false",
filters: undefined,
newMailCache: [],
folderInfoChangeCache: [],
@@ -45,7 +54,7 @@ SysTrayX.Messaging = {
// Minimize on startup handled by Companion app as backup
if (SysTrayX.startupState === "minimized") {
SysTrayX.Link.postSysTrayXMessage({ window: "minimized_all_startup" });
SysTrayX.Link.postSysTrayXMessage({ window: { state : "minimized_all_startup", id: 0 } });
}
// Lookout for storage changes
@@ -107,12 +116,16 @@ SysTrayX.Messaging = {
const getCountTypePromise = () => new Promise((res) => res(getCountType()));
SysTrayX.Messaging.countType = await getCountTypePromise();
// Get the show new indicator
const getShowNewIndicatorPromise = () => new Promise((res) => res(getShowNewIndicator()));
SysTrayX.Messaging.showNewIndicator = await getShowNewIndicatorPromise();
// Check the filters for the accounts
SysTrayX.Messaging.accountFilterCheck();
// Handle cached mail changes on startup
SysTrayX.Messaging.startupDelayFinished = true;
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false" ) {
SysTrayX.Messaging.listenerNewMail();
}
SysTrayX.Messaging.listenerFolderInfoChanged();
@@ -162,11 +175,11 @@ SysTrayX.Messaging = {
if (ids.includes(id)) {
newFilters.push(SysTrayX.Messaging.filters[i]);
} else {
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
if (SysTrayX.Messaging.new[id] != undefined) {
delete SysTrayX.Messaging.new[id];
}
if (SysTrayX.Messaging.unread[id] != undefined) {
if (SysTrayX.Messaging.unread[id] !== undefined) {
delete SysTrayX.Messaging.unread[id];
}
}
@@ -229,7 +242,7 @@ SysTrayX.Messaging = {
},
listenerFolderInfoChanged: async function (folder, folderInfo) {
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
// Cache the folder change
if (folder)
@@ -325,7 +338,10 @@ SysTrayX.Messaging = {
sendMailCountPre115();
}
} else {
sendMailCount();
if (SysTrayX.Messaging.startupDelayFinished)
{
sendMailCount();
}
}
},
@@ -349,15 +365,40 @@ SysTrayX.Messaging = {
deleteFolderFromFilters(deletedFolder);
},
onCloseButton: function () {
//console.debug("Minimize all")
onNewWindow: async function (id) {
if (SysTrayX.Messaging.closeType === "2" || SysTrayX.Messaging.closeType === "4") {
// Activate the extra close button when all to tray/taskbar is selected
browser.browserAction.setTitle({title: "Force close"});
browser.browserAction.setIcon({path: "icons/close.svg"});
browser.browserAction.enable();
} else {
browser.browserAction.setTitle({title: " "});
browser.browserAction.setIcon({path: "icons/dummy.png"});
browser.browserAction.disable();
}
SysTrayX.Link.postSysTrayXMessage({ window: "minimized_all" });
/*
browser.windows.update(browser.windows.WINDOW_ID_CURRENT, {
state: "minimized",
});
*/
SysTrayX.Link.postSysTrayXMessage({ newWindow: id });
},
onCloseButton: async function (id, quit) {
let state = undefined;
if (SysTrayX.Messaging.closeType === "1" || SysTrayX.Messaging.closeType === "2") {
// Minimize to tray
state = "docked";
} else if (SysTrayX.Messaging.closeType === "3" || SysTrayX.Messaging.closeType === "4") {
// Minimize
state = "minimized";
}
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 } });
}
},
//
@@ -378,14 +419,14 @@ SysTrayX.Messaging = {
browser.windowEvent.setCloseType(Number(SysTrayX.Messaging.closeType));
browser.windowEvent.onCloseButtonClick.removeListener(
SysTrayX.Messaging.onCloseButton
);
if (SysTrayX.Messaging.closeType !== "0") {
browser.windowEvent.onCloseButtonClick.addListener(
SysTrayX.Messaging.onCloseButton
);
} else {
browser.windowEvent.onCloseButtonClick.removeListener(
SysTrayX.Messaging.onCloseButton
);
}
}
@@ -396,6 +437,13 @@ SysTrayX.Messaging = {
sendMailCount();
}
if ("showNewIndicator" in changes && changes["showNewIndicator"].newValue) {
SysTrayX.Messaging.showNewIndicator = changes["showNewIndicator"].newValue;
sendMailCountPre115();
sendMailCount();
}
if ("addonprefchanged" in changes && changes["addonprefchanged"].newValue) {
//
// Send new preferences to the app
@@ -575,6 +623,7 @@ SysTrayX.Messaging = {
"showNewIndicator",
"countType",
"startupDelay",
"apiCountMethod",
"numberColor",
"numberSize",
"numberAlignment",
@@ -611,6 +660,7 @@ SysTrayX.Messaging = {
const showNewIndicator = result.showNewIndicator || "false";
const countType = result.countType || "0";
const startupDelay = result.startupDelay || "5";
const apiCountMethod = result.apiCountMethod || "false";
let numberColor = result.numberColor || "#000000";
const numberSize = result.numberSize || "10";
const numberAlignment = result.numberAlignment || "4";
@@ -648,6 +698,7 @@ SysTrayX.Messaging = {
showNewIndicator,
countType,
startupDelay,
apiCountMethod,
numberColor,
numberSize,
numberAlignment,
@@ -665,7 +716,7 @@ SysTrayX.Messaging = {
// Send startup state after the prefs
// so the hide is handled conform the prefs
if (SysTrayX.startupState === "minimized") {
SysTrayX.Link.postSysTrayXMessage({ window: "minimized_all" });
SysTrayX.Link.postSysTrayXMessage({ window: { state: "minimized_all", id: 0 } } );
//SysTrayX.Link.postSysTrayXMessage({ window: SysTrayX.startupState });
}
@@ -849,6 +900,14 @@ SysTrayX.Link = {
});
}
const apiCountMethod = response["preferences"].apiCountMethod;
if (apiCountMethod !== undefined) {
await storage().set({
apiCountMethod: apiCountMethod,
});
SysTrayX.Messaging.apiCountMethod = apiCountMethod;
}
const numberColor = response["preferences"].numberColor;
if (numberColor) {
await storage().set({
@@ -930,9 +989,21 @@ SysTrayX.Link = {
};
SysTrayX.Window = {
blockFocusChange: 0,
focusChanged: function (windowId) {
browser.windows.getCurrent().then((win) => {
SysTrayX.Link.postSysTrayXMessage({ window: win.state });
//console.debug("focusChanged Id: " + win.id);
//console.debug("focusChanged state: " + win.state);
//console.debug("focusChanged block: " + SysTrayX.Window.blockFocusChange);
if( win.id !== SysTrayX.Window.blockFocusChange) {
SysTrayX.Link.postSysTrayXMessage({ window: { state: win.state, id: win.id } } );
} else {
// Reset block
SysTrayX.Window.blockFocusChange = 0;
}
});
},
@@ -941,7 +1012,7 @@ SysTrayX.Window = {
//console.debug("Folder changed tab: " + JSON.stringify(tab));
//console.debug("Folder changed displayedFolder: " + JSON.stringify(displayedFolder));
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
const oldDisplayedFolder = SysTrayX.Messaging.displayedFolder;
if (oldDisplayedFolder !== undefined) {
if (
@@ -970,6 +1041,20 @@ SysTrayX.Window = {
};
async function start() {
// Setup the link first
SysTrayX.Link.init();
// Force close a window using a toolbar button
browser.browserAction.disable();
browser.browserAction.onClicked.addListener(async () => {
const window = await browser.windows.getCurrent();
browser.windowEvent.forceClose(window.id);
// Send new state to the companion
SysTrayX.Link.postSysTrayXMessage({ closeWindow: { id: window.id, quit: true } });
});
// Set platform
SysTrayX.Info.platformInfo = await browser.runtime
.getPlatformInfo()
@@ -989,8 +1074,12 @@ async function start() {
SysTrayX.Info.displayInfo();
// Get the API count method preference
const apiCountMethod = await getApiCountMethod();
SysTrayX.Messaging.apiCountMethod = apiCountMethod;
// Try to catch the mails
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
// Catch the new incomming mail
browser.messages.onNewMailReceived.addListener(
SysTrayX.Messaging.listenerNewMail
@@ -1021,12 +1110,31 @@ async function start() {
SysTrayX.startupWindowPositions = await getStartupWindowPositions();
}
// Get the close type
// Get main window id
const window = await browser.windows.getCurrent();
SysTrayX.mainWindowId = window.id;
//console.debug("Main window ID: " + SysTrayX.mainWindowId);
// Get all windows
const windows = await browser.windows.getAll();
SysTrayX.windows = windows;
//console.debug("All window IDs: " + JSON.stringify(windows.map((win) => win.id)));
//console.debug("Window: " + JSON.stringify(windows));
// Set the close type
SysTrayX.Messaging.closeType = await getCloseType();
browser.windowEvent.setCloseType(Number(SysTrayX.Messaging.closeType));
// Set the main window id
browser.windowEvent.setMainWindowId(Number(SysTrayX.mainWindowId));
// Intercept close button?
if (SysTrayX.Messaging.closeType !== "0") {
browser.windowEvent.onNewWindow.addListener(
SysTrayX.Messaging.onNewWindow
);
browser.windowEvent.onCloseButtonClick.addListener(
SysTrayX.Messaging.onCloseButton
);
@@ -1060,9 +1168,6 @@ async function start() {
const getIconPromise = () => new Promise((res) => res(getIcon()));
await getIconPromise();
// Setup the link first
SysTrayX.Link.init();
// Main start
SysTrayX.Messaging.init();
}

17
webext/icons/close.svg Normal file
View File

@@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<defs id="defs3051">
<style type="text/css" id="current-color-scheme">
.ColorScheme-Text {
color:#232629;
}
.ColorScheme-NegativeText {
color:#da4453;
}
</style>
</defs>
<path
style="fill:currentColor;fill-opacity:1;stroke:none"
class="ColorScheme-NegativeText"
d="M 8,2 A 6,6 0 0 0 2,8 6,6 0 0 0 8,14 6,6 0 0 0 14,8 6,6 0 0 0 8,2 Z M 5.70703,5 8,7.29297 10.29297,5 11,5.70703 8.70703,8 11,10.29297 10.29297,11 8,8.70703 5.70703,11 5,10.29297 7.29297,8 5,5.70703 5.70703,5 Z"
/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 626 B

BIN
webext/icons/dummy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 B

120
webext/js/defaults.js
View File

@@ -6,6 +6,22 @@ function storage() {
return browser.storage.local;
}
//
// Get API count method preference
//
async function getApiCountMethod() {
function resolve(result) {
const apiCountMethod = result.apiCountMethod || "false";
return apiCountMethod;
}
function reject() {
return "false";
}
return await storage().get("apiCountMethod").then(resolve, reject);
}
//
// Get window startup state
//
@@ -219,7 +235,7 @@ async function getFilters() {
filters = [];
for (const account of SysTrayX.Messaging.accounts) {
const inbox = account.folders.filter(
(folder) => folder.type == "inbox"
(folder) => folder.type === "inbox"
);
if (inbox.length > 0) {
@@ -259,12 +275,27 @@ async function getCountType() {
}
function reject() {
return undefined;
return "0";
}
return await storage().get("countType").then(resolve, reject);
}
//
// Get show new indicator
//
async function getShowNewIndicator() {
function resolve(result) {
return result.showNewIndicator || "false";
}
function reject() {
return "false";
}
return await storage().get("showNewIndicator").then(resolve, reject);
}
//
// Get start app parameters
//
@@ -416,7 +447,7 @@ const collectUnreadMail = async () => {
// Count and send the unread and new mails
const sendMailCountPre115 = () => {
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
// Collect the unread mail
collectUnreadMail();
@@ -453,44 +484,79 @@ const sendMailCountPre115 = () => {
// Count and send the unread and new mails (>TB115)
const sendMailCount = async () => {
if (SysTrayX.Info.browserInfo.majorVersion >= 115) {
if (SysTrayX.Info.browserInfo.majorVersion >= 115 && SysTrayX.Messaging.apiCountMethod === "true") {
// New only works for >=TB106
let unreadCount = 0;
let newCount = 0;
for (const filter of SysTrayX.Messaging.filters) {
for (const path of filter.folders) {
const folder = {
accountId: filter.accountId,
path: path,
};
if( SysTrayX.Messaging.countType === "1" || SysTrayX.Messaging.showNewIndicator === "true" ) {
async function* listMessages(folder) {
let page = await messenger.messages.list(folder);
for (let message of page.messages) {
yield message;
}
while (page.id) {
page = await messenger.messages.continueList(page.id);
// Get both unread and new message count
for (const filter of SysTrayX.Messaging.filters) {
for (const path of filter.folders) {
const folder = {
accountId: filter.accountId,
path: path,
};
async function* listMessages(folder) {
let page = await messenger.messages.list(folder);
for (let message of page.messages) {
yield message;
}
while (page.id) {
page = await messenger.messages.continueList(page.id);
for (let message of page.messages) {
yield message;
}
}
}
let messages = listMessages(folder);
for await (let message of messages) {
if( message.new )
{
newCount = newCount + 1;
}
if( !message.read )
{
unreadCount = unreadCount + 1;
}
}
}
let messages = listMessages(folder);
for await (let message of messages) {
if( message.new )
{
newCount = newCount + 1;
}
} else {
// Only unread count
for (const filter of SysTrayX.Messaging.filters) {
for (const path of filter.folders) {
const folder = {
accountId: filter.accountId,
path: path,
};
let mailFolderInfo = {};
try {
mailFolderInfo = await browser.folders.getFolderInfo(folder);
} catch (err) {
//console.debug("Filter error: " + err);
//console.debug("Filter error: " + JSON.stringify(folder));
// Get all accounts
SysTrayX.Messaging.accounts = await browser.accounts.list(false);
// Check the filters for the accounts
SysTrayX.Messaging.accountFilterCheck();
}
if( !message.read )
{
unreadCount = unreadCount + 1;
if (mailFolderInfo.unreadMessageCount !== undefined) {
unreadCount = unreadCount + mailFolderInfo.unreadMessageCount;
}
}
}

4
webext/js/options_accounts.js
View File

@@ -150,7 +150,7 @@ SysTrayX.Accounts = {
JSON.stringify({
accountName: element.accountName,
accountId: element.accountId,
type: element.type != undefined ? element.type : "",
type: element.type !== undefined ? element.type : "",
path: element.path,
name: element.originalName
? element.originalName
@@ -210,7 +210,7 @@ SysTrayX.Accounts = {
':scope > input[type="checkbox"]'
);
if (mainCb && mainCb != this) {
if (mainCb && mainCb !== this) {
mainCb.checked = this.checked;
const mainCbChildren = mainCb.parentNode.querySelectorAll(

482
webext/js/windowEvent.js
View File

@@ -1,206 +1,340 @@
// This is the important part. It implements the functions and events defined in schema.json.
// The variable must have the same name you've been using so far, "myapi" in this case.
var windowEvent = class extends ExtensionCommon.ExtensionAPI {
getAPI(context) {
console.log("windowEvent API started");
/* eslint-disable object-shorthand */
// To be notified of the extension going away, call callOnClose with any object that has a
// close function, such as this one.
context.callOnClose(this);
"use strict";
return {
// Again, this key must have the same name.
windowEvent: {
setCloseType: async function (type) {
windowListener.setCloseType(type);
},
// Using a closure to not leak anything but the API to the outside world.
(function (exports) {
// An event. Most of this is boilerplate you don't need to worry about, just copy it.
onCloseButtonClick: new ExtensionCommon.EventManager({
context,
name: "windowEvent.onCloseButtonClick",
// In this function we add listeners for any events we want to listen to, and return a
// function that removes those listeners. To have the event fire in your extension,
// call fire.async.
register(fire) {
function callback(event) {
return fire.async();
}
// Get various parts of the WebExtension framework that we need.
var { ExtensionCommon } = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
windowListener.addOnCloseButton(callback);
return function () {
windowListener.removeOnCloseButton(callback);
};
},
}).api(),
},
};
}
// You probably already know what this does.
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
close() {
// This function is called if the extension is disabled or removed, or Thunderbird closes.
// We registered it with callOnClose, above.
console.log("windowEvent API closed");
}
};
// A helpful class for listening to windows opening and closing.
var { ExtensionSupport } = ChromeUtils.import("resource:///modules/ExtensionSupport.jsm");
// A helpful class for listening to windows opening and closing.
// (This file had a lowercase E in Thunderbird 65 and earlier.)
var { ExtensionSupport } = ChromeUtils.import(
"resource:///modules/ExtensionSupport.jsm"
);
/**
* This object is just what we're using to listen for toolbar clicks. The implementation
* isn't what this example is about, but you might be interested as it's a common pattern.
* We count the number of callbacks waiting for events so that we're only listening if we
* need to be.
*
* An EventEmitter has the following basic functions:
*
* EventEmitter.on(emitterName, callback)
* Registers a callback for a custom emitter.
*
* EventEmitter.off(emitterName, callback)
* Unregisters a callback for a custom emitter.
*
* EventEmitter.emit(emitterName)
* Emit a custom emitter, all provided parameters will be forwarded to the registered callbacks.
*/
// This object is just what we're using to listen for toolbar clicks. The implementation isn't
// what this example is about, but you might be interested as it's a common pattern. We count the
// number of callbacks waiting for events so that we're only listening if we need to be.
var windowListener = new (class extends ExtensionCommon.EventEmitter {
constructor() {
super();
this.callbackOnCloseButtonCount = 0;
this.callbackOnLoadWindowCount = 0;
let windowListener;
this.MESSAGE_CLOSE_TYPE_DEFAULT = 0;
this.MESSAGE_CLOSE_TYPE_MIN_MAIN_TRAY_CLOSE_CHILDREN = 1;
this.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY = 2;
this.MESSAGE_CLOSE_TYPE_MIN_MAIN_CLOSE_CHILDREN = 3;
this.MESSAGE_CLOSE_TYPE_MIN_ALL = 4;
class WindowListener extends ExtensionCommon.EventEmitter {
constructor(extension) {
super();
this.extension = extension;
this.onNewWindowCallbackCount = 0;
this.onCloseButtonClickCallbackCount = 0;
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_MAIN_CLOSE_CHILDREN;
}
setCloseType(closeType) {
if (closeType === 0) {
this.MESSAGE_CLOSE_TYPE_DEFAULT = 0;
this.MESSAGE_CLOSE_TYPE_MIN_MAIN_TRAY_CLOSE_CHILDREN = 1;
this.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY = 2;
this.MESSAGE_CLOSE_TYPE_MIN_MAIN_CLOSE_CHILDREN = 3;
this.MESSAGE_CLOSE_TYPE_MIN_ALL = 4;
this.closeType = this.MESSAGE_CLOSE_TYPE_DEFAULT;
} else if (closeType === 1) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_MAIN_TRAY_CLOSE_CHILDREN;
} else if (closeType === 2) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY;
} else if (closeType === 3) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_MAIN_CLOSE_CHILDREN;
} else if (closeType === 4) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_ALL;
} else console.log("Unknown close type: " + closeType);
}
this.mainWindowId = 0;
addOnCloseButton(callback) {
if (this.callbackOnCloseButtonCount == 0) {
this.on("close-clicked", callback);
this.callbackOnCloseButtonCount++;
ExtensionSupport.registerWindowListener("closeButtonListener", {
chromeURLs: [
"chrome://messenger/content/messenger.xhtml",
"chrome://messenger/content/messenger.xul",
],
onLoadWindow: function (window) {
windowListener.callbackOnLoadWindowCount++;
if (
windowListener.callbackOnLoadWindowCount === 1 ||
windowListener.closeType ===
windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL ||
windowListener.closeType ===
windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY
) {
window.addEventListener(
"close",
windowListener.onCloseButton,
true
);
windowListener.hijackTitlebarCloseButton(window);
windowListener.oldClose = window.close;
window.close = () => windowListener.onCloseButton(null);
console.log("Close listener added");
}
},
});
this.activeWindows = {};
}
}
removeOnCloseButton(callback) {
if (this.callbackOnCloseButtonCount == 1) {
this.off("close-clicked", callback);
this.callbackOnCloseButtonCount--;
get listenerIdNewWindow() {
return `window_event_listener_new_window_${this.extension.uuid}_${this.extension.instanceId}`;
}
for (let window of ExtensionSupport.openWindows) {
if (
[
get listenerIdCloseButton() {
return `window_event_listener_close_button_${this.extension.uuid}_${this.extension.instanceId}`;
}
setCloseType(closeType) {
if (closeType === 0) {
this.closeType = this.MESSAGE_CLOSE_TYPE_DEFAULT;
} else if (closeType === 1) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_MAIN_TRAY_CLOSE_CHILDREN;
} else if (closeType === 2) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY;
} else if (closeType === 3) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_MAIN_CLOSE_CHILDREN;
} else if (closeType === 4) {
this.closeType = this.MESSAGE_CLOSE_TYPE_MIN_ALL;
} else console.log("Unknown close type: " + closeType);
}
setMainWindowId(id) {
this.mainWindowId = id;
}
forceClose(id) {
if (this.activeWindows[id] !== undefined) {
this.activeWindows[id].window.close = this.activeWindows[id].close;
this.activeWindows[id].window.close();
}
}
addOnNewWindow(callback, context) {
// Registering the callback for "new-window".
this.on("new-window", callback);
this.onNewWindowCallbackCount++;
if (this.onNewWindowCallbackCount === 1) {
ExtensionSupport.registerWindowListener(this.listenerIdNewWindow, {
context,
chromeURLs: [
"chrome://messenger/content/messenger.xhtml",
"chrome://messenger/content/messenger.xul",
].includes(window.location.href)
) {
window.removeEventListener(
"close",
windowListener.onCloseButton,
true
);
window.close = windowListener.oldClose;
],
onLoadWindow: function (window) {
// Get current window id
const id = context.extension.windowManager.getWrapper(window).id;
console.log("Close listener removed");
windowListener.emit("new-window", id);
console.log("New window added: " + id);
}
});
}
}
removeOnNewWindow(callback, context) {
// Un-Registering the callback for "new-window".
this.off("new-window", callback);
this.onNewWindowCallbackCount--;
if (this.onNewWindowCallbackCount === 0) {
for (let window of ExtensionSupport.openWindows) {
if ([
"chrome://messenger/content/messenger.xhtml",
"chrome://messenger/content/messenger.xul",
].includes(window.location.href)) {
// Get current window id
const id = context.extension.windowManager.getWrapper(window).id;
console.log("New window removed: " + id);
}
}
ExtensionSupport.unregisterWindowListener( this.listenerIdNewWindow );
}
ExtensionSupport.unregisterWindowListener("closeButtonListener");
}
}
addOnCloseButtonClick(callback, context) {
// Registering the callback for "close-clicked".
this.on( "close-clicked", callback );
this.onCloseButtonClickCallbackCount++;
onCloseButton(event) {
if (event) event.preventDefault();
windowListener.emit("close-clicked");
return true;
}
if (this.onCloseButtonClickCallbackCount === 1) {
ExtensionSupport.registerWindowListener(this.listenerIdCloseButton, {
context,
chromeURLs: [
"chrome://messenger/content/messenger.xhtml",
"chrome://messenger/content/messenger.xul",
],
onLoadWindow: function ( window ) {
// Get current window id
const id = context.extension.windowManager.getWrapper(window).id
hijackTitlebarCloseButton(window) {
if (
windowListener.replaceCommand(window, "titlebar-close", function () {
return windowListener.onCloseButton(null);
})
) {
console.log("replaced command= " + "titlebar-close");
}
}
if (id === windowListener.mainWindowId ||
windowListener.closeType === windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY ||
windowListener.closeType === windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL) {
replaceCommand(window, eltId, gotHidden) {
let elt = window.document.getElementById(eltId);
if (!elt) {
console.log("Element '" + eltId + "' not found. Command not replaced.");
return false;
function onCloseButton(event) {
if ( event ) event.preventDefault();
windowListener.emit("close-clicked", id, false);
// console.log("Close clicked: " + event);
// console.log("Close clicked: " + id);
return true;
}
// Store the window data
windowListener.activeWindows[id] = {
window,
close : window.close,
listener: onCloseButton
};
// Intercept the close event (triggered when clicking the close button)
window.addEventListener(
"close",
onCloseButton,
true
);
// Pre TB115 close menu, now same as close button
window.close = () => onCloseButton(null);
console.log("Close listener added for: " + id);
} else {
function onCloseButton2(event) {
console.log("Real Close clicked: " + id);
windowListener.emit("close-clicked", id, true);
window.close = windowListener.activeWindows[id].close;
window.close();
return false;
}
// Store the window data
windowListener.activeWindows[id] = {
window,
close : window.close,
listener: onCloseButton2
};
// Intercept the close event (triggered when clicking the close button)
window.addEventListener(
"close",
onCloseButton2,
true
);
// Pre TB115 close menu, now same as close button
window.close = () => onCloseButton2(null);
}
},
});
}
}
let prevent = null;
if (elt.command) {
prevent = {
event: "click",
func: function (e) {
e.preventDefault();
removeOnCloseButtonClick(callback, context) {
// Un-Registering the callback for "close-clicked".
this.off( "close-clicked", callback );
this.onCloseButtonClickCallbackCount--;
if (this.onCloseButtonClickCallbackCount === 0) {
for (let window of ExtensionSupport.openWindows) {
if ([
"chrome://messenger/content/messenger.xhtml",
"chrome://messenger/content/messenger.xul",
].includes(window.location.href)) {
// Get current window id
const id = context.extension.windowManager.getWrapper(window).id
if (id === windowListener.mainWindowId ||
windowListener.closeType === windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL_TRAY ||
windowListener.closeType === windowListener.MESSAGE_CLOSE_TYPE_MIN_ALL) {
// Release the close event (triggered when clicking the close button)
window.removeEventListener(
"close",
windowListener.activeWindows[id].listener,
true
);
window.close = windowListener.activeWindows[id].close;
// Clean the storage
delete windowListener.activeWindows[id];
console.log("Close listener removed for: " + id);
}
}
}
ExtensionSupport.unregisterWindowListener(this.listenerIdCloseButton);
}
}
};
// This is the important part. It implements the functions and events defined
// in the schema.json. The name must match what you've been using so far,
// "windowEvent" in this case.
class windowEvent extends ExtensionCommon.ExtensionAPI {
// An alternative to defining a constructor here, is to use the onStartup
// event. However, this causes the API to be instantiated directly after the
// add-on has been loaded, not when the API is first used. Depends on what is
// desired.
constructor(extension) {
super(extension);
windowListener = new WindowListener(extension);
}
getAPI(context) {
console.log("windowEvent API started");
return {
// This key must match the class name.
windowEvent: {
setCloseType: async function (type) {
windowListener.setCloseType(type);
},
setMainWindowId: async function (id) {
windowListener.setMainWindowId(id);
},
forceClose: async function (id) {
windowListener.forceClose(id);
},
// An event. Most of this is boilerplate you don't need to worry about, just copy it.
onNewWindow: new ExtensionCommon.EventManager({
context,
name: "windowEvent.onNewWindow",
// In this function we add listeners for any events we want to listen to, and return a
// function that removes those listeners. To have the event fire in your extension,
// call fire.async.
register(fire) {
function callback(event, id) {
return fire.async(id);
}
windowListener.addOnNewWindow(callback,context);
return function () {
windowListener.removeOnNewWindow(callback,context);
};
},
}).api(),
// An event. Most of this is boilerplate you don't need to worry about, just copy it.
onCloseButtonClick: new ExtensionCommon.EventManager({
context,
name: "windowEvent.onCloseButtonClick",
// In this function we add listeners for any events we want to listen to, and return a
// function that removes those listeners. To have the event fire in your extension,
// call fire.async.
register(fire) {
function callback(event, id, quit) {
return fire.async(id, quit);
}
windowListener.addOnCloseButtonClick(callback,context);
return function () {
windowListener.removeOnCloseButtonClick(callback,context);
};
},
}).api(),
},
};
} else if (elt.getAttribute("oncommand")) {
prevent = {
event: "command",
func: function (e) {
e.stopPropagation();
},
};
} else {
console.warn("Could not replace oncommand on " + eltId);
return false;
}
let callback = function (event) {
if (event.target.id === eltId) {
console.debug(prevent.event + " on " + eltId);
if (gotHidden()) prevent.func(event);
onShutdown(isAppShutdown) {
// This function is called if the extension is disabled or removed, or Thunderbird closes.
// We usually do not have to do any cleanup, if Thunderbird is shutting down entirely
if (isAppShutdown) {
return;
}
};
/* We put listeners on the "titlebar" parent node, because:
- we can hardly short-circuit command/oncommand (probably because they are
registered first)
- we'd have otherwise to alter "oncommand"/"command" attribute and use
Function(), which do not pass review nowadays. */
elt.parentNode.addEventListener(prevent.event, callback, true);
console.log("windowEvent API closed");
}
};
return true;
}
})();
// Export the api by assigning in to the exports parameter of the anonymous closure
// function, which is the global this.
exports.windowEvent = windowEvent;
})(this)

8
webext/manifest.json
View File

@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extension_name__",
"description": "__MSG_extension_description__",
"version": "0.9.6",
"version": "0.9.7",
"author": "Maxime Rijnders",
"homepage_url": "https://github.com/Ximi1970/systray-x",
@@ -22,6 +22,12 @@
"permissions": ["accountsRead", "messagesRead", "storage", "nativeMessaging"],
"browser_action": {
"default_title": " ",
"default_icon": "icons/dummy.png",
"allowed_spaces": ["mail", "addressbook", "calendar", "tasks", "chat", "settings", "default" ]
},
"background": {
"page": "background.html"
},

9
webext/options.html
View File

@@ -419,6 +419,15 @@
</tr>
</table>
<div id="apicountmethod">
<div id="inputcheck">
<input type="checkbox" name="apiCountMethod" id="apiCountMethod" value="" />
<label for="apiCountMethod" id="apiCountMethodLabel">
__MSG_count_api_count_method__
</label>
</div>
</div>
<table id="numberprops">
<caption>
__MSG_count_number_options__

41
webext/options.js
View File

@@ -222,6 +222,14 @@ SysTrayX.SaveOptions = {
startupDelay: startupDelay,
});
//
// Save API count method state
//
const apiCountMethod = document.querySelector('input[name="apiCountMethod"]').checked;
await storage().set({
apiCountMethod: `${apiCountMethod}`,
});
//
// Save number color
//
@@ -496,6 +504,16 @@ SysTrayX.RestoreOptions = {
SysTrayX.RestoreOptions.ontartupDelayError
);
//
// Restore API count method state
//
await storage()
.get("apiCountMethod")
.then(
SysTrayX.RestoreOptions.setApiCountMethod,
SysTrayX.RestoreOptions.onApiCountMethodError
);
//
// Restore number color
//
@@ -924,6 +942,20 @@ SysTrayX.RestoreOptions = {
console.log(`StartupDelay Error: ${error}`);
},
//
// Restore API count method state callbacks
//
setApiCountMethod: function (result) {
const apiCountMethod = result.apiCountMethod || "false";
const checkbox = document.querySelector(`input[name="apiCountMethod"]`);
checkbox.checked = apiCountMethod === "true";
},
onApiCountMethodError: function (error) {
console.log(`ApiCountMethod Error: ${error}`);
},
//
// Restore number color
//
@@ -1278,6 +1310,11 @@ SysTrayX.StorageChanged = {
startupDelay: changes[item].newValue,
});
}
if (item === "apiCountMethod") {
SysTrayX.RestoreOptions.setApiCountMethod({
apiCountMethod: changes[item].newValue,
});
}
if (item === "numberColor") {
SysTrayX.RestoreOptions.setNumberColor({
numberColor: changes[item].newValue,
@@ -1401,6 +1438,10 @@ async function start() {
document.getElementById("kdeintegration").style.display = "none";
}
if (SysTrayX.Info.browserInfo.majorVersion < 115) {
document.getElementById("apicountmethod").style.display = "none";
}
// Setup account tree
const accountsInitPromise = () =>
new Promise((res) => res(SysTrayX.Accounts.init()));

32
webext/schema_windowEvent.json
View File

@@ -15,13 +15,43 @@
"maximum": 4
}
]
},
{
"name": "setMainWindowId",
"type": "function",
"description": "Set the main window id.",
"async": true,
"parameters": [
{
"type": "integer",
"name": "type"
}
]
},
{
"name": "forceClose",
"type": "function",
"description": "Really close the window.",
"async": true,
"parameters": [
{
"type": "integer",
"name": "type"
}
]
}
],
"events": [
{
"name": "onNewWindow",
"type": "function",
"description": "Fires when the user opens a new window.",
"parameters": []
},
{
"name": "onCloseButtonClick",
"type": "function",
"description": "Fires when the user clicks on the close button of the main window.",
"description": "Fires when the user clicks on the close button of a window.",
"parameters": []
}
]