add gui to install file, update required packages, and create wrapper…

… script
shadeyg56 · Feb 5, 2023 · 5426a6a · 5426a6a
1 parent 84124df
commit 5426a6a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/auto-cpufreq-installer b/auto-cpufreq-installer
@@ -66,7 +66,9 @@ function install {
 
   # this is necessary since we need this script before we can run auto-cpufreq itself
   cp scripts/auto-cpufreq-venv-wrapper /usr/local/bin/auto-cpufreq
+  cp scripts/start_app /usr/local/bin/auto-cpufreq-gtk
   chmod a+x /usr/local/bin/auto-cpufreq
+  chmod a+x /usr/local/bin/auto-cpufreq-gtk
 }
 
 # First argument is the distro
@@ -140,7 +142,7 @@ function tool_install {
 separator
 if [ -f /etc/debian_version ]; then
 	detected_distro "Debian based"
-	apt install python3-dev python3-pip python3-venv python3-setuptools dmidecode -y
+	apt install python3-dev python3-pip python3-venv python3-setuptools dmidecode libgirepository1.0-dev libcairo2-dev -y
 	completed
 	complete_msg
 elif [ -f /etc/redhat-release ]; then
@@ -170,12 +172,12 @@ elif [ -f /etc/os-release ];then
 	opensuse)
 		detected_distro "OpenSUSE"
     		echo -e "\nDetected an OpenSUSE distribution\n\nSetting up Python environment\n"
-		zypper install -y python38 python3-pip python3-setuptools python3-devel gcc dmidecode
+		zypper install -y python38 python3-pip python3-setuptools python3-devel gcc dmidecode gobject-introspection-devel python3-cairo-devel
 		completed
 		;;
 	arch|manjaro|endeavouros|garuda|artix)
 		detected_distro "Arch Linux based"
-		pacman -S --noconfirm --needed python python-pip python-setuptools base-devel dmidecode
+		pacman -S --noconfirm --needed python python-pip python-setuptools base-devel dmidecode  gobject-introspection
 		completed
 		;;
 	void)

diff --git a/auto_cpufreq/gui/__init__.py b/auto_cpufreq/gui/__init__.py
diff --git a/auto_cpufreq/gui/app.py b/auto_cpufreq/gui/app.py
@@ -5,8 +5,10 @@
 from gi.repository import Gtk, GLib, Gdk, Gio
 
 import os
+import sys
 
-from objects import RadioButtonView, SystemStatsLabel, CPUFreqStatsLabel, CurrentGovernorBox
+sys.path.append("../")
+from auto_cpufreq.gui.objects import RadioButtonView, SystemStatsLabel, CPUFreqStatsLabel, CurrentGovernorBox
 
 CSS_FILE = "styles.css"
 
@@ -18,7 +20,7 @@ def __init__(self):
         self.set_default_size(640, 480)
         self.set_border_width(10)
 
-        self.load_css()
+        #self.load_css()
 
         settings = Gtk.Settings.get_default()
         # Theme

diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,4 @@ setuptools
 psutil
 click
 distro
+PyGObject
diff --git a/scripts/start_app b/scripts/start_app
@@ -0,0 +1,8 @@
+#!/usr/bin/sh
+
+# load python virtual environment
+venv_dir=/opt/auto-cpufreq/venv
+. "${venv_dir}/bin/activate"
+python_command="${venv_dir}/bin/python ${venv_dir}/bin/app.py"
+
+pkexec env DISPLAY=$DISPLAY WAYLAND_DISPLAY=$WAYLAND_DISPLAY XDG_SESSION_TYPE=$XDG_SESSION_TYPE XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR XAUTHORITY=$XAUTHORITY GTK_THEME=$GTK_THEME PATH=$PATH ${python_command}
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def read(name):
     author="Adnan Hodzic",
     author_email="adnan@hodzic.org",
     url="https://github.com/AdnanHodzic/auto-cpufreq",
-    packages=["auto_cpufreq"],
+    packages=["auto_cpufreq", "auto_cpufreq/gui"],
     install_requires=read("requirements.txt"),
     include_package_data=True,
     zip_safe=True,
@@ -40,5 +40,5 @@ def read(name):
         "Intended Audience :: Developers",
         "Operating System :: POSIX :: Linux" "Environment :: Console" "Natural Language :: English",
     ],
-    scripts=["bin/auto-cpufreq"],
+    scripts=["bin/auto-cpufreq", "auto_cpufreq/gui/app.py"],
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ setuptools @@
     psutil
     click
     distro
+    PyGObject