From 5407a84f093c19ee967f07f029f096aaba2f6ab0 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Fri, 25 Aug 2023 18:18:20 +0200 Subject: [PATCH] Cleanup --- .../SysTray-X-app/languages/SysTray-X.de.qm | Bin 7843 -> 7841 bytes .../SysTray-X-app/languages/SysTray-X.de.ts | 10 +-- .../SysTray-X-app/languages/SysTray-X.el.qm | Bin 8217 -> 8215 bytes .../SysTray-X-app/languages/SysTray-X.el.ts | 14 ++- .../languages/SysTray-X.en-US.qm | Bin 7249 -> 7243 bytes .../languages/SysTray-X.en-US.ts | 16 +--- .../SysTray-X-app/languages/SysTray-X.it.qm | Bin 7967 -> 7965 bytes .../SysTray-X-app/languages/SysTray-X.it.ts | 14 ++- .../SysTray-X-app/languages/SysTray-X.nl.qm | Bin 7691 -> 7689 bytes .../SysTray-X-app/languages/SysTray-X.nl.ts | 10 +-- .../languages/SysTray-X.pt-BR.qm | Bin 7677 -> 7675 bytes .../languages/SysTray-X.pt-BR.ts | 11 +-- .../SysTray-X-app/languages/SysTray-X.ru.qm | Bin 7732 -> 7730 bytes .../SysTray-X-app/languages/SysTray-X.ru.ts | 10 +-- app/SysTray-X/SysTray-X-app/preferences.cpp | 44 ++++----- app/SysTray-X/SysTray-X-app/preferences.h | 48 +++++----- app/SysTray-X/SysTray-X-app/preferences.ui | 20 ++--- .../SysTray-X-app/preferencesdialog.cpp | 84 +++++++++--------- .../SysTray-X-app/preferencesdialog.h | 32 +++---- app/SysTray-X/SysTray-X-app/systrayx.cpp | 22 ++--- app/SysTray-X/SysTray-X-app/systrayx.h | 4 +- app/SysTray-X/SysTray-X-app/systrayxlink.cpp | 52 +++++------ app/SysTray-X/SysTray-X-app/systrayxlink.h | 12 +-- webext/_locales/de/messages.json | 12 +-- webext/_locales/el/messages.json | 12 +-- webext/_locales/en-US/messages.json | 14 +-- webext/_locales/it/messages.json | 12 +-- webext/_locales/nl/messages.json | 12 +-- webext/_locales/pt-BR/messages.json | 12 +-- webext/_locales/ru/messages.json | 12 +-- webext/background.js | 44 ++++----- webext/css/options.css | 2 +- webext/js/defaults.js | 12 +-- webext/options.html | 16 ++-- webext/options.js | 62 ++++++------- 35 files changed, 286 insertions(+), 339 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.qm index f5c58e6098316f3027cc381f33ffb6a028a6d92d..4cbfd974b2828d52e62ff06a781178c59a3a6567 100644 GIT binary patch delta 254 zcmZ2%yU=z*s+8nE24i7C1_lO21~0Rz3=C`q5L&8sV!b}&@rmp8IVUhJpLT?SL9%D! zb9X_1R*3>*e* zjw+H23|#Bj=D%Iaz##UAZDCj_1A~+S+vdhw3=BMP*j{?gV_;xi%Wkpi5Ca3_yUEuX z^#!>(J3M~@oiveiRpC3J9gdUvnZzY^x%Ip2fHvE32mW8lz#z!Zee>r9pjjIy+cUWf z2J+b+Vg@>LCts?tGSH^D$tJp6-1_q&-tkN%47#KtyC)+c+2VQ4m?YqLj!1;wuT`z@!K|Fv>pJNLH1BU^d zqlzR01J^pX`EQppFo^wQTNoC~z#wJBwz=^Z0|U<+wwGS>7#LXBvRkY=#K6G#jy=NZ z9njPrlg~5ibMkU_c>V%9ZQ^8pCUHr9ZvE~$pv^Yif&W)BFbJ}9-~4$2Xx8S*_Dt@A z!F;xdn1PPm&6g^y474d>@^mI0#v7ZDFu96Oj*%#zyoQ@&vY><YFc1oMQz5l+a1L diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts index d246c6a..716d397 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts @@ -206,10 +206,6 @@ Default minimize Standard Minimieren - - Minimize to tray, method 1 - In Systemleiste verbergen, Methode 1 - Minimize to tray, method 2 @@ -235,10 +231,6 @@ Start application minimized Anwendung minimiert starten - - Minimize on close - Beim Fensterschließen, Minimieren - Number properties @@ -358,7 +350,7 @@ - Startup application + Start application Startanwendung diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.qm index 848bb7aef50f7cec736fce21026c334528f36fc0..c3eb3e40d55d5ebab250180baaa7b9732ae3272a 100644 GIT binary patch delta 253 zcmbQ~Fx_E7nxq$lv9KTm1A`)im)TSX2DV8MTKee3dVR+46W8l=o?u!&?Fa*d)U}Dv z-38aOiv8kaU=W_nD*aN0fkAB5WP3(;PhmFJzAFq2Tv=@DdMOMH5*2Lv99tL|IO5nG zRU{c0xSiPMzg-Fx*J4{37RtaNUB$M!@fHIE?k<5qeRdE delta 260 zcmbR4Fw#!{h3uR!Cu3_8Uc#DC7cM{u6uXzj%tT)*$RvltsV3J^uaC!$c z_1@(3jQX6`oE@IOfKFRHnV(5qGL~DvyAEix26y29l?)6*irhDUUI3c)bFw{?yWng- z+e6Gi9yedAurdRK_>{@hnRFQaHXmUM7Molo**{raQjbG8xFoTtq_kl22MP7fj8bB3 E0AH3yh5!Hn diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts index ed7c44c..7a76b25 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts @@ -186,10 +186,6 @@ Default minimize Προεπιλεγμένη ελαχιστοποίηση - - Minimize to tray, method 1 - Μέθοδος 1 - Minimize to tray, method 2 @@ -347,11 +343,6 @@ Arguments: Επιχειρήματα: - - - Startup application - Εφαρμογή εκκίνησης - Mail @@ -383,6 +374,11 @@ Apps Εφαρμογές + + + Start application + Εφαρμογή εκκίνησης + Save diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.qm index aaacd993fe857aa1b08fd97a4604b8b4e54ed273..d5c107e083895578bf25f2daf033b789f9cf71cd 100644 GIT binary patch delta 268 zcmca;aoS=+n&bfnV_`uC1_nh2FSDr(3~VA0T0(tdy*}gZiR<+_CowIbc7%aJJYeE; zcfqf$V!!wp7zFOJO21TLU=ZFk*`Cqe^D-N2-xUT1PA4{Xy%Yup(GWI$jx7uf>{Hkr zRV0Dp@7U(QT?!NzU|Sd#3N-2s+vdhw3=G`=*j{?gV_;xSX17>%h=GCe)#U4p`huFA z9iG2{PMXZQs_-4qj>yUUOyZK<-1^;hK$|CU2mW8lz`#G9`{vIJ3=9&%lkJ(@1x5L6 z4>1ExuIEb?R%T!jDVsc1se5#K6G#iao;V9njPZ zlg~5ibLw+;c>V%9ZSrJ(CUHqYZvE~$pv@Dw1OKmNVBnw5ee>r91_lYB3z*ymrTJ_R zF#}C*t_d$4rU< diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts index d955c0b..81b1a29 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts @@ -211,10 +211,6 @@ Default minimize Default minimize - - Minimize to tray, method 1 - Minimize to tray, method 1 - Minimize to tray, method 2 @@ -240,10 +236,6 @@ Start application minimized Start application minimized - - Minimize on close - Minimize on close - Number properties @@ -363,12 +355,8 @@ - Startup application - Startup application - - - Arguments: - Arguments: + Start application + Start application diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.qm index de1b4e145a741852ad3841d448a51e831c97cdce..6198b4de384156c276a3afc9f6d8dc5d5eaf9399 100644 GIT binary patch delta 258 zcmbPlH`i`Lnq&%tv9KTm1A{Vym)TSX2DW(+TI%}5dVNOeiR<+_KQS$zc7%aJ^2NmG z?tf-hBr^FrqrPA) zXNTu6pp!Opt}1*7w4;79Ka;p*J-2>$9nj_!?!f;m85jhExo`fwz`!8QI@zAdU2rv@ z?IC8M$*O#*!paN`Vw)yUXVPH|+I)nmS#{F0t4jW0 F1pw`tNYVfR diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts index b6fce1f..d648117 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts @@ -192,10 +192,6 @@ Default minimize Minimizzazione predefinita - - Minimize to tray, method 1 - Minimizza nel vassoio, metodo 1 - Minimize to tray, method 2 @@ -348,11 +344,6 @@ Arguments: Argomenti: - - - Startup application - Applicazione di avvio - Mail @@ -384,6 +375,11 @@ Apps Applicazioni + + + Start application + Applicazione di avvio + Save diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.qm index f932f4b1917a5ac446841c84ad8eaa9b63e8a55e..eb62c28b85434b56a7a7c3ed6995162a409ab90c 100644 GIT binary patch delta 253 zcmeCS>9m=UCKtz@W(BWj2+8fz1X&OJ1E=ug@4ialJmL4Ab&yM;I6+zD#`X zF1VIe>=z#cgODw&^h*^622q2__KfbHiEONWR~Q&Lx3H<}r7$pv-D1<{*uucT{(#L< zMUsJmtBP&@+oeG9DQpYFLKzq&``9)&-eO?jImPzUYaRmwYdO2cszVG6jISnNXVe#5 z&)MPm3+SYYoU01oF))bSp3KiAE;*lDzq^isLGTWD;Qy5j3<7JpZ~nZ%z#zps*`CQ= za66yvA!eY-ihQZU%0Qb~CQoP5VYJ(Pgz3J>WF-j=R>9zs#G=X7;>$NzN=#w}0MHsn A!T9(1WCK<(GEG)>tz@W(BWj2+8fz1X&OJ1K?ug{n`alJmL9Mke?M;I6+zD<1Y zF1Vgm>=z#cgODw&^h*^629ev7?HSzzli67Nt}rlgZedf`OJQITyThi>v4w$w{Q;Y! ziX;OAR~6g*w@ZQI)7TbvZuXzj%tmW($s}3vF7EHbDefault minimize Standaard minimalisatie - - Minimize to tray, method 1 - Minimaliseer naar systeemvak, methode 1 - Minimize to tray, method 2 @@ -239,10 +235,6 @@ Start application minimized Start programma geminimaliseerd - - Minimize on close - Minimaliseren bij sluiten - Number properties @@ -362,7 +354,7 @@ - Startup application + Start application Start programma diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.qm index b37885bba86610092578cc694ed1151773641c98..0aaa09326b3de34025e1056861cbb345b7217732 100644 GIT binary patch delta 253 zcmexs{o8s%nxqedv9KTm1A`)im)TSX2G%1GT5|8idVNOOiR<+_e=#kec7%aJ;?~6H z?t(K}#eVTIFbJ+?m42zhz#wvGvOS}_XDAzM-xUT1PA4{Xy%Yupv3YFz99tL|*o)X4 zRU{c0xLDZczg-Fx4`5pu7RtaNS;4ls@fHIEj}zNVuX#XA+1V{t9b#Z$Y?^$XQC~2W zv%~Wj&`HxdR~5bk+L1q*pGjPDGPizr9nj_=?!f;m85jf{xo`fw05t3MWP2ue!G(Ob xhnRspPQFxOWd;V(ZIh=n=`b2>KEhNiGI@iz1FK+gNn+7te({By_u#j zDv}HgTr6z!-!27;2eB;-3uR!CtYX{Tc#DC7$BFHw*F2!5?Cch+4lyt=HnB%Iy#t#1 zV)A)Lea>*s4$oger%j*C&m=B6m0Q2N4rp@_ci{h(3=9H}+&6z-0Gjo7vOSZ#;9@@8 zL(D)PH(#o-G6RF?j>*%RbQp~`A7LsMnY={2aDefault minimize Comportamento padrão - - Minimize to tray, method 1 - Minimizar para à área de notificações? (muito grande) - Minimizar para a tray, método 1 - Minimize to tray, method 2 @@ -239,10 +234,6 @@ Start application minimized Iniciar aplicação minimizada - - Minimize on close - Minimizar ao fechar - Number properties @@ -362,7 +353,7 @@ - Startup application + Start application Aplicativo de inicialização diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.qm b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.qm index 9512af122540445627c1bec20b1362269e0f86c4..19dbd4869bfcc57fdab99d65922f5dd3724e2311 100644 GIT binary patch delta 258 zcmdmDv&m*cnq&oov9KTm1A`)im)TSX2DUl~E%|n0y*^{$#P#}|Vob}Y9bsUQ_&4#n zyWmMyv0r=)41%v&rC+KrFo>#6wr6zrOk`v2yTZW0`G8GbFNJ|Y>>Qgu#})<#4h=R( z6-fpLu0?F~-!27;x3Db?3uR!CT*kJ!@fHIE&oQ=_Uh^0jSa-5ptUAQNz{D~6I-|be zT+R;9UqB~ybFM0U$G{+Rcrrhexa4wf{q8!T&3)W~|5q|F2u$X_`SSt;gOu!KdnTZ} z_-qd`15LK(OBGfIy6eN_=}bC|F`JJt9T%C*Bw@xT7+jKAR5JM>r~2e>@$${-5@%Tf D1FA{R delta 260 zcmdmFv&CjYnq(D&v9KTm1A`)im)TSX2DUl~E%|<8y*^{`#P#}|5=_gd9bsUQWSIEe zUGOxk*e^Z?2Eo^?(l1pQ7(@;juU#})<#4h=R( z6-fpLu0?F~-!27;x3Mh@3k4drf^Bo-Ed~ajV{9+I<}om^?qs)Eb%=q1iGw}D=^X=u zsMX~2jQX7OIXgUm0iD)8nV(5qawWHZcOB5?KJLK(D;XFBCUf8Xd4YjJN`A6E6VP3J zwuhL3Cfo9*3M&Im_%wMslMZ9t<|9nUMJB%!FQ42kZpI-TT#{H+Qd%(iAgB7~REe{! E0R3r7OaK4? diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts index 020a2d5..af72a01 100644 --- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts +++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts @@ -207,10 +207,6 @@ Need documentation what methods do... Свернуть окно - - Minimize to tray, method 1 - Свернуть в трей, вариант 1 - Minimize to tray, method 2 @@ -236,10 +232,6 @@ Start application minimized Запуск приложения свернутым - - Minimize on close - Сворачивать при закрытии - Number properties @@ -359,7 +351,7 @@ - Startup application + Start application Приложение при запуске diff --git a/app/SysTray-X/SysTray-X-app/preferences.cpp b/app/SysTray-X/SysTray-X-app/preferences.cpp index 0734e17..a65948d 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.cpp +++ b/app/SysTray-X/SysTray-X-app/preferences.cpp @@ -81,8 +81,8 @@ Preferences::Preferences( QObject *parent ) : QObject( parent ) m_theme = PREF_THEME_LIGHT; - m_startup_app = ""; - m_startup_app_args = ""; + m_start_app = ""; + m_start_app_args = ""; m_close_app = ""; m_close_app_args = ""; } @@ -693,55 +693,55 @@ void Preferences::setTheme( Theme theme ) /* - * Get the startup application. + * Get the start application. */ -QString Preferences::getStartupApplication() const +QString Preferences::getStartApp() const { - return m_startup_app; + return m_start_app; } /* - * Set the startup application. + * Set the start application. */ -void Preferences::setStartupApplication( QString app ) +void Preferences::setStartApp( QString app ) { - if( m_startup_app != app ) + if( m_start_app != app ) { - m_startup_app = app; + m_start_app = app; /* * Tell the world the new preference */ - emit signalStartupAppChange(); + emit signalStartAppChange(); } } /* - * Get the startup application arguments. + * Get the start application arguments. */ -QString Preferences::getStartupApplicationArgs() const +QString Preferences::getStartAppArgs() const { - return m_startup_app_args; + return m_start_app_args; } /* - * Set the startup application arguments. + * Set the start application arguments. */ -void Preferences::setStartupApplicationArgs( QString args ) +void Preferences::setStartAppArgs( QString args ) { - if( m_startup_app_args != args ) + if( m_start_app_args != args ) { - m_startup_app_args = args; + m_start_app_args = args; /* * Tell the world the new preference */ - emit signalStartupAppArgsChange(); + emit signalStartAppArgsChange(); } } @@ -749,7 +749,7 @@ void Preferences::setStartupApplicationArgs( QString args ) /* * Get the close application. */ -QString Preferences::getCloseApplication() const +QString Preferences::getCloseApp() const { return m_close_app; @@ -759,7 +759,7 @@ QString Preferences::getCloseApplication() const /* * Set the close application. */ -void Preferences::setCloseApplication( QString app ) +void Preferences::setCloseApp( QString app ) { if( m_close_app != app ) { @@ -776,7 +776,7 @@ void Preferences::setCloseApplication( QString app ) /* * Get the close application arguments. */ -QString Preferences::getCloseApplicationArgs() const +QString Preferences::getCloseAppArgs() const { return m_close_app_args; @@ -786,7 +786,7 @@ QString Preferences::getCloseApplicationArgs() const /* * Set the close application arguments. */ -void Preferences::setCloseApplicationArgs( QString args ) +void Preferences::setCloseAppArgs( QString args ) { if( m_close_app_args != args ) { diff --git a/app/SysTray-X/SysTray-X-app/preferences.h b/app/SysTray-X/SysTray-X-app/preferences.h index e99ccd7..abaca82 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.h +++ b/app/SysTray-X/SysTray-X-app/preferences.h @@ -463,60 +463,60 @@ class Preferences : public QObject void setTheme( Theme theme ); /** - * @brief getStartupApplication. Get the startup application. + * @brief getStartApp. Get the start application. * * @return The app. */ - QString getStartupApplication() const; + QString getStartApp() const; /** - * @brief setStartupApplication. Set the startup application. + * @brief setStartApp. Set the start application. * * @param app The app. */ - void setStartupApplication( QString app ); + void setStartApp( QString app ); /** - * @brief getStartupApplicationArgs. Get the startup application arguments. + * @brief getStartAppArgs. Get the start application arguments. * * @return The arg. */ - QString getStartupApplicationArgs() const; + QString getStartAppArgs() const; /** - * @brief setStartupApplicationArgs. Set the startup application arguments. + * @brief setStartAppArgs. Set the start application arguments. * * @param app The args. */ - void setStartupApplicationArgs( QString args ); + void setStartAppArgs( QString args ); /** - * @brief getCloseApplication. Get the close application. + * @brief getCloseApp. Get the close application. * * @return The app. */ - QString getCloseApplication() const; + QString getCloseApp() const; /** - * @brief setCloseApplication. Set the close application. + * @brief setCloseApp. Set the close application. * * @param app The app. */ - void setCloseApplication( QString app ); + void setCloseApp( QString app ); /** - * @brief getCloseApplicationArgs. Get the close application arguments. + * @brief getCloseAppArgs. Get the close application arguments. * * @return The args. */ - QString getCloseApplicationArgs() const; + QString getCloseAppArgs() const; /** - * @brief setCloseApplicationArgs. Set the close application arguments. + * @brief setCloseAppArgs. Set the close application arguments. * * @param args The args. */ - void setCloseApplicationArgs( QString args ); + void setCloseAppArgs( QString args ); /** * @brief getDebug. Get the debug windows state. @@ -670,14 +670,14 @@ class Preferences : public QObject void signalThemeChange(); /** - * @brief signalStartupAppChange. Signal a startup application change. + * @brief signalStartAppChange. Signal a start application change. */ - void signalStartupAppChange(); + void signalStartAppChange(); /** - * @brief signalStartupAppArgsChange. Signal a startup application arguments change. + * @brief signalStartAppArgsChange. Signal a start application arguments change. */ - void signalStartupAppArgsChange(); + void signalStartAppArgsChange(); /** * @brief signalCloseAppChange. Signal a close application change. @@ -847,14 +847,14 @@ class Preferences : public QObject Theme m_theme; /** - * @brief m_startup_app + * @brief m_start_app */ - QString m_startup_app; + QString m_start_app; /** - * @brief m_startup_app_args + * @brief m_start_app_args */ - QString m_startup_app_args; + QString m_start_app_args; /** * @brief m_close_app diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui index c7a7ce3..ff2cb03 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.ui +++ b/app/SysTray-X/SysTray-X-app/preferences.ui @@ -842,7 +842,7 @@ - + @@ -863,7 +863,7 @@ - + @@ -875,7 +875,7 @@ - Startup application + Start application @@ -883,10 +883,10 @@ - + - + Browse... @@ -904,7 +904,7 @@ - + @@ -1059,12 +1059,12 @@ - - - - + + + + diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp index 12b17a3..3a356cc 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp @@ -118,8 +118,8 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi connect( m_ui->savePushButton, &QPushButton::clicked, this, &PreferencesDialog::slotAccept); connect( m_ui->cancelPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotReject); - connect( m_ui->startupBrowseButton, &QPushButton::clicked, this, &PreferencesDialog::slotStartupApplicationSelect ); - connect( m_ui->closeBrowseButton, &QPushButton::clicked, this, &PreferencesDialog::slotCloseApplicationSelect ); + connect( m_ui->startBrowseButton, &QPushButton::clicked, this, &PreferencesDialog::slotStartAppSelect ); + connect( m_ui->closeBrowseButton, &QPushButton::clicked, this, &PreferencesDialog::slotCloseAppSelect ); /* * Set number color @@ -153,12 +153,12 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi setNumberMargins( m_pref->getNumberMargins() ); /* - * Set the startup and close application parameters + * Set the start and close application parameters */ - setStartupApplication( m_pref->getStartupApplication() ); - setStartupApplicationArgs( m_pref->getStartupApplicationArgs() ); - setCloseApplication( m_pref->getCloseApplication() ); - setCloseApplicationArgs( m_pref->getCloseApplicationArgs() ); + setStartApp( m_pref->getStartApp() ); + setStartAppArgs( m_pref->getStartAppArgs() ); + setCloseApp( m_pref->getCloseApp() ); + setCloseAppArgs( m_pref->getCloseAppArgs() ); /* * Dialog on top @@ -445,37 +445,37 @@ void PreferencesDialog::setTheme( Preferences::Theme theme ) /* - * Set startup application + * Set start application */ -void PreferencesDialog::setStartupApplication( QString app ) +void PreferencesDialog::setStartApp( QString app ) { - m_ui->startupApplicationLineEdit->setText( app ); + m_ui->startAppLineEdit->setText( app ); } /* - * Set startup application arguments + * Set start application arguments */ -void PreferencesDialog::setStartupApplicationArgs( QString args ) +void PreferencesDialog::setStartAppArgs( QString args ) { - m_ui->startupApplicationArgsLineEdit->setText( args ); + m_ui->startAppArgsLineEdit->setText( args ); } /* * Set close application */ -void PreferencesDialog::setCloseApplication( QString app ) +void PreferencesDialog::setCloseApp( QString app ) { - m_ui->closeApplicationLineEdit->setText( app ); + m_ui->closeAppLineEdit->setText( app ); } /* * Set close application arguments */ -void PreferencesDialog::setCloseApplicationArgs( QString args ) +void PreferencesDialog::setCloseAppArgs( QString args ) { - m_ui->closeApplicationArgsLineEdit->setText( args ); + m_ui->closeAppArgsLineEdit->setText( args ); } @@ -519,14 +519,14 @@ void PreferencesDialog::slotAccept() Preferences::Theme theme = static_cast< Preferences::Theme >( m_ui->themeGroup->checkedId() ); m_pref->setTheme( theme ); - QString startupApp = m_ui->startupApplicationLineEdit->text(); - m_pref->setStartupApplication( startupApp ); - QString startupAppArgs= m_ui->startupApplicationArgsLineEdit->text(); - m_pref->setStartupApplicationArgs( startupAppArgs ); - QString closeApp = m_ui->closeApplicationLineEdit->text(); - m_pref->setCloseApplication( closeApp ); - QString closeAppArgs= m_ui->closeApplicationArgsLineEdit->text(); - m_pref->setCloseApplicationArgs( closeAppArgs ); + QString startApp = m_ui->startAppLineEdit->text(); + m_pref->setStartApp( startApp ); + QString startAppArgs= m_ui->startAppArgsLineEdit->text(); + m_pref->setStartAppArgs( startAppArgs ); + QString closeApp = m_ui->closeAppLineEdit->text(); + m_pref->setCloseApp( closeApp ); + QString closeAppArgs= m_ui->closeAppArgsLineEdit->text(); + m_pref->setCloseAppArgs( closeAppArgs ); /* * Force different color? @@ -592,10 +592,10 @@ void PreferencesDialog::slotReject() setNumberAlignment( m_pref->getNumberAlignment() ); setNumberMargins( m_pref->getNumberMargins() ); setTheme( m_pref->getTheme() ); - setStartupApplication( m_pref->getStartupApplication() ); - setStartupApplicationArgs( m_pref->getStartupApplicationArgs() ); - setCloseApplication( m_pref->getCloseApplication() ); - setCloseApplicationArgs( m_pref->getCloseApplicationArgs() ); + setStartApp( m_pref->getStartApp() ); + setStartAppArgs( m_pref->getStartAppArgs() ); + setCloseApp( m_pref->getCloseApp() ); + setCloseAppArgs( m_pref->getCloseAppArgs() ); setDebug( m_pref->getDebug()); } @@ -666,15 +666,15 @@ void PreferencesDialog::slotColorSelect() /* - * Handle the startup application button + * Handle the start application button */ -void PreferencesDialog::slotStartupApplicationSelect() +void PreferencesDialog::slotStartAppSelect() { QFileDialog file_dialog( this, tr( "Select application" ), "", "" ); if( file_dialog.exec() ) { - setStartupApplication( file_dialog.selectedFiles()[ 0 ] ); + setStartApp( file_dialog.selectedFiles()[ 0 ] ); } } @@ -682,13 +682,13 @@ void PreferencesDialog::slotStartupApplicationSelect() /* * Handle the close application button */ -void PreferencesDialog::slotCloseApplicationSelect() +void PreferencesDialog::slotCloseAppSelect() { QFileDialog file_dialog( this, tr( "Select application" ), "", "" ); if( file_dialog.exec() ) { - setCloseApplication( file_dialog.selectedFiles()[ 0 ] ); + setCloseApp( file_dialog.selectedFiles()[ 0 ] ); } } @@ -893,20 +893,20 @@ void PreferencesDialog::slotThemeChange() /* - * Handle the startup application change signal + * Handle the start application change signal */ -void PreferencesDialog::slotStartupAppChange() +void PreferencesDialog::slotStartAppChange() { - setStartupApplication( m_pref->getStartupApplication() ); + setStartApp( m_pref->getStartApp() ); } /* - * Handle the startup application arguments change signal + * Handle the start application arguments change signal */ -void PreferencesDialog::slotStartupAppArgsChange() +void PreferencesDialog::slotStartAppArgsChange() { - setStartupApplicationArgs( m_pref->getStartupApplicationArgs() ); + setStartAppArgs( m_pref->getStartAppArgs() ); } @@ -915,7 +915,7 @@ void PreferencesDialog::slotStartupAppArgsChange() */ void PreferencesDialog::slotCloseAppChange() { - setCloseApplication( m_pref->getCloseApplication() ); + setCloseApp( m_pref->getCloseApp() ); } @@ -924,5 +924,5 @@ void PreferencesDialog::slotCloseAppChange() */ void PreferencesDialog::slotCloseAppArgsChange() { - setCloseApplicationArgs( m_pref->getCloseApplicationArgs() ); + setCloseAppArgs( m_pref->getCloseAppArgs() ); } diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.h b/app/SysTray-X/SysTray-X-app/preferencesdialog.h index c62eee0..ae20b0e 100644 --- a/app/SysTray-X/SysTray-X-app/preferencesdialog.h +++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.h @@ -210,32 +210,32 @@ class PreferencesDialog : public QDialog void setTheme( Preferences::Theme theme ); /** - * @brief setStartupApplication. Set the startup application. + * @brief setStartApp. Set the start application. * * @param app The application. */ - void setStartupApplication( QString app ); + void setStartApp( QString app ); /** - * @brief setStartupApplicationArgs. Set the startup application arguments. + * @brief setStartAppArgs. Set the start application arguments. * * @param args The application arguments. */ - void setStartupApplicationArgs( QString args ); + void setStartAppArgs( QString args ); /** - * @brief setCloseApplication. Set the close application. + * @brief setCloseApp. Set the close application. * * @param app The application. */ - void setCloseApplication( QString app ); + void setCloseApp( QString app ); /** - * @brief setCloseApplicationArgs. Set the close application arguments. + * @brief setCloseAppArgs. Set the close application arguments. * * @param args The application arguments. */ - void setCloseApplicationArgs( QString args ); + void setCloseAppArgs( QString args ); signals: @@ -355,14 +355,14 @@ class PreferencesDialog : public QDialog void slotThemeChange(); /** - * @brief slotStartupAppChange. Slot for handling startup application change. + * @brief slotStartAppChange. Slot for handling start application change. */ - void slotStartupAppChange(); + void slotStartAppChange(); /** - * @brief slotStartupAppArgsChange. Slot for handling startup application arguments change. + * @brief slotStartAppArgsChange. Slot for handling start application arguments change. */ - void slotStartupAppArgsChange(); + void slotStartAppArgsChange(); /** * @brief slotCloseAppChange. Slot for handling close application change. @@ -402,14 +402,14 @@ class PreferencesDialog : public QDialog void slotColorSelect(); /** - * @brief slotStartupApplicationSelect. Handle the startup application button click. + * @brief slotStartAppSelect. Handle the start application button click. */ - void slotStartupApplicationSelect(); + void slotStartAppSelect(); /** - * @brief slotCloseApplicationSelect. Handle the close application button click. + * @brief slotCloseAppSelect. Handle the close application button click. */ - void slotCloseApplicationSelect(); + void slotCloseAppSelect(); private: diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index d7e63bf..545becf 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -133,8 +133,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_pref_dialog, &PreferencesDialog::slotRestoreWindowPositionsChange ); connect( m_preferences, &Preferences::signalCloseTypeChange, m_pref_dialog, &PreferencesDialog::slotCloseTypeChange ); connect( m_preferences, &Preferences::signalThemeChange, m_pref_dialog, &PreferencesDialog::slotThemeChange ); - connect( m_preferences, &Preferences::signalStartupAppChange, m_pref_dialog, &PreferencesDialog::slotStartupAppChange ); - connect( m_preferences, &Preferences::signalStartupAppArgsChange, m_pref_dialog, &PreferencesDialog::slotStartupAppArgsChange ); + connect( m_preferences, &Preferences::signalStartAppChange, m_pref_dialog, &PreferencesDialog::slotStartAppChange ); + 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::signalDebugChange, m_pref_dialog, &PreferencesDialog::slotDebugChange ); @@ -157,8 +157,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_preferences, &Preferences::signalRestoreWindowPositionsChange, m_link, &SysTrayXLink::slotRestoreWindowPositionsChange ); connect( m_preferences, &Preferences::signalCloseTypeChange, m_link, &SysTrayXLink::slotCloseTypeChange ); connect( m_preferences, &Preferences::signalThemeChange, m_link, &SysTrayXLink::slotThemeChange ); - connect( m_preferences, &Preferences::signalStartupAppChange, m_link, &SysTrayXLink::slotStartupAppChange ); - connect( m_preferences, &Preferences::signalStartupAppArgsChange, m_link, &SysTrayXLink::slotStartupAppArgsChange ); + connect( m_preferences, &Preferences::signalStartAppChange, m_link, &SysTrayXLink::slotStartAppChange ); + 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::signalDebugChange, m_link, &SysTrayXLink::slotDebugChange ); @@ -176,7 +176,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_link, &SysTrayXLink::signalVersion, this, &SysTrayX::slotVersion ); connect( m_link, &SysTrayXLink::signalKdeIntegration, this, &SysTrayX::slotSelectIconObject ); connect( m_link, &SysTrayXLink::signalLocale, this, &SysTrayX::slotLoadLanguage ); - connect( m_link, &SysTrayXLink::signalStartupApp, this, &SysTrayX::slotStartupApp ); + connect( m_link, &SysTrayXLink::signalStartApp, this, &SysTrayX::slotStartApp ); connect( m_link, &SysTrayXLink::signalCloseApp, this, &SysTrayX::slotCloseApp ); #ifdef Q_OS_UNIX @@ -209,7 +209,7 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) m_preferences->setStartupApplication( "/home/maxime/test.sh" ); m_preferences->setStartupApplicationArgs( "/home/maxime/startup.txt StartupString" ); - slotStartupApp(); + slotStartApp(); */ } @@ -728,10 +728,10 @@ void SysTrayX::slotLoadLanguage( QString locale ) /* * Handle a startup app launch request */ -void SysTrayX::slotStartupApp() +void SysTrayX::slotStartApp() { - QString app = m_preferences->getStartupApplication(); - QString args = m_preferences->getStartupApplicationArgs(); + QString app = m_preferences->getStartApp(); + QString args = m_preferences->getStartAppArgs(); QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); if( !app.isEmpty() ) @@ -746,8 +746,8 @@ void SysTrayX::slotStartupApp() */ void SysTrayX::slotCloseApp() { - QString app = m_preferences->getCloseApplication(); - QString args = m_preferences->getCloseApplicationArgs(); + QString app = m_preferences->getCloseApp(); + QString args = m_preferences->getCloseAppArgs(); QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); if( !app.isEmpty() ) diff --git a/app/SysTray-X/SysTray-X-app/systrayx.h b/app/SysTray-X/SysTray-X-app/systrayx.h index 9888ff5..f48103d 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.h +++ b/app/SysTray-X/SysTray-X-app/systrayx.h @@ -139,9 +139,9 @@ class SysTrayX : public QObject void slotLoadLanguage( QString locale ); /** - * @brief slotStartupApp. Handle a startup app launch request. + * @brief slotStartApp. Handle a start app launch request. */ - void slotStartupApp(); + void slotStartApp(); /** * @brief slotCloseApp. Handle a close app launch request. diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp index 618e4c4..cfaf6e1 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.cpp @@ -435,19 +435,19 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message ) DecodePreferences( jsonObject[ "preferences" ].toObject() ); } - if( jsonObject.contains( "startupApp" ) && jsonObject[ "startupApp" ].isString() && - jsonObject.contains( "startupAppArgs" ) && jsonObject[ "startupAppArgs" ].isString() ) + if( jsonObject.contains( "startApp" ) && jsonObject[ "startApp" ].isString() && + jsonObject.contains( "startAppArgs" ) && jsonObject[ "startAppArgs" ].isString() ) { - QString app = jsonObject[ "startupApp" ].toString(); - QString args = jsonObject[ "startupAppArgs" ].toString(); + QString app = jsonObject[ "startApp" ].toString(); + QString args = jsonObject[ "startAppArgs" ].toString(); /* - * Store the new startup application parameters + * Store the new start application parameters */ - m_pref->setStartupApplication( app ); - m_pref->setStartupApplicationArgs( args ); + m_pref->setStartApp( app ); + m_pref->setStartAppArgs( args ); - emit signalStartupApp(); + emit signalStartApp(); } if( jsonObject.contains( "closeApp" ) && jsonObject[ "closeApp" ].isString() ) @@ -791,24 +791,24 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref ) m_pref->setTheme( theme ); } - if( pref.contains( "startupApp" ) && pref[ "startupApp" ].isString() ) + if( pref.contains( "startApp" ) && pref[ "startApp" ].isString() ) { - QString app = pref[ "startupApp" ].toString(); + QString app = pref[ "startApp" ].toString(); /* - * Store the new startup application + * Store the new start application */ - m_pref->setStartupApplication( app ); + m_pref->setStartApp( app ); } - if( pref.contains( "startupAppArgs" ) && pref[ "startupAppArgs" ].isString() ) + if( pref.contains( "startAppArgs" ) && pref[ "startAppArgs" ].isString() ) { - QString args = pref[ "startupAppArgs" ].toString(); + QString args = pref[ "startAppArgs" ].toString(); /* - * Store the new startup application arguments + * Store the new start application arguments */ - m_pref->setStartupApplicationArgs( args ); + m_pref->setStartAppArgs( args ); } if( pref.contains( "closeApp" ) && pref[ "closeApp" ].isString() ) @@ -818,7 +818,7 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref ) /* * Store the new close application */ - m_pref->setCloseApplication( app ); + m_pref->setCloseApp( app ); } if( pref.contains( "closeAppArgs" ) && pref[ "closeAppArgs" ].isString() ) @@ -828,7 +828,7 @@ void SysTrayXLink::DecodePreferences( const QJsonObject& pref ) /* * Store the new close application arguments */ - m_pref->setCloseApplicationArgs( args ); + m_pref->setCloseAppArgs( args ); } if( pref.contains( "debug" ) && pref[ "debug" ].isString() ) @@ -911,10 +911,10 @@ void SysTrayXLink::EncodePreferences( const Preferences& pref ) prefObject.insert("startupDelay", QJsonValue::fromVariant( QString::number( pref.getStartupDelay() ) ) ); prefObject.insert("theme", QJsonValue::fromVariant( QString::number( pref.getTheme() ) ) ); - prefObject.insert("startupApp", QJsonValue::fromVariant( pref.getStartupApplication() ) ); - prefObject.insert("startupAppArgs", QJsonValue::fromVariant( pref.getStartupApplicationArgs() ) ); - prefObject.insert("closeApp", QJsonValue::fromVariant( pref.getCloseApplication() ) ); - prefObject.insert("closeAppArgs", QJsonValue::fromVariant( pref.getCloseApplicationArgs() ) ); + prefObject.insert("startApp", QJsonValue::fromVariant( pref.getStartApp() ) ); + prefObject.insert("startAppArgs", QJsonValue::fromVariant( pref.getStartAppArgs() ) ); + prefObject.insert("closeApp", QJsonValue::fromVariant( pref.getCloseApp() ) ); + prefObject.insert("closeAppArgs", QJsonValue::fromVariant( pref.getCloseAppArgs() ) ); QJsonObject preferencesObject; preferencesObject.insert("preferences", prefObject ); @@ -1185,9 +1185,9 @@ void SysTrayXLink::slotThemeChange() /* - * Handle a startup application change signal + * Handle a start application change signal */ -void SysTrayXLink::slotStartupAppChange() +void SysTrayXLink::slotStartAppChange() { if( m_pref->getAppPrefChanged() ) { @@ -1197,9 +1197,9 @@ void SysTrayXLink::slotStartupAppChange() /* - * Handle a startup application arguments change signal + * Handle a start application arguments change signal */ -void SysTrayXLink::slotStartupAppArgsChange() +void SysTrayXLink::slotStartAppArgsChange() { if( m_pref->getAppPrefChanged() ) { diff --git a/app/SysTray-X/SysTray-X-app/systrayxlink.h b/app/SysTray-X/SysTray-X-app/systrayxlink.h index 9cf4a67..89c2e4e 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxlink.h +++ b/app/SysTray-X/SysTray-X-app/systrayxlink.h @@ -242,9 +242,9 @@ class SysTrayXLink : public QObject void signalWindowPositions( QList< QPoint > window_positions ); /** - * @brief signalStartupApp. Signal the startup app launch request. + * @brief signalStartApp. Signal the start app launch request. */ - void signalStartupApp(); + void signalStartApp(); /** * @brief signalCloseApp. Signal the close app launch request. @@ -354,14 +354,14 @@ class SysTrayXLink : public QObject void slotThemeChange(); /** - * @brief slotStartupAppChange. Slot for handling startup application change signals. + * @brief slotStartAppChange. Slot for handling start application change signals. */ - void slotStartupAppChange(); + void slotStartAppChange(); /** - * @brief slotStartupAppArgsChange. Slot for handling startup application arguments change signals. + * @brief slotStartAppArgsChange. Slot for handling start application arguments change signals. */ - void slotStartupAppArgsChange(); + void slotStartAppArgsChange(); /** * @brief slotCloseAppChange. Slot for handling close application change signals. diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json index e27ea91..1b12b34 100644 --- a/webext/_locales/de/messages.json +++ b/webext/_locales/de/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Startanwendung", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Anwendung: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Argumente: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/el/messages.json b/webext/_locales/el/messages.json index 1bf6a00..cc3b4ab 100644 --- a/webext/_locales/el/messages.json +++ b/webext/_locales/el/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Εφαρμογή εκκίνησης", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Εφαρμογή: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Επιχειρήματα: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/en-US/messages.json b/webext/_locales/en-US/messages.json index 84f6bf8..48e9fc7 100644 --- a/webext/_locales/en-US/messages.json +++ b/webext/_locales/en-US/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { - "message": "Startup application", - "description": "The startup application parameters" + "start_application": { + "message": "Start application", + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Application: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Arguments: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/it/messages.json b/webext/_locales/it/messages.json index c20008b..864ff45 100644 --- a/webext/_locales/it/messages.json +++ b/webext/_locales/it/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Applicazione di avvio", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Applicazione: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Argomenti: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json index c3b5dab..156b29a 100644 --- a/webext/_locales/nl/messages.json +++ b/webext/_locales/nl/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Start programma", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Programma: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Argumenten: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/pt-BR/messages.json b/webext/_locales/pt-BR/messages.json index 269934a..0b65ab1 100644 --- a/webext/_locales/pt-BR/messages.json +++ b/webext/_locales/pt-BR/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Aplicativo de inicialização", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Aplicativo: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "Argumentos: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/_locales/ru/messages.json b/webext/_locales/ru/messages.json index e118871..44ec014 100644 --- a/webext/_locales/ru/messages.json +++ b/webext/_locales/ru/messages.json @@ -314,19 +314,19 @@ "description": "Title for Apps options" }, - "startup_application": { + "start_application": { "message": "Приложение при запуске", - "description": "The startup application parameters" + "description": "The start application parameters" }, - "startup_app": { + "start_app": { "message": "Приложение: ", - "description": "The startup application" + "description": "The start application" }, - "startup_app_args": { + "start_app_args": { "message": "аргументы: ", - "description": "Arguments for a startup application" + "description": "Arguments for a start application" }, "close_application": { diff --git a/webext/background.js b/webext/background.js index 3c766e7..02747f4 100644 --- a/webext/background.js +++ b/webext/background.js @@ -6,8 +6,8 @@ var SysTrayX = { hideDefaultIcon: false, - startupApp: "", - startupAppArgs: "", + startApp: "", + startAppArgs: "", }; SysTrayX.Info = { @@ -66,8 +66,8 @@ SysTrayX.Messaging = { // Send preferences to app SysTrayX.Messaging.sendPreferences(); - // Send startup app trigger - SysTrayX.Messaging.sendStartupApp(); + // Send start app trigger + SysTrayX.Messaging.sendStartApp(); // Let us wait until TB is ready, needed for TB91 and higher? const startupDelay = await storage() @@ -581,10 +581,10 @@ SysTrayX.Messaging = { }); }, - sendStartupApp: function () { + sendStartApp: function () { SysTrayX.Link.postSysTrayXMessage({ - startupApp: SysTrayX.startupApp, - startupAppArgs: SysTrayX.startupAppArgs, + startApp: SysTrayX.startApp, + startAppArgs: SysTrayX.startAppArgs, }); }, @@ -618,8 +618,8 @@ SysTrayX.Messaging = { "countType", "startupDelay", "theme", - "startupApp", - "startupAppArgs", + "startApp", + "startAppArgs", "closeApp", "closeAppArgs", ]) @@ -656,8 +656,8 @@ SysTrayX.Messaging = { const countType = result.countType || "0"; const startupDelay = result.startupDelay || "5"; const theme = result.theme || "0"; - const startupApp = result.startupApp || ""; - const startupAppArgs = result.startupAppArgs || ""; + const startApp = result.startApp || ""; + const startAppArgs = result.startAppArgs || ""; const closeApp = result.closeApp || ""; const closeAppArgs = result.closeAppArgs || ""; @@ -691,8 +691,8 @@ SysTrayX.Messaging = { countType, startupDelay, theme, - startupApp, - startupAppArgs, + startApp, + startAppArgs, closeApp, closeAppArgs, }, @@ -907,17 +907,17 @@ SysTrayX.Link = { }); } - const startupApp = response["preferences"].startupApp; - if (startupApp !== undefined) { + const startApp = response["preferences"].startApp; + if (startApp !== undefined) { await storage().set({ - startupApp: startupApp, + startApp: startApp, }); } - const startupAppArgs = response["preferences"].startupAppArgs; - if (startupAppArgs !== undefined) { + const startAppArgs = response["preferences"].startAppArgs; + if (startAppArgs !== undefined) { await storage().set({ - startupAppArgs: startupAppArgs, + startAppArgs: startAppArgs, }); } @@ -1032,9 +1032,9 @@ async function start() { SysTrayX.hideDefaultIcon = hideDefaultIcon; // Get startup app launch parameters - const {startupApp, startupAppArgs} = await getStartupAppParam(); - SysTrayX.startupApp = startupApp; - SysTrayX.startupAppArgs = startupAppArgs; + const {startApp, startAppArgs} = await getStartAppParam(); + SysTrayX.startApp = startApp; + SysTrayX.startAppArgs = startAppArgs; // Used sync storage // const inUse = await browser.storage.sync.getBytesInUse(); diff --git a/webext/css/options.css b/webext/css/options.css index cd66f76..fe90ccd 100644 --- a/webext/css/options.css +++ b/webext/css/options.css @@ -138,7 +138,7 @@ body { padding: 10px 10px 10px 10px; } -#startupapplicationselect { +#startapplicationselect { width: 25em; border-style: solid; border-width: 1px; diff --git a/webext/js/defaults.js b/webext/js/defaults.js index 27ec2a1..5189c2d 100644 --- a/webext/js/defaults.js +++ b/webext/js/defaults.js @@ -289,19 +289,19 @@ async function getCountType() { // // Get startup app parameters // -async function getStartupAppParam() { +async function getStartAppParam() { function resolve(result) { - const startupApp = result.startupApp || ""; - const startupAppArgs = result.startupAppArgs || ""; - return { startupApp, startupAppArgs }; + const startApp = result.startApp || ""; + const startAppArgs = result.startAppArgs || ""; + return { startApp, startAppArgs }; } function reject() { - return { startupApp: "", startupAppArgs: "" }; + return { startApp: "", startAppArgs: "" }; } return await storage() - .get(["startupApp", "startupAppArgs"]) + .get(["startApp", "startAppArgs"]) .then(resolve, reject); } diff --git a/webext/options.html b/webext/options.html index 1cee5dd..1f65a19 100644 --- a/webext/options.html +++ b/webext/options.html @@ -517,29 +517,29 @@

__MSG_apps__

- +
- + - + diff --git a/webext/options.js b/webext/options.js index 40c4e7c..f0e6750 100644 --- a/webext/options.js +++ b/webext/options.js @@ -303,10 +303,10 @@ SysTrayX.SaveOptions = { // // Save launch parameters // - const startupAppInput = document.getElementById("startupAppInput"); - const startupApp = startupAppInput.value; - const startupAppArgsInput = document.getElementById("startupAppArgsInput"); - const startupAppArgs = startupAppArgsInput.value; + const startAppInput = document.getElementById("startAppInput"); + const startApp = startAppInput.value; + const startAppArgsInput = document.getElementById("startAppArgsInput"); + const startAppArgs = startAppArgsInput.value; const closeAppInput = document.getElementById("closeAppInput"); const closeApp = closeAppInput.value; @@ -315,8 +315,8 @@ SysTrayX.SaveOptions = { // Store launch parameters await storage().set({ - startupApp: startupApp, - startupAppArgs: startupAppArgs, + startApp: startApp, + startAppArgs: startAppArgs, closeApp: closeApp, closeAppArgs: closeAppArgs, }); @@ -537,17 +537,17 @@ SysTrayX.RestoreOptions = { // Restore launch parameters // await storage() - .get("startupApp") + .get("startApp") .then( - SysTrayX.RestoreOptions.setStartupApp, - SysTrayX.RestoreOptions.onStartupAppError + SysTrayX.RestoreOptions.setStartApp, + SysTrayX.RestoreOptions.onStartAppError ); await storage() - .get("startupAppArgs") + .get("startAppArgs") .then( - SysTrayX.RestoreOptions.setStartupAppArgs, - SysTrayX.RestoreOptions.onStartupAppArgsError + SysTrayX.RestoreOptions.setStartAppArgs, + SysTrayX.RestoreOptions.onStartAppArgsError ); await storage() @@ -966,29 +966,29 @@ SysTrayX.RestoreOptions = { // // Restore startup app callbacks // - setStartupApp: function (result) { - const startupApp = result.startupApp || ""; + setStartApp: function (result) { + const startApp = result.startApp || ""; - const startupAppInput = document.getElementById("startupAppInput"); - startupAppInput.value = startupApp; + const startAppInput = document.getElementById("startAppInput"); + startAppInput.value = startApp; }, - onStartupAppError: function (error) { - console.log(`StartupApp Error: ${error}`); + onStartAppError: function (error) { + console.log(`StartApp Error: ${error}`); }, // // Restore startup app args callbacks // - setStartupAppArgs: function (result) { - const startupAppArgs = result.startupAppArgs || ""; + setStartAppArgs: function (result) { + const startAppArgs = result.startAppArgs || ""; - const startupAppArgsInput = document.getElementById("startupAppArgsInput"); - startupAppArgsInput.value = startupAppArgs; + const startAppArgsInput = document.getElementById("startAppArgsInput"); + startAppArgsInput.value = startAppArgs; }, - onStartupAppArgsError: function (error) { - console.log(`StartupAppArgs Error: ${error}`); + onStartAppArgsError: function (error) { + console.log(`StartAppArgs Error: ${error}`); }, // @@ -1269,14 +1269,14 @@ SysTrayX.StorageChanged = { theme: changes[item].newValue, }); } - if (item === "startupApp") { - SysTrayX.RestoreOptions.setStartupApp({ - startupApp: changes[item].newValue, + if (item === "startApp") { + SysTrayX.RestoreOptions.setStartApp({ + startApp: changes[item].newValue, }); } - if (item === "startupAppArgs") { - SysTrayX.RestoreOptions.setStartupAppArgs({ - startupAppArgs: changes[item].newValue, + if (item === "startAppArgs") { + SysTrayX.RestoreOptions.setStartAppArgs({ + startAppArgs: changes[item].newValue, }); } if (item === "closeApp") { @@ -1321,7 +1321,7 @@ SysTrayX.StorageChanged = { document.getElementById("minimizeiconselect").className = "active"; document.getElementById("closeselect").className = "active"; document.getElementById("themeselect").className = "active"; - document.getElementById("startupapplicationselect").className = "active"; + document.getElementById("startapplicationselect").className = "active"; document.getElementById("closeapplicationselect").className = "active"; }, };
- __MSG_startup_application__ + __MSG_start_application__
- +
- +