From bfd5ba6a3cddeb1f66ac5f1454d0cc1fc66d1de8 Mon Sep 17 00:00:00 2001
From: zkk <1007518571@qq.com>
Date: Fri, 14 Feb 2025 15:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Squashed commit of the following:
commit 2dba9f8ee2725847f31c891b19df6d9b81e03568
Merge: 03cd3722 18f05cc5
Author: zkk <1007518571@qq.com>
Date: Fri Feb 14 15:21:36 2025 +0800
Merge commit '18f05cc52dfb7889853a4f84aad975309ab7dbbe' into release
commit 18f05cc52dfb7889853a4f84aad975309ab7dbbe
Author: zkk <1007518571@qq.com>
Date: Wed Feb 5 10:59:00 2025 +0800
修复连接不了未加密网络的旧问题
commit 025a26209cbe15a0b7f5f1aba5166da63d6eaebf
Author: zkk <1007518571@qq.com>
Date: Fri Jan 24 15:48:52 2025 +0800
重构网络页面，解决卡顿问题
commit fdc851c4e66e3b872eb2564442f0c67369b9e3e2
Author: zkk <1007518571@qq.com>
Date: Fri Jan 24 15:13:41 2025 +0800
优化菜单页面的点击效果和增加列表风格属性
commit e6cfa874208f8d98d0360fb073e4da15c935b202
Author: zkk <1007518571@qq.com>
Date: Tue Jan 21 15:11:28 2025 +0800
优化进入工厂模式的方式为10s内点击5次
commit 03cd37229ee6c606e9814af602709d81b2c79bec
Merge: cf7cafef adcbaa17
Author: zkk <1007518571@qq.com>
Date: Fri Jan 17 14:38:18 2025 +0800
Merge commit 'adcbaa1795bffedc3000bc9e59eabba04d946dd4' into release
commit adcbaa1795bffedc3000bc9e59eabba04d946dd4
Author: zkk <1007518571@qq.com>
Date: Tue Jan 14 15:34:10 2025 +0800
实现探针偏移值校准保存前范围检测，避免保存错误值无法启动问题
commit cf7cafefbcd2274c9a481e58042d11db8cd79961
Merge: dc3478b4 8d259cea
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 17:26:59 2025 +0800
Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release
commit 8d259ceadd5026cecc1dc61224d91aef4f3877b4
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 17:15:46 2025 +0800
实现 打印中恢复喷头温度 提示语的翻译
commit dd11c9683cb5af5407e650eea9b683b1066256c7
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 16:52:04 2025 +0800
优化单个喷头时不显示喷头偏移菜单
commit c3ec7a81bbe1490b76202485d0502a4829a3cee5
Author: zkk <1007518571@qq.com>
Date: Fri Jan 3 17:52:24 2025 +0800
修复屏幕耗材检测显示偶尔不准确的问题
commit 413bf6fc4a740f53d265c63abe7c51eaad483cb0
Author: zkk <1007518571@qq.com>
Date: Fri Jan 3 15:00:54 2025 +0800
修复耗材检测弹窗异常问题
commit dc3478b48c7da1dbae120d1270c9ab64646d6647
Merge: 02c7556c 3bfc1aa7
Author: zkk <1007518571@qq.com>
Date: Thu Jan 2 11:18:07 2025 +0800
Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release
commit 3bfc1aa714e282d74b801155d830377ca58d8f59
Author: zkk <1007518571@qq.com>
Date: Thu Jan 2 11:17:15 2025 +0800
修复移轴页面移轴功能失效问题
commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 15:07:54 2024 +0800
Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release
commit 991003e6cbea335eca73d3783aa1837059614724
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 15:03:34 2024 +0800
优化完整 简体中文和繁体中文的翻译
commit 1a177e90d09b9b9949bff2a1e3c6b12173420620
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 14:10:03 2024 +0800
优化排除对象的英文语法错误
commit e8d509cb6c2883b1fadb5ab9f9ca658e61849055
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 16:40:52 2024 +0800
优化耗材检测显示内容
commit 1b7670485a918cb334119175777525f768e670be
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 14:56:25 2024 +0800
完善断料自动切头功能描述
commit ecc0c3dd16442497e56f5f8ab3a0c6be00bd180e
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 13:40:01 2024 +0800
实现弹窗翻译功能
commit bc6d60fa183af50b7b16fea685139ca9d5df90ea
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 09:53:16 2024 +0800
优化不合理名称和不合理大小写
commit 2e650926bdba1c65baa506be1b1dd09621e8d8ea
Author: zkk <1007518571@qq.com>
Date: Thu Dec 26 15:06:11 2024 +0800
修复10寸屏幕偏移值微调页面出界问题
commit c481b551f777a3a6cadf7be3bfcab38448b51694
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 15:28:26 2024 +0800
优化移轴设置页面没有返回按钮的问题
commit 2b3c9936bd693c8fc265d6352799f382680f4920
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 10:05:04 2024 +0800
删除移动设置页面中轴反转的选项
commit 5e37d59497c54086d3f1e215cbabc03254857a58
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 09:05:03 2024 +0800
优化选择语言标题
commit 5214c3697baac78bd0a465e33d6f4f3c1e30862e
Author: zkk <1007518571@qq.com>
Date: Tue Dec 24 10:57:41 2024 +0800
增加设置hostname功能
commit 3709a7465cc2e0d677ecc9979fb18144f7e0ec33
Author: zkk <1007518571@qq.com>
Date: Tue Dec 24 10:43:46 2024 +0800
增加工厂设置中打包模式
commit 0c2a2618beb68d50601e433beef06122fb0ffd40
Author: zkk <1007518571@qq.com>
Date: Mon Dec 23 16:25:37 2024 +0800
实现恢复出厂设置功能
commit e3a38f85613d53a4a063e835c34c701196010c6e
Author: zkk <1007518571@qq.com>
Date: Mon Dec 23 15:48:17 2024 +0800
一点格式化
commit 4e9e452e8bed4b53eaaae8f0a69142de8aa50611
Author: zkk <1007518571@qq.com>
Date: Sat Dec 21 14:20:22 2024 +0800
优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头
commit 3b85e8e8d59b0d4eae75f80d9e637fe9dc272cbe
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date: Wed Dec 18 17:26:08 2024 +0800
Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop
commit 882850dbde648598e5f91281101d0ea01fd56d56
Author: zkk <1007518571@qq.com>
Date: Wed Dec 18 17:21:16 2024 +0800
补充双喷头偏移校准页面二维码图片
commit 10ec2029eb73e66874d5a0ec492c016480641110
Author: ruipeng <1041589370@qq.com>
Date: Wed Dec 18 17:17:18 2024 +0800
增加自动切换喷头开关选项
commit 3d6eed9d9526b77472ba7df29014b5768c594026
Author: zkk <1007518571@qq.com>
Date: Mon Dec 16 16:33:34 2024 +0800
喷头偏移值校准功能的实现
commit 40ecbb3ea4827c9bac1aa271cccc958c94c1114a
Author: zkk <1007518571@qq.com>
Date: Fri Dec 13 09:20:00 2024 +0800
z探针校准时指定默认激活工具头为第一个头
commit bce3caa409618ef5bc2067865940d14a1441c0f8
Author: zkk <1007518571@qq.com>
Date: Fri Dec 13 09:19:19 2024 +0800
优化z探针校准时候移动过慢问题
commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date: Thu Dec 12 10:33:58 2024 +0800
Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release
commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date: Thu Dec 12 10:30:00 2024 +0800
Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop
commit 1a69b5180de733f15550a1294a7221d6070306a0
Author: ruipeng <1041589370@qq.com>
Date: Wed Dec 11 11:44:36 2024 +0800
新增D600pro2、D1000的V0版机型
commit e3fd413d6256414441e9fe653c1132b1799a5cb2
Author: zkk <1007518571@qq.com>
Date: Tue Dec 10 14:34:13 2024 +0800
修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug
commit 594fb668fe94fe907c028bf65ecced43ea8660cb
Author: zkk <1007518571@qq.com>
Date: Tue Dec 10 14:25:04 2024 +0800
设置自适应调平选项默认为关闭状态
commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date: Fri Nov 29 10:18:32 2024 +0800
Merge branch 'develop' into release
---
ks_includes/sdbus_nm.py | 56 ++++--
panels/network.py | 428 +++++++++++++++++++++-------------------
panels/system.py | 4 +-
styles/dark/style.css | 13 ++
styles/light/style.css | 12 ++
5 files changed, 284 insertions(+), 229 deletions(-)
diff --git a/ks_includes/sdbus_nm.py b/ks_includes/sdbus_nm.py
index ac1525de..a8652749 100644
--- a/ks_includes/sdbus_nm.py
+++ b/ks_includes/sdbus_nm.py
@@ -175,23 +175,32 @@ class SdbusNm:
networks = []
try:
if self.wlan_device:
+ seen_networks = {}
all_aps = [AccessPoint(result) for result in self.wlan_device.access_points]
- networks.extend(
- {
- "SSID": ap.ssid.decode("utf-8"),
- "known": self.is_known(ap.ssid.decode("utf-8")),
- "security": get_encryption(
- ap.rsn_flags or ap.wpa_flags or ap.flags
- ),
- "frequency": WifiChannels(ap.frequency)[0],
- "channel": WifiChannels(ap.frequency)[1],
- "signal_level": ap.strength,
- "max_bitrate": ap.max_bitrate,
- "BSSID": ap.hw_address,
- }
- for ap in all_aps
- if ap.ssid
- )
+ for ap in all_aps:
+ if not ap.ssid:
+ continue
+
+ ssid = ap.ssid.decode("utf-8")
+ signal_level = ap.strength
+ if ssid in seen_networks:
+ if signal_level > seen_networks[ssid]["signal_level"]:
+ seen_networks[ssid] = {
+ "SSID": ssid,
+ "known": self.is_known(ssid),
+ "security": get_encryption(ap.rsn_flags or ap.wpa_flags or ap.flags),
+ "signal_level": signal_level,
+ "BSSID": ap.hw_address,
+ }
+ else:
+ seen_networks[ssid] = {
+ "SSID": ssid,
+ "known": self.is_known(ssid),
+ "security": get_encryption(ap.rsn_flags or ap.wpa_flags or ap.flags),
+ "signal_level": signal_level,
+ "BSSID": ap.hw_address,
+ }
+ networks = list(seen_networks.values())
return sorted(networks, key=lambda i: i["signal_level"], reverse=True)
return networks
except Exception as e:
@@ -200,6 +209,15 @@ class SdbusNm:
def get_bssid_from_ssid(self, ssid):
return next(net["BSSID"] for net in self.get_networks() if ssid == net["SSID"])
+ def get_is_connected(self):
+ state = self.wlan_device.state
+ if state in [
+ enums.DeviceState.ACTIVATED,
+ ]:
+ return True
+ else:
+ return False
+
def get_connected_ap(self):
if self.wlan_device.active_access_point == "/":
return None
@@ -248,9 +266,7 @@ class SdbusNm:
}
if security_type == "Open":
- properties["802-11-wireless-security"] = {
- "key-mgmt": ("s", "none"),
- }
+ properties["802-11-wireless"]["security"] = ("s", "none")
elif "WPA-PSK" in security_type:
properties["802-11-wireless-security"] = {
"key-mgmt": ("s", "wpa-psk"),
@@ -350,8 +366,6 @@ class SdbusNm:
def connect(self, ssid):
if target_connection := self.get_connection_path_by_ssid(ssid):
- message = ssid + "\n" + _("Starting WiFi Association")
- self.popup(message, 1)
try:
active_connection = self.nm.activate_connection(target_connection)
return target_connection
diff --git a/panels/network.py b/panels/network.py
index 680a329c..e1215e7d 100644
--- a/panels/network.py
+++ b/panels/network.py
@@ -42,19 +42,28 @@ class Panel(ScreenPanel):
self.content.add(self.error_box)
self._screen.panels_reinit.append(self._screen._cur_panels[-1])
return
- self.update_timeout = None
- self.conn_status = None
+ self.reload_timer_id = None
+ self.monitor_timer_id = None
+ self.delay_reload_timer_id = None
self.init_status = False
self.reload = False
- self.last_ap_bssid = ''
- self.network_list = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, hexpand=True, vexpand=True)
+ self.last_state = None
+ self.network_list = Gtk.ListBox(selection_mode=Gtk.SelectionMode.NONE)
self.network_rows = {}
self.networks = {}
self.wifi_signal_icons = {
- 'excellent': self._gtk.PixbufFromIcon('wifi_excellent'),
- 'good': self._gtk.PixbufFromIcon('wifi_good'),
- 'fair': self._gtk.PixbufFromIcon('wifi_fair'),
- 'weak': self._gtk.PixbufFromIcon('wifi_weak'),
+ "excellent": self._gtk.PixbufFromIcon(
+ "wifi_excellent", width=self._gtk.content_width * 0.06, height=self._gtk.content_height * 0.06
+ ),
+ "good": self._gtk.PixbufFromIcon(
+ "wifi_good", width=self._gtk.content_width * 0.06, height=self._gtk.content_height * 0.06
+ ),
+ "fair": self._gtk.PixbufFromIcon(
+ "wifi_fair", width=self._gtk.content_width * 0.06, height=self._gtk.content_height * 0.06
+ ),
+ "weak": self._gtk.PixbufFromIcon(
+ "wifi_weak", width=self._gtk.content_width * 0.06, height=self._gtk.content_height * 0.06
+ ),
}
self.network_interfaces = self.sdbus_nm.get_interfaces()
@@ -74,7 +83,6 @@ class Panel(ScreenPanel):
self.reload_button = self._gtk.Button("refresh", None, "custom-icon-button", self.bts)
self.reload_button.set_no_show_all(True)
- self.reload_button.show()
self.reload_button.connect("clicked", self.reload_networks)
self.reload_button.set_hexpand(False)
@@ -96,82 +104,103 @@ class Panel(ScreenPanel):
if self.sdbus_nm.wifi:
self.labels['main_box'].pack_start(sbox, False, False, 5)
- GLib.idle_add(self.load_networks)
scroll.add(self.network_list)
- self.sdbus_nm.enable_monitoring(True)
- self.conn_status = GLib.timeout_add_seconds(1, self.sdbus_nm.monitor_connection_status)
+ if self.sdbus_nm.nm.wireless_enabled:
+ self.reload_button.show()
+ self.sdbus_nm.enable_monitoring(True)
+ self.monitor_timer_id = GLib.timeout_add(500, self.sdbus_nm.monitor_connection_status)
else:
self._screen.show_popup_message(_("No wireless interface has been found"), level=2)
- self.labels['networkinfo'] = Gtk.Label()
- scroll.add(self.labels['networkinfo'])
+ self.labels["networkinfo"] = Gtk.Label()
+ scroll.add(self.labels["networkinfo"])
self.update_single_network_info()
- self.labels['main_box'].pack_start(scroll, True, True, 0)
- self.content.add(self.labels['main_box'])
+ self.labels["main_box"].pack_start(scroll, True, True, 0)
+ self.content.add(self.labels["main_box"])
+ self.network_list.connect("row-activated", self.handle_wifi_selection)
def popup_callback(self, msg, level=3):
- self._screen.show_popup_message(msg, level)
+ if not self.refresh_status(msg):
+ for item in self.network_rows:
+ if self.network_rows[item]["label_state"] is not None:
+ self.network_rows[item]["label_state"].set_no_show_all(True)
+ self.network_rows[item]["label_state"].hide()
+ self._screen.show_popup_message(msg, level)
+
+ def handle_wifi_selection(self, list_box, row):
+ index = row.get_index()
+ logging.info(f"clicked SSID is {self.networks[index]['SSID']}")
+ self.connect_network(list_box, self.networks[index]["SSID"])
+
+ def add_network_item(self, ssid, lock, known, signal):
+ self.network_rows[ssid] = {}
+ self.network_rows[ssid]["row"] = Gtk.ListBoxRow()
+ self.network_rows[ssid]["hbox"] = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=15)
+ self.network_rows[ssid]["row"].add(self.network_rows[ssid]["hbox"])
+ self.network_rows[ssid]["row"].get_style_context().add_class("frame-item")
+
+ self.network_rows[ssid]["signal_ico"] = self._gtk.Image()
+ self.network_rows[ssid]["signal_ico"].set_from_pixbuf(self.get_signal_strength_icon(signal))
+ self.network_rows[ssid]["signal_ico"].set_margin_start(50)
+ self.network_rows[ssid]["hbox"].pack_start(self.network_rows[ssid]["signal_ico"], False, True, 20)
+
+ self.network_rows[ssid]["label_box"] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+ self.network_rows[ssid]["label_ssid"] = Gtk.Label(label=ssid, xalign=0)
+ self.network_rows[ssid]["label_state"] = Gtk.Label(label="", xalign=0)
+ self.network_rows[ssid]["label_state"].set_ellipsize(Pango.EllipsizeMode.END)
+ self.network_rows[ssid]["label_state"].set_no_show_all(True)
+ self.network_rows[ssid]["label_box"].pack_start(self.network_rows[ssid]["label_ssid"], True, False, 0)
+ self.network_rows[ssid]["label_box"].pack_start(self.network_rows[ssid]["label_state"], True, False, 0)
+ self.network_rows[ssid]["hbox"].pack_start(self.network_rows[ssid]["label_box"], False, True, 10)
+
+ if known:
+ self.network_rows[ssid]["delete"] = self._gtk.Button("delete", None, "custom-icon-button", self.bts)
+ self.network_rows[ssid]["delete"].connect("clicked", self.remove_confirm_dialog, ssid, ssid)
+ self.network_rows[ssid]["delete"].set_hexpand(False)
+ self.network_rows[ssid]["delete"].set_halign(Gtk.Align.END)
+ self.network_rows[ssid]["hbox"].pack_end(self.network_rows[ssid]["delete"], False, True, 10)
+
+ if "Open" not in lock:
+ self.network_rows[ssid]["lock_image"] = self._gtk.Image(
+ "lock", self._gtk.content_width * 0.04, self._gtk.content_height * 0.04
+ )
+ self.network_rows[ssid]["lock_image"].set_hexpand(False)
+ self.network_rows[ssid]["lock_image"].set_halign(Gtk.Align.END)
+ self.network_rows[ssid]["hbox"].pack_end(self.network_rows[ssid]["lock_image"], False, True, 10)
+
+ self.network_rows[ssid]["hbox"].set_margin_end(50)
+ self.network_list.add(self.network_rows[ssid]["row"])
+
+ def move_network_to_front(self, networks, target_name):
+ if not target_name or (networks and networks[0].get("SSID") == target_name):
+ return networks
+ target_index = next((i for i, network in enumerate(networks) if network.get("SSID") == target_name), None)
+ if target_index is not None:
+ target_network = networks.pop(target_index)
+ networks.insert(0, target_network)
+ return networks
def load_networks(self):
- GLib.timeout_add_seconds(10, self._gtk.Button_busy, self.reload_button, False)
- self.content.show_all()
- return False
+ self.connected_ap = self.sdbus_nm.get_connected_ap()
+ ap_ssid = None
+ if self.connected_ap:
+ ap_ssid = self.connected_ap.ssid.decode("utf-8")
+ self.networks = self.move_network_to_front(self.sdbus_nm.get_networks(), ap_ssid)
+ if self.last_state != self.sdbus_nm.wifi_state:
+ self.last_state = self.sdbus_nm.wifi_state
+ self.sdbus_nm.wifi_state = -1
+ self.sdbus_nm.monitor_connection_status()
- def add_network(self, bssid):
- if bssid in self.network_rows:
- return
-
- networks = self.sdbus_nm.get_networks()
- if networks:
- net = next((net for net in networks if bssid == net['BSSID']), None)
- if net is None:
- self.remove_network_from_list(bssid)
- return
-
- ssid = net['SSID']
-
- connect = self._gtk.Button("load", None, "color3", self.bts)
- connect.connect("clicked", self.connect_network, ssid)
- connect.set_hexpand(False)
- connect.set_halign(Gtk.Align.END)
-
- delete = self._gtk.Button("delete", None, "color3", self.bts)
- delete.connect("clicked", self.remove_confirm_dialog, ssid, bssid)
- delete.set_hexpand(False)
- delete.set_halign(Gtk.Align.END)
-
- buttons = Gtk.Box(spacing=5)
-
- name = Gtk.Label(hexpand=True, halign=Gtk.Align.START, wrap=True, wrap_mode=Pango.WrapMode.WORD_CHAR)
- if bssid == self.sdbus_nm.get_connected_bssid():
- ssid += ' (' + _("Connected") + ')'
- name.set_markup(f"{ssid}")
- else:
- name.set_markup(f"{ssid}")
- if net['known']:
- buttons.add(delete)
- buttons.add(connect)
-
- labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, vexpand=True,
- halign=Gtk.Align.START, valign=Gtk.Align.CENTER)
- labels.add(name)
- icon = self._gtk.Image()
-
- self.network_rows[bssid] = Gtk.Box(spacing=5, hexpand=True, vexpand=False)
- self.network_rows[bssid].get_style_context().add_class("frame-item")
- self.network_rows[bssid].add(icon)
- self.network_rows[bssid].add(labels)
- self.network_rows[bssid].add(buttons)
-
- self.networks[bssid] = {
- "connect": connect,
- "delete": delete,
- "icon": icon,
- "name": name,
- "row": self.network_rows[bssid],
- }
-
- self.network_list.add(self.network_rows[bssid])
+ for item in self.networks:
+ ssid = item.get("SSID")
+ if ssid:
+ self.add_network_item(
+ ssid,
+ item.get("security", "unknown"),
+ item.get("known", False),
+ item.get("signal_level", 0),
+ )
+ self.network_list.show_all()
def remove_confirm_dialog(self, widget, ssid, bssid):
@@ -189,21 +218,20 @@ class Panel(ScreenPanel):
self._gtk.remove_dialog(dialog)
if response_id == Gtk.ResponseType.CANCEL:
return
- bssid = self.sdbus_nm.get_bssid_from_ssid(ssid)
- self.remove_network_from_list(bssid)
if response_id == Gtk.ResponseType.OK:
logging.info(f"Deleting {ssid}")
self.sdbus_nm.delete_network(ssid)
if response_id == Gtk.ResponseType.APPLY:
logging.info(f"Disconnecting {ssid}")
self.sdbus_nm.disconnect_network()
+ self.delay_reload_networks(100)
def add_new_network(self, widget, ssid):
self._screen.remove_keyboard()
- psk = self.labels['network_psk'].get_text()
- identity = self.labels['network_identity'].get_text()
- eap_method = self.get_dropdown_value(self.labels['network_eap_method'])
- phase2 = self.get_dropdown_value(self.labels['network_phase2'])
+ psk = self.labels["network_psk"].get_text()
+ identity = self.labels["network_identity"].get_text()
+ eap_method = self.get_dropdown_value(self.labels["network_eap_method"])
+ phase2 = self.get_dropdown_value(self.labels["network_phase2"])
logging.debug(f"{phase2=}")
logging.debug(f"{eap_method=}")
result = self.sdbus_nm.add_network(ssid, psk, eap_method, identity, phase2)
@@ -240,36 +268,37 @@ class Panel(ScreenPanel):
del self.labels[i]
self.show_add = False
+ def get_network_index(self, ssid):
+ for index, network in enumerate(self.networks):
+ if network.get("SSID") == ssid:
+ return index
+ return -1
+
def connect_network(self, widget, ssid, showadd=True):
- self.deactivate()
- if showadd and not self.sdbus_nm.is_known(ssid):
- sec_type = self.sdbus_nm.get_security_type(ssid)
+ index = self.get_network_index(ssid)
+ ssid = self.networks[index]["SSID"]
+ if showadd and not self.networks[index]["known"]: # self.sdbus_nm.is_known(ssid):
+ sec_type = self.networks[index]["security"] # self.sdbus_nm.get_security_type(ssid)
if sec_type == "Open" or "OWE" in sec_type:
logging.debug("Network is Open do not show psk")
- result = self.sdbus_nm.add_network(ssid, '')
+ result = self.sdbus_nm.add_network(ssid, "", "")
+ self.sdbus_nm.connect(ssid)
if "error" in result:
self._screen.show_popup_message(result["message"])
else:
self.show_add_network(widget, ssid)
- self.activate()
return
- bssid = self.sdbus_nm.get_bssid_from_ssid(ssid)
- if bssid and bssid in self.network_rows:
- self.remove_network_from_list(bssid)
self.sdbus_nm.connect(ssid)
- self.reload_networks()
- if self.conn_status is None:
+ self.delay_reload_networks(1000)
+ if self.monitor_timer_id is None:
self.sdbus_nm.enable_monitoring(True)
- self.conn_status = GLib.timeout_add(500, self.sdbus_nm.monitor_connection_status)
+ self.monitor_timer_id = GLib.timeout_add(500, self.sdbus_nm.monitor_connection_status)
- def remove_network_from_list(self, bssid):
- if bssid not in self.network_rows:
- logging.error(f"{bssid} not in rows")
- return
- self.network_list.remove(self.network_rows[bssid])
- del self.network_rows[bssid]
- del self.networks[bssid]
- return
+ def remove_network_list(self):
+ for row in self.network_list.get_children():
+ self.network_list.remove(row)
+ row.destroy()
+ self.network_rows.clear()
def show_add_network(self, widget, ssid):
if self.show_add:
@@ -277,174 +306,161 @@ class Panel(ScreenPanel):
for child in self.content.get_children():
self.content.remove(child)
-
if "add_network" in self.labels:
- del self.labels['add_network']
-
+ del self.labels["add_network"]
eap_method = Gtk.ComboBoxText(hexpand=True)
for method in ("peap", "ttls", "pwd", "leap", "md5"):
eap_method.append(method, method.upper())
- self.labels['network_eap_method'] = eap_method
+ self.labels["network_eap_method"] = eap_method
eap_method.set_active(0)
phase2 = Gtk.ComboBoxText(hexpand=True)
for method in ("mschapv2", "gtc", "pap", "chap", "mschap", "disabled"):
phase2.append(method, method.upper())
- self.labels['network_phase2'] = phase2
+ self.labels["network_phase2"] = phase2
phase2.set_active(0)
- auth_selection_box = Gtk.Box(no_show_all=True)
- auth_selection_box.add(self.labels['network_eap_method'])
- auth_selection_box.add(self.labels['network_phase2'])
+ self.labels["network_identity"] = Gtk.Entry(hexpand=True, no_show_all=True)
+ self.labels["network_identity"].connect("focus-in-event", self._screen.show_keyboard)
- self.labels['network_identity'] = Gtk.Entry(hexpand=True, no_show_all=True)
- self.labels['network_identity'].connect("focus-in-event", self._screen.show_keyboard)
+ self.labels["network_psk"] = Gtk.Entry(hexpand=True)
+ self.labels["network_psk"].set_visibility(False)
+ self.labels["network_psk"].connect("activate", self.add_new_network, ssid)
+ self.labels["network_psk"].connect("focus-in-event", self._screen.show_keyboard)
- self.labels['network_psk'] = Gtk.Entry(hexpand=True)
- self.labels['network_psk'].connect("activate", self.add_new_network, ssid)
- self.labels['network_psk'].connect("focus-in-event", self._screen.show_keyboard)
-
- save = self._gtk.Button("sd", _("Save"), "color3")
+ save = self._gtk.Button("load", style="color3")
save.set_hexpand(False)
save.connect("clicked", self.add_new_network, ssid)
user_label = Gtk.Label(label=_("User"), hexpand=False, no_show_all=True)
auth_grid = Gtk.Grid()
auth_grid.attach(user_label, 0, 0, 1, 1)
- auth_grid.attach(self.labels['network_identity'], 1, 0, 1, 1)
+ auth_grid.attach(self.labels["network_identity"], 1, 0, 1, 1)
auth_grid.attach(Gtk.Label(label=_("Password"), hexpand=False), 0, 1, 1, 1)
- auth_grid.attach(self.labels['network_psk'], 1, 1, 1, 1)
+ auth_grid.attach(self.labels["network_psk"], 1, 1, 1, 1)
auth_grid.attach(save, 2, 0, 1, 2)
- if "802.1x" in self.sdbus_nm.get_security_type(ssid):
- user_label.show()
- self.labels['network_eap_method'].show()
- self.labels['network_phase2'].show()
- self.labels['network_identity'].show()
- auth_selection_box.show()
-
- self.labels['add_network'] = Gtk.Box(
- orientation=Gtk.Orientation.VERTICAL, spacing=5, valign=Gtk.Align.CENTER,
- hexpand=True, vexpand=True
+ self.labels["add_network"] = Gtk.Box(
+ orientation=Gtk.Orientation.VERTICAL, spacing=5, valign=Gtk.Align.CENTER, hexpand=True, vexpand=True
)
- self.labels['add_network'].add(Gtk.Label(label=_("Connecting to %s") % ssid))
- self.labels['add_network'].add(auth_selection_box)
- self.labels['add_network'].add(auth_grid)
+ self.labels["add_network"].add(Gtk.Label(label=_("Connecting to %s") % ssid))
+ self.labels["add_network"].add(auth_grid)
scroll = self._gtk.ScrolledWindow()
- scroll.add(self.labels['add_network'])
+ scroll.add(self.labels["add_network"])
self.content.add(scroll)
- self.labels['network_psk'].grab_focus_without_selecting()
+ self.labels["network_psk"].grab_focus_without_selecting()
self.content.show_all()
self.show_add = True
- def update_all_networks(self):
- self.ap_bssid = self.sdbus_nm.get_connected_bssid()
- if self.last_ap_bssid != self.ap_bssid:
- self.remove_network_from_list(self.last_ap_bssid)
- self.remove_network_from_list(self.ap_bssid)
- self.last_ap_bssid = self.ap_bssid
-
- if self.reload:
- for child in self.network_list.get_children():
- self.network_list.remove(child)
- self.reload = False
-
- self.interface = self.sdbus_nm.get_primary_interface()
- self.labels['interface'].set_text(_("Interface") + f': {self.interface}')
- self.labels['ip'].set_text(f"IP: {self.sdbus_nm.get_ip_address()}")
- nets = self.sdbus_nm.get_networks()
- remove = [bssid for bssid in self.network_rows.keys() if bssid not in [net['BSSID'] for net in nets]]
- for bssid in remove:
- self.remove_network_from_list(bssid)
- for net in nets:
- if net['BSSID'] not in self.network_rows.keys():
- self.add_network(net['BSSID'])
- self.update_network_info(net)
- for i, net in enumerate(nets):
- for child in self.network_list.get_children():
- if 'BSSID' in net and net['BSSID'] in self.network_rows:
- if child == self.network_rows[net['BSSID']]:
- self.network_list.reorder_child(child, i)
- self.network_list.show_all()
- return True
-
- def update_network_info(self, net):
- if net['BSSID'] not in self.network_rows.keys() or net['BSSID'] not in self.networks:
- logging.info(f"Unknown SSID {net['SSID']}")
- return
- self.networks[net['BSSID']]['icon'].set_from_pixbuf(self.get_signal_strength_icon(net["signal_level"]))
-
def get_signal_strength_icon(self, signal_level):
# networkmanager uses percentage not dbm
if signal_level > 75:
- return self.wifi_signal_icons['excellent']
+ return self.wifi_signal_icons["excellent"]
elif signal_level > 60:
- return self.wifi_signal_icons['good']
+ return self.wifi_signal_icons["good"]
elif signal_level > 30:
- return self.wifi_signal_icons['fair']
+ return self.wifi_signal_icons["fair"]
else:
- return self.wifi_signal_icons['weak']
+ return self.wifi_signal_icons["weak"]
- def update_single_network_info(self):
- self.labels['networkinfo'].set_markup(
- f'{self.interface}\n\n'
- + '' + _("Hostname") + f': {os.uname().nodename}\n'
- f'IPv4: {self.sdbus_nm.get_ip_address()}\n'
- )
- self.labels['networkinfo'].show_all()
- return True
+ def refresh_status(self, state=None):
+ if state:
+ self.connected_ap = self.sdbus_nm.get_connected_ap()
+ if self.connected_ap:
+ ap_ssid = self.connected_ap.ssid.decode("utf-8")
+ self.set_connect_state(ap_ssid, state)
+ return True
+ else:
+ return False
+
+ def set_connect_state(self, ssid, state):
+ for item in self.network_rows:
+ if self.network_rows[item]["label_state"] is not None:
+ self.network_rows[item]["label_state"].set_no_show_all(True)
+ self.network_rows[item]["label_state"].hide()
+ if ssid and state and ssid in self.network_rows:
+ if self.network_rows[ssid]["label_state"] is not None:
+ self.network_rows[ssid]["label_state"].set_markup(f'{state}')
+ self.network_rows[ssid]["label_state"].set_no_show_all(False)
+ self.network_list.show_all()
def reload_networks(self, widget=None):
- self.deactivate()
+ if self.reload:
+ return
+ self.reload = True
+ self.remove_network_list()
del self.network_rows
self.network_rows = {}
if self.sdbus_nm is not None and self.sdbus_nm.wifi:
- if widget:
- self._gtk.Button_busy(widget, True)
+ self._gtk.Button_busy(self.reload_button, True)
if not self.init_status:
self.sdbus_nm.rescan()
else:
self.init_status = False
self.load_networks()
- self.activate()
- self.reload = True
+ if self.sdbus_nm.get_is_connected():
+ self.refresh_status(_('Network connected'))
+
+ self._gtk.Button_busy(self.reload_button, False)
+ self.reload = False
+
+ if self.delay_reload_timer_id:
+ GLib.source_remove(self.delay_reload_timer_id)
+ self.delay_reload_timer_id = None
+
+ return self.sdbus_nm.nm.wireless_enabled
+
+ def delay_reload_networks(self, s):
+ self._gtk.Button_busy(self.reload_button, True)
+ if not self.delay_reload_timer_id:
+ self.delay_reload_timer_id = GLib.timeout_add(s, self.reload_networks)
+
+ def start_refresh_timer(self):
+ if not self.sdbus_nm.monitor_connection_status():
+ self.sdbus_nm.enable_monitoring(True)
+ if self.monitor_timer_id is None:
+ self.monitor_timer_id = GLib.timeout_add(600, self.sdbus_nm.monitor_connection_status)
+ if self.reload_timer_id is None:
+ self.reload_timer_id = GLib.timeout_add_seconds(10, self.reload_networks)
+ return False
+
+ def stop_refresh_timer(self):
+ if self.monitor_timer_id is not None:
+ self.sdbus_nm.enable_monitoring(False)
+ GLib.source_remove(self.monitor_timer_id)
+ self.monitor_timer_id = None
+ if self.reload_timer_id is not None:
+ GLib.source_remove(self.reload_timer_id)
+ self.reload_timer_id = None
def activate(self):
if self.sdbus_nm is None:
return
- if self.update_timeout is None:
- if self.sdbus_nm.wifi:
- if self.sdbus_nm.is_wifi_enabled():
- if self.reload_button.get_sensitive():
- self._gtk.Button_busy(self.reload_button, True)
- self.sdbus_nm.rescan()
- self.load_networks()
- self.update_timeout = GLib.timeout_add_seconds(5, self.update_all_networks)
- else:
- self.update_single_network_info()
- self.update_timeout = GLib.timeout_add_seconds(5, self.update_single_network_info)
+ if self.sdbus_nm.wifi:
+ if self.sdbus_nm.is_wifi_enabled():
+ self.delay_reload_networks(1000)
+ self.start_refresh_timer()
def deactivate(self):
if self.sdbus_nm is None:
return
- if self.update_timeout is not None:
- GLib.source_remove(self.update_timeout)
- self.update_timeout = None
- if self.sdbus_nm.wifi:
- self.sdbus_nm.enable_monitoring(False)
- if self.conn_status is not None:
- GLib.source_remove(self.conn_status)
- self.conn_status = None
+ self.stop_refresh_timer()
def toggle_wifi(self, switch, gparams):
enable = switch.get_active()
logging.info(f"WiFi {enable}")
self.sdbus_nm.toggle_wifi(enable)
if enable:
+ self.reload_button.set_no_show_all(False)
self.reload_button.show()
+ self.network_list.set_no_show_all(False)
self.network_list.show()
self.init_status = True
- self.reload_networks(self.reload_button)
+ self.delay_reload_networks(3000)
+ self.start_refresh_timer()
else:
+ self.stop_refresh_timer()
+ self.reload_button.set_no_show_all(True)
self.reload_button.hide()
+ self.network_list.set_no_show_all(True)
self.network_list.hide()
diff --git a/panels/system.py b/panels/system.py
index 2a3c151b..c9e514df 100644
--- a/panels/system.py
+++ b/panels/system.py
@@ -18,8 +18,8 @@ class Panel(ScreenPanel):
self.labels = {}
self.click_count = 0
self.last_click_time = 0
- self.click_threshold = 0.2
- self.target_clicks = 10
+ self.click_threshold = 2.0
+ self.target_clicks = 5
self.grid = Gtk.Grid(column_spacing=10, row_spacing=5)
self.sysinfo = screen.printer.system_info
diff --git a/styles/dark/style.css b/styles/dark/style.css
index ae63ec56..ef988248 100644
--- a/styles/dark/style.css
+++ b/styles/dark/style.css
@@ -33,6 +33,7 @@
color: @yellow-opa-100;
}
+list,
list row,
treeview.view,
window {
@@ -105,6 +106,18 @@ button.invalid:active,
border-color: @blue-opa-50;
}
+button.color1:hover,
+button.color2:hover,
+button.color3:hover,
+button.color4:hover,
+button.update:hover,
+button.invalid:hover,
+.dialog button:hover,
+row:hover {
+ background-color: @blue-opa-50;
+ border-color: @blue-opa-50;
+}
+
button.active {
background-color: @white-opa-20;
}
diff --git a/styles/light/style.css b/styles/light/style.css
index 56f76948..48417f8d 100644
--- a/styles/light/style.css
+++ b/styles/light/style.css
@@ -19,6 +19,7 @@
color: @text ;
}
+list,
list row,
treeview.view,
window {
@@ -117,6 +118,17 @@ button.invalid:active,
background-color: @active;
}
+row:hover,
+button.color1:hover,
+button.color2:hover,
+button.color3:hover,
+button.color4:hover,
+button.update:hover,
+button.invalid:hover,
+.dialog button:hover {
+ background-color: @active;
+}
+
button.active {
background-color: @active;
}