diff --git a/gui/__main__.py b/gui/__main__.py index e8481f8..2a38393 100755 --- a/gui/__main__.py +++ b/gui/__main__.py @@ -2020,10 +2020,56 @@ class MenuPage(Page): is_profile_enabled = self.connection_manager.is_profile_connected( self.reverse_id) show_verification_widget = False + label_principal = None + label_tor = None + text_color = "white" + operator_name = profile_obj.location.operator.name if profile_obj.location and profile_obj.location.operator else "" - if protocol.lower() in ["wireguard", "open", "lokinet", "residential", "hidetor"]: + if operator_name != 'Simplified Privacy': + if profile_obj.is_session_profile(): + text_color = "black" + label_background = QLabel(self) + label_background.setGeometry(0, 60, 410, 354) + pixmap_bg = QPixmap(os.path.join( + self.btn_path, "browser only.png")) + label_background.setPixmap(pixmap_bg) + label_background.setScaledContents(True) + label_background.show() + label_background.lower() + self.additional_labels.append(label_background) + + l_img = QLabel(self) + l_img.setGeometry(20, 125, 100, 100) + pixmap_loc = QPixmap(os.path.join( + self.btn_path, f"icon_{location}.png")) + l_img.setPixmap(pixmap_loc) + l_img.setScaledContents(True) + l_img.show() + self.additional_labels.append(l_img) + l_name = f"{profile_obj.location.country_name}, {profile_obj.location.name}" if profile_obj.location else "" + o_name = profile_obj.location.operator.name if profile_obj.location and profile_obj.location.operator else "" + n_key = profile_obj.location.operator.nostr_public_key if profile_obj.location and profile_obj.location.operator else "" + + info_txt = QTextEdit(self) + info_txt.setGeometry(130, 110, 260, 250) + info_txt.setReadOnly(True) + info_txt.setFrameStyle(QFrame.Shape.NoFrame) + info_txt.setStyleSheet( + f"background: transparent; border: none; color: {text_color}; font-size: 15px;") + info_txt.setVerticalScrollBarPolicy( + Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + info_txt.setHorizontalScrollBarPolicy( + Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + info_txt.setWordWrapMode( + QtGui.QTextOption.WrapMode.WrapAnywhere) + info_txt.setText( + f"Location: {l_name}\n\nOperator: {o_name}\n\nNostr: {n_key}") + info_txt.show() + + self.additional_labels.append(info_txt) + + elif protocol.lower() in ["wireguard", "open", "lokinet", "residential", "hidetor"]: - label_principal = None if protocol.lower() == "wireguard" and is_profile_enabled and profile_obj and profile_obj.connection and profile_obj.connection.code == 'wireguard': verification_widget = self.create_verification_widget( profile_obj) @@ -2040,7 +2086,7 @@ class MenuPage(Page): label_principal.show() self.additional_labels.append(label_principal) - if protocol.lower() == "wireguard" and ConfigurationController.get_endpoint_verification_enabled(): + if protocol.lower() == "wireguard" and ConfigurationController.get_endpoint_verification_enabled() and operator_name == 'Simplified Privacy': if is_profile_enabled and profile_obj and profile_obj.connection and profile_obj.connection.code == 'wireguard': verified_icon = QLabel(self) verified_icon.setGeometry(20, 50, 100, 80) @@ -2051,91 +2097,94 @@ class MenuPage(Page): verified_icon.show() self.additional_labels.append(verified_icon) - if protocol.lower() == "hidetor" and not show_verification_widget: + if operator_name == 'Simplified Privacy': + if protocol.lower() == "hidetor" and not show_verification_widget: - if label_principal: - label_principal.setGeometry(0, 80, 400, 300) - label_background = QLabel(self) - label_background.setGeometry(0, 60, 410, 354) - if connection == 'just proxy': - image_path = os.path.join( - self.btn_path, f"icon_{location}.png") - else: - image_path = os.path.join( - self.btn_path, f"hdtor_{location}.png") - pixmap = QPixmap(image_path) - label_background.setPixmap(pixmap) - label_background.show() - label_background.setScaledContents(True) - label_background.lower() - self.additional_labels.append(label_background) + if label_principal: + label_principal.setGeometry(0, 80, 400, 300) + label_background = QLabel(self) + label_background.setGeometry(0, 60, 410, 354) + if connection == 'just proxy': + image_path = os.path.join( + self.btn_path, f"icon_{location}.png") + else: + image_path = os.path.join( + self.btn_path, f"hdtor_{location}.png") + pixmap = QPixmap(image_path) + label_background.setPixmap(pixmap) + label_background.show() + label_background.setScaledContents(True) + label_background.lower() + self.additional_labels.append(label_background) - if protocol.lower() == "wireguard" and connection.lower() == "browser-only" and not show_verification_widget: + if protocol.lower() == "wireguard" and connection.lower() == "browser-only" and not show_verification_widget: - if label_principal: - label_principal.setGeometry(0, 80, 400, 300) + if label_principal: + label_principal.setGeometry(0, 80, 400, 300) - label_background = QLabel(self) - label_background.setGeometry(0, 60, 410, 354) - is_supported = profile.get('browser_supported', False) - image_name = "browser only.png" if is_supported else "unsupported_browser_only.png" - pixmap = QPixmap(os.path.join(self.btn_path, image_name)) - label_background.setPixmap(pixmap) - label_background.show() - label_background.setScaledContents(True) - label_background.lower() - self.additional_labels.append(label_background) + label_background = QLabel(self) + label_background.setGeometry(0, 60, 410, 354) + is_supported = profile.get('browser_supported', False) + image_name = "browser only.png" if is_supported else "unsupported_browser_only.png" + pixmap = QPixmap(os.path.join(self.btn_path, image_name)) + label_background.setPixmap(pixmap) + label_background.show() + label_background.setScaledContents(True) + label_background.lower() + self.additional_labels.append(label_background) - if protocol.lower() == "residential" and connection.lower() == "tor": + if protocol.lower() == "residential" and connection.lower() == "tor": - label_background = QLabel(self) - label_background.setGeometry(0, 60, 410, 354) - pixmap = QPixmap(os.path.join( - self.btn_path, "browser_tor.png")) - label_background.setPixmap(pixmap) - label_background.show() - label_background.setScaledContents(True) - # label_background.setStyleSheet("background-color: blue;") - self.additional_labels.append(label_background) + label_background = QLabel(self) + label_background.setGeometry(0, 60, 410, 354) + pixmap = QPixmap(os.path.join( + self.btn_path, "browser_tor.png")) + label_background.setPixmap(pixmap) + label_background.show() + label_background.setScaledContents(True) + # label_background.setStyleSheet("background-color: blue;") + self.additional_labels.append(label_background) - label_garaje = QLabel(self) - label_garaje.setGeometry(5, 110, 400, 300) - pixmap = QPixmap(os.path.join( - self.btn_path, f"{country_garaje} garaje.png")) - label_garaje.setPixmap(pixmap) - label_garaje.show() - label_garaje.setScaledContents(True) - # label_garaje.setStyleSheet("background-color: red;") - self.additional_labels.append(label_garaje) + label_garaje = QLabel(self) + label_garaje.setGeometry(5, 110, 400, 300) + pixmap = QPixmap(os.path.join( + self.btn_path, f"{country_garaje} garaje.png")) + label_garaje.setPixmap(pixmap) + label_garaje.show() + label_garaje.setScaledContents(True) + # label_garaje.setStyleSheet("background-color: red;") + self.additional_labels.append(label_garaje) + + label_tor = QLabel(self) + label_tor.setGeometry(330, 300, 75, 113) - label_tor = QLabel(self) - label_tor.setGeometry(330, 300, 75, 113) pixmap = QPixmap(os.path.join(self.btn_path, "tor 86x130.png")) - label_tor.setPixmap(pixmap) - label_tor.show() - label_tor.setScaledContents(True) - self.additional_labels.append(label_tor) - if protocol.lower() == "residential" and connection.lower() == "just proxy": + if label_tor: + label_tor.setPixmap(pixmap) + label_tor.show() + label_tor.setScaledContents(True) + self.additional_labels.append(label_tor) + if protocol.lower() == "residential" and connection.lower() == "just proxy": - label_background = QLabel(self) - label_background.setGeometry(0, 60, 410, 354) - pixmap = QPixmap(os.path.join( - self.btn_path, "browser_just_proxy.png")) - label_background.setPixmap(pixmap) - label_background.show() - label_background.setScaledContents(True) - # label_background.setStyleSheet("background-color: blue;") - self.additional_labels.append(label_background) + label_background = QLabel(self) + label_background.setGeometry(0, 60, 410, 354) + pixmap = QPixmap(os.path.join( + self.btn_path, "browser_just_proxy.png")) + label_background.setPixmap(pixmap) + label_background.show() + label_background.setScaledContents(True) + # label_background.setStyleSheet("background-color: blue;") + self.additional_labels.append(label_background) - label_garaje = QLabel(self) - label_garaje.setGeometry(5, 110, 400, 300) - pixmap = QPixmap(os.path.join( - self.btn_path, f"{country_garaje} garaje.png")) - label_garaje.setPixmap(pixmap) - label_garaje.show() - label_garaje.setScaledContents(True) - # label_garaje.setStyleSheet("background-color: red;") - self.additional_labels.append(label_garaje) + label_garaje = QLabel(self) + label_garaje.setGeometry(5, 110, 400, 300) + pixmap = QPixmap(os.path.join( + self.btn_path, f"{country_garaje} garaje.png")) + label_garaje.setPixmap(pixmap) + label_garaje.show() + label_garaje.setScaledContents(True) + # label_garaje.setStyleSheet("background-color: red;") + self.additional_labels.append(label_garaje) # Actualizar perfil para editar editar_profile = {"profile_number": profile_number, @@ -3326,21 +3375,6 @@ class WireGuardPage(Page): self.page_stack.findChild(ProtocolPage))) -class lokinetPage(Page): - def __init__(self, page_stack, parent=None): - super().__init__("Lokinet", page_stack, parent) - self.create_interface_elements() - - def create_interface_elements(self): - pass - - -class OpenPage(Page): - def __init__(self, page_stack, parent=None): - super().__init__("Opne", page_stack, parent) - pass - - class HidetorPage(Page): def __init__(self, page_stack, main_window, parent=None): super().__init__("HideTor", page_stack, main_window, parent) diff --git a/gui/resources/images/icon_cl_rm.png b/gui/resources/images/icon_cl_rm.png new file mode 100755 index 0000000..274487d Binary files /dev/null and b/gui/resources/images/icon_cl_rm.png differ diff --git a/gui/resources/images/icon_mini_cl_rm.png b/gui/resources/images/icon_mini_cl_rm.png new file mode 100755 index 0000000..9303bd4 Binary files /dev/null and b/gui/resources/images/icon_mini_cl_rm.png differ diff --git a/pyproject.toml b/pyproject.toml index 1cc56e8..d7e7078 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "sp-hydra-veil-gui" -version = "2.0.1" +version = "2.0.2" authors = [ { name = "Simplified Privacy" }, ]