Skip to content
Snippets Groups Projects
Commit 6aa1b8e1 authored by Sander de Snoo's avatar Sander de Snoo
Browse files

Small fixes after release 1.4.67

parent c83115f6
No related branches found
No related tags found
No related merge requests found
......@@ -109,7 +109,7 @@ class Favorites:
return {}
else:
qt_show_error(
"Parse error",
"VideoMode: Parse error",
f"Stored favorite '{name}' cannot be parsed as YAML.\n"
f"Check file '{path}'.")
raise
......@@ -124,7 +124,7 @@ class Favorites:
try:
result = yaml.load(stream)
except Exception as ex:
qt_show_exception("Failed to parse YAML", ex, f"in group '{group}'")
qt_show_exception("VideoMode: Failed to parse YAML", ex, f"in group '{group}'")
raise
return result
......@@ -186,7 +186,7 @@ class Favorites:
pattern = re.compile(r"[a-zA-Z0-9_ -.]+")
if not pattern.match(name):
qt_show_error(
"Invalid name",
"VideoMode: Invalid name",
f"'{name}' is not a valid favorite name.\n"
"Valid characters are: a-zA-Z0-9_ -.")
......
......@@ -50,7 +50,7 @@ class Settings:
def update(self, values: dict[str, any]):
for name, value in values.items():
if name not in self._values:
logger.warning(f"Setting {self.group}:{name} does not exist")
logger.warning(f"Setting {self._group_name}:{name} does not exist")
continue
if self._values[name] != value:
self.set_value(name, value)
......@@ -136,7 +136,7 @@ class TextElement(GuiElement):
self._widget.setCurrentText(value)
if self._widget.currentText() != value:
qt_show_error(
"Invalid value",
"VideoMode: Invalid value",
f"{self._name} cannot be set to '{value}'")
def get_value(self) -> str:
......
......@@ -121,7 +121,7 @@ def install_qt_message_handler():
_qt_message_handler_installed = True
def qt_show_exception(message, ex, extra_line: str = None):
def qt_show_exception(message: str, ex: Exception, extra_line: str = None):
# logger.error(message, exc_info=ex)
text = message
if extra_line:
......@@ -129,7 +129,7 @@ def qt_show_exception(message, ex, extra_line: str = None):
text += f"\n{type(ex).__name__}: {ex}"
msg = QMessageBox(
QMessageBox.Critical,
"QT-DataViewer: " + message,
message,
text,
QMessageBox.Ok,
)
......@@ -138,11 +138,11 @@ def qt_show_exception(message, ex, extra_line: str = None):
msg.exec_()
def qt_show_error(title, message):
def qt_show_error(title: str, message: str):
# logger.error(message)
msg = QMessageBox(
QMessageBox.Critical,
"QT-DataViewer: " + title,
title,
message,
QMessageBox.Ok,
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment