new visulation in Hub
This commit is contained in:
@@ -1,87 +1,3 @@
|
||||
"""Sovran_SystemsOS_Hub — Main GTK4 Application."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "4.0")
|
||||
gi.require_version("Adw", "1")
|
||||
|
||||
from gi.repository import Adw, Gdk, Gio, GLib, Gtk
|
||||
|
||||
from .config import load_config
|
||||
from .service_tile import ServiceTile
|
||||
|
||||
APP_ID = "com.sovransystems.hub"
|
||||
|
||||
# Initialize libadwaita BEFORE any widget creation
|
||||
Adw.init()
|
||||
|
||||
|
||||
class SovranHubWindow(Adw.ApplicationWindow):
|
||||
|
||||
def __init__(self, app, config):
|
||||
super().__init__(
|
||||
application=app,
|
||||
title="Sovran_SystemsOS Hub",
|
||||
default_width=680,
|
||||
default_height=700,
|
||||
)
|
||||
self._config = config
|
||||
self._tiles = []
|
||||
|
||||
css_path = os.environ.get("SOVRAN_HUB_CSS", "")
|
||||
if css_path and os.path.isfile(css_path):
|
||||
provider = Gtk.CssProvider()
|
||||
provider.load_from_path(css_path)
|
||||
Gtk.StyleContext.add_provider_for_display(
|
||||
Gdk.Display.get_default(), provider,
|
||||
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION,
|
||||
)
|
||||
|
||||
header = Adw.HeaderBar()
|
||||
refresh_btn = Gtk.Button(
|
||||
icon_name="view-refresh-symbolic",
|
||||
tooltip_text="Refresh now",
|
||||
)
|
||||
refresh_btn.connect("clicked", lambda _b: self._refresh_all())
|
||||
header.pack_end(refresh_btn)
|
||||
|
||||
self._flowbox = Gtk.FlowBox(
|
||||
max_children_per_line=4,
|
||||
min_children_per_line=2,
|
||||
selection_mode=Gtk.SelectionMode.NONE,
|
||||
homogeneous=True,
|
||||
row_spacing=12,
|
||||
column_spacing=12,
|
||||
margin_top=16,
|
||||
margin_bottom=16,
|
||||
margin_start=16,
|
||||
margin_end=16,
|
||||
halign=Gtk.Align.CENTER,
|
||||
valign=Gtk.Align.START,
|
||||
)
|
||||
|
||||
scrolled = Gtk.ScrolledWindow(
|
||||
hscrollbar_policy=Gtk.PolicyType.NEVER,
|
||||
vscrollbar_policy=Gtk.PolicyType.AUTOMATIC,
|
||||
vexpand=True,
|
||||
child=self._flowbox,
|
||||
)
|
||||
|
||||
toolbar_view = Adw.ToolbarView()
|
||||
toolbar_view.add_top_bar(header)
|
||||
toolbar_view.set_content(scrolled)
|
||||
self.set_content(toolbar_view)
|
||||
|
||||
self._build_tiles()
|
||||
|
||||
interval = config.get("refresh_interval", 5)
|
||||
if interval and interval > 0:
|
||||
GLib.timeout_add_seconds(interval, self._auto_refresh)
|
||||
|
||||
def _build_tiles(self):
|
||||
method = self._config.get("command_method", "systemctl")
|
||||
for entry in self._config.get("services", []):
|
||||
@@ -91,34 +7,9 @@ class SovranHubWindow(Adw.ApplicationWindow):
|
||||
scope=entry.get("type", "system"),
|
||||
method=method,
|
||||
icon_name=entry.get("icon", ""),
|
||||
enabled=entry.get("enabled", True),
|
||||
)
|
||||
self._flowbox.append(tile)
|
||||
self._tiles.append(tile)
|
||||
|
||||
# Defer first status poll so the window renders immediately
|
||||
GLib.idle_add(self._refresh_all)
|
||||
|
||||
def _refresh_all(self):
|
||||
for t in self._tiles:
|
||||
t.refresh()
|
||||
return False
|
||||
|
||||
def _auto_refresh(self):
|
||||
self._refresh_all()
|
||||
return True
|
||||
|
||||
|
||||
class SovranHubApp(Adw.Application):
|
||||
|
||||
def __init__(self):
|
||||
super().__init__(
|
||||
application_id=APP_ID,
|
||||
flags=Gio.ApplicationFlags.DEFAULT_FLAGS,
|
||||
)
|
||||
self._config = load_config()
|
||||
|
||||
def do_activate(self):
|
||||
win = self.get_active_window()
|
||||
if not win:
|
||||
win = SovranHubWindow(self, self._config)
|
||||
win.present()
|
||||
GLib.idle_add(self._refresh_all)
|
||||
@@ -22,7 +22,8 @@ ICON_EXTENSIONS = [".svg", ".png"]
|
||||
|
||||
class ServiceTile(Gtk.Box):
|
||||
|
||||
def __init__(self, name, unit, scope="system", method="systemctl", icon_name="", **kw):
|
||||
def __init__(self, name, unit, scope="system", method="systemctl",
|
||||
icon_name="", enabled=True, **kw):
|
||||
super().__init__(
|
||||
orientation=Gtk.Orientation.VERTICAL,
|
||||
spacing=6,
|
||||
@@ -37,6 +38,7 @@ class ServiceTile(Gtk.Box):
|
||||
self._unit = unit
|
||||
self._scope = scope
|
||||
self._method = method
|
||||
self._enabled = enabled
|
||||
|
||||
self._logo = Gtk.Image(pixel_size=48, margin_top=12, halign=Gtk.Align.CENTER)
|
||||
self._set_logo(icon_name)
|
||||
@@ -70,7 +72,14 @@ class ServiceTile(Gtk.Box):
|
||||
controls.append(restart_btn)
|
||||
self.append(controls)
|
||||
|
||||
# No self.refresh() here — the application calls it via GLib.idle_add
|
||||
# If the feature is disabled in custom.nix, lock the tile immediately
|
||||
if not self._enabled:
|
||||
self._switch.set_active(False)
|
||||
self._switch.set_sensitive(False)
|
||||
self._status_label.set_label("○ disabled")
|
||||
self._status_label.set_css_classes(["caption", "disabled-label"])
|
||||
self._logo.set_opacity(0.35)
|
||||
self.set_tooltip_text(f"{name} is not enabled in custom.nix")
|
||||
|
||||
def _set_logo(self, icon_name):
|
||||
if icon_name and ICON_DIR:
|
||||
@@ -87,6 +96,10 @@ class ServiceTile(Gtk.Box):
|
||||
self._logo.set_from_icon_name("system-run-symbolic")
|
||||
|
||||
def refresh(self):
|
||||
# Don't poll systemctl for disabled features
|
||||
if not self._enabled:
|
||||
return
|
||||
|
||||
active = systemctl.is_active(self._unit, self._scope)
|
||||
is_on = active == "active"
|
||||
is_loading = active in LOADING_STATES
|
||||
@@ -111,10 +124,14 @@ class ServiceTile(Gtk.Box):
|
||||
self._status_label.set_css_classes(["caption", "dim-label"])
|
||||
|
||||
def _on_toggled(self, switch, state):
|
||||
if not self._enabled:
|
||||
return True # block the toggle
|
||||
systemctl.run_action("start" if state else "stop", self._unit, self._scope, self._method)
|
||||
GLib.timeout_add(1500, self.refresh)
|
||||
return False
|
||||
|
||||
def _on_restart(self, _btn):
|
||||
if not self._enabled:
|
||||
return
|
||||
systemctl.run_action("restart", self._unit, self._scope, self._method)
|
||||
GLib.timeout_add(1500, self.refresh)
|
||||
Reference in New Issue
Block a user