Skip to content

Add toggleable system temperature monitoring widget #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions config/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,29 +83,28 @@ def load_config():
NOTIF_POS = config.get(NOTIF_POS_KEY, NOTIF_POS_DEFAULT)

BAR_COMPONENTS_VISIBILITY = {
"button_apps": config.get("bar_button_apps_visible", True),
"systray": config.get("bar_systray_visible", True),
"control": config.get("bar_control_visible", True),
"network": config.get("bar_network_visible", True),
"button_tools": config.get("bar_button_tools_visible", True),
"sysprofiles": config.get("bar_sysprofiles_visible", True),
"button_overview": config.get("bar_button_overview_visible", True),
"ws_container": config.get("bar_ws_container_visible", True),
"weather": config.get("bar_weather_visible", True),
"battery": config.get("bar_battery_visible", True),
"metrics": config.get("bar_metrics_visible", True),
"language": config.get("bar_language_visible", True),
"date_time": config.get("bar_date_time_visible", True),
"button_power": config.get("bar_button_power_visible", True),
'button_apps': config.get('bar_button_apps_visible', True),
'systray': config.get('bar_systray_visible', True),
'control': config.get('bar_control_visible', True),
'network': config.get('bar_network_visible', True),
'button_tools': config.get('bar_button_tools_visible', True),
'button_overview': config.get('bar_button_overview_visible', True),
'ws_container': config.get('bar_ws_container_visible', True),
'weather': config.get('bar_weather_visible', True),
'battery': config.get('bar_battery_visible', True),
'metrics': config.get('bar_metrics_visible', True),
'temperatures': config.get('bar_temperatures_visible', False),
'sysprofiles': config.get("bar_sysprofiles_visible", True),
'language': config.get('bar_language_visible', True),
'date_time': config.get('bar_date_time_visible', True),
'button_power': config.get('bar_button_power_visible', True),
}

BAR_METRICS_DISKS = config.get('bar_metrics_disks', ["/"])
METRICS_VISIBLE = config.get('metrics_visible', {'cpu': True, 'ram': True, 'disk': True, 'gpu': True})
METRICS_SMALL_VISIBLE = config.get('metrics_small_visible', {'cpu': True, 'ram': True, 'disk': True, 'gpu': True})
TEMPERATURE_POLL_INTERVAL = config.get('temperature_poll_interval', 1)

BAR_METRICS_DISKS = config.get("bar_metrics_disks", ["/"])
METRICS_VISIBLE = config.get(
"metrics_visible", {"cpu": True, "ram": True, "disk": True, "gpu": True}
)
METRICS_SMALL_VISIBLE = config.get(
"metrics_small_visible", {"cpu": True, "ram": True, "disk": True, "gpu": True}
)
else:
WALLPAPERS_DIR = WALLPAPERS_DIR_DEFAULT
BAR_POSITION = "Left"
Expand All @@ -126,23 +125,25 @@ def load_config():
PANEL_POSITION = PANEL_POSITION_DEFAULT
NOTIF_POS = NOTIF_POS_DEFAULT

# Merged default BAR_COMPONENTS_VISIBILITY dictionary
BAR_COMPONENTS_VISIBILITY = {
"button_apps": True,
"systray": True,
"control": True,
"network": True,
"button_tools": True,
"button_overview": True,
"ws_container": True,
"weather": True,
"battery": True,
"metrics": True,
"language": True,
"date_time": True,
"button_power": True,
"sysprofiles": True,
'button_apps': True,
'systray': True,
'control': True,
'network': True,
'button_tools': True,
'button_overview': True,
'ws_container': True,
'weather': True,
'battery': True,
'metrics': True,
'temperatures': False,
'sysprofiles': True,
'language': True,
'date_time': True,
'button_power': True,
}

BAR_METRICS_DISKS = ["/"]
METRICS_VISIBLE = {"cpu": True, "ram": True, "disk": True, "gpu": True}
METRICS_SMALL_VISIBLE = {"cpu": True, "ram": True, "disk": True, "gpu": True}
METRICS_SMALL_VISIBLE = {"cpu": True, "ram": True, "disk": True, "gpu": True}
2 changes: 2 additions & 0 deletions config/settings_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from .settings_utils import backup_and_replace, bind_vars, start_config



class HyprConfGUI(Window):
def __init__(self, show_lock_checkbox: bool, show_idle_checkbox: bool, **kwargs):
super().__init__(
Expand Down Expand Up @@ -580,6 +581,7 @@ def create_appearance_tab(self):
"weather": "Weather Widget",
"battery": "Battery Indicator",
"metrics": "System Metrics",
'temperatures': "System Temps",
"language": "Language Indicator",
"date_time": "Date & Time",
"button_power": "Power Button",
Expand Down
69 changes: 37 additions & 32 deletions modules/bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
import modules.icons as icons
from modules.controls import ControlSmall
from modules.dock import Dock
from modules.metrics import Battery, MetricsSmall, NetworkApplet
from modules.metrics import (Battery, MetricsSmall, NetworkApplet,
TemperaturesBar)
from modules.systemprofiles import Systemprofiles
from modules.systemtray import SystemTray
from modules.weather import Weather
Expand Down Expand Up @@ -173,9 +174,9 @@ def __init__(self, **kwargs):
self.button_tools.connect("leave_notify_event", self.on_button_leave)

self.systray = SystemTray()

self.weather = Weather()
self.sysprofiles = Systemprofiles()
self.temperatures_bar = TemperaturesBar()

self.network = NetworkApplet()

Expand Down Expand Up @@ -240,8 +241,8 @@ def __init__(self, **kwargs):
self.battery = Battery()

self.apply_component_props()

self.rev_right = [
self.temperatures_bar,
self.metrics,
self.control,
]
Expand Down Expand Up @@ -486,43 +487,47 @@ def __init__(self, **kwargs):
self.chinese_numbers()

def apply_component_props(self):
# Merged components dictionary
components = {
"button_apps": self.button_apps,
"systray": self.systray,
"control": self.control,
"network": self.network,
"button_tools": self.button_tools,
"button_overview": self.button_overview,
"ws_container": self.ws_container,
"weather": self.weather,
"battery": self.battery,
"metrics": self.metrics,
"language": self.language,
"date_time": self.date_time,
"button_power": self.button_power,
"sysprofiles": self.sysprofiles,
'button_apps': self.button_apps,
'systray': self.systray,
'control': self.control,
'network': self.network,
'button_tools': self.button_tools,
'button_overview': self.button_overview,
'ws_container': self.ws_container,
'weather': self.weather,
'battery': self.battery,
'metrics': self.metrics,
'temperatures': self.temperatures_bar,
'language': self.language,
'date_time': self.date_time,
'button_power': self.button_power,
'sysprofiles': self.sysprofiles,
}

for component_name, widget in components.items():
if component_name in self.component_visibility:
widget.set_visible(self.component_visibility[component_name])

def toggle_component_visibility(self, component_name):
# Merged components dictionary
components = {
"button_apps": self.button_apps,
"systray": self.systray,
"control": self.control,
"network": self.network,
"button_tools": self.button_tools,
"button_overview": self.button_overview,
"ws_container": self.ws_container,
"weather": self.weather,
"battery": self.battery,
"metrics": self.metrics,
"language": self.language,
"date_time": self.date_time,
"button_power": self.button_power,
"sysprofiles": self.sysprofiles,
'button_apps': self.button_apps,
'systray': self.systray,
'control': self.control,
'network': self.network,
'button_tools': self.button_tools,
'button_overview': self.button_overview,
'ws_container': self.ws_container,
'weather': self.weather,
'battery': self.battery,
'metrics': self.metrics,
'temperatures': self.temperatures_bar,
'language': self.language,
'date_time': self.date_time,
'button_power': self.button_power,
'sysprofiles': self.sysprofiles,
}

if component_name in components and component_name in self.component_visibility:
Expand Down Expand Up @@ -607,4 +612,4 @@ def chinese_numbers(self):
if data.BAR_WORKSPACE_USE_CHINESE_NUMERALS:
self.workspaces_num.add_style_class("chinese")
else:
self.workspaces_num.remove_style_class("chinese")
self.workspaces_num.remove_style_class("chinese")
Loading