diff --git a/gui/__main__.py b/gui/__main__.py index 1b39ac9..ba07698 100755 --- a/gui/__main__.py +++ b/gui/__main__.py @@ -2104,7 +2104,7 @@ class MenuPage(Page): nostr_txt.show() self.additional_labels.append(nostr_txt) - elif protocol.lower() in ["wireguard", "open", "lokinet", "residential", "hidetor"]: + elif protocol.lower() in ["wireguard", "open", "residential", "hidetor"]: label_principal = QLabel(self) label_principal.setGeometry(0, 90, 400, 300) pixmap = QPixmap(os.path.join( @@ -2114,7 +2114,7 @@ class MenuPage(Page): label_principal.show() self.additional_labels.append(label_principal) - if protocol.lower() in ["wireguard", "open", "lokinet", "residential", "hidetor"]: + if protocol.lower() in ["wireguard", "open", "residential", "hidetor"]: if protocol.lower() == "wireguard" and ConfigurationController.get_endpoint_verification_enabled(): if is_profile_enabled and profile_obj and profile_obj.connection and profile_obj.connection.code == 'wireguard': @@ -4424,8 +4424,8 @@ class ScreenPage(Page): ok_button = QPushButton("OK") cancel_button = QPushButton("Cancel") - button_layout.addWidget(ok_button) button_layout.addWidget(cancel_button) + button_layout.addWidget(ok_button) layout.addLayout(input_layout) layout.addLayout(button_layout) @@ -4441,6 +4441,14 @@ class ScreenPage(Page): dialog, "Invalid Resolution", "Width and height must be positive numbers.") return + host_w = self.custom_window.host_screen_width + host_h = self.custom_window.host_screen_height + + if width > host_w or height > host_h: + QMessageBox.warning( + dialog, "Invalid Resolution", f"Resolution cannot be larger than your screen size ({host_w}x{host_h}).") + return + if width > 10000 or height > 10000: QMessageBox.warning( dialog, "Invalid Resolution", "Resolution too large. Maximum 10000x10000.") @@ -5077,10 +5085,6 @@ class EditorPage(Page): "dimentions": self.connection_manager.get_available_resolutions(data_profile.get('id', '')) }, selected_profile_str) - elif protocol == "lokinet": - self.process_and_show_labels(data_profile, { - "protocol": ['lokinet'] - }, selected_profile_str) elif protocol == "open": self.process_and_show_labels(data_profile, { "protocol": ['open'] @@ -7990,6 +7994,14 @@ class IdPage(Page): obj.textChanged.connect(self.toggle_button_state) self.text_edit = obj + self.note_label = QLabel( + "Note: Billing IDs are tied to a single location", self) + self.note_label.setGeometry(1, 100, 500, 20) + self.note_label.setStyleSheet( + "color: white; font-size: 13px; font-style: italic;") + self.note_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.note_label.show() + def toggle_button_state(self): text = self.text_edit.toPlainText() if text.strip(): @@ -10011,8 +10023,8 @@ class FastRegistrationPage(Page): button_layout = QHBoxLayout() ok_button = QPushButton("OK") cancel_button = QPushButton("Cancel") - button_layout.addWidget(ok_button) button_layout.addWidget(cancel_button) + button_layout.addWidget(ok_button) layout.addLayout(input_layout) layout.addLayout(button_layout) diff --git a/pyproject.toml b/pyproject.toml index d996220..faaf955 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "sp-hydra-veil-gui" -version = "2.2.1" +version = "2.2.2" authors = [ { name = "Simplified Privacy" }, ]