From 1f52405d1765f07264221467dc170d8914e7fe55 Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Wed, 19 Nov 2025 16:20:33 +0000 Subject: [PATCH 1/6] ADD: added priority to 'get_saved_networks' --- BlocksScreen/lib/network.py | 1 + 1 file changed, 1 insertion(+) diff --git a/BlocksScreen/lib/network.py b/BlocksScreen/lib/network.py index 312b60e8..ed6fe1af 100644 --- a/BlocksScreen/lib/network.py +++ b/BlocksScreen/lib/network.py @@ -731,6 +731,7 @@ def get_saved_networks( "mode": network_properties["802-11-wireless"][ "mode" ], + "priority": network_properties["connection"].get("autoconnect-priority", (None, None))[1], } if network_properties["connection"]["type"][1] == "802-11-wireless" From c48c8d8999d8a3a3414ddb4d255d2c065f2b1bf0 Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Wed, 19 Nov 2025 16:24:46 +0000 Subject: [PATCH 2/6] ADD: added priority buttons ADD: added details page to saved network Refacotr: refactor how edit on saved is made --- BlocksScreen/lib/panels/networkWindow.py | 53 +- BlocksScreen/lib/ui/wifiConnectivityWindow.ui | 1172 +++++++++++------ .../lib/ui/wifiConnectivityWindow_ui.py | 513 +++++--- 3 files changed, 1146 insertions(+), 592 deletions(-) diff --git a/BlocksScreen/lib/panels/networkWindow.py b/BlocksScreen/lib/panels/networkWindow.py index 57617efe..64dae53f 100644 --- a/BlocksScreen/lib/panels/networkWindow.py +++ b/BlocksScreen/lib/panels/networkWindow.py @@ -223,7 +223,7 @@ def __init__(self, parent: typing.Optional[QtWidgets.QWidget], /) -> None: ) ) self.delete_network_signal.connect(self.delete_network) - self.panel.saved_connection_change_password_field.returnPressed.connect( + self.panel.snd_back.clicked.connect( lambda: self.update_network( ssid=self.panel.saved_connection_network_name.text(), password=self.panel.saved_connection_change_password_field.text(), @@ -316,8 +316,19 @@ def __init__(self, parent: typing.Optional[QtWidgets.QWidget], /) -> None: QtGui.QPixmap(":/dialog/media/btn_icons/yes.svg") ) - self.panel.network_activate_btn.clicked.connect(self.saved_wifi_option_selected) - self.panel.network_delete_btn.clicked.connect(self.saved_wifi_option_selected) + self.panel.network_details_btn.setPixmap( + QtGui.QPixmap(":/ui/media/btn_icons/printer_settings.svg") + ) + + self.panel.snd_back.clicked.connect(lambda:self.setCurrentIndex(self.indexOf(self.panel.saved_connection_page))) + self.panel.network_details_btn.clicked.connect(lambda:self.setCurrentIndex(self.indexOf(self.panel.saved_details_page))) + + self.panel.network_activate_btn.clicked.connect( + lambda: self.saved_wifi_option_selected() + ) + self.panel.network_delete_btn.clicked.connect( + lambda: self.saved_wifi_option_selected() + ) self.network_list_worker.build() self.request_network_scan.emit() @@ -801,10 +812,19 @@ def update_network( if not self.sdbus_network.is_known(ssid): return + checked_btn = self.panel.prioritbtngroup.checkedButton() + if checked_btn == self.panel.hig_priorrity_btn: + priority = 90 + elif checked_btn == self.panel.low_priorrity_btn: + priority = 20 + else: + priority = 50 + self.sdbus_network.update_connection_settings( ssid=ssid, password=password, new_ssid=new_ssid, + priority=priority ) QtCore.QTimer().singleShot(10000, lambda: self.network_list_worker.build()) self.setCurrentIndex(self.indexOf(self.panel.network_list_page)) @@ -838,14 +858,35 @@ def handle_network_list(self, data: typing.List[typing.Tuple]) -> None: def handle_button_click(self, ssid: str): """Handles pressing a network""" - if ssid in self.sdbus_network.get_saved_ssid_names(): + _saved_ssids = self.sdbus_network.get_saved_networks() + if any(item["ssid"] == ssid for item in _saved_ssids): self.setCurrentIndex(self.indexOf(self.panel.saved_connection_page)) self.panel.saved_connection_network_name.setText(str(ssid)) + self.panel.snd_name.setText(str(ssid)) + + # find the entry for this SSID + entry = next((item for item in _saved_ssids if item["ssid"] == ssid), None) + + logger.debug(_saved_ssids) + + if entry is not None: + priority = entry.get("priority") + + if priority == 90: + self.panel.hig_priorrity_btn.setChecked(True) + elif priority == 20: + self.panel.low_priorrity_btn.setChecked(True) + else: + self.panel.med_priorrity_btn.setChecked(True) + _curr_ssid = self.sdbus_network.get_current_ssid() if _curr_ssid != str(ssid): - self.panel.network_activate_btn.show() + self.panel.network_activate_btn.setDisabled(False) + self.panel.sn_info.setText("Saved Network") else: - self.panel.network_activate_btn.hide() + self.panel.network_activate_btn.setDisabled(True) + self.panel.sn_info.setText("Active Network") + self.panel.frame.repaint() else: diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui index 289cbe08..ae004364 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui @@ -40,7 +40,7 @@ - 2 + 4 @@ -1066,7 +1066,56 @@ using the buttons on the side. - + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + 20 + + + + color: rgb(255, 255, 255); + + + + + + false + + + Qt::AlignCenter + + + + + 60 @@ -1080,7 +1129,7 @@ using the buttons on the side. - Delete + Back true @@ -1092,12 +1141,524 @@ using the buttons on the side. icon - :/ui/media/btn_icons/indf_svg.svg + :/ui/media/btn_icons/back.svg + + + + - + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 20 + + + + + + + + + + + + + 0 + 0 + + + + + 400 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 120 + 120 + 120 + + + + + + + 120 + 120 + 120 + + + + + + + + + 15 + + + + Signal +Strength + + + Qt::AlignCenter + + + + + + + + 250 + 0 + + + + + 11 + + + + color: rgb(255, 255, 255); + + + TextLabel + + + Qt::AlignCenter + + + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 120 + 120 + 120 + + + + + + + 120 + 120 + 120 + + + + + + + + + 15 + + + + Security +Type + + + Qt::AlignCenter + + + + + + + + 250 + 0 + + + + + 11 + + + + color: rgb(255, 255, 255); + + + TextLabel + + + Qt::AlignCenter + + + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 120 + 120 + 120 + + + + + + + 120 + 120 + 120 + + + + + + + + + 15 + + + + Status + + + Qt::AlignCenter + + + + + + + + 250 + 0 + + + + + 11 + + + + color: rgb(255, 255, 255); + + + TextLabel + + + Qt::AlignCenter + + + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 250 + 80 + + + + + 250 + 80 + + + + + 15 + + + + Connect + + + true + + + + + + + + 250 + 80 + + + + + 250 + 80 + + + + + 15 + + + + Details + + + true + + + + + + + + 250 + 80 + + + + + 250 + 80 + + + + + 15 + + + + Forget + + + true + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 60 + + + + + + + + + 0 + 0 + + 16777215 @@ -1182,7 +1743,7 @@ using the buttons on the side. - + 60 @@ -1215,9 +1776,9 @@ using the buttons on the side. - + - + Qt::Vertical @@ -1227,19 +1788,25 @@ using the buttons on the side. 20 - 30 + 20 - + 0 0 + + + 0 + 70 + + 16777215 @@ -1252,7 +1819,7 @@ using the buttons on the side. QFrame::Raised - + 0 @@ -1261,9 +1828,9 @@ using the buttons on the side. 62 - + - + @@ -1399,394 +1966,189 @@ Password - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 200 - 150 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 0 - 20 - 201 - 119 - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 120 - 120 - 120 - - - - - - - 120 - 120 - 120 - - - - - - - - - 15 - - - - Signal -Strength - - - Qt::AlignCenter - - - - - - - - 150 - 0 - - - - - 150 - 16777215 - - - - Qt::Horizontal - - - - - - - - 20 - - - - color:white - - - TextLabel - - - Qt::AlignCenter - - - - - - - - - - - - 200 - 100 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 80 - 80 - - - - - 80 - 80 - - - - - - - true - - - - - - - - 60 - 60 - - - - - 80 - 80 - - - - - - - true - - - - - - + - - - - 0 - 0 - - - - - 0 - 0 - - - - - 200 - 150 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 0 - 20 - 201 - 119 - - - - - - - - 100 - 16777215 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 120 - 120 - 120 - - - - - - - 120 - 120 - 120 - - - - - - - - - 15 - - - - Security -Type - - - Qt::AlignCenter - - - - - - - - 150 - 0 - - - - Qt::Horizontal - - - - - - - - 20 - - - - color:white - - - TextLabel - - - Qt::AlignCenter - - - - - - + + + + + + 0 + 0 + + + + + 400 + 160 + + + + + 400 + 99999 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + Priority + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 10 + 10 + + + + + + + + + + + 100 + 100 + + + + + 100 + 100 + + + + Low + + + true + + + true + + + true + + + back_btn + + + icon + + + :/ui/media/btn_icons/indf_svg.svg + + + prioritbtngroup + + + + + + + + 100 + 100 + + + + + 100 + 100 + + + + Medium + + + true + + + true + + + true + + + true + + + back_btn + + + icon + + + :/ui/media/btn_icons/indf_svg.svg + + + prioritbtngroup + + + + + + + + 100 + 100 + + + + + 100 + 100 + + + + High + + + true + + + false + + + true + + + true + + + back_btn + + + icon + + + :/ui/media/btn_icons/indf_svg.svg + + + prioritbtngroup + + + + + + + + + @@ -2731,7 +3093,7 @@ Type BlocksCustomLinEdit QLineEdit -
lib.utils.blocks_linedit
+
lib.utils.blocks_linedit
 NetworkWidgetbuttons @@ -2754,6 +3116,11 @@ Type QLabel
lib.panels.widgets.loadWidget
 + + GroupButton + QPushButton +
lib.utils.group_button
+ @@ -2762,4 +3129,7 @@ Type + + + diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py index fccaf1ae..da92fe64 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py @@ -435,15 +435,55 @@ def setupUi(self, wifi_stacked_page): self.verticalLayout_11.setObjectName("verticalLayout_11") self.horizontalLayout_7 = QtWidgets.QHBoxLayout() self.horizontalLayout_7.setObjectName("horizontalLayout_7") - self.saved_connection_delete_network_button = IconButton(parent=self.saved_connection_page) - self.saved_connection_delete_network_button.setMinimumSize(QtCore.QSize(60, 60)) - self.saved_connection_delete_network_button.setMaximumSize(QtCore.QSize(60, 60)) - self.saved_connection_delete_network_button.setFlat(True) - self.saved_connection_delete_network_button.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) - self.saved_connection_delete_network_button.setObjectName("saved_connection_delete_network_button") - self.horizontalLayout_7.addWidget(self.saved_connection_delete_network_button) + spacerItem4 = QtWidgets.QSpacerItem(60, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_7.addItem(spacerItem4) self.saved_connection_network_name = QtWidgets.QLabel(parent=self.saved_connection_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.saved_connection_network_name.sizePolicy().hasHeightForWidth()) + self.saved_connection_network_name.setSizePolicy(sizePolicy) self.saved_connection_network_name.setMaximumSize(QtCore.QSize(16777215, 60)) + font = QtGui.QFont() + font.setPointSize(20) + self.saved_connection_network_name.setFont(font) + self.saved_connection_network_name.setStyleSheet("color: rgb(255, 255, 255);") + self.saved_connection_network_name.setText("") + self.saved_connection_network_name.setScaledContents(False) + self.saved_connection_network_name.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.saved_connection_network_name.setObjectName("saved_connection_network_name") + self.horizontalLayout_7.addWidget(self.saved_connection_network_name) + self.saved_connection_back_button = IconButton(parent=self.saved_connection_page) + self.saved_connection_back_button.setMinimumSize(QtCore.QSize(60, 60)) + self.saved_connection_back_button.setMaximumSize(QtCore.QSize(60, 60)) + self.saved_connection_back_button.setFlat(True) + self.saved_connection_back_button.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")) + self.saved_connection_back_button.setObjectName("saved_connection_back_button") + self.horizontalLayout_7.addWidget(self.saved_connection_back_button, 0, QtCore.Qt.AlignmentFlag.AlignRight) + self.verticalLayout_11.addLayout(self.horizontalLayout_7) + self.verticalLayout_5 = QtWidgets.QVBoxLayout() + self.verticalLayout_5.setObjectName("verticalLayout_5") + spacerItem5 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.verticalLayout_5.addItem(spacerItem5) + self.horizontalLayout_9 = QtWidgets.QHBoxLayout() + self.horizontalLayout_9.setObjectName("horizontalLayout_9") + self.verticalLayout_2 = QtWidgets.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.frame = BlocksCustomFrame(parent=self.saved_connection_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth()) + self.frame.setSizePolicy(sizePolicy) + self.frame.setMaximumSize(QtCore.QSize(400, 16777215)) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame.setObjectName("frame") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.frame) + self.verticalLayout_6.setObjectName("verticalLayout_6") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.netlist_strength_label_2 = QtWidgets.QLabel(parent=self.frame) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) @@ -463,42 +503,31 @@ def setupUi(self, wifi_stacked_page): brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.Text, brush) - self.saved_connection_network_name.setPalette(palette) + self.netlist_strength_label_2.setPalette(palette) font = QtGui.QFont() - font.setPointSize(20) - self.saved_connection_network_name.setFont(font) - self.saved_connection_network_name.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.saved_connection_network_name.setObjectName("saved_connection_network_name") - self.horizontalLayout_7.addWidget(self.saved_connection_network_name) - self.saved_connection_back_button = IconButton(parent=self.saved_connection_page) - self.saved_connection_back_button.setMinimumSize(QtCore.QSize(60, 60)) - self.saved_connection_back_button.setMaximumSize(QtCore.QSize(60, 60)) - self.saved_connection_back_button.setFlat(True) - self.saved_connection_back_button.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")) - self.saved_connection_back_button.setObjectName("saved_connection_back_button") - self.horizontalLayout_7.addWidget(self.saved_connection_back_button) - self.verticalLayout_11.addLayout(self.horizontalLayout_7) - self.verticalLayout_5 = QtWidgets.QVBoxLayout() - self.verticalLayout_5.setObjectName("verticalLayout_5") - spacerItem4 = QtWidgets.QSpacerItem(20, 30, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - self.verticalLayout_5.addItem(spacerItem4) - self.frame_5 = BlocksCustomFrame(parent=self.saved_connection_page) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.frame_5.sizePolicy().hasHeightForWidth()) - self.frame_5.setSizePolicy(sizePolicy) - self.frame_5.setMaximumSize(QtCore.QSize(16777215, 70)) - self.frame_5.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_5.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_5.setObjectName("frame_5") - self.layoutWidget_5 = QtWidgets.QWidget(parent=self.frame_5) - self.layoutWidget_5.setGeometry(QtCore.QRect(0, 0, 776, 62)) - self.layoutWidget_5.setObjectName("layoutWidget_5") - self.horizontalLayout_8 = QtWidgets.QHBoxLayout(self.layoutWidget_5) - self.horizontalLayout_8.setContentsMargins(0, 0, 0, 0) - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.saved_connection_change_password_label_2 = QtWidgets.QLabel(parent=self.layoutWidget_5) + font.setPointSize(15) + self.netlist_strength_label_2.setFont(font) + self.netlist_strength_label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.netlist_strength_label_2.setObjectName("netlist_strength_label_2") + self.horizontalLayout.addWidget(self.netlist_strength_label_2) + self.saved_connection_signal_strength_info_frame = QtWidgets.QLabel(parent=self.frame) + self.saved_connection_signal_strength_info_frame.setMinimumSize(QtCore.QSize(250, 0)) + font = QtGui.QFont() + font.setPointSize(11) + self.saved_connection_signal_strength_info_frame.setFont(font) + self.saved_connection_signal_strength_info_frame.setStyleSheet("color: rgb(255, 255, 255);") + self.saved_connection_signal_strength_info_frame.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.saved_connection_signal_strength_info_frame.setObjectName("saved_connection_signal_strength_info_frame") + self.horizontalLayout.addWidget(self.saved_connection_signal_strength_info_frame) + self.verticalLayout_6.addLayout(self.horizontalLayout) + self.line_4 = QtWidgets.QFrame(parent=self.frame) + self.line_4.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line_4.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line_4.setObjectName("line_4") + self.verticalLayout_6.addWidget(self.line_4) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.netlist_security_label_2 = QtWidgets.QLabel(parent=self.frame) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) @@ -518,55 +547,31 @@ def setupUi(self, wifi_stacked_page): brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.Text, brush) - self.saved_connection_change_password_label_2.setPalette(palette) + self.netlist_security_label_2.setPalette(palette) font = QtGui.QFont() font.setPointSize(15) - self.saved_connection_change_password_label_2.setFont(font) - self.saved_connection_change_password_label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.saved_connection_change_password_label_2.setObjectName("saved_connection_change_password_label_2") - self.horizontalLayout_8.addWidget(self.saved_connection_change_password_label_2, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) - self.saved_connection_change_password_field = BlocksCustomLinEdit(parent=self.layoutWidget_5) - self.saved_connection_change_password_field.setMinimumSize(QtCore.QSize(500, 60)) - self.saved_connection_change_password_field.setMaximumSize(QtCore.QSize(500, 16777215)) + self.netlist_security_label_2.setFont(font) + self.netlist_security_label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.netlist_security_label_2.setObjectName("netlist_security_label_2") + self.horizontalLayout_2.addWidget(self.netlist_security_label_2) + self.saved_connection_security_type_info_label = QtWidgets.QLabel(parent=self.frame) + self.saved_connection_security_type_info_label.setMinimumSize(QtCore.QSize(250, 0)) font = QtGui.QFont() - font.setPointSize(12) - self.saved_connection_change_password_field.setFont(font) - self.saved_connection_change_password_field.setObjectName("saved_connection_change_password_field") - self.horizontalLayout_8.addWidget(self.saved_connection_change_password_field, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) - self.saved_connection_change_password_view = IconButton(parent=self.layoutWidget_5) - self.saved_connection_change_password_view.setMinimumSize(QtCore.QSize(60, 60)) - self.saved_connection_change_password_view.setMaximumSize(QtCore.QSize(60, 60)) - self.saved_connection_change_password_view.setFlat(True) - self.saved_connection_change_password_view.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/unsee.svg")) - self.saved_connection_change_password_view.setObjectName("saved_connection_change_password_view") - self.horizontalLayout_8.addWidget(self.saved_connection_change_password_view, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) - self.verticalLayout_5.addWidget(self.frame_5) - self.horizontalLayout_9 = QtWidgets.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.frame_3 = BlocksCustomFrame(parent=self.saved_connection_page) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.frame_3.sizePolicy().hasHeightForWidth()) - self.frame_3.setSizePolicy(sizePolicy) - self.frame_3.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_3.setMaximumSize(QtCore.QSize(200, 150)) - self.frame_3.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_3.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_3.setObjectName("frame_3") - self.layoutWidget_3 = QtWidgets.QWidget(parent=self.frame_3) - self.layoutWidget_3.setGeometry(QtCore.QRect(0, 20, 201, 119)) - self.layoutWidget_3.setObjectName("layoutWidget_3") - self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.layoutWidget_3) - self.verticalLayout_6.setContentsMargins(0, 0, 0, 0) - self.verticalLayout_6.setObjectName("verticalLayout_6") - self.sabed_connection_signal_strength_label = QtWidgets.QLabel(parent=self.layoutWidget_3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.sabed_connection_signal_strength_label.sizePolicy().hasHeightForWidth()) - self.sabed_connection_signal_strength_label.setSizePolicy(sizePolicy) - self.sabed_connection_signal_strength_label.setMaximumSize(QtCore.QSize(100, 16777215)) + font.setPointSize(11) + self.saved_connection_security_type_info_label.setFont(font) + self.saved_connection_security_type_info_label.setStyleSheet("color: rgb(255, 255, 255);") + self.saved_connection_security_type_info_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.saved_connection_security_type_info_label.setObjectName("saved_connection_security_type_info_label") + self.horizontalLayout_2.addWidget(self.saved_connection_security_type_info_label) + self.verticalLayout_6.addLayout(self.horizontalLayout_2) + self.line_5 = QtWidgets.QFrame(parent=self.frame) + self.line_5.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line_5.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line_5.setObjectName("line_5") + self.verticalLayout_6.addWidget(self.line_5) + self.horizontalLayout_8 = QtWidgets.QHBoxLayout() + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.netlist_security_label_4 = QtWidgets.QLabel(parent=self.frame) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) @@ -586,70 +591,77 @@ def setupUi(self, wifi_stacked_page): brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.Text, brush) - self.sabed_connection_signal_strength_label.setPalette(palette) + self.netlist_security_label_4.setPalette(palette) font = QtGui.QFont() font.setPointSize(15) - self.sabed_connection_signal_strength_label.setFont(font) - self.sabed_connection_signal_strength_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.sabed_connection_signal_strength_label.setObjectName("sabed_connection_signal_strength_label") - self.verticalLayout_6.addWidget(self.sabed_connection_signal_strength_label, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignBottom) - self.line_4 = QtWidgets.QFrame(parent=self.layoutWidget_3) - self.line_4.setMinimumSize(QtCore.QSize(150, 0)) - self.line_4.setMaximumSize(QtCore.QSize(150, 16777215)) - self.line_4.setFrameShape(QtWidgets.QFrame.Shape.HLine) - self.line_4.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) - self.line_4.setObjectName("line_4") - self.verticalLayout_6.addWidget(self.line_4, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) - self.saved_connection_signal_strength_info_frame = QtWidgets.QLabel(parent=self.layoutWidget_3) + self.netlist_security_label_4.setFont(font) + self.netlist_security_label_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.netlist_security_label_4.setObjectName("netlist_security_label_4") + self.horizontalLayout_8.addWidget(self.netlist_security_label_4) + self.sn_info = QtWidgets.QLabel(parent=self.frame) + self.sn_info.setMinimumSize(QtCore.QSize(250, 0)) font = QtGui.QFont() - font.setPointSize(20) - self.saved_connection_signal_strength_info_frame.setFont(font) - self.saved_connection_signal_strength_info_frame.setStyleSheet("color:white") - self.saved_connection_signal_strength_info_frame.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.saved_connection_signal_strength_info_frame.setObjectName("saved_connection_signal_strength_info_frame") - self.verticalLayout_6.addWidget(self.saved_connection_signal_strength_info_frame, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignTop) - self.horizontalLayout_9.addWidget(self.frame_3) - self.frame = BlocksCustomFrame(parent=self.saved_connection_page) - self.frame.setMaximumSize(QtCore.QSize(200, 100)) - self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame.setObjectName("frame") - self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame) - self.horizontalLayout.setObjectName("horizontalLayout") - self.network_activate_btn = IconButton(parent=self.frame) - self.network_activate_btn.setMinimumSize(QtCore.QSize(80, 80)) - self.network_activate_btn.setMaximumSize(QtCore.QSize(80, 80)) - self.network_activate_btn.setText("") + font.setPointSize(11) + self.sn_info.setFont(font) + self.sn_info.setStyleSheet("color: rgb(255, 255, 255);") + self.sn_info.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.sn_info.setObjectName("sn_info") + self.horizontalLayout_8.addWidget(self.sn_info) + self.verticalLayout_6.addLayout(self.horizontalLayout_8) + self.verticalLayout_2.addWidget(self.frame) + self.horizontalLayout_9.addLayout(self.verticalLayout_2) + self.frame_8 = BlocksCustomFrame(parent=self.saved_connection_page) + self.frame_8.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_8.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame_8.setObjectName("frame_8") + self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_8) + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.network_activate_btn = BlocksCustomButton(parent=self.frame_8) + self.network_activate_btn.setMinimumSize(QtCore.QSize(250, 80)) + self.network_activate_btn.setMaximumSize(QtCore.QSize(250, 80)) + font = QtGui.QFont() + font.setPointSize(15) + self.network_activate_btn.setFont(font) self.network_activate_btn.setFlat(True) self.network_activate_btn.setObjectName("network_activate_btn") - self.horizontalLayout.addWidget(self.network_activate_btn) - self.network_delete_btn = IconButton(parent=self.frame) - self.network_delete_btn.setMinimumSize(QtCore.QSize(60, 60)) - self.network_delete_btn.setMaximumSize(QtCore.QSize(80, 80)) - self.network_delete_btn.setText("") + self.verticalLayout_4.addWidget(self.network_activate_btn, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.network_details_btn = BlocksCustomButton(parent=self.frame_8) + self.network_details_btn.setMinimumSize(QtCore.QSize(250, 80)) + self.network_details_btn.setMaximumSize(QtCore.QSize(250, 80)) + font = QtGui.QFont() + font.setPointSize(15) + self.network_details_btn.setFont(font) + self.network_details_btn.setFlat(True) + self.network_details_btn.setObjectName("network_details_btn") + self.verticalLayout_4.addWidget(self.network_details_btn, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) + self.network_delete_btn = BlocksCustomButton(parent=self.frame_8) + self.network_delete_btn.setMinimumSize(QtCore.QSize(250, 80)) + self.network_delete_btn.setMaximumSize(QtCore.QSize(250, 80)) + font = QtGui.QFont() + font.setPointSize(15) + self.network_delete_btn.setFont(font) self.network_delete_btn.setFlat(True) self.network_delete_btn.setObjectName("network_delete_btn") - self.horizontalLayout.addWidget(self.network_delete_btn) - self.horizontalLayout_9.addWidget(self.frame) - self.frame_4 = BlocksCustomFrame(parent=self.saved_connection_page) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + self.verticalLayout_4.addWidget(self.network_delete_btn, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.horizontalLayout_9.addWidget(self.frame_8) + self.verticalLayout_5.addLayout(self.horizontalLayout_9) + self.verticalLayout_11.addLayout(self.verticalLayout_5) + wifi_stacked_page.addWidget(self.saved_connection_page) + self.saved_details_page = QtWidgets.QWidget() + self.saved_details_page.setObjectName("saved_details_page") + self.verticalLayout_19 = QtWidgets.QVBoxLayout(self.saved_details_page) + self.verticalLayout_19.setObjectName("verticalLayout_19") + self.horizontalLayout_14 = QtWidgets.QHBoxLayout() + self.horizontalLayout_14.setObjectName("horizontalLayout_14") + spacerItem6 = QtWidgets.QSpacerItem(60, 60, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_14.addItem(spacerItem6) + self.snd_name = QtWidgets.QLabel(parent=self.saved_details_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.frame_4.sizePolicy().hasHeightForWidth()) - self.frame_4.setSizePolicy(sizePolicy) - self.frame_4.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_4.setMaximumSize(QtCore.QSize(200, 150)) - self.frame_4.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame_4.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame_4.setObjectName("frame_4") - self.layoutWidget_4 = QtWidgets.QWidget(parent=self.frame_4) - self.layoutWidget_4.setGeometry(QtCore.QRect(0, 20, 201, 119)) - self.layoutWidget_4.setObjectName("layoutWidget_4") - self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.layoutWidget_4) - self.verticalLayout_7.setContentsMargins(0, 0, 0, 0) - self.verticalLayout_7.setObjectName("verticalLayout_7") - self.saved_connection_security_type_label = QtWidgets.QLabel(parent=self.layoutWidget_4) - self.saved_connection_security_type_label.setMaximumSize(QtCore.QSize(100, 16777215)) + sizePolicy.setHeightForWidth(self.snd_name.sizePolicy().hasHeightForWidth()) + self.snd_name.setSizePolicy(sizePolicy) + self.snd_name.setMaximumSize(QtCore.QSize(16777215, 60)) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) @@ -669,39 +681,154 @@ def setupUi(self, wifi_stacked_page): brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.Text, brush) - self.saved_connection_security_type_label.setPalette(palette) + self.snd_name.setPalette(palette) + font = QtGui.QFont() + font.setPointSize(20) + self.snd_name.setFont(font) + self.snd_name.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.snd_name.setObjectName("snd_name") + self.horizontalLayout_14.addWidget(self.snd_name) + self.snd_back = IconButton(parent=self.saved_details_page) + self.snd_back.setMinimumSize(QtCore.QSize(60, 60)) + self.snd_back.setMaximumSize(QtCore.QSize(60, 60)) + self.snd_back.setFlat(True) + self.snd_back.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/back.svg")) + self.snd_back.setObjectName("snd_back") + self.horizontalLayout_14.addWidget(self.snd_back) + self.verticalLayout_19.addLayout(self.horizontalLayout_14) + self.verticalLayout_8 = QtWidgets.QVBoxLayout() + self.verticalLayout_8.setObjectName("verticalLayout_8") + spacerItem7 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.verticalLayout_8.addItem(spacerItem7) + self.frame_9 = BlocksCustomFrame(parent=self.saved_details_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.frame_9.sizePolicy().hasHeightForWidth()) + self.frame_9.setSizePolicy(sizePolicy) + self.frame_9.setMinimumSize(QtCore.QSize(0, 70)) + self.frame_9.setMaximumSize(QtCore.QSize(16777215, 70)) + self.frame_9.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_9.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame_9.setObjectName("frame_9") + self.layoutWidget_8 = QtWidgets.QWidget(parent=self.frame_9) + self.layoutWidget_8.setGeometry(QtCore.QRect(0, 0, 776, 62)) + self.layoutWidget_8.setObjectName("layoutWidget_8") + self.horizontalLayout_10 = QtWidgets.QHBoxLayout(self.layoutWidget_8) + self.horizontalLayout_10.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout_10.setObjectName("horizontalLayout_10") + self.saved_connection_change_password_label_3 = QtWidgets.QLabel(parent=self.layoutWidget_8) + palette = QtGui.QPalette() + brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Active, QtGui.QPalette.ColorRole.WindowText, brush) + brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Active, QtGui.QPalette.ColorRole.Text, brush) + brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Inactive, QtGui.QPalette.ColorRole.WindowText, brush) + brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Inactive, QtGui.QPalette.ColorRole.Text, brush) + brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.WindowText, brush) + brush = QtGui.QBrush(QtGui.QColor(120, 120, 120)) + brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) + palette.setBrush(QtGui.QPalette.ColorGroup.Disabled, QtGui.QPalette.ColorRole.Text, brush) + self.saved_connection_change_password_label_3.setPalette(palette) font = QtGui.QFont() font.setPointSize(15) - self.saved_connection_security_type_label.setFont(font) - self.saved_connection_security_type_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.saved_connection_security_type_label.setObjectName("saved_connection_security_type_label") - self.verticalLayout_7.addWidget(self.saved_connection_security_type_label, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignBottom) - self.line_5 = QtWidgets.QFrame(parent=self.layoutWidget_4) - self.line_5.setMinimumSize(QtCore.QSize(150, 0)) - self.line_5.setFrameShape(QtWidgets.QFrame.Shape.HLine) - self.line_5.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) - self.line_5.setObjectName("line_5") - self.verticalLayout_7.addWidget(self.line_5, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) - self.saved_connection_security_type_info_label = QtWidgets.QLabel(parent=self.layoutWidget_4) + self.saved_connection_change_password_label_3.setFont(font) + self.saved_connection_change_password_label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.saved_connection_change_password_label_3.setObjectName("saved_connection_change_password_label_3") + self.horizontalLayout_10.addWidget(self.saved_connection_change_password_label_3, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.saved_connection_change_password_field = BlocksCustomLinEdit(parent=self.layoutWidget_8) + self.saved_connection_change_password_field.setMinimumSize(QtCore.QSize(500, 60)) + self.saved_connection_change_password_field.setMaximumSize(QtCore.QSize(500, 16777215)) font = QtGui.QFont() - font.setPointSize(20) - self.saved_connection_security_type_info_label.setFont(font) - self.saved_connection_security_type_info_label.setStyleSheet("color:white") - self.saved_connection_security_type_info_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) - self.saved_connection_security_type_info_label.setObjectName("saved_connection_security_type_info_label") - self.verticalLayout_7.addWidget(self.saved_connection_security_type_info_label, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignTop) - self.horizontalLayout_9.addWidget(self.frame_4) - self.verticalLayout_5.addLayout(self.horizontalLayout_9) - self.verticalLayout_11.addLayout(self.verticalLayout_5) - wifi_stacked_page.addWidget(self.saved_connection_page) + font.setPointSize(12) + self.saved_connection_change_password_field.setFont(font) + self.saved_connection_change_password_field.setObjectName("saved_connection_change_password_field") + self.horizontalLayout_10.addWidget(self.saved_connection_change_password_field, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) + self.saved_connection_change_password_view = IconButton(parent=self.layoutWidget_8) + self.saved_connection_change_password_view.setMinimumSize(QtCore.QSize(60, 60)) + self.saved_connection_change_password_view.setMaximumSize(QtCore.QSize(60, 60)) + self.saved_connection_change_password_view.setFlat(True) + self.saved_connection_change_password_view.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/unsee.svg")) + self.saved_connection_change_password_view.setObjectName("saved_connection_change_password_view") + self.horizontalLayout_10.addWidget(self.saved_connection_change_password_view, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.verticalLayout_8.addWidget(self.frame_9) + self.horizontalLayout_13 = QtWidgets.QHBoxLayout() + self.horizontalLayout_13.setObjectName("horizontalLayout_13") + self.verticalLayout_13 = QtWidgets.QVBoxLayout() + self.verticalLayout_13.setObjectName("verticalLayout_13") + self.frame_12 = BlocksCustomFrame(parent=self.saved_details_page) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.frame_12.sizePolicy().hasHeightForWidth()) + self.frame_12.setSizePolicy(sizePolicy) + self.frame_12.setMinimumSize(QtCore.QSize(400, 160)) + self.frame_12.setMaximumSize(QtCore.QSize(400, 99999)) + self.frame_12.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_12.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame_12.setObjectName("frame_12") + self.verticalLayout_17 = QtWidgets.QVBoxLayout(self.frame_12) + self.verticalLayout_17.setObjectName("verticalLayout_17") + spacerItem8 = QtWidgets.QSpacerItem(10, 10, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.verticalLayout_17.addItem(spacerItem8) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.low_priorrity_btn = GroupButton(parent=self.frame_12) + self.low_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.low_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.low_priorrity_btn.setCheckable(True) + self.low_priorrity_btn.setAutoExclusive(True) + self.low_priorrity_btn.setFlat(True) + self.low_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.low_priorrity_btn.setObjectName("low_priorrity_btn") + self.prioritbtngroup = QtWidgets.QButtonGroup(wifi_stacked_page) + self.prioritbtngroup.setObjectName("prioritbtngroup") + self.prioritbtngroup.addButton(self.low_priorrity_btn) + self.horizontalLayout_4.addWidget(self.low_priorrity_btn) + self.med_priorrity_btn = GroupButton(parent=self.frame_12) + self.med_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.med_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.med_priorrity_btn.setCheckable(True) + self.med_priorrity_btn.setChecked(True) + self.med_priorrity_btn.setAutoExclusive(True) + self.med_priorrity_btn.setFlat(True) + self.med_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.med_priorrity_btn.setObjectName("med_priorrity_btn") + self.prioritbtngroup.addButton(self.med_priorrity_btn) + self.horizontalLayout_4.addWidget(self.med_priorrity_btn) + self.hig_priorrity_btn = GroupButton(parent=self.frame_12) + self.hig_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.hig_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.hig_priorrity_btn.setCheckable(True) + self.hig_priorrity_btn.setChecked(False) + self.hig_priorrity_btn.setAutoExclusive(True) + self.hig_priorrity_btn.setFlat(True) + self.hig_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.hig_priorrity_btn.setObjectName("hig_priorrity_btn") + self.prioritbtngroup.addButton(self.hig_priorrity_btn) + self.horizontalLayout_4.addWidget(self.hig_priorrity_btn) + self.verticalLayout_17.addLayout(self.horizontalLayout_4) + self.verticalLayout_13.addWidget(self.frame_12, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.horizontalLayout_13.addLayout(self.verticalLayout_13) + self.verticalLayout_8.addLayout(self.horizontalLayout_13) + self.verticalLayout_19.addLayout(self.verticalLayout_8) + wifi_stacked_page.addWidget(self.saved_details_page) self.hotspot_page = QtWidgets.QWidget() self.hotspot_page.setObjectName("hotspot_page") self.verticalLayout_12 = QtWidgets.QVBoxLayout(self.hotspot_page) self.verticalLayout_12.setObjectName("verticalLayout_12") self.hospot_page_header_layout = QtWidgets.QHBoxLayout() self.hospot_page_header_layout.setObjectName("hospot_page_header_layout") - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - self.hospot_page_header_layout.addItem(spacerItem5) + spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.hospot_page_header_layout.addItem(spacerItem9) self.hotspot_header_title = QtWidgets.QLabel(parent=self.hotspot_page) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) @@ -740,8 +867,8 @@ def setupUi(self, wifi_stacked_page): self.hotspot_page_content_layout = QtWidgets.QVBoxLayout() self.hotspot_page_content_layout.setContentsMargins(-1, 5, -1, 5) self.hotspot_page_content_layout.setObjectName("hotspot_page_content_layout") - spacerItem6 = QtWidgets.QSpacerItem(20, 50, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - self.hotspot_page_content_layout.addItem(spacerItem6) + spacerItem10 = QtWidgets.QSpacerItem(20, 50, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.hotspot_page_content_layout.addItem(spacerItem10) self.frame_6 = BlocksCustomFrame(parent=self.hotspot_page) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -807,11 +934,11 @@ def setupUi(self, wifi_stacked_page): self.hotspot_name_input_field.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password) self.hotspot_name_input_field.setObjectName("hotspot_name_input_field") self.horizontalLayout_11.addWidget(self.hotspot_name_input_field, 0, QtCore.Qt.AlignmentFlag.AlignHCenter) - spacerItem7 = QtWidgets.QSpacerItem(60, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_11.addItem(spacerItem7) + spacerItem11 = QtWidgets.QSpacerItem(60, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_11.addItem(spacerItem11) self.hotspot_page_content_layout.addWidget(self.frame_6) - spacerItem8 = QtWidgets.QSpacerItem(773, 128, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) - self.hotspot_page_content_layout.addItem(spacerItem8) + spacerItem12 = QtWidgets.QSpacerItem(773, 128, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) + self.hotspot_page_content_layout.addItem(spacerItem12) self.frame_7 = BlocksCustomFrame(parent=self.hotspot_page) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) @@ -1017,7 +1144,7 @@ def setupUi(self, wifi_stacked_page): wifi_stacked_page.addWidget(self.hotspot_page) self.retranslateUi(wifi_stacked_page) - wifi_stacked_page.setCurrentIndex(2) + wifi_stacked_page.setCurrentIndex(4) QtCore.QMetaObject.connectSlotsByName(wifi_stacked_page) def retranslateUi(self, wifi_stacked_page): @@ -1052,24 +1179,39 @@ def retranslateUi(self, wifi_stacked_page): self.add_network_password_view.setProperty("class", _translate("wifi_stacked_page", "back_btn")) self.add_network_password_view.setProperty("button_type", _translate("wifi_stacked_page", "icon")) self.add_network_validation_button.setText(_translate("wifi_stacked_page", "Activate")) - self.saved_connection_delete_network_button.setText(_translate("wifi_stacked_page", "Delete")) - self.saved_connection_delete_network_button.setProperty("class", _translate("wifi_stacked_page", "back_btn")) - self.saved_connection_delete_network_button.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.saved_connection_network_name.setText(_translate("wifi_stacked_page", "SSID")) self.saved_connection_back_button.setText(_translate("wifi_stacked_page", "Back")) self.saved_connection_back_button.setProperty("class", _translate("wifi_stacked_page", "back_btn")) self.saved_connection_back_button.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.saved_connection_change_password_label_2.setText(_translate("wifi_stacked_page", "Change\n" -"Password")) - self.saved_connection_change_password_view.setText(_translate("wifi_stacked_page", "View")) - self.saved_connection_change_password_view.setProperty("class", _translate("wifi_stacked_page", "back_btn")) - self.saved_connection_change_password_view.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.sabed_connection_signal_strength_label.setText(_translate("wifi_stacked_page", "Signal\n" + self.netlist_strength_label_2.setText(_translate("wifi_stacked_page", "Signal\n" "Strength")) self.saved_connection_signal_strength_info_frame.setText(_translate("wifi_stacked_page", "TextLabel")) - self.saved_connection_security_type_label.setText(_translate("wifi_stacked_page", "Security\n" + self.netlist_security_label_2.setText(_translate("wifi_stacked_page", "Security\n" "Type")) self.saved_connection_security_type_info_label.setText(_translate("wifi_stacked_page", "TextLabel")) + self.netlist_security_label_4.setText(_translate("wifi_stacked_page", "Status")) + self.sn_info.setText(_translate("wifi_stacked_page", "TextLabel")) + self.network_activate_btn.setText(_translate("wifi_stacked_page", "Connect")) + self.network_details_btn.setText(_translate("wifi_stacked_page", "Details")) + self.network_delete_btn.setText(_translate("wifi_stacked_page", "Forget")) + self.snd_name.setText(_translate("wifi_stacked_page", "SSID")) + self.snd_back.setText(_translate("wifi_stacked_page", "Back")) + self.snd_back.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.snd_back.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.saved_connection_change_password_label_3.setText(_translate("wifi_stacked_page", "Change\n" +"Password")) + self.saved_connection_change_password_view.setText(_translate("wifi_stacked_page", "View")) + self.saved_connection_change_password_view.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.saved_connection_change_password_view.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.frame_12.setProperty("text", _translate("wifi_stacked_page", "Priority")) + self.low_priorrity_btn.setText(_translate("wifi_stacked_page", "Low")) + self.low_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.low_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.med_priorrity_btn.setText(_translate("wifi_stacked_page", "Medium")) + self.med_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.med_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.hig_priorrity_btn.setText(_translate("wifi_stacked_page", "High")) + self.hig_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.hig_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) self.hotspot_header_title.setText(_translate("wifi_stacked_page", "Hotspot")) self.hotspot_back_button.setText(_translate("wifi_stacked_page", "Back")) self.hotspot_back_button.setProperty("class", _translate("wifi_stacked_page", "back_btn")) @@ -1085,4 +1227,5 @@ def retranslateUi(self, wifi_stacked_page): from lib.utils.blocks_frame import BlocksCustomFrame from lib.utils.blocks_linedit import BlocksCustomLinEdit from lib.utils.blocks_togglebutton import NetworkWidgetbuttons +from lib.utils.group_button import GroupButton from lib.utils.icon_button import IconButton From 97de96869966dd2240d9955bdca367cb9d4ffbf9 Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Wed, 19 Nov 2025 16:25:06 +0000 Subject: [PATCH 3/6] ADD: added option to set an Tittle --- BlocksScreen/lib/utils/blocks_frame.py | 108 +++++++++++++++++++++---- 1 file changed, 92 insertions(+), 16 deletions(-) diff --git a/BlocksScreen/lib/utils/blocks_frame.py b/BlocksScreen/lib/utils/blocks_frame.py index 6783ad8a..b76aea76 100644 --- a/BlocksScreen/lib/utils/blocks_frame.py +++ b/BlocksScreen/lib/utils/blocks_frame.py @@ -1,29 +1,105 @@ -from PyQt6.QtWidgets import QFrame -from PyQt6.QtGui import QPainter, QPen, QBrush, QColor -from PyQt6.QtCore import QRectF +from PyQt6 import QtCore, QtGui, QtWidgets +import typing - -class BlocksCustomFrame(QFrame): +class BlocksCustomFrame(QtWidgets.QFrame): def __init__(self, parent=None): super().__init__(parent) - self._radius = 20 + + self._radius = 10 + self._left_line_width = 15 + self._is_centered = False + self.text = "" + + self.setMinimumHeight(40) + self.setMinimumWidth(300) def setRadius(self, radius: int): """Set widget frame radius""" self._radius = radius self.update() - def radius(self): - """Get widget frame radius""" - return self._radius + def setLeftLineWidth(self, width: int): + """Set widget left line width""" + self._left_line_width = width + self.update() + + def setCentered(self, centered: bool): + """Set if text is centered or left-aligned""" + self._is_centered = centered + self.update() + + def setProperty(self, name: str|None, value: typing.Any) -> bool: + if name == "text": + self.text = value + self.update() + return True + return super().setProperty(name, value) + + def paintEvent(self, a0): + painter = QtGui.QPainter(self) + painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing) - def paintEvent(self, event): - """Re-implemented method, paint widget""" - painter = QPainter(self) - painter.setRenderHint(QPainter.RenderHint.Antialiasing) - rect = QRectF(self.rect()) - pen = QPen(QColor(20, 20, 20, 70)) + + rect = QtCore.QRectF(self.rect()) + pen = QtGui.QPen(QtGui.QColor(20, 20, 20, 70)) pen.setWidth(2) painter.setPen(pen) - painter.setBrush(QBrush(QColor(50, 50, 50, 100))) + painter.setBrush(QtGui.QBrush(QtGui.QColor(50, 50, 50, 100))) painter.drawRoundedRect(rect.adjusted(1, 1, -1, -1), self._radius, self._radius) + + if self.text: + + painter.setPen(QtGui.QColor("white")) + font = QtGui.QFont() + font.setPointSize(12) + painter.setFont(font) + fm = painter.fontMetrics() + text_width = fm.horizontalAdvance(self.text) + baseline = fm.ascent() + + margin = 10 + spacing = 8 + line_center_y = margin + baseline // 2 + + if self._is_centered: + left_line_width = self._left_line_width + right_line_width = self._left_line_width + + total_content_width = ( + left_line_width + spacing + text_width + spacing + right_line_width + ) + + start_x = (self.width() - total_content_width) // 2 + x = max(margin, start_x) + + else: + left_line_width = self._left_line_width + x = margin + right_line_width = 0 + + small_rect = QtCore.QRect( + x, + line_center_y - 1, + left_line_width, + 3 + ) + painter.fillRect(small_rect, QtGui.QColor("white")) + x += left_line_width + spacing + + painter.drawText(x, margin + baseline, self.text) + x += text_width + spacing + + if self._is_centered: + big_rect_width = right_line_width + else: + remaining_width = self.width() - x - margin + big_rect_width = max(0, remaining_width) + + big_rect = QtCore.QRect( + x, + line_center_y - 1, + big_rect_width, + 3 + ) + + painter.fillRect(big_rect, QtGui.QColor("white")) \ No newline at end of file From d222744491e1a0634c1b570034c4d051b53e9e0a Mon Sep 17 00:00:00 2001 From: Roberto Martins Date: Wed, 19 Nov 2025 16:26:55 +0000 Subject: [PATCH 4/6] UPD: changed some text --- BlocksScreen/lib/ui/wifiConnectivityWindow.ui | 2 +- BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui index ae004364..c757f773 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui @@ -1996,7 +1996,7 @@ Password QFrame::Raised - Priority + Network priority diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py index da92fe64..2b7a3854 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py @@ -1202,7 +1202,7 @@ def retranslateUi(self, wifi_stacked_page): self.saved_connection_change_password_view.setText(_translate("wifi_stacked_page", "View")) self.saved_connection_change_password_view.setProperty("class", _translate("wifi_stacked_page", "back_btn")) self.saved_connection_change_password_view.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.frame_12.setProperty("text", _translate("wifi_stacked_page", "Priority")) + self.frame_12.setProperty("text", _translate("wifi_stacked_page", "Network priority")) self.low_priorrity_btn.setText(_translate("wifi_stacked_page", "Low")) self.low_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) self.low_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) From 3a563855bbced4051fb8b0cf9ec073d75288bfbf Mon Sep 17 00:00:00 2001 From: Roberto Date: Wed, 10 Dec 2025 22:00:21 +0000 Subject: [PATCH 5/6] Refactor: Ran Ruff formatter --- BlocksScreen/lib/network.py | 4 ++- BlocksScreen/lib/panels/networkWindow.py | 19 +++++----- BlocksScreen/lib/utils/blocks_frame.py | 45 +++++++++--------------- 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/BlocksScreen/lib/network.py b/BlocksScreen/lib/network.py index ed6fe1af..51b87074 100644 --- a/BlocksScreen/lib/network.py +++ b/BlocksScreen/lib/network.py @@ -731,7 +731,9 @@ def get_saved_networks( "mode": network_properties["802-11-wireless"][ "mode" ], - "priority": network_properties["connection"].get("autoconnect-priority", (None, None))[1], + "priority": network_properties["connection"].get( + "autoconnect-priority", (None, None) + )[1], } if network_properties["connection"]["type"][1] == "802-11-wireless" diff --git a/BlocksScreen/lib/panels/networkWindow.py b/BlocksScreen/lib/panels/networkWindow.py index 64dae53f..4790a226 100644 --- a/BlocksScreen/lib/panels/networkWindow.py +++ b/BlocksScreen/lib/panels/networkWindow.py @@ -319,9 +319,13 @@ def __init__(self, parent: typing.Optional[QtWidgets.QWidget], /) -> None: self.panel.network_details_btn.setPixmap( QtGui.QPixmap(":/ui/media/btn_icons/printer_settings.svg") ) - - self.panel.snd_back.clicked.connect(lambda:self.setCurrentIndex(self.indexOf(self.panel.saved_connection_page))) - self.panel.network_details_btn.clicked.connect(lambda:self.setCurrentIndex(self.indexOf(self.panel.saved_details_page))) + + self.panel.snd_back.clicked.connect( + lambda: self.setCurrentIndex(self.indexOf(self.panel.saved_connection_page)) + ) + self.panel.network_details_btn.clicked.connect( + lambda: self.setCurrentIndex(self.indexOf(self.panel.saved_details_page)) + ) self.panel.network_activate_btn.clicked.connect( lambda: self.saved_wifi_option_selected() @@ -818,13 +822,10 @@ def update_network( elif checked_btn == self.panel.low_priorrity_btn: priority = 20 else: - priority = 50 + priority = 50 self.sdbus_network.update_connection_settings( - ssid=ssid, - password=password, - new_ssid=new_ssid, - priority=priority + ssid=ssid, password=password, new_ssid=new_ssid, priority=priority ) QtCore.QTimer().singleShot(10000, lambda: self.network_list_worker.build()) self.setCurrentIndex(self.indexOf(self.panel.network_list_page)) @@ -886,7 +887,7 @@ def handle_button_click(self, ssid: str): else: self.panel.network_activate_btn.setDisabled(True) self.panel.sn_info.setText("Active Network") - + self.panel.frame.repaint() else: diff --git a/BlocksScreen/lib/utils/blocks_frame.py b/BlocksScreen/lib/utils/blocks_frame.py index b76aea76..7de7514e 100644 --- a/BlocksScreen/lib/utils/blocks_frame.py +++ b/BlocksScreen/lib/utils/blocks_frame.py @@ -1,14 +1,15 @@ from PyQt6 import QtCore, QtGui, QtWidgets import typing + class BlocksCustomFrame(QtWidgets.QFrame): def __init__(self, parent=None): super().__init__(parent) self._radius = 10 - self._left_line_width = 15 - self._is_centered = False - self.text = "" + self._left_line_width = 15 + self._is_centered = False + self.text = "" self.setMinimumHeight(40) self.setMinimumWidth(300) @@ -28,7 +29,7 @@ def setCentered(self, centered: bool): self._is_centered = centered self.update() - def setProperty(self, name: str|None, value: typing.Any) -> bool: + def setProperty(self, name: str | None, value: typing.Any) -> bool: if name == "text": self.text = value self.update() @@ -39,7 +40,6 @@ def paintEvent(self, a0): painter = QtGui.QPainter(self) painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing) - rect = QtCore.QRectF(self.rect()) pen = QtGui.QPen(QtGui.QColor(20, 20, 20, 70)) pen.setWidth(2) @@ -48,41 +48,35 @@ def paintEvent(self, a0): painter.drawRoundedRect(rect.adjusted(1, 1, -1, -1), self._radius, self._radius) if self.text: - painter.setPen(QtGui.QColor("white")) font = QtGui.QFont() font.setPointSize(12) painter.setFont(font) fm = painter.fontMetrics() text_width = fm.horizontalAdvance(self.text) - baseline = fm.ascent() + baseline = fm.ascent() margin = 10 spacing = 8 line_center_y = margin + baseline // 2 if self._is_centered: - left_line_width = self._left_line_width + left_line_width = self._left_line_width right_line_width = self._left_line_width - + total_content_width = ( left_line_width + spacing + text_width + spacing + right_line_width ) start_x = (self.width() - total_content_width) // 2 - x = max(margin, start_x) + x = max(margin, start_x) else: - left_line_width = self._left_line_width + left_line_width = self._left_line_width x = margin - right_line_width = 0 - - small_rect = QtCore.QRect( - x, - line_center_y - 1, - left_line_width, - 3 - ) + right_line_width = 0 + + small_rect = QtCore.QRect(x, line_center_y - 1, left_line_width, 3) painter.fillRect(small_rect, QtGui.QColor("white")) x += left_line_width + spacing @@ -90,16 +84,11 @@ def paintEvent(self, a0): x += text_width + spacing if self._is_centered: - big_rect_width = right_line_width + big_rect_width = right_line_width else: remaining_width = self.width() - x - margin - big_rect_width = max(0, remaining_width) + big_rect_width = max(0, remaining_width) - big_rect = QtCore.QRect( - x, - line_center_y - 1, - big_rect_width, - 3 - ) + big_rect = QtCore.QRect(x, line_center_y - 1, big_rect_width, 3) - painter.fillRect(big_rect, QtGui.QColor("white")) \ No newline at end of file + painter.fillRect(big_rect, QtGui.QColor("white")) From f3f03b5986a59e42a45538e317b1b16706ccdeae Mon Sep 17 00:00:00 2001 From: Roberto Date: Fri, 12 Dec 2025 17:34:46 +0000 Subject: [PATCH 6/6] Refactor: some butttons text and group name --- BlocksScreen/lib/panels/networkWindow.py | 6 +- BlocksScreen/lib/ui/wifiConnectivityWindow.ui | 16 ++-- .../lib/ui/wifiConnectivityWindow_ui.py | 88 +++++++++---------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/BlocksScreen/lib/panels/networkWindow.py b/BlocksScreen/lib/panels/networkWindow.py index 4790a226..125d07ba 100644 --- a/BlocksScreen/lib/panels/networkWindow.py +++ b/BlocksScreen/lib/panels/networkWindow.py @@ -816,10 +816,10 @@ def update_network( if not self.sdbus_network.is_known(ssid): return - checked_btn = self.panel.prioritbtngroup.checkedButton() - if checked_btn == self.panel.hig_priorrity_btn: + checked_btn = self.panel.priority_btn_group.checkedButton() + if checked_btn == self.panel.high_priority_btn: priority = 90 - elif checked_btn == self.panel.low_priorrity_btn: + elif checked_btn == self.panel.low_priority_btn: priority = 20 else: priority = 50 diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui index c757f773..871ba2dd 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow.ui +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow.ui @@ -2018,7 +2018,7 @@ Password - + 100 @@ -2053,12 +2053,12 @@ Password :/ui/media/btn_icons/indf_svg.svg - prioritbtngroup + priority_btn_group - + 100 @@ -2096,12 +2096,12 @@ Password :/ui/media/btn_icons/indf_svg.svg - prioritbtngroup + priority_btn_group - + 100 @@ -2139,7 +2139,7 @@ Password :/ui/media/btn_icons/indf_svg.svg - prioritbtngroup + priority_btn_group @@ -3093,7 +3093,7 @@ Password BlocksCustomLinEdit QLineEdit -
lib.utils.blocks_linedit
+
lib.utils.blocks_linedit
 NetworkWidgetbuttons @@ -3130,6 +3130,6 @@ Password - + diff --git a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py index 2b7a3854..1af9f761 100644 --- a/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py +++ b/BlocksScreen/lib/ui/wifiConnectivityWindow_ui.py @@ -1,4 +1,4 @@ -# Form implementation generated from reading ui file '/home/levi/main/BlocksScreen/BlocksScreen/lib/ui/wifiConnectivityWindow.ui' +# Form implementation generated from reading ui file '/home/levi/BlocksScreen/BlocksScreen/lib/ui/wifiConnectivityWindow.ui' # # Created by: PyQt6 UI code generator 6.7.1 # @@ -781,40 +781,40 @@ def setupUi(self, wifi_stacked_page): self.verticalLayout_17.addItem(spacerItem8) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.low_priorrity_btn = GroupButton(parent=self.frame_12) - self.low_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) - self.low_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) - self.low_priorrity_btn.setCheckable(True) - self.low_priorrity_btn.setAutoExclusive(True) - self.low_priorrity_btn.setFlat(True) - self.low_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) - self.low_priorrity_btn.setObjectName("low_priorrity_btn") - self.prioritbtngroup = QtWidgets.QButtonGroup(wifi_stacked_page) - self.prioritbtngroup.setObjectName("prioritbtngroup") - self.prioritbtngroup.addButton(self.low_priorrity_btn) - self.horizontalLayout_4.addWidget(self.low_priorrity_btn) - self.med_priorrity_btn = GroupButton(parent=self.frame_12) - self.med_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) - self.med_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) - self.med_priorrity_btn.setCheckable(True) - self.med_priorrity_btn.setChecked(True) - self.med_priorrity_btn.setAutoExclusive(True) - self.med_priorrity_btn.setFlat(True) - self.med_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) - self.med_priorrity_btn.setObjectName("med_priorrity_btn") - self.prioritbtngroup.addButton(self.med_priorrity_btn) - self.horizontalLayout_4.addWidget(self.med_priorrity_btn) - self.hig_priorrity_btn = GroupButton(parent=self.frame_12) - self.hig_priorrity_btn.setMinimumSize(QtCore.QSize(100, 100)) - self.hig_priorrity_btn.setMaximumSize(QtCore.QSize(100, 100)) - self.hig_priorrity_btn.setCheckable(True) - self.hig_priorrity_btn.setChecked(False) - self.hig_priorrity_btn.setAutoExclusive(True) - self.hig_priorrity_btn.setFlat(True) - self.hig_priorrity_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) - self.hig_priorrity_btn.setObjectName("hig_priorrity_btn") - self.prioritbtngroup.addButton(self.hig_priorrity_btn) - self.horizontalLayout_4.addWidget(self.hig_priorrity_btn) + self.low_priority_btn = GroupButton(parent=self.frame_12) + self.low_priority_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.low_priority_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.low_priority_btn.setCheckable(True) + self.low_priority_btn.setAutoExclusive(True) + self.low_priority_btn.setFlat(True) + self.low_priority_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.low_priority_btn.setObjectName("low_priority_btn") + self.priority_btn_group = QtWidgets.QButtonGroup(wifi_stacked_page) + self.priority_btn_group.setObjectName("priority_btn_group") + self.priority_btn_group.addButton(self.low_priority_btn) + self.horizontalLayout_4.addWidget(self.low_priority_btn) + self.med_priority_btn = GroupButton(parent=self.frame_12) + self.med_priority_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.med_priority_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.med_priority_btn.setCheckable(True) + self.med_priority_btn.setChecked(True) + self.med_priority_btn.setAutoExclusive(True) + self.med_priority_btn.setFlat(True) + self.med_priority_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.med_priority_btn.setObjectName("med_priority_btn") + self.priority_btn_group.addButton(self.med_priority_btn) + self.horizontalLayout_4.addWidget(self.med_priority_btn) + self.high_priority_btn = GroupButton(parent=self.frame_12) + self.high_priority_btn.setMinimumSize(QtCore.QSize(100, 100)) + self.high_priority_btn.setMaximumSize(QtCore.QSize(100, 100)) + self.high_priority_btn.setCheckable(True) + self.high_priority_btn.setChecked(False) + self.high_priority_btn.setAutoExclusive(True) + self.high_priority_btn.setFlat(True) + self.high_priority_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/ui/media/btn_icons/indf_svg.svg")) + self.high_priority_btn.setObjectName("high_priority_btn") + self.priority_btn_group.addButton(self.high_priority_btn) + self.horizontalLayout_4.addWidget(self.high_priority_btn) self.verticalLayout_17.addLayout(self.horizontalLayout_4) self.verticalLayout_13.addWidget(self.frame_12, 0, QtCore.Qt.AlignmentFlag.AlignHCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) self.horizontalLayout_13.addLayout(self.verticalLayout_13) @@ -1203,15 +1203,15 @@ def retranslateUi(self, wifi_stacked_page): self.saved_connection_change_password_view.setProperty("class", _translate("wifi_stacked_page", "back_btn")) self.saved_connection_change_password_view.setProperty("button_type", _translate("wifi_stacked_page", "icon")) self.frame_12.setProperty("text", _translate("wifi_stacked_page", "Network priority")) - self.low_priorrity_btn.setText(_translate("wifi_stacked_page", "Low")) - self.low_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) - self.low_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.med_priorrity_btn.setText(_translate("wifi_stacked_page", "Medium")) - self.med_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) - self.med_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) - self.hig_priorrity_btn.setText(_translate("wifi_stacked_page", "High")) - self.hig_priorrity_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) - self.hig_priorrity_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.low_priority_btn.setText(_translate("wifi_stacked_page", "Low")) + self.low_priority_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.low_priority_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.med_priority_btn.setText(_translate("wifi_stacked_page", "Medium")) + self.med_priority_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.med_priority_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) + self.high_priority_btn.setText(_translate("wifi_stacked_page", "High")) + self.high_priority_btn.setProperty("class", _translate("wifi_stacked_page", "back_btn")) + self.high_priority_btn.setProperty("button_type", _translate("wifi_stacked_page", "icon")) self.hotspot_header_title.setText(_translate("wifi_stacked_page", "Hotspot")) self.hotspot_back_button.setText(_translate("wifi_stacked_page", "Back")) self.hotspot_back_button.setProperty("class", _translate("wifi_stacked_page", "back_btn"))