christofsteel/syng
christofsteel/syng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Implemented password fields in GUI

Browse source
This commit is contained in:
Christoph Stahl 2024-09-23 17:14:08 +02:00
parent b9aa39e5b7
commit 391075faaf
3 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
syng/gui.py
View file

@ -16,7 +16,7 @@ import string
import signal import signal
from PyQt6.QtCore import QTimer from PyQt6.QtCore import QTimer
from PyQt6.QtGui import QCloseEvent, QIcon, QPixmap from PyQt6.QtGui import QAction, QCloseEvent, QIcon, QPixmap
from PyQt6.QtWidgets import ( from PyQt6.QtWidgets import (
QApplication, QApplication,
QCheckBox, QCheckBox,
@ -69,6 +69,7 @@ class OptionFrame(QWidget):
description: str, description: str,
value: Optional[str] = "", value: Optional[str] = "",
callback: Optional[Callable[..., None]] = None, callback: Optional[Callable[..., None]] = None,
is_password: bool = False,
) -> None: ) -> None:
if value is None: if value is None:
value = "" value = ""
@ -76,6 +77,20 @@ class OptionFrame(QWidget):
label = QLabel(description, self) label = QLabel(description, self)
self.string_options[name] = QLineEdit(self) self.string_options[name] = QLineEdit(self)
if is_password:
self.string_options[name].setEchoMode(QLineEdit.EchoMode.Password)
action = self.string_options[name].addAction(
QIcon.fromTheme("dialog-password"), QLineEdit.ActionPosition.TrailingPosition
)
if action is not None:
action.triggered.connect(
lambda: self.string_options[name].setEchoMode(
QLineEdit.EchoMode.Normal
if self.string_options[name].echoMode() == QLineEdit.EchoMode.Password
else QLineEdit.EchoMode.Password
)
)
self.string_options[name].insert(value) self.string_options[name].insert(value)
self.form_layout.addRow(label, self.string_options[name]) self.form_layout.addRow(label, self.string_options[name])
if callback is not None: if callback is not None:
@ -114,7 +129,7 @@ class OptionFrame(QWidget):
if callback is not None: if callback is not None:
input_field.textChanged.connect(callback) input_field.textChanged.connect(callback)
minus_button = QPushButton("-", input_and_minus) minus_button = QPushButton(QIcon.fromTheme("list-remove"), "", input_and_minus)
minus_button.clicked.connect( minus_button.clicked.connect(
partial(self.del_list_element, name, input_field, input_and_minus, layout) partial(self.del_list_element, name, input_field, input_and_minus, layout)
) )
@ -142,7 +157,7 @@ class OptionFrame(QWidget):
self.list_options[name] = [] self.list_options[name] = []
for v in value: for v in value:
self.add_list_element(name, container_layout, v, callback) self.add_list_element(name, container_layout, v, callback)
plus_button = QPushButton("+", self) plus_button = QPushButton(QIcon.fromTheme("list-add"), "", self)
plus_button.clicked.connect( plus_button.clicked.connect(
partial(self.add_list_element, name, container_layout, "", callback) partial(self.add_list_element, name, container_layout, "", callback)
) )
@ -242,6 +257,8 @@ class SourceTab(OptionFrame):
self.add_list_option(name, desc, value=value) self.add_list_option(name, desc, value=value)
case builtins.str: case builtins.str:
self.add_string_option(name, desc, value=value) self.add_string_option(name, desc, value=value)
case "password":
self.add_string_option(name, desc, value=value, is_password=True)
class GeneralConfig(OptionFrame): class GeneralConfig(OptionFrame):
@ -255,7 +272,7 @@ class GeneralConfig(OptionFrame):
self.add_string_option("server", "Server", config["server"], callback) self.add_string_option("server", "Server", config["server"], callback)
self.add_string_option("room", "Room", config["room"], callback) self.add_string_option("room", "Room", config["room"], callback)
self.add_string_option("secret", "Admin Password", config["secret"]) self.add_string_option("secret", "Admin Password", config["secret"], is_password=True)
self.add_choose_option( self.add_choose_option(
"waiting_room_policy", "waiting_room_policy",
"Waiting room policy", "Waiting room policy",
@ -266,7 +283,9 @@ class GeneralConfig(OptionFrame):
self.add_string_option( self.add_string_option(
"preview_duration", "Preview duration in seconds", str(config["preview_duration"]) "preview_duration", "Preview duration in seconds", str(config["preview_duration"])
) )
self.add_string_option("key", "Key for server (if necessary)", config["key"]) self.add_string_option(
"key", "Key for server (if necessary)", config["key"], is_password=True
)
def get_config(self) -> dict[str, Any]: def get_config(self) -> dict[str, Any]:
config = super().get_config() config = super().get_config()

4
syng/sources/s3.py
View file

@ -41,8 +41,8 @@ class S3Source(FileBasedSource):
source_name = "s3" source_name = "s3"
config_schema = FileBasedSource.config_schema | { config_schema = FileBasedSource.config_schema | {
"endpoint": (str, "Endpoint of the s3", ""), "endpoint": (str, "Endpoint of the s3", ""),
"access_key": (str, "Access Key of the s3", ""), "access_key": ("password", "Access Key of the s3", ""),
"secret_key": (str, "Secret Key of the s3", ""), "secret_key": ("password", "Secret Key of the s3", ""),
"secure": (bool, "Use SSL", True), "secure": (bool, "Use SSL", True),
"bucket": (str, "Bucket of the s3", ""), "bucket": (str, "Bucket of the s3", ""),
"tmp_dir": (str, "Folder for\ntemporary download", "/tmp/syng"), "tmp_dir": (str, "Folder for\ntemporary download", "/tmp/syng"),

2
syng/sources/source.py
View file

@ -106,7 +106,7 @@ class Source(ABC):
""" """
source_name: str = "" source_name: str = ""
config_schema: dict[str, tuple[type | list[type], str, Any]] = { config_schema: dict[str, tuple[type | list[type] | str, str, Any]] = {
"enabled": (bool, "Enable this source", False) "enabled": (bool, "Enable this source", False)
} }