diff --git a/.gitignore b/.gitignore index 6f6aec4..acccf1b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,9 @@ *.a *.lib +# Compiled linguistic files +*.qm + # Executables *.exe *.out diff --git a/docs/tested_devices.md b/docs/tested_devices.md index 76a9392..353989a 100644 --- a/docs/tested_devices.md +++ b/docs/tested_devices.md @@ -22,6 +22,7 @@ | MSI GF65 Thin 10SDR | E16W1IMS.50C 11/19/2020 | ❌ Mode (everything's greyed out)
✔ Battery Limit
✔ Cooler Boost
✔ Fan Control | ❌ Keyboard Backlit (greyed out)
❓ FN -> Super (Not greyed out, but doesn't affect anything when ticked)
✔ Webcam
❌ USB Power Share (greyed out) | | MSI Modern 15 B5M | 15HKEMS1.103 06/29/2022 | ❌ Mode (everything's greyed out)
❓ Battery Limit
✔ Cooler Boost
❓ Fan Control | ❌ Keyboard Backlit (greyed out)
❓ FN -> Super (Not greyed out, but doesn't affect anything when ticked)
✔ Webcam
❓ USB Power Share | | MSI Katana GF66 12UD | 1584EMS1.110 06/21/2022 | ✔ Mode
✔ Battery Limit
✔ Cooler Boost
✔ Fan Control | ✔ Keyboard Backlit
✔ FN -> Super
✔ Webcam
✔ USB Power Share | +| MSI Katana GF66 12UG | 1583EMS1.109 03/29/2026 | ✔ Mode
✔ Battery Limit
✔ Cooler Boost
✔ Fan Control | ✔ Keyboard Backlit
✔ FN -> Super
✔ Webcam
✔ USB Power Share | | MSI Summit E14Evo A12M | 1594EMS1.118 03/22/2023 | ✔ Mode
✔ Battery Limit
✔ Cooler Boost
✔ Fan Control | ✔ Keyboard Backlit
✔ FN -> Super
✔ Webcam
✔ USB Power Share | | MSI Summit E14 Flip Evo A12MT | 14F1EMS1.115 09/13/2022 | ✔ Mode
✔ Battery Limit
✔ Cooler Boost
❌ Fan Control | ✔ Keyboard Backlit
✔ FN -> Super
✔ Webcam
✔ USB Power Share | | MSI Delta 15 A5EFK | 15CKEMS1.108 02/09/2021 | ❌ Mode (everything's greyed out)
✔ Battery Limit
✔ Cooler Boost
✔ Fan Control | ❌ Keyboard Backlit
❓ FN -> Super (Not greyed out, but doesn't affect anything when ticked)
✔ Webcam
❌ USB Power Share (greyed out)| diff --git a/resources/mcontrolcenter-symbolic.svg b/resources/mcontrolcenter-symbolic.svg new file mode 100644 index 0000000..251084d --- /dev/null +++ b/resources/mcontrolcenter-symbolic.svg @@ -0,0 +1,82 @@ + + + + diff --git a/scripts/create_installer.sh b/scripts/create_installer.sh index af30687..e715a11 100755 --- a/scripts/create_installer.sh +++ b/scripts/create_installer.sh @@ -15,7 +15,7 @@ mkdir $APP_DIR cp ../build/mcontrolcenter $APP_DIR cp ../build/helper/mcontrolcenter-helper $APP_DIR cp ../src/helper/mcontrolcenter-helper.conf ../src/helper/mcontrolcenter.helper.service $APP_DIR -cp ../resources/mcontrolcenter.desktop ../resources/mcontrolcenter.svg $APP_DIR +cp ../resources/mcontrolcenter.desktop ../resources/mcontrolcenter.svg ../resources/mcontrolcenter-symbolic.svg $APP_DIR cp ./install.sh ./uninstall.sh $DIST_DIR diff --git a/scripts/install.sh b/scripts/install.sh index be4cee3..171f9e9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,6 +11,7 @@ APP_DIR='./app/' APP_BIN='mcontrolcenter' SVG_ICON='mcontrolcenter.svg' +SVG_ICON_MC='mcontrolcenter-symbolic.svg' SHORTCUT='mcontrolcenter.desktop' HELPER_BIN='mcontrolcenter-helper' DBUS_CONF='mcontrolcenter-helper.conf' @@ -24,6 +25,7 @@ rm -fv /home/$SUDO_USER/.local/share/applications/$SHORTCUT install -vDm644 $APP_DIR$SHORTCUT $SHORTCUTS_PATH$SHORTCUT install -vDm644 $APP_DIR$SVG_ICON $SCALABLE_ICONS_PATH$SVG_ICON +install -vDm644 $APP_DIR$SVG_ICON_MC $SCALABLE_ICONS_PATH$SVG_ICON_MC install -vDm755 $APP_DIR$HELPER_BIN $LIB_EXEC_PATH$HELPER_BIN @@ -32,4 +34,3 @@ install -vDm644 $APP_DIR$DBUS_CONF $DBUS_SYSTEM_PATH$DBUS_CONF install -vDm644 $APP_DIR$DBUS_SERVICE $DBUS_SERVICES_PATH$DBUS_SERVICE echo "Installation was successful" - diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 0785c20..6cff6e6 100755 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -8,6 +8,7 @@ rm -fv /usr/bin/mcontrolcenter rm -fv /usr/share/applications/$SHORTCUT rm -fv /home/$SUDO_USER/.local/share/applications/$SHORTCUT rm -fv /usr/share/icons/hicolor/scalable/apps/mcontrolcenter.svg +rm -fv /usr/share/icons/hicolor/scalable/apps/mcontrolcenter-symbolic.svg rm -fv /usr/libexec/mcontrolcenter-helper rm -fv /etc/dbus-1/system.d/mcontrolcenter-helper.conf rm -fv /usr/share/dbus-1/system.d/mcontrolcenter-helper.conf diff --git a/src/i18n/MControlCenter_de_DE.ts b/src/i18n/MControlCenter_de_DE.ts index 5cee723..069cde9 100644 --- a/src/i18n/MControlCenter_de_DE.ts +++ b/src/i18n/MControlCenter_de_DE.ts @@ -155,6 +155,16 @@ Advanced Erweitert + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Kühlen @@ -215,6 +225,22 @@ Current fan Mode: Aktueller Lüftermodus: + + Follow system's power profile + + + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Keyboard Tastatur @@ -265,6 +291,10 @@ Weitere Informationen finden Sie auf der Seite <Über>. Charge the battery when under 90%, stop at 100% Lade die Batterie, wenn sie unter 90% ist, und stoppe das Laden bei 100% + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> <html><head/><body><p align="center"><span style=" font-weight:700;">Warnung</span>: Das Schreiben der falschen Werte an die falschen Adressen <span style=" font-weight:700;">FÜHRT ZUR BESCHÄDIGUNG IHRES GERÄTS!</span></p><p align="center">Schreiben Sie <span style=" font-weight:700;">niemals</span> in den EC-Speicher, ohne zu wissen, wie man einen ordnungsgemäßen <span style=" font-weight:700;">BIOS/EC</span>-Reset durchführt. Bedenken Sie, dass ein Reset das Gerät <span style=" font-weight:700;">möglicherweise nicht</span> repariert, wenn es beschädigt ist. </p></body></html> diff --git a/src/i18n/MControlCenter_en.ts b/src/i18n/MControlCenter_en.ts index b587b6a..5f27d86 100644 --- a/src/i18n/MControlCenter_en.ts +++ b/src/i18n/MControlCenter_en.ts @@ -115,16 +115,6 @@ rpm - - Couldn't connect to UPower to get charger status. -Make sure that UPower is installed and running then restart the app. - - - - Couldn't connect to Power Profiles Daemon. -Make sure that either Power Profiles Daemon or TuneD is installed and restart the app. - - Mode @@ -165,6 +155,16 @@ Make sure that either Power Profiles Daemon or TuneD is installed and restart th Advanced + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling @@ -297,6 +297,10 @@ Make sure that either Power Profiles Daemon or TuneD is installed and restart th MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_es.ts b/src/i18n/MControlCenter_es.ts index 837019c..4f89bd7 100644 --- a/src/i18n/MControlCenter_es.ts +++ b/src/i18n/MControlCenter_es.ts @@ -155,6 +155,16 @@ Advanced Avanzado + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Enfriamiento @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_eu.ts b/src/i18n/MControlCenter_eu.ts index 6c78502..5c44e41 100644 --- a/src/i18n/MControlCenter_eu.ts +++ b/src/i18n/MControlCenter_eu.ts @@ -155,6 +155,16 @@ Advanced Aurreratua + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Hoztu @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_fi_FI.ts b/src/i18n/MControlCenter_fi_FI.ts index 3fb0ae4..1c9ab80 100644 --- a/src/i18n/MControlCenter_fi_FI.ts +++ b/src/i18n/MControlCenter_fi_FI.ts @@ -155,6 +155,16 @@ Advanced Edistynyt + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Jäähdytys @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_fr.ts b/src/i18n/MControlCenter_fr.ts index 06e97a7..adfb1dc 100644 --- a/src/i18n/MControlCenter_fr.ts +++ b/src/i18n/MControlCenter_fr.ts @@ -155,6 +155,16 @@ Advanced Avancé + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Refroidissement @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption Performances maximales au prix de la chaleur et d'une consommation électrique accrue + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. Si vous utilisez principalement votre ordinateur avec le chargeur branché, il est recommandé de mettre la limite de charge à un pourcentage plus bas (60 % ou 80 %) pour prolonger la durée de vie de votre batterie. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% Charge la batterie en-dessous de 90 %, arrête à 100 % @@ -271,6 +297,10 @@ MSI-EC Status: État MSI-EC : + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> <html><head/><body><p align="center"><span style=" font-weight:700;">Danger</span> : Écrire la mauvaise valeur à la mauvaise adresse <span style=" font-weight:700;">DÉTRUIRA VOTRE ORDINATEUR !</span></p><p align="center"><span style=" font-weight:700;">N'écrivez <span style=" font-weight:700;">jamais</span> dans la mémoire EC sans savoir comment réinitialiser le <span style=" font-weight:700;">BIOS/EC</span>. Gardez en tête qu'une réinitialisation <span style=" font-weight:700;">ne garantit pas</span> de réparer votre ordinateur si celui-ci est briqué/détruit. </p></body></html> diff --git a/src/i18n/MControlCenter_hu.ts b/src/i18n/MControlCenter_hu.ts index e716cd1..eecad65 100644 --- a/src/i18n/MControlCenter_hu.ts +++ b/src/i18n/MControlCenter_hu.ts @@ -155,6 +155,16 @@ Advanced Haladó + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Hűtés @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_it.ts b/src/i18n/MControlCenter_it.ts index eabe890..bd2b042 100644 --- a/src/i18n/MControlCenter_it.ts +++ b/src/i18n/MControlCenter_it.ts @@ -77,7 +77,7 @@ About - About + Info Version: @@ -155,6 +155,18 @@ Advanced Avanzato + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + Impossibile connettersi a UPower per ottenere lo stato dell'alimentazione. +Assicurarsi che UPower sia installato e in esecuzione, quindi riavviare il sistema. + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + Impossibile connettersi a Power Profiles Daemon. +Assicurarsi che Power Profiles Daemon oppure TuneD sia installato, quindi riavviare il sistema. + Cooling Raffreddamento @@ -181,124 +193,145 @@ Overview - + Panoramica The middle spot between fan noise and power usage - + Il punto intermedio tra rumore delle ventole e consumo energetico Low fan noise and moderate power usage - + Basso rumore delle ventole e moderato consumo energetico Limits performance and turns off fans at lower temperatures - + Limita le prestazioni e spegne le ventole a temperature inferiori GPU Fan: - + Ventola GPU: CPU Fan: - + Ventola CPU: USB Power - + Alimentazione USB FN ⇄ Meta - + FN ⇄ Meta Current fan Mode: - + Modalità ventole attuale: Keyboard - + Tastiera <html><head/><body><p><span style=" font-weight:700;">MC</span>ontrol<span style=" font-weight:700;">C</span>enter (MCC) is an application that allows you to change the settings of MSI laptops running Linux.</p><p>MCC acts as a graphical interface for the <span style=" font-weight:700;">MSI-EC </span>driver that already exist in the Linux kernel, if your device is not supported (grey buttons/limited in-app functionality), please visit the msi-ec github page to get help.</p></body></html> - + <html><head/><body><p><span style=" font-weight:700;">MC</span>ontrol<span style=" font-weight:700;">C</span>enter (MCC) è un'applicazione che ti consente di modificare le impostazioni dei laptop MSI in esecuzione su Linux.</p><p>MCC funge da interfaccia grafica per il driver <span style=" font-weight:700;">MSI-EC </span>che esiste già nel kernel Linux; se il tuo dispositivo non è supportato (pulsanti grigi/funzionalità limitata nell'app), visita la pagina github di msi-ec per ricevere aiuto.</p></body></html> MCC GitHub: - + GitHub MCC: MSI-EC GitHub: - + GitHub MSI-EC: This mode unlocks Advanced fan mode - + Questa modalità sblocca la modalità ventole Avanzata High Performance - + Alte prestazioni Maximum performance at the cost of heat and increased power consumption - + Massime prestazioni a costo di più calore e maggiore consumo energetico + + + Follow system's power profile + Segui il profilo energetico del sistema If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. - + Se usi principalmente il tuo laptop con l'alimentatore collegato la maggior parte del tempo, si consiglia di impostare la capacità di carica su una percentuale inferiore (60% o 80%) per prolungare il ciclo di vita della batteria. + + + Automatic Profile Switching + Cambio automatico del profilo + + + On Charger: + Alimentatore: + + + On Battery: + Batteria: Charge the battery when under 90%, stop at 100% - + Carica la batteria quando è sotto il 90%, fermati al 100% Keyboard Backlight - + Retroilluminazione Tastiera - - + - MCC Bug Tracker: - + Tracciatore bug MCC: Qt version: - + Versione Qt: MSI-EC Status: - + Stato MSI-EC: + + + Symbolic tray icon: + Usa icona simbolica: <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> - + <html><head/><body><p align="center"><span style=" font-weight:700;">Attenzione</span>: Scrivere valori errati negli indirizzi sbagliati <span style=" font-weight:700;">DISTRUGGERÀ IL VOSTRO DISPOSITIVO!</span></p><p align="center"><span style=" font-weight:700;">Non</span> scrivere nella memoria EC senza sapere come eseguire un corretto reset del <span style=" font-weight:700;">BIOS/EC</span>, tieni presente che un ripristino <span style=" font-weight:700;">potrebbe non</span> riparare il dispositivo se questo è stato bruciato/danneggiato. </p></body></html> The msi-ec module is not loaded/installed. Check the <About> page for more info. - + Il modulo msi-ec non è caricato/installato. +Controlla la pagina Info per maggiori dettagli. The ec_sys module couldn't be detected, it might be required to control the fans. - + Non è stato possibile rilevare il modulo ec_sys; potrebbe essere necessario per controllare le ventole. Loaded - + Caricato Fallback: Only ec_sys is loaded - + Riserva: Caricato solo ec_sys Failed to load both msi-ec/ec_sys - + Impossibile caricare sia msi-ec che ec_sys OFF - + SPENTO diff --git a/src/i18n/MControlCenter_lt.ts b/src/i18n/MControlCenter_lt.ts index 90e01fd..4c32350 100644 --- a/src/i18n/MControlCenter_lt.ts +++ b/src/i18n/MControlCenter_lt.ts @@ -271,5 +271,9 @@ <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center">Never write to EC memory without knowing how to do a proper BIOS/EC reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p><p align="center"><br/></p></body></html> + + Follow system's power profile + + diff --git a/src/i18n/MControlCenter_nb.ts b/src/i18n/MControlCenter_nb.ts index 7328bc3..a0382c7 100644 --- a/src/i18n/MControlCenter_nb.ts +++ b/src/i18n/MControlCenter_nb.ts @@ -155,6 +155,16 @@ Advanced Avansert + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Kjøling @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_nl_NL.ts b/src/i18n/MControlCenter_nl_NL.ts index 8179d4e..f0c4b8f 100644 --- a/src/i18n/MControlCenter_nl_NL.ts +++ b/src/i18n/MControlCenter_nl_NL.ts @@ -155,6 +155,16 @@ Advanced Geavanceerd + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Koelen @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_pt_BR.ts b/src/i18n/MControlCenter_pt_BR.ts index 06e3b43..8acfaf9 100644 --- a/src/i18n/MControlCenter_pt_BR.ts +++ b/src/i18n/MControlCenter_pt_BR.ts @@ -155,6 +155,16 @@ Advanced Avançado + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Arrefecimento @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_pt_PT.ts b/src/i18n/MControlCenter_pt_PT.ts index a67ea4f..fd37372 100644 --- a/src/i18n/MControlCenter_pt_PT.ts +++ b/src/i18n/MControlCenter_pt_PT.ts @@ -155,6 +155,16 @@ Advanced Avançado + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Arrefecimento @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_ru.ts b/src/i18n/MControlCenter_ru.ts index 4687c68..ec96f19 100644 --- a/src/i18n/MControlCenter_ru.ts +++ b/src/i18n/MControlCenter_ru.ts @@ -155,6 +155,16 @@ Advanced Расширенный + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Охлаждение @@ -215,6 +225,22 @@ Current fan Mode: Режим вентилятора: + + Follow system's power profile + + + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Keyboard Клавиатура @@ -265,6 +291,10 @@ Check the <About> page for more info. Charge the battery when under 90%, stop at 100% Заряжать батарею, если заряд ниже 90%, остановить на 100% + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_tr.ts b/src/i18n/MControlCenter_tr.ts index 3875893..cecfa9c 100644 --- a/src/i18n/MControlCenter_tr.ts +++ b/src/i18n/MControlCenter_tr.ts @@ -158,6 +158,16 @@ Advanced + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling @@ -246,10 +256,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -274,6 +300,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_vi.ts b/src/i18n/MControlCenter_vi.ts index 19ad302..62b9739 100644 --- a/src/i18n/MControlCenter_vi.ts +++ b/src/i18n/MControlCenter_vi.ts @@ -155,6 +155,16 @@ Advanced Nâng cao + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling Tản nhiệt @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/i18n/MControlCenter_zh_CN.ts b/src/i18n/MControlCenter_zh_CN.ts index 86f1ca5..48d72bf 100644 --- a/src/i18n/MControlCenter_zh_CN.ts +++ b/src/i18n/MControlCenter_zh_CN.ts @@ -155,6 +155,16 @@ Advanced 高级（手动） + + Couldn't connect to UPower to get charger status. +Make sure that UPower is installed and running then restart the system. + + + + Couldn't connect to Power Profiles Daemon. +Make sure that either Power Profiles Daemon or TuneD is installed and restart the system. + + Cooling 冷却选项 @@ -243,10 +253,26 @@ Maximum performance at the cost of heat and increased power consumption + + Follow system's power profile + + If you mainly use your laptop with the charger plugged most of the time, it is recommended to set the charge capacity at a lower percentage (60% or 80%) to prolong your battery lifecycle. + + Automatic Profile Switching + + + + On Charger: + + + + On Battery: + + Charge the battery when under 90%, stop at 100% @@ -271,6 +297,10 @@ MSI-EC Status: + + Symbolic tray icon: + + <html><head/><body><p align="center"><span style=" font-weight:700;">Warning</span>: Writing the wrong values to the wrong addresses <span style=" font-weight:700;">WILL BRICK YOUR DEVICE!</span></p><p align="center"><span style=" font-weight:700;">Never</span> write to EC memory without knowing how to do a proper <span style=" font-weight:700;">BIOS/EC</span> reset, keep in mind that a reset <span style=" font-weight:700;">might not</span> fix the device if the device got bricked/broken. </p></body></html> diff --git a/src/images/mcontrolcenter.png b/src/images/mcontrolcenter.png deleted file mode 100644 index ecefd8d..0000000 Binary files a/src/images/mcontrolcenter.png and /dev/null differ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c5f29ba..96bce22 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -147,7 +147,8 @@ MainWindow::MainWindow(QWidget *parent) if (s.isValueExist("MainWindow/Width") && s.isValueExist("MainWindow/Height")) MainWindow::resize(s.getValue("MainWindow/Width").toInt(), s.getValue("MainWindow/Height").toInt()); - createTrayIcon(); + bool useSymbolicIcon = s.getValue("Settings/symbolicTrayIcon").toBool(); + createTrayIcon(useSymbolicIcon); ui->tabWidget->tabBar()->setExpanding(true); // Disable debug tab @@ -181,6 +182,7 @@ MainWindow::MainWindow(QWidget *parent) ui->userModeOnBatteryComboBox->setCurrentIndex(s.getValue("Settings/UserModeOnBattery").toInt()); ui->userModeOnChargerComboBox->setCurrentIndex(s.getValue("Settings/UserModeOnCharger").toInt()); ui->autoPPDCheckBox->setChecked(s.getValue("Settings/autoPPDstate").toBool()); + ui->symbolicTrayIconCheckBox->setChecked(s.getValue("Settings/symbolicTrayIcon").toBool()); } MainWindow::~MainWindow() { @@ -902,6 +904,16 @@ void MainWindow::on_superBatteryModeRadioButton_toggled(bool checked) { setSuperBatteryMode(); } +void MainWindow::on_symbolicTrayIconCheckBox_toggled(bool checked) { + Settings::setValue("Settings/symbolicTrayIcon", checked); + if (trayIcon) { + if (checked) + trayIcon->setIcon(QIcon(":/images/AppIconSymbolic")); + else + trayIcon->setIcon(QIcon(":/images/AppIcon")); + } +} + void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) { switch (reason) { case QSystemTrayIcon::Trigger: @@ -918,7 +930,7 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) { } } -void MainWindow::createTrayIcon() { +void MainWindow::createTrayIcon(bool useSymbolicIcon) { createActions(); modeTrayMenu = new QMenu(tr("Mode")); @@ -955,8 +967,7 @@ void MainWindow::createTrayIcon() { trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); - auto icon = QIcon(":/images/AppIcon"); - trayIcon->setIcon(icon); + trayIcon->setIcon(useSymbolicIcon ? QIcon(":/images/AppIconSymbolic") : QIcon(":/images/AppIcon")); trayIcon->setToolTip("MControlCenter"); trayIcon->show(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 83019b0..b518314 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -95,7 +95,7 @@ Q_OBJECT qint64 timeLastWatcherInterval = 0; void timerSleepTimeout(); - void createTrayIcon(); + void createTrayIcon(bool useSymbolicIcon); void createActions(); void iconActivated(QSystemTrayIcon::ActivationReason reason); void saveStateRequest(QSessionManager &sessionManager); @@ -125,6 +125,7 @@ private slots: void on_ChargerStateChange(bool isCharging); void on_PowerProfileChange(const PowerProfile profile); + void on_symbolicTrayIconCheckBox_toggled(bool checked); void on_bestMobilityRadioButton_toggled(bool checked); void on_balancedBatteryRadioButton_toggled(bool checked); void on_bestBatteryRadioButton_toggled(bool checked); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 6b5c11c..5d33c5d 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1994,15 +1994,29 @@ - - - - - - - - - - + + + - + + + + + + + Symbolic tray icon: + + + + + + + + + + + + + Qt::Orientation::Vertical diff --git a/src/resources.qrc b/src/resources.qrc index bf22031..1e0d3a5 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,6 +1,7 @@ - images/mcontrolcenter.png + ../resources/mcontrolcenter.svg + ../resources/mcontrolcenter-symbolic.svg i18n/MControlCenter_de_DE.qm