diff --git a/auto_cpufreq/gui/app.py b/auto_cpufreq/gui/app.py index b671891..4eec8cd 100644 --- a/auto_cpufreq/gui/app.py +++ b/auto_cpufreq/gui/app.py @@ -27,21 +27,22 @@ class MyWindow(Gtk.Window): self.build() def main(self): - # main VBOX - self.vbox_top = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - self.vbox_top.set_valign(Gtk.Align.CENTER) - self.vbox_top.set_halign(Gtk.Align.CENTER) - self.add(self.vbox_top) + # 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 self.hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=HBOX_PADDING) self.systemstats = SystemStatsLabel() self.hbox.pack_start(self.systemstats, False, False, 0) + self.add(self.hbox) self.vbox_right = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=20) self.menu = DropDownMenu(self) - self.vbox_top.pack_start(self.menu, False, False, 0) + self.hbox.pack_end(self.menu, False, False, 0) self.currentgovernor = CurrentGovernorBox() self.vbox_right.pack_start(self.currentgovernor, False, False, 0) @@ -50,7 +51,7 @@ class MyWindow(Gtk.Window): self.cpufreqstats = CPUFreqStatsLabel() self.vbox_right.pack_start(self.cpufreqstats, False, False, 0) - self.hbox.pack_start(self.vbox_right, True, True, 0) + self.hbox.pack_start(self.vbox_right, False, False, 0) self.vbox_top.pack_start(self.hbox, False, False, 0) @@ -84,4 +85,5 @@ class MyWindow(Gtk.Window): win = MyWindow() win.connect("destroy", Gtk.main_quit) win.show_all() +GLib.set_application_name("auto-cpufreq") Gtk.main() \ No newline at end of file diff --git a/auto_cpufreq/gui/objects.py b/auto_cpufreq/gui/objects.py index 9c9b8fd..cb398a2 100644 --- a/auto_cpufreq/gui/objects.py +++ b/auto_cpufreq/gui/objects.py @@ -112,8 +112,8 @@ class SystemStatsLabel(Gtk.Label): old_stdout = sys.stdout text = StringIO() sys.stdout = text - sysinfo() distro_info() + sysinfo() self.set_label(text.getvalue()) sys.stdout = old_stdout @@ -139,6 +139,7 @@ class DropDownMenu(Gtk.MenuButton): def __init__(self, parent): super().__init__() self.set_halign(Gtk.Align.END) + self.set_valign(Gtk.Align.START) self.image = Gtk.Image.new_from_icon_name("open-menu-symbolic", Gtk.IconSize.LARGE_TOOLBAR) self.add(self.image) self.menu = self.build_menu(parent) diff --git a/scripts/auto-cpufreq-gtk.desktop b/scripts/auto-cpufreq-gtk.desktop index 6201b1f..bbe928f 100644 --- a/scripts/auto-cpufreq-gtk.desktop +++ b/scripts/auto-cpufreq-gtk.desktop @@ -4,4 +4,5 @@ Exec=auto-cpufreq-gtk Type=Application Terminal=false Icon=auto-cpufreq +StartupWMClass=App.py Categories=System; \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9a26f35..6075c44 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -23,6 +23,8 @@ parts: build-packages: - gcc - python3-dev + - libgirepository1.0-dev + - libcairo2-dev stage-packages: - coreutils - dmidecode