GUI: finishing touches and bug fixes (#554)
* Squashed commit of the following: commit ec7e087b343f33af7a92b190ed666845dab60f20 Merge: 32b6e639912f9d
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Mon Feb 13 14:11:21 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit 32b6e632830fe8a7c3a3ce601ef2ba5b254572d7 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 13 14:10:34 2023 -0600 increase MenuButton size commit 12a2cda82a5f56bfbb532c893d822341e9b2d7cb Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 23:35:33 2023 -0600 set app icon commit d170d07e866644bcb662bf342530c497390f0303 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 23:35:15 2023 -0600 remove unused pixbuf commit 993333fb5aad448103e24e38bc85fb04e7e4dd0c Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 22:43:56 2023 -0600 fix MenuButton icon commit d1b8bd74caab2cf216bf40bdfc35ef3520e891c7 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 17:19:32 2023 -0600 add icon commit 13f43fa0c7d59b2405bac688119690d01a7ec019 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 17:19:10 2023 -0600 add pkexec policy and change wrapper for gui commit 4ddbb9c6667aa97bb7cd242fb4a376e061c9b308 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 14:09:35 2023 -0600 add icon to destop entry and about dialog commit9912f9d809
Author: Siddharth Kumar Jha <101443068+siddharthkumarjha@users.noreply.github.com> Date: Sun Feb 12 12:55:14 2023 +0530 Update Readme for issue of auto-cpufreq not autostarting on AUR (#485) * Updated Readme for issue auto-cpufreq not autostarting Added solution to issue https://github.com/AdnanHodzic/auto-cpufreq/issues/463 * Fixed minor errors * Fixed auto-cpufreq.serivce Typo * Reprashed text as per suggestion commit 4379024adab282fcdb58a7091df2a6adf833e700 Author: shadeyg56 <shadeyg56@gmail.com> Date: Tue Feb 7 19:06:59 2023 -0600 add removal of gui and desktop entry commit 42693703324762418a7f810f04a3d77803afa236 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 6 23:28:44 2023 -0600 CPU stats refresh and style stuff commit 7149db72c0bb39af57ceccb16df8e9164c77fae3 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 6 23:10:29 2023 -0600 daemon detection, daemon install/removal, and layout stuff commit f7e03c9bcc2e2578703807ceeb7a652903571b71 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 19:26:42 2023 -0600 improve AboutDialog Please enter the commit message for your changes. Lines starting commit cb8cfe7b3194273dea229fe550fdf66cd6af82fa Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 18:28:19 2023 -0600 add dropdown menu and (not completed) about dialog commit ade1fed790f2ebbaae4e92ce8879ab812c9b2850 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 15:57:17 2023 -0600 actually fix css commit 67c8c97bcf2f2f408431bc162c38dee5c278ed0b Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 15:54:47 2023 -0600 fix css commitc65eac3472
Author: Adnan Hodzic <adnan@hodzic.org> Date: Sun Feb 5 09:29:19 2023 +0100 Update readme, install psutil lib for power_helper commit bd3feae38824764155d31ccd6debc1fcf18830da Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 00:42:52 2023 -0600 add desktop entry for gui commit 5426a6a443c90a9d65b858ae1951219898cba332 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 00:33:08 2023 -0600 add gui to install file, update required packages, and create wrapper script commit 84124dfa605b930b3722ed852486cbe11c254092 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 23:28:24 2023 -0600 create system tray commit 7b0d46d8ddafdeff9006a1ad10ccd99c24b9eb1e Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 23:28:01 2023 -0600 small changes to layout commit cd51ea317085ac6ea5b4918ef057ad4c19a71640 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 00:44:08 2023 -0600 css styling support commit 136b449febece04c036b72b4a14ccceb422f62dd Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 00:14:52 2023 -0600 several improvements commit f9f7170391e1abc1499b7d5ae93327999e013730 Merge: 242a8d08f343df
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Fri Feb 3 22:44:01 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit8f343df8b8
Merge:dadfae0
b38919f
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Fri Feb 3 14:54:11 2023 -0600 Merge pull request #481 from shadeyg56/master Fix uncaught error in checking for snap commitb38919f56b
Author: shadeyg56 <shadeyg56@gmail.com> Date: Fri Feb 3 14:48:01 2023 -0600 fix uncaught error in checking for snap commit 242a8d0401d1ffd00c982aa731c04ef7ea726fee Merge: f50b982dadfae0
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Fri Feb 3 14:19:01 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commitdadfae087f
Author: Adnan Hodzic <adnan@hodzic.org> Date: Fri Feb 3 20:02:03 2023 +0100 Update README with new config options commit471611de7d
Author: Adnan Hodzic <adnan@hodzic.org> Date: Fri Feb 3 18:44:33 2023 +0100 Remove GNOME Power Profiles Daemon performance install commitf574257dc4
Author: Adnan Hodzic <adnan@hodzic.org> Date: Fri Feb 3 18:32:04 2023 +0100 Remove install_performance flag commit04b878360c
Author: Adnan Hodzic <adnan@hodzic.org> Date: Fri Feb 3 17:52:20 2023 +0100 Snap tag 2.0-beta + governor_override improvements commitfe21ddf245
Author: Adnan Hodzic <adnan@hodzic.org> Date: Fri Feb 3 17:28:12 2023 +0100 Working governor override on Snap package commit f50b9829e5438bb96ded73775668fa048fcd3951 Merge: a98225e69ef913
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Thu Feb 2 18:19:10 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit a98225e7280802c2fb09a9a52a40f7e55b26b3b1 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 18:18:43 2023 -0600 Revert "basic GUI" This reverts commit d2610c921b7209fde7d7be13f187510631cc33b3. commit 9606472fdbbff6dd551cd291b37349df17098d2e Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 18:13:41 2023 -0600 basic gui commit d2610c921b7209fde7d7be13f187510631cc33b3 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 17:47:55 2023 -0600 basic GUI commit bdbe12018b380ed70f100729c9ea3732ba24f572 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 15:21:42 2023 -0600 rename folder commit 31095c472e4af734a3a601f804787de89ad47964 Author: shadeyg56 <shadeyg56@gmail.com> Date: Wed Jan 25 23:39:52 2023 -0600 add tray * Squashed commit of the following: commit e2eaffc32b382f67f97d2e25858b5b5a4abffeae Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 20 23:08:57 2023 -0600 move text to be inline with menu commit e1dae9d9de25f13c51dd983f5b4b0fbdf1bf0349 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 19 17:50:26 2023 -0600 move distro info to top of system stats box commit 959405bedc52dce14f5fd70d2fcd5fbee57e59a5 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 19 17:49:15 2023 -0600 fix app name on GNOME commit 346093dfce6ce0bfa1954ed3bb6f5364250d05b7 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 19 17:01:03 2023 -0600 fix snap dependencies commit ec7e087b343f33af7a92b190ed666845dab60f20 Merge: 32b6e639912f9d
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Mon Feb 13 14:11:21 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit 32b6e632830fe8a7c3a3ce601ef2ba5b254572d7 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 13 14:10:34 2023 -0600 increase MenuButton size commit 12a2cda82a5f56bfbb532c893d822341e9b2d7cb Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 23:35:33 2023 -0600 set app icon commit d170d07e866644bcb662bf342530c497390f0303 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 23:35:15 2023 -0600 remove unused pixbuf commit 993333fb5aad448103e24e38bc85fb04e7e4dd0c Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 22:43:56 2023 -0600 fix MenuButton icon commit d1b8bd74caab2cf216bf40bdfc35ef3520e891c7 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 17:19:32 2023 -0600 add icon commit 13f43fa0c7d59b2405bac688119690d01a7ec019 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 17:19:10 2023 -0600 add pkexec policy and change wrapper for gui commit 4ddbb9c6667aa97bb7cd242fb4a376e061c9b308 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 12 14:09:35 2023 -0600 add icon to destop entry and about dialog commit 4379024adab282fcdb58a7091df2a6adf833e700 Author: shadeyg56 <shadeyg56@gmail.com> Date: Tue Feb 7 19:06:59 2023 -0600 add removal of gui and desktop entry commit 42693703324762418a7f810f04a3d77803afa236 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 6 23:28:44 2023 -0600 CPU stats refresh and style stuff commit 7149db72c0bb39af57ceccb16df8e9164c77fae3 Author: shadeyg56 <shadeyg56@gmail.com> Date: Mon Feb 6 23:10:29 2023 -0600 daemon detection, daemon install/removal, and layout stuff commit f7e03c9bcc2e2578703807ceeb7a652903571b71 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 19:26:42 2023 -0600 improve AboutDialog Please enter the commit message for your changes. Lines starting commit cb8cfe7b3194273dea229fe550fdf66cd6af82fa Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 18:28:19 2023 -0600 add dropdown menu and (not completed) about dialog commit ade1fed790f2ebbaae4e92ce8879ab812c9b2850 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 15:57:17 2023 -0600 actually fix css commit 67c8c97bcf2f2f408431bc162c38dee5c278ed0b Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 15:54:47 2023 -0600 fix css commit bd3feae38824764155d31ccd6debc1fcf18830da Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 00:42:52 2023 -0600 add desktop entry for gui commit 5426a6a443c90a9d65b858ae1951219898cba332 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sun Feb 5 00:33:08 2023 -0600 add gui to install file, update required packages, and create wrapper script commit 84124dfa605b930b3722ed852486cbe11c254092 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 23:28:24 2023 -0600 create system tray commit 7b0d46d8ddafdeff9006a1ad10ccd99c24b9eb1e Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 23:28:01 2023 -0600 small changes to layout commit cd51ea317085ac6ea5b4918ef057ad4c19a71640 Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 00:44:08 2023 -0600 css styling support commit 136b449febece04c036b72b4a14ccceb422f62dd Author: shadeyg56 <shadeyg56@gmail.com> Date: Sat Feb 4 00:14:52 2023 -0600 several improvements commit f9f7170391e1abc1499b7d5ae93327999e013730 Merge: 242a8d08f343df
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Fri Feb 3 22:44:01 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit 242a8d0401d1ffd00c982aa731c04ef7ea726fee Merge: f50b982dadfae0
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Fri Feb 3 14:19:01 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit f50b9829e5438bb96ded73775668fa048fcd3951 Merge: a98225e69ef913
Author: shadeyg56 <31134255+shadeyg56@users.noreply.github.com> Date: Thu Feb 2 18:19:10 2023 -0600 Merge branch 'AdnanHodzic:master' into gui commit a98225e7280802c2fb09a9a52a40f7e55b26b3b1 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 18:18:43 2023 -0600 Revert "basic GUI" This reverts commit d2610c921b7209fde7d7be13f187510631cc33b3. commit 9606472fdbbff6dd551cd291b37349df17098d2e Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 18:13:41 2023 -0600 basic gui commit d2610c921b7209fde7d7be13f187510631cc33b3 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 17:47:55 2023 -0600 basic GUI commit bdbe12018b380ed70f100729c9ea3732ba24f572 Author: shadeyg56 <shadeyg56@gmail.com> Date: Thu Feb 2 15:21:42 2023 -0600 rename folder commit 31095c472e4af734a3a601f804787de89ad47964 Author: shadeyg56 <shadeyg56@gmail.com> Date: Wed Jan 25 23:39:52 2023 -0600 add tray * fix undefined var * app no longer needs root to start, only asks when needed * fix wmclass * create file in /bin for gui * fix bug with radio buttons and pkexec * snap: update snap to package GTK gui * update setup.py * requirements.txt: fix conflict * Merge master into dev * Add Snap package icon * gui: fix pkexec on launch * Deploy auto-cpufreq-gtk as binary using dump * auto-cpufreq + gtk as part of parts * snap: fix packaging for gtk app * add additional error catching to GUI * GUI: add threading * GUI: switch to ThreadPool for daemon stuff * disable debug catch * remove useless comments * GUI: add message for Snap users --------- Co-authored-by: Adnan Hodzic <adnan@hodzic.org>
This commit is contained in:
parent
3e2b779406
commit
257d6e9532
|
@ -6,12 +6,18 @@ from gi.repository import Gtk, GLib, Gdk, Gio, GdkPixbuf
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
sys.path.append("../")
|
sys.path.append("../")
|
||||||
from auto_cpufreq.core import is_running
|
from auto_cpufreq.core import is_running
|
||||||
from auto_cpufreq.gui.objects import RadioButtonView, SystemStatsLabel, CPUFreqStatsLabel, CurrentGovernorBox, DropDownMenu, DaemonNotRunningView
|
from auto_cpufreq.gui.objects import RadioButtonView, SystemStatsLabel, CPUFreqStatsLabel, CurrentGovernorBox, DropDownMenu, DaemonNotRunningView
|
||||||
|
|
||||||
CSS_FILE = "/usr/local/share/auto-cpufreq/scripts/style.css"
|
if os.getenv("PKG_MARKER") == "SNAP":
|
||||||
|
ICON_FILE = "/snap/auto-cpufreq/current/icon.png"
|
||||||
|
CSS_FILE = "/snap/auto-cpufreq/current/style.css"
|
||||||
|
else:
|
||||||
|
ICON_FILE = "/usr/local/share/auto-cpufreq/images/icon.png"
|
||||||
|
CSS_FILE = "/usr/local/share/auto-cpufreq/scripts/style.css"
|
||||||
|
|
||||||
HBOX_PADDING = 20
|
HBOX_PADDING = 20
|
||||||
|
|
||||||
|
@ -22,15 +28,11 @@ class ToolWindow(Gtk.Window):
|
||||||
self.set_border_width(10)
|
self.set_border_width(10)
|
||||||
self.set_resizable(False)
|
self.set_resizable(False)
|
||||||
self.load_css()
|
self.load_css()
|
||||||
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(filename="/usr/local/share/auto-cpufreq/images/icon.png", width=500, height=500, preserve_aspect_ratio=True)
|
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(filename=ICON_FILE, width=500, height=500, preserve_aspect_ratio=True)
|
||||||
self.set_icon(pixbuf)
|
self.set_icon(pixbuf)
|
||||||
self.build()
|
self.build()
|
||||||
|
|
||||||
def main(self):
|
def main(self):
|
||||||
# self.vbox_top = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
|
|
||||||
# self.vbox_top.set_valign(Gtk.Align.CENTER)
|
|
||||||
# self.vbox_top.set_halign(Gtk.Align.CENTER)
|
|
||||||
#self.add(self.vbox_top)
|
|
||||||
|
|
||||||
# Main HBOX
|
# Main HBOX
|
||||||
self.hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=HBOX_PADDING)
|
self.hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=HBOX_PADDING)
|
||||||
|
@ -54,14 +56,30 @@ class ToolWindow(Gtk.Window):
|
||||||
self.hbox.pack_start(self.vbox_right, False, False, 0)
|
self.hbox.pack_start(self.vbox_right, False, False, 0)
|
||||||
|
|
||||||
|
|
||||||
GLib.timeout_add_seconds(5, self.refresh)
|
GLib.timeout_add_seconds(5, self.refresh_in_thread)
|
||||||
|
|
||||||
|
def snap(self):
|
||||||
|
box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER, valign=Gtk.Align.CENTER)
|
||||||
|
|
||||||
|
label = Gtk.Label(label="GUI not available due to Snap package confinement limitations.\nPlease install auto-cpufreq using auto-cpufreq-installer\nVisit the GitHub repo for more info")
|
||||||
|
label.set_justify(Gtk.Justification.CENTER)
|
||||||
|
button = Gtk.LinkButton.new_with_label(
|
||||||
|
uri="https://github.com/AdnanHodzic/auto-cpufreq",
|
||||||
|
label="GitHub Repo"
|
||||||
|
)
|
||||||
|
|
||||||
|
box.pack_start(label, False, False, 0)
|
||||||
|
box.pack_start(button, False, False, 0)
|
||||||
|
self.add(box)
|
||||||
|
|
||||||
def daemon_not_running(self):
|
def daemon_not_running(self):
|
||||||
self.box = DaemonNotRunningView(self)
|
self.box = DaemonNotRunningView(self)
|
||||||
self.add(self.box)
|
self.add(self.box)
|
||||||
|
|
||||||
def build(self):
|
def build(self):
|
||||||
if is_running("auto-cpufreq", "--daemon"):
|
if os.getenv("PKG_MARKER") == "SNAP":
|
||||||
|
self.snap()
|
||||||
|
elif is_running("auto-cpufreq", "--daemon"):
|
||||||
self.main()
|
self.main()
|
||||||
else:
|
else:
|
||||||
self.daemon_not_running()
|
self.daemon_not_running()
|
||||||
|
@ -73,9 +91,12 @@ class ToolWindow(Gtk.Window):
|
||||||
self.gtk_context.add_provider_for_screen(screen, self.gtk_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
|
self.gtk_context.add_provider_for_screen(screen, self.gtk_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
|
||||||
self.gtk_provider.load_from_file(Gio.File.new_for_path(CSS_FILE))
|
self.gtk_provider.load_from_file(Gio.File.new_for_path(CSS_FILE))
|
||||||
|
|
||||||
def refresh(self):
|
def refresh_in_thread(self):
|
||||||
|
Thread(target=self._refresh).start()
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _refresh(self):
|
||||||
self.systemstats.refresh()
|
self.systemstats.refresh()
|
||||||
self.currentgovernor.refresh()
|
self.currentgovernor.refresh()
|
||||||
self.cpufreqstats.refresh()
|
self.cpufreqstats.refresh()
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ from gi.repository import Gtk, GdkPixbuf
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import platform as pl
|
import platform as pl
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
|
||||||
sys.path.append("../../")
|
sys.path.append("../../")
|
||||||
from subprocess import getoutput, run, PIPE
|
from subprocess import getoutput, run, PIPE
|
||||||
|
@ -77,9 +78,6 @@ class RadioButtonView(Gtk.Box):
|
||||||
self.pack_start(self.powersave, True, True, 0)
|
self.pack_start(self.powersave, True, True, 0)
|
||||||
self.pack_start(self.performance, True, True, 0)
|
self.pack_start(self.performance, True, True, 0)
|
||||||
|
|
||||||
#self.pack_start(self.label, False, False, 0)
|
|
||||||
#self.pack_start(self.hbox, False, False, 0)
|
|
||||||
|
|
||||||
def on_button_toggled(self, button, override):
|
def on_button_toggled(self, button, override):
|
||||||
if button.get_active():
|
if button.get_active():
|
||||||
if not self.set_by_app:
|
if not self.set_by_app:
|
||||||
|
@ -185,7 +183,11 @@ class DropDownMenu(Gtk.MenuButton):
|
||||||
confirm.destroy()
|
confirm.destroy()
|
||||||
if response == Gtk.ResponseType.YES:
|
if response == Gtk.ResponseType.YES:
|
||||||
try:
|
try:
|
||||||
result = run("pkexec auto-cpufreq --remove", shell=True, stdout=PIPE, stderr=PIPE)
|
# run in thread to prevent GUI from hanging
|
||||||
|
with ThreadPoolExecutor() as executor:
|
||||||
|
kwargs = {"shell": True, "stdout": PIPE, "stderr": PIPE}
|
||||||
|
future = executor.submit(run, "pkexec auto-cpufreq --remove", **kwargs)
|
||||||
|
result = future.result()
|
||||||
if result.stderr.decode() == PKEXEC_ERROR:
|
if result.stderr.decode() == PKEXEC_ERROR:
|
||||||
raise Exception("Authorization was cancelled")
|
raise Exception("Authorization was cancelled")
|
||||||
dialog = Gtk.MessageDialog(
|
dialog = Gtk.MessageDialog(
|
||||||
|
@ -215,7 +217,6 @@ class AboutDialog(Gtk.Dialog):
|
||||||
super().__init__(title="About", transient_for=parent)
|
super().__init__(title="About", transient_for=parent)
|
||||||
app_version = get_version()
|
app_version = get_version()
|
||||||
self.box = self.get_content_area()
|
self.box = self.get_content_area()
|
||||||
# self.box.set_homogeneous(True)
|
|
||||||
self.box.set_spacing(10)
|
self.box.set_spacing(10)
|
||||||
self.add_button("Close", Gtk.ResponseType.CLOSE)
|
self.add_button("Close", Gtk.ResponseType.CLOSE)
|
||||||
self.set_default_size(400, 350)
|
self.set_default_size(400, 350)
|
||||||
|
@ -267,9 +268,16 @@ class DaemonNotRunningView(Gtk.Box):
|
||||||
|
|
||||||
def install_daemon(self, button, parent):
|
def install_daemon(self, button, parent):
|
||||||
try:
|
try:
|
||||||
result = run("pkexec auto-cpufreq --install", shell=True, stdout=PIPE, stderr=PIPE)
|
# run in thread to prevent GUI from hanging
|
||||||
|
with ThreadPoolExecutor() as executor:
|
||||||
|
kwargs = {"shell": True, "stdout": PIPE, "stderr": PIPE}
|
||||||
|
future = executor.submit(run, "pkexec auto-cpufreq --install", **kwargs)
|
||||||
|
result = future.result()
|
||||||
if result.stderr.decode() == PKEXEC_ERROR:
|
if result.stderr.decode() == PKEXEC_ERROR:
|
||||||
raise Exception("Authorization was cancelled")
|
raise Exception("Authorization was cancelled")
|
||||||
|
# enable for debug. causes issues if kept
|
||||||
|
# elif result.stderr is not None:
|
||||||
|
# raise Exception(result.stderr.decode())
|
||||||
dialog = Gtk.MessageDialog(
|
dialog = Gtk.MessageDialog(
|
||||||
transient_for=parent,
|
transient_for=parent,
|
||||||
message_type=Gtk.MessageType.INFO,
|
message_type=Gtk.MessageType.INFO,
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -13,7 +13,7 @@ def read(name):
|
||||||
return f.read()
|
return f.read()
|
||||||
|
|
||||||
# Used for the tar.gz/snap releases
|
# Used for the tar.gz/snap releases
|
||||||
VERSION = "1.9.9"
|
VERSION = "2.0"
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="auto-cpufreq",
|
name="auto-cpufreq",
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 104 KiB |
|
@ -0,0 +1,10 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Encoding=UTF-8
|
||||||
|
Name=auto-cpufreq
|
||||||
|
Comment=Automatic CPU speed & power optimizer for Linux
|
||||||
|
Exec=auto-cpufreq.auto-cpufreq-gtk
|
||||||
|
StartupWMClass=app.py
|
||||||
|
Terminal=false
|
||||||
|
Icon=${SNAP}/meta/gui/auto-cpufreq.png
|
||||||
|
Categories=System;
|
|
@ -41,6 +41,10 @@ parts:
|
||||||
cpufreqctl.sh: usr/bin/cpufreqctl.auto-cpufreq
|
cpufreqctl.sh: usr/bin/cpufreqctl.auto-cpufreq
|
||||||
snapdaemon.sh: usr/bin/snapdaemon
|
snapdaemon.sh: usr/bin/snapdaemon
|
||||||
|
|
||||||
|
copy-image:
|
||||||
|
plugin: dump
|
||||||
|
source: images
|
||||||
|
|
||||||
plugs:
|
plugs:
|
||||||
etc-auto-cpufreq-conf:
|
etc-auto-cpufreq-conf:
|
||||||
interface: system-files
|
interface: system-files
|
||||||
|
@ -78,7 +82,6 @@ apps:
|
||||||
- cpu-control
|
- cpu-control
|
||||||
- system-observe
|
- system-observe
|
||||||
- hardware-observe
|
- hardware-observe
|
||||||
- etc-auto-cpufreq-conf
|
|
||||||
environment:
|
environment:
|
||||||
LC_ALL: C.UTF-8
|
LC_ALL: C.UTF-8
|
||||||
LANG: C.UTF-8
|
LANG: C.UTF-8
|
||||||
|
|
Loading…
Reference in New Issue