diff -Nru slimbookamdcontroller-0.2/bin/slimbookamdcontroller-pkexec slimbookamdcontroller-0.3/bin/slimbookamdcontroller-pkexec --- slimbookamdcontroller-0.2/bin/slimbookamdcontroller-pkexec 1970-01-01 00:00:00.000000000 +0000 +++ slimbookamdcontroller-0.3/bin/slimbookamdcontroller-pkexec 2021-06-04 15:30:08.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/bash + +set -x + +python3 /usr/share/slimbookamdcontroller/src/applyconfig.py \ No newline at end of file diff -Nru slimbookamdcontroller-0.2/debian/changelog slimbookamdcontroller-0.3/debian/changelog --- slimbookamdcontroller-0.2/debian/changelog 2021-04-20 14:00:36.000000000 +0000 +++ slimbookamdcontroller-0.3/debian/changelog 2021-06-07 11:36:06.000000000 +0000 @@ -1,3 +1,10 @@ +slimbookamdcontroller (0.3) focal; urgency=low + + * Modified icon setting + * Modified TDP Adjustments + + -- slimbook Wed, 7 Jun 2021 16:12:59 +0200 + slimbookamdcontroller (0.2) focal; urgency=low * Some code improvements have been made, as TDP adjustments or show CPU model. diff -Nru slimbookamdcontroller-0.2/debian/control slimbookamdcontroller-0.3/debian/control --- slimbookamdcontroller-0.2/debian/control 2021-04-20 13:19:00.000000000 +0000 +++ slimbookamdcontroller-0.3/debian/control 2021-06-04 14:18:40.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: slimbook Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 -Homepage: +Homepage: http://slimbook.es Package: slimbookamdcontroller Architecture: all @@ -20,7 +20,6 @@ cmake-data, gir1.2-appindicator3-0.1, libcurl4, - libjsoncpp1, libpci-dev, librhash0, libudev-dev, diff -Nru slimbookamdcontroller-0.2/debian/install slimbookamdcontroller-0.3/debian/install --- slimbookamdcontroller-0.2/debian/install 2021-04-20 14:12:59.000000000 +0000 +++ slimbookamdcontroller-0.3/debian/install 2021-06-04 14:18:24.000000000 +0000 @@ -4,4 +4,5 @@ slimbookamdcontroller-sudo /etc/sudoers.d slimbookamdcontroller.desktop /usr/share/slimbookamdcontroller slimbookamdcontroller /usr/bin -slimbookamdcontroller.desktop /usr/share/applications \ No newline at end of file +slimbookamdcontroller.desktop /usr/share/applications +src/images/icons/* /usr/share/icons/hicolor \ No newline at end of file diff -Nru slimbookamdcontroller-0.2/debian/source/format slimbookamdcontroller-0.3/debian/source/format --- slimbookamdcontroller-0.2/debian/source/format 2021-04-01 15:11:58.000000000 +0000 +++ slimbookamdcontroller-0.3/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru slimbookamdcontroller-0.2/debian/source/options slimbookamdcontroller-0.3/debian/source/options --- slimbookamdcontroller-0.2/debian/source/options 2021-04-01 15:11:58.000000000 +0000 +++ slimbookamdcontroller-0.3/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -extend-diff-ignore = "^[^/]*[.]egg-info/" diff -Nru slimbookamdcontroller-0.2/policykit/com.ubuntu.pkexecslimbookamdcontroller.policy slimbookamdcontroller-0.3/policykit/com.ubuntu.pkexecslimbookamdcontroller.policy --- slimbookamdcontroller-0.2/policykit/com.ubuntu.pkexecslimbookamdcontroller.policy 1970-01-01 00:00:00.000000000 +0000 +++ slimbookamdcontroller-0.3/policykit/com.ubuntu.pkexecslimbookamdcontroller.policy 2021-06-04 15:51:30.000000000 +0000 @@ -0,0 +1,19 @@ + + + + + + Authentication is required to install packages and add PPA repositories + configurator + + auth_admin + auth_admin + auth_admin + + /usr/bin/slimbookamdcontroller-pkexec + true + + + \ No newline at end of file diff -Nru slimbookamdcontroller-0.2/slimbookamdcontroller slimbookamdcontroller-0.3/slimbookamdcontroller --- slimbookamdcontroller-0.2/slimbookamdcontroller 2021-04-06 14:03:14.000000000 +0000 +++ slimbookamdcontroller-0.3/slimbookamdcontroller 2021-06-07 07:58:12.000000000 +0000 @@ -5,6 +5,23 @@ import sys import subprocess +from pathlib import Path + + +os.environ['NO_AT_BRIDGE'] = '1' +if str(Path(__file__).absolute()).startswith('/usr'): + print("A") + srcpath = '/usr/share/slimbookamdcontroller/src' + print(srcpath) +else: + print("B") + srcpath = str(Path(__file__).absolute().parents[1] / 'src') + print(srcpath) + +sys.path.insert(1, srcpath) + + + if __name__ == "__main__": pgrep = subprocess.getoutput("pgrep slimbookamdcontroller") @@ -13,5 +30,10 @@ if len(numProcRunning) > 1: print('Slimbook AMD it is in execution') else: - os.system('python3 /usr/share/slimbookamdcontroller/src/slimbookamdcontroller.py') -exit(0) \ No newline at end of file + + try: + from slimbookamdcontroller import SlimbookAMD + except KeyboardInterrupt as exception: + print(exception) + #os.system('python3 /usr/share/slimbookamdcontroller/src/slimbookamdcontroller.py') +exit(0) diff -Nru slimbookamdcontroller-0.2/slimbookamdcontroller.desktop slimbookamdcontroller-0.3/slimbookamdcontroller.desktop --- slimbookamdcontroller-0.2/slimbookamdcontroller.desktop 2021-04-14 13:49:58.000000000 +0000 +++ slimbookamdcontroller-0.3/slimbookamdcontroller.desktop 2021-06-04 13:54:40.000000000 +0000 @@ -1,13 +1,12 @@ [Desktop Entry] Name=Slimbook AMD Controller -Version=0.1beta +Version=0.3beta Exec=slimbookamdcontroller Comment=Modify your CPU power! -Icon=/usr/share/slimbookamdcontroller/src/images/icono.png +Icon=slimbookamdcontroller Type=Application Terminal=false StartupNotify=true Encoding=UTF-8 Categories=Utility; Name[es_ES]=Slimbook AMD Controller -Name=Slimbook AMD Controller diff -Nru slimbookamdcontroller-0.2/src/applyconfig.py slimbookamdcontroller-0.3/src/applyconfig.py --- slimbookamdcontroller-0.2/src/applyconfig.py 2021-05-04 11:08:07.000000000 +0000 +++ slimbookamdcontroller-0.3/src/applyconfig.py 2021-06-07 10:03:54.000000000 +0000 @@ -1,12 +1,10 @@ -#This file just reads and applies the info in .config +#This file just reads and applies ryzen configuaration info from .config import os import signal import sys import gi import subprocess -import shutil import configparser -import re #Busca patrones expresiones regulares from os.path import expanduser @@ -55,4 +53,5 @@ print('--------------------------------------------') + \ No newline at end of file Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/css/Oswald-Regular.ttf and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/css/Oswald-Regular.ttf differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/css/Oswald.zip and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/css/Oswald.zip differ diff -Nru slimbookamdcontroller-0.2/src/css/style.css slimbookamdcontroller-0.3/src/css/style.css --- slimbookamdcontroller-0.2/src/css/style.css 2021-05-03 14:34:31.000000000 +0000 +++ slimbookamdcontroller-0.3/src/css/style.css 2021-06-07 08:33:12.000000000 +0000 @@ -10,11 +10,15 @@ /* CLASSES */ -/* label:visited{ - color: white; +/* *{ + border-width: 1px; + border-color: red; + border-style: solid; } */ + + radiobutton { color: white; padding-top: 15px; @@ -27,10 +31,9 @@ } #info { - margin-right: 50px; - margin-left: 50px; + margin-right: 60px; + margin-left: 60px; - color: white; } #top { @@ -41,12 +44,16 @@ opacity: 0; } -#label { +#label, dialog label, label:visited, link { color: rgb(255, 255, 255); } +/* dialog>box{ + margin: 20px; + +} */ -/* NAMES */ +/* Classes */ .help{ @@ -83,6 +90,7 @@ .bg-image { background-image: url('../images/bg4.png'); background-repeat: no-repeat; + background-size: auto; background-color: #111111; } Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/1024x1024/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/1024x1024/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/128x128/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/128x128/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/16x16/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/16x16/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/192x192/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/192x192/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/20x20/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/20x20/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/22x22/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/22x22/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/24x24/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/24x24/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/256x256/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/256x256/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/28x28/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/28x28/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/32x32/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/32x32/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/36x36/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/36x36/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/40x40/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/40x40/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/480x480/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/480x480/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/48x48/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/48x48/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/512x512/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/512x512/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/64x64/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/64x64/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/72x72/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/72x72/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/8x8/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/8x8/apps/slimbookamdcontroller.png differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/images/icons/96x96/apps/slimbookamdcontroller.png and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/images/icons/96x96/apps/slimbookamdcontroller.png differ diff -Nru slimbookamdcontroller-0.2/src/images/icons/scalable/apps/slimbookamdcontroller.svg slimbookamdcontroller-0.3/src/images/icons/scalable/apps/slimbookamdcontroller.svg --- slimbookamdcontroller-0.2/src/images/icons/scalable/apps/slimbookamdcontroller.svg 1970-01-01 00:00:00.000000000 +0000 +++ slimbookamdcontroller-0.3/src/images/icons/scalable/apps/slimbookamdcontroller.svg 2021-06-04 11:57:54.000000000 +0000 @@ -0,0 +1,152 @@ + + + diff -Nru slimbookamdcontroller-0.2/src/images/slimbookamdcontroller.svg slimbookamdcontroller-0.3/src/images/slimbookamdcontroller.svg --- slimbookamdcontroller-0.2/src/images/slimbookamdcontroller.svg 1970-01-01 00:00:00.000000000 +0000 +++ slimbookamdcontroller-0.3/src/images/slimbookamdcontroller.svg 2021-06-04 11:57:54.000000000 +0000 @@ -0,0 +1,152 @@ + + + Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.mo and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.mo differ diff -Nru slimbookamdcontroller-0.2/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.po slimbookamdcontroller-0.3/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.po --- slimbookamdcontroller-0.2/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.po 2021-05-04 11:26:35.000000000 +0000 +++ slimbookamdcontroller-0.3/src/locale/es_ES/LC_MESSAGES/slimbookamdcontrollerinfo.po 2021-06-07 09:01:16.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2021-05-04 13:17+0200\n" -"PO-Revision-Date: 2021-05-04 13:26+0200\n" +"POT-Creation-Date: 2021-06-02 13:03+0200\n" +"PO-Revision-Date: 2021-06-02 13:33+0200\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,22 +17,28 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Language: es\n" -#: slimbookamdcontrollerinfo.py:83 +#: slimbookamdcontrollerinfo.py:84 msgid "" -"Slimbook AMD Controller is an application that modifies the performance of " -"AMD Ryzen processors, and through which you can extend the life of the " -"BATTERY of your laptop thanks to a lower consumption, or increase the TDP of " -"the CPU to increase its power, (although you will get higher consumption and " -"calories) Be careful! Third-party software is used, such as RyzenAdj from " -"FlyGoat." +"The Slimbook AMD Controller app is capable of setting several TDP power " +"levels for your AMD Ryzen mobile processor. Switching between the different " +"performance presets will give you the ability to control both performance " +"and battery life with a single click. Bear in mind that the higher you set " +"your performance level, your processor will also run hotter and drain your " +"battery faster, so keep that in mind! \n" +"\n" +"Slimbook AMD Controller uses the third party software RyzenAdj from FlyGoat." msgstr "" -"Slimbook AMD Controller es una aplicación que modifica el rendimiento de los " -"procesadores AMD Ryzen, mediante la cual puedes extender la vida útil de la " -"BATERÍA de tu portátil gracias a un menor consumo, o aumentar el TDP de la " -"CPU para aumentar su potencia, (aunque obtendrá mayor consumo y calorías) " -"¡Cuidado! Se utiliza software de terceros, como RyzenAdj de FlyGoat." +"La aplicación Slimbook AMD Controller es capaz de configurar varios niveles " +"de potencia TDP para su procesador AMD Ryzen. Cambiar los diferentes " +"ajustes preestablecidos de rendimiento le dará la capacidad de controlar " +"tanto el rendimiento como la duración de la batería con un solo clic. Tenga " +"en cuenta que cuanto más alto establezca su nivel de rendimiento, su " +"procesador se calentará más y agotará su batería más rápido, ¡así que ten " +"cuidado! \n" +"\n" +"Slimbook AMD Controller utiliza el software de terceros RyzenAdj de FlyGoat." -#: slimbookamdcontrollerinfo.py:90 +#: slimbookamdcontrollerinfo.py:91 msgid "" "Many laptops limit the power of the CPU, when working without the charger " "connected. Therefore, if you want to take advantage of the high-performance " @@ -40,45 +46,57 @@ msgstr "" "Muchos portátiles limitan la potencia de la CPU cuando se trabaja sin el " "cargador conectado. Por lo tanto, si desea aprovechar el modo de alto " -"rendimiento de esta aplicación, es posible que necesites conectar el " +"rendimiento de esta aplicación, es posible que necesite conectar el " "cargador." -#: slimbookamdcontrollerinfo.py:90 +#: slimbookamdcontrollerinfo.py:91 msgid "Note: " msgstr "Nota:" -#: slimbookamdcontrollerinfo.py:100 +#: slimbookamdcontrollerinfo.py:97 +msgid " or buying a brand new Slimbook." +msgstr " o comprando un Slimbook." + +#: slimbookamdcontrollerinfo.py:97 +msgid "" +"If you want to support the Slimbook team with the development of this app " +"and several more to come, you can do so by joining our " +msgstr "" +"Si quieres apoyar al equipo de Slimbook con el desarrollo de esta " +"aplicación y varias más , puedes hacerlo uniéndote a nuestro " + +#: slimbookamdcontrollerinfo.py:104 msgid "This software is provided * as is * without warranty of any kind.." msgstr "Este software se proporciona *tal cual* sin garantía de ningún tipo." -#: slimbookamdcontrollerinfo.py:104 +#: slimbookamdcontrollerinfo.py:108 msgid "You are free from:" -msgstr "Usted está libre de:" +msgstr "Usted es libre de:" -#: slimbookamdcontrollerinfo.py:108 +#: slimbookamdcontrollerinfo.py:112 msgid "Share: " msgstr "Compartir: " -#: slimbookamdcontrollerinfo.py:108 +#: slimbookamdcontrollerinfo.py:112 msgid "" "copy and redistribute the material in any medium or format\n" "Slimbook Copyright - License Creative Commons BY-NC-ND" msgstr "" "copiar y redistribuir el material en cualquier medio o formato\n" -"Slimbook Copyright - Licencia Creative Commons BY-NC-ND" +"Slimbook Copyright - License Creative Commons BY-NC-ND" -#: slimbookamdcontrollerinfo.py:189 +#: slimbookamdcontrollerinfo.py:193 msgid "@Visit Slimbook web" msgstr "@Visita la web de slimbook" -#: slimbookamdcontrollerinfo.py:200 +#: slimbookamdcontrollerinfo.py:204 msgid "@SlimbookAMDController Tutorial" msgstr "@Tutorial SlimbookAMDController " -#: slimbookamdcontrollerinfo.py:205 +#: slimbookamdcontrollerinfo.py:209 msgid "Send an e-mail a: " msgstr "Envíe un correo electrónico a: " -#: slimbookamdcontrollerinfo.py:247 +#: slimbookamdcontrollerinfo.py:252 msgid "'The email has been copied to the clipboard'" msgstr "'El correo electrónico ha sido copiado en el portapapeles'" Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/__pycache__/slimbookamdcontroller.cpython-38.pyc and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/__pycache__/slimbookamdcontroller.cpython-38.pyc differ Binary files /tmp/tmpv_7oekcv/MjGPMa4vDk/slimbookamdcontroller-0.2/src/__pycache__/slimbookamdcontrollerinfo.cpython-38.pyc and /tmp/tmpv_7oekcv/pslcbuas9c/slimbookamdcontroller-0.3/src/__pycache__/slimbookamdcontrollerinfo.cpython-38.pyc differ diff -Nru slimbookamdcontroller-0.2/src/slimbookamdcontrollerindicator.py slimbookamdcontroller-0.3/src/slimbookamdcontrollerindicator.py --- slimbookamdcontroller-0.2/src/slimbookamdcontrollerindicator.py 2021-05-04 09:43:42.000000000 +0000 +++ slimbookamdcontroller-0.3/src/slimbookamdcontrollerindicator.py 2021-06-07 11:33:12.000000000 +0000 @@ -9,6 +9,8 @@ import gi import configparser import gettext, locale +import sys + gi.require_version('AppIndicator3', '0.1') from gi.repository import AppIndicator3 @@ -16,6 +18,11 @@ from gi.repository import Gtk from configparser import ConfigParser from os.path import expanduser + + +srcpath = '/usr/share/slimbookamdcontroller/src' +sys.path.insert(1, srcpath) + #from Tkinter import* currpath = os.path.dirname(os.path.realpath(__file__)) @@ -112,8 +119,7 @@ Gtk.main_quit() def openWindow(self, source): - - os.system('python3 '+currpath+'/slimbookamdcontroller.py') + os.system("slimbookamdcontroller") def inicio(self): config = configparser.ConfigParser() @@ -176,7 +182,7 @@ print('Updating '+self.modo_actual+' to : '+self.parameters[0]+' '+self.parameters[1]+' '+self.parameters[2]+'.\n') self.update_config_file("mode", self.modo_actual) - os.system('python3 '+currpath+'/applyconfig.py') + call=os.system('python3 '+currpath+'/applyconfig.py') #Funcion para configuracion de medio rendimiento def mediorendimiento(self, widget): @@ -186,7 +192,7 @@ print('Updating '+self.modo_actual+' to : '+self.parameters[3]+' '+self.parameters[4]+' '+self.parameters[5]+'.\n') self.update_config_file("mode", self.modo_actual) - os.system('python3 '+currpath+'/applyconfig.py') + call=os.system('python3 '+currpath+'/applyconfig.py') #Funcion para configuracion de alto rendimiento def altorendimiento(self, widget): @@ -196,7 +202,7 @@ print('Updating '+self.modo_actual+' to : '+self.parameters[6]+' '+self.parameters[7]+' '+self.parameters[8]+'.\n') self.update_config_file("mode", self.modo_actual) - os.system('python3 '+currpath+'/applyconfig.py') + call=os.system('python3 '+currpath+'/applyconfig.py') Indicator() diff -Nru slimbookamdcontroller-0.2/src/slimbookamdcontrollerinfo.pot slimbookamdcontroller-0.3/src/slimbookamdcontrollerinfo.pot --- slimbookamdcontroller-0.2/src/slimbookamdcontrollerinfo.pot 2021-05-04 11:17:24.000000000 +0000 +++ slimbookamdcontroller-0.3/src/slimbookamdcontrollerinfo.pot 2021-06-02 11:03:48.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-05-04 13:17+0200\n" +"POT-Creation-Date: 2021-06-02 13:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,49 +15,60 @@ "Generated-By: pygettext.py 1.5\n" -#: slimbookamdcontrollerinfo.py:83 -msgid "Slimbook AMD Controller is an application that modifies the performance of AMD Ryzen processors, and through which you can extend the life of the BATTERY of your laptop thanks to a lower consumption, or increase the TDP of the CPU to increase its power, (although you will get higher consumption and calories) Be careful! Third-party software is used, such as RyzenAdj from FlyGoat." +#: slimbookamdcontrollerinfo.py:84 +msgid "" +"The Slimbook AMD Controller app is capable of setting several TDP power levels for your AMD Ryzen mobile processor. Switching between the different performance presets will give you the ability to control both performance and battery life with a single click. Bear in mind that the higher you set your performance level, your processor will also run hotter and drain your battery faster, so keep that in mind! \n" +"\n" +"Slimbook AMD Controller uses the third party software RyzenAdj from FlyGoat." msgstr "" -#: slimbookamdcontrollerinfo.py:90 +#: slimbookamdcontrollerinfo.py:91 msgid "Many laptops limit the power of the CPU, when working without the charger connected. Therefore, if you want to take advantage of the high-performance mode of this application, you may need to connect the charger." msgstr "" -#: slimbookamdcontrollerinfo.py:90 +#: slimbookamdcontrollerinfo.py:91 msgid "Note: " msgstr "" -#: slimbookamdcontrollerinfo.py:100 -msgid "This software is provided * as is * without warranty of any kind.." +#: slimbookamdcontrollerinfo.py:97 +msgid " or buying a brand new Slimbook." +msgstr "" + +#: slimbookamdcontrollerinfo.py:97 +msgid "If you want to support the Slimbook team with the development of this app and several more to come, you can do so by joining our " msgstr "" #: slimbookamdcontrollerinfo.py:104 -msgid "You are free from:" +msgid "This software is provided * as is * without warranty of any kind.." msgstr "" #: slimbookamdcontrollerinfo.py:108 +msgid "You are free from:" +msgstr "" + +#: slimbookamdcontrollerinfo.py:112 msgid "Share: " msgstr "" -#: slimbookamdcontrollerinfo.py:108 +#: slimbookamdcontrollerinfo.py:112 msgid "" "copy and redistribute the material in any medium or format\n" "Slimbook Copyright - License Creative Commons BY-NC-ND" msgstr "" -#: slimbookamdcontrollerinfo.py:189 +#: slimbookamdcontrollerinfo.py:193 msgid "@Visit Slimbook web" msgstr "" -#: slimbookamdcontrollerinfo.py:200 +#: slimbookamdcontrollerinfo.py:204 msgid "@SlimbookAMDController Tutorial" msgstr "" -#: slimbookamdcontrollerinfo.py:205 +#: slimbookamdcontrollerinfo.py:209 msgid "Send an e-mail a: " msgstr "" -#: slimbookamdcontrollerinfo.py:247 +#: slimbookamdcontrollerinfo.py:252 msgid "'The email has been copied to the clipboard'" msgstr "" diff -Nru slimbookamdcontroller-0.2/src/slimbookamdcontrollerinfo.py slimbookamdcontroller-0.3/src/slimbookamdcontrollerinfo.py --- slimbookamdcontroller-0.2/src/slimbookamdcontrollerinfo.py 2021-05-04 11:16:59.000000000 +0000 +++ slimbookamdcontroller-0.3/src/slimbookamdcontrollerinfo.py 2021-06-07 14:12:59.000000000 +0000 @@ -8,6 +8,7 @@ gi.require_version('Gtk', '3.0') gi.require_version('Gdk', '3.0') +from pathlib import Path from gi.repository import Gtk, Gdk, GdkPixbuf from os.path import expanduser @@ -17,17 +18,19 @@ #IDIOMAS ---------------------------------------------------------------- # pygettext -d slimbookamdcontrollercopy slimbookamdcontrollercopy.py + currpath = os.path.dirname(os.path.realpath(__file__)) entorno_usu = locale.getlocale()[0] -if entorno_usu.find("en") >= 0 or entorno_usu.find("es") >= 0: - idiomas = [entorno_usu] -else: +try: + if entorno_usu.find("en") >= 0 or entorno_usu.find("es") >= 0: + idiomas = [entorno_usu] + else: + idiomas = ['en_EN'] +except: idiomas = ['en_EN'] -#entorno_usu="fr_FR" -#idiomas = ['fr_FR'] -print('Language: ', entorno_usu) +print('Language: ', idiomas) t = gettext.translation('slimbookamdcontrollerinfo', currpath+'/locale', languages=idiomas, @@ -36,7 +39,7 @@ user = expanduser("~") -currpath = os.path.dirname(os.path.realpath(__file__)) + style_provider = Gtk.CssProvider() style_provider.load_from_path(currpath+'/css/style.css') @@ -59,10 +62,27 @@ #self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT) #self.add_buttons(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT) - self.set_icon_from_file(currpath+"/images/icono.png") + if str(Path(__file__).parent.absolute()).startswith('/usr'): + #print("yes") + SHAREDIR = os.path.join('/usr', 'share') + ICONDIR = os.path.join(SHAREDIR, 'icons', 'hicolor', 'scalable', 'apps') + else: + ROOTDIR = os.path.dirname(__file__) + #print(ROOTDIR) + ICONDIR = os.path.normpath( + os.path.join(ROOTDIR, 'images')) + #print(ICONDIR) + ICON = os.path.join('/usr/share/slimbookamdcontroller/src/images/slimbookamdcontroller.svg') + #print('Ruta icono: '+ICON) + + try: + self.set_icon_from_file(ICON) + except: + print("Not found") + self.set_position(Gtk.WindowPosition.CENTER_ALWAYS) self.get_style_context().add_class("bg-color") - self.set_default_size(900, 600) + self.set_default_size(900, 0) self.set_decorated(False) vbox = Gtk.VBox(spacing=5) @@ -80,19 +100,26 @@ iconApp.set_name('top') - info = Gtk.Label(label=_("Slimbook AMD Controller is an application that modifies the performance of AMD Ryzen processors, and through which you can extend the life of the BATTERY of your laptop thanks to a lower consumption, or increase the TDP of the CPU to increase its power, (although you will get higher consumption and calories) Be careful! Third-party software is used, such as RyzenAdj from FlyGoat.")) - info.set_name('label') + info = Gtk.Label() + info.set_markup(''+(_("The Slimbook AMD Controller app is capable of setting several TDP power levels for your AMD Ryzen mobile processor. Switching between the different performance presets will give you the ability to control both performance and battery life with a single click. Bear in mind that the higher you set your performance level, your processor will also run hotter and drain your battery faster, so keep that in mind! \n\nSlimbook AMD Controller uses the third party software RyzenAdj from FlyGoat."))+'') info.set_line_wrap(True) + info.set_name('label') info.set_name('info') - info2 = Gtk.Label() - info2.set_markup(""+_("Note: ")+""+_("Many laptops limit the power of the CPU, when working without the charger connected. Therefore, if you want to take advantage of the high-performance mode of this application, you may need to connect the charger.")+"") + info2.set_markup(''+_('If you want to support the Slimbook team with the development of this app and several more to come, you can do so by joining our ') + " patreon " +_(' or buying a brand new Slimbook.')+'') info2.set_line_wrap(True) info2.set_name('label') info2.set_name('info') + info3 = Gtk.Label() + info3.set_markup(""+_("Note: ")+""+_("Many laptops limit the power of the CPU, when working without the charger connected. Therefore, if you want to take advantage of the high-performance mode of this application, you may need to connect the charger.")+"") + info3.set_line_wrap(True) + info3.set_name('label') + info3.set_name('info') + + enlaces_box = Gtk.Box(spacing=5) enlaces_box.set_halign(Gtk.Align.CENTER) @@ -223,20 +250,22 @@ # PACKKING ---------------------------------------------------------------------- vbox.pack_start(evnt_close,True, True, 0) - vbox.pack_start(iconApp,True, True,20) + vbox.pack_start(iconApp, True, True, 20) - vbox.pack_start(info,True, True,10) + vbox.pack_start(info, True, True, 20) + vbox.pack_start(enlaces_box, True, True, 5) vbox.pack_start(link_box2, True, True, 10) vbox.pack_start(email, True, True, 10) - vbox.pack_start(salvavidas, True, True, 10) + vbox.pack_start(salvavidas, True, True, 0) vbox.pack_start(license1, True, True, 0) vbox.pack_start(license2, True, True, 0) vbox.pack_start(licencia, True, True, 10) - vbox.pack_start(info2,True, True,10) + vbox.pack_start(info2, True, True, 20) + vbox.pack_start(info3,True, True, 0) #SHOW self.show_all() @@ -250,6 +279,7 @@ self.close() self.hide() self.destroy() + Gtk.main_quit dialog = PreferencesDialog() dialog.connect("destroy", Gtk.main_quit) diff -Nru slimbookamdcontroller-0.2/src/slimbookamdcontroller.py slimbookamdcontroller-0.3/src/slimbookamdcontroller.py --- slimbookamdcontroller-0.2/src/slimbookamdcontroller.py 2021-05-04 10:51:50.000000000 +0000 +++ slimbookamdcontroller-0.3/src/slimbookamdcontroller.py 2021-06-07 13:42:44.000000000 +0000 @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import os -import signal import sys import gi import subprocess @@ -10,6 +9,7 @@ import shutil import configparser import re #Busca patrones expresiones regulares +from pathlib import Path gi.require_version('Gtk', '3.0') gi.require_version('Gdk', '3.0') @@ -19,6 +19,10 @@ from gi.repository import Gdk, Gtk, GLib, GdkPixbuf, AppIndicator3 from os.path import expanduser +srcpath = '/usr/share/slimbookamdcontroller/src' +sys.path.insert(1, srcpath) + + user = expanduser("~") currpath = os.path.dirname(os.path.realpath(__file__)) config_object = ConfigParser() @@ -69,7 +73,7 @@ rbutton3 = Gtk.RadioButton.new_with_mnemonic_from_widget(rbutton1, (_("High"))) -class SlimbookAMD(Gtk.Window): +class SlimbookAMD(Gtk.ApplicationWindow): #ESTAS VARIABLES SE QUEDAN AQUI PORQUE SI SE DEFINEN ARRIBA NO PARECEN PODERSE MODIFICAR @@ -81,9 +85,26 @@ def __init__(self): - #VENTANA - Gtk.Window.__init__(self, title ="Slimbook AMD Controller") - self.set_icon_from_file(currpath+"/images/icono.png") + #VENTANA + Gtk.Window.__init__(self, title ="Slimbook AMD Controller") + + if str(Path(__file__).parent.absolute()).startswith('/usr'): + #print("yes") + SHAREDIR = os.path.join('/usr', 'share') + ICONDIR = os.path.join(SHAREDIR, 'icons', 'hicolor', 'scalable', 'apps') + else: + ROOTDIR = os.path.dirname(__file__) + #print(ROOTDIR) + ICONDIR = os.path.normpath( + os.path.join(ROOTDIR, 'images')) + #print(ICONDIR) + ICON = os.path.join(ICONDIR, 'slimbookamdcontroller.svg') + #print('Ruta icono: '+ICON) + + try: + self.set_icon_from_file(ICON) + except: + print("Icon not found") self.set_decorated(False) self.set_size_request(0,560) #anchoxalto self.set_position(Gtk.WindowPosition.CENTER) @@ -473,7 +494,8 @@ os.system('sudo /usr/share/slimbookamdcontroller/ryzenadj --info') print('\n') #Abre la ventana de info - os.system('python3 '+currpath+'/slimbookamdcontrollerinfo.py') + from slimbookamdcontrollerinfo import PreferencesDialog + #os.system('python3 '+currpath+'/slimbookamdcontrollerinfo.py') def on_btnCerrar_clicked(self, widget, x): Gtk.main_quit() @@ -511,10 +533,10 @@ if letras == "U": self.parameters=('8000-8000-8000','11000-11000-15000','25000-30000-35000') else: - if letras == "H": + if letras == "HS": self.parameters=('10000-10000-10000','15000-15000-25000','60000-65000-70000') else: - if letras == "HX" or letras == "HS": + if letras == "HX" or letras == "H": self.parameters=('10000-10000-10000','15000-15000-25000','70000-80000-100000') else: print("Procesador no concebido por este software") @@ -556,4 +578,4 @@ win.connect("destroy", Gtk.main_quit) win.show_all() -Gtk.main() \ No newline at end of file +Gtk.main()