Improve error message and UX

rascal2/dialogs/startup_dialog.py

@@ -1,4 +1,5 @@
 import os
+import traceback
 from pathlib import Path
 
 from PyQt6 import QtCore, QtWidgets
@@ -184,7 +185,17 @@ def project_start_failed(self, exception, args):
         error = str(exception).strip().replace("\n", "")
         message = f"The Project ({folder_name}) could not be opened because:\n\n{error}"
         LOGGER.error(message, exc_info=exception)
-        QtWidgets.QMessageBox.critical(self, self.windowTitle(), message)
+
+        message_box = QtWidgets.QMessageBox(self)
+        message_box.setStyleSheet("QMessageBox QTextEdit{color: red; font-family: monospace; font-weight:500;}")
+        message_box.setWindowTitle(self.windowTitle())
+        message_box.setIcon(QtWidgets.QMessageBox.Icon.Critical)
+        message_box.setText(message)
+
+        reverse_tb = "\n".join(reversed(traceback.format_tb(exception.__traceback__)))
+        message_box.setDetailedText(reverse_tb)
+
+        message_box.exec()
 
 
 class NewProjectDialog(StartupDialog):
@@ -253,7 +264,6 @@ def __init__(self, title, desc):
         title_widget = QtWidgets.QLabel(title)
         title_widget.setObjectName("title")
         desc_widget = QtWidgets.QLabel(desc)
-        desc_widget.setObjectName("desc")
         layout.addWidget(title_widget)
         layout.addWidget(desc_widget)
         self.setLayout(layout)

rascal2/static/style.css

@@ -47,6 +47,7 @@ QPushButton:pressed {
 QPushButton:hover,
 QPushButton:pressed {
     background-color: @Highlight;
+    color: @HighlightedText;
 }
 
 QPushButton:disabled,
@@ -64,14 +65,14 @@ QPushButton:checked {
 QLineEdit {
     color: @Text;
     background-color: @Base;
-    selection-color: @Text;
+    selection-color: @HighlightedText;
     selection-background-color: @Highlight;
     border: 1px solid darkgray;
     border-radius: 3px;
 }
 
 QLineEdit:read-only {
-    selection-color: @Text;
+    selection-color: @HighlightedText;
     selection-background-color: @Highlight;
     background-color: transparent;
 }
@@ -170,6 +171,8 @@ StartupDialog QLineEdit[error="true"] {
     border: 1px solid #E34234;
 }
 
+StartupDialog QListWidget::item{color:green;}
+
 StartupDialog QListWidget::item:hover {
     background-color: @Highlight;
 }
@@ -201,10 +204,6 @@ DisplayWidget #title{
     font-size: 16px;
 }
 
-DisplayWidget #desc{
-    color: @text
-}
-
 /*****************************
      ProjectWidget Styles
 *****************************/
@@ -422,8 +421,13 @@ AbstractProjectListWidget QPushButton {
 }
 
 AbstractProjectListWidget QTableView {
-    border: 1px solid @Midlight;
-    background-color: @Window;
+    selection-color: @HighlightedText;
+    selection-background-color: @Highlight;
+}
+
+AbstractProjectListWidget QTableView::item:selected:!active{
+    background-color: @Highlight;
+    color: @HighlightText;
 }
 
 #CountHeader::section {
@@ -439,6 +443,18 @@ AbstractProjectListWidget QTableView {
     font-weight: 600;
 }
 
+ContrastWidget QListView{
+    show-decoration-selected: 1;
+}
+
+ContrastWidget QListView::item {
+    border-bottom: 1px solid @Midlight;
+}
+
+ContrastWidget QListView::item:selected {
+    background-color: @Highlight;
+    color: @HighlightedText;
+}
 
 /*****************************
    BayesPlotsDialog Styles

rascal2/theme.py

@@ -13,6 +13,7 @@ def set_stylesheet(app):
         replacements = {
             "@Path": IMAGES_PATH.as_posix(),
             "@Window": palette.window().color().name(),
+            "@HighlightedText": palette.highlightedText().color().name(),
             "@Highlight": palette.highlight().color().name(),
             "@Midlight": palette.midlight().color().name(),
             "@Text": palette.text().color().name(),

rascal2/widgets/delegates.py

@@ -1,5 +1,6 @@
 """Delegates for items in Qt tables."""
 
+from enum import Enum
 from typing import Literal
 
 from PyQt6 import QtCore, QtGui, QtWidgets
@@ -33,6 +34,9 @@ def createEditor(self, parent, option, index):
             widget.editor.open_on_show = True
             widget.editor.text_changed.connect(self.commit_and_close_editor)
 
+        if issubclass(self.field_info.annotation, Enum):
+            widget.editor.activated.connect(self.commit_and_close_editor)
+
         self.widget = widget
         # Using the BaseInputWidget directly did not style properly,
         # this uses the editor widget while holding a reference to BaseInputWidget.
@@ -147,6 +151,7 @@ def createEditor(self, parent, option, index):
             names = [""] + names
         widget.addItems(names)
         widget.setCurrentText(index.data(QtCore.Qt.ItemDataRole.DisplayRole))
+        widget.currentTextChanged.connect(self.commit_and_close_editor)
 
         return widget
 
@@ -158,6 +163,11 @@ def setModelData(self, editor, model, index):
         data = editor.currentText()
         model.setData(index, data, QtCore.Qt.ItemDataRole.EditRole)
 
+    def commit_and_close_editor(self):
+        editor = self.sender()
+        self.commitData.emit(editor)
+        self.closeEditor.emit(editor)
+
 
 class SignalSourceDelegate(QtWidgets.QStyledItemDelegate):
     """Item delegate to choose from draft project parameters, with a check for different source types."""

rascal2/widgets/inputs.py

@@ -101,7 +101,7 @@ class IntInputWidget(BaseInputWidget):
     def create_editor(self, field_info: FieldInfo) -> QtWidgets.QWidget:
         editor = QtWidgets.QSpinBox(self)
         # default max and min are 99 and 0
-        # there is no 'integer infinity' so we just set them to biggest possible numbers
+        # there is no 'integer infinity' so we just set them to the biggest possible numbers
         editor.setMaximum(2**31 - 1)
         editor.setMinimum(-(2**31))
         for item in field_info.metadata:

rascal2/widgets/project/lists.py

@@ -37,6 +37,7 @@ def __init__(self, classlist: ratapi.ClassList[T], parent: QtWidgets.QWidget):
         self.classlist = classlist
         self.item_type = classlist._class_handle
         self.edit_mode = False
+        self.renamed_entries = {}
 
     def rowCount(self, parent=None) -> int:
         return len(self.classlist)
@@ -75,6 +76,10 @@ def set_data(self, row: int, param: str, value: Any):
             The value to set the parameter to.
 
         """
+        if param == "name" and self.classlist[row].name != value:
+            self.renamed_entries[self.classlist[row].name] = value
+            self.renamed_entries.pop(value, None)  # avoid cycle
+
         setattr(self.classlist[row], param, value)
         self.endResetModel()
 
@@ -100,6 +105,7 @@ def delete_item(self, row: int):
         """
         if len(self.classlist) == 0:
             return
+        self.renamed_entries[self.classlist[row].name] = ""
         self.classlist.pop(row)
         self.endResetModel()
 
@@ -641,19 +647,32 @@ def data_combobox(field: str) -> QtWidgets.QWidget:
                     return widget
                 case "model":
                     if self.project_widget.draft_project["model"] == LayerModels.StandardLayers:
-                        widget = StandardLayerModelWidget(current_data, self)
+                        model_field_name = "domain_contrasts" if self.model.domains else "layers"
+                        changes = self.parent.parent.renamed_parameters.get(model_field_name, {})
+                        clean_data = [changes.get(item, item) for item in current_data]
+
+                        widget = StandardLayerModelWidget(clean_data, self)
                         widget.model.dataChanged.connect(
                             lambda: self.model.set_data(i, field, widget.model.stringList())
                         )
                         widget.model.rowsMoved.connect(lambda: self.model.set_data(i, field, widget.model.stringList()))
+                        if current_data != clean_data:
+                            # Data is missing so updated model to get better error message
+                            self.model.set_data(i, field, clean_data)
                         return widget
                     else:
                         widget = QtWidgets.QComboBox(self)
-                        widget.addItem("", [])
+                        model_items = []
                         for file in self.project_widget.draft_project["custom_files"]:
                             widget.addItem(file.name, [file.name])
+                            model_items.append(file.name)
                         if current_data:
-                            widget.setCurrentText(current_data[0])
+                            changes = self.parent.parent.renamed_parameters.get("custom_files", {})
+                            widget.setCurrentText(changes.get(current_data[0], current_data[0]))
+                            if current_data[0] not in model_items:
+                                # Data is missing so updated model to get better error message
+                                widget.setCurrentIndex(-1)
+                                self.model.set_data(i, field, [])
                         else:
                             widget.setCurrentText("")
                         widget.currentTextChanged.connect(lambda: self.model.set_data(i, field, widget.currentData()))
@@ -666,21 +685,28 @@ def data_combobox(field: str) -> QtWidgets.QWidget:
                     project_field_name = field + "s"
                     pass
 
+            changes = self.parent.parent.renamed_parameters.get(project_field_name, {})
             project_field = self.project_widget.draft_project[project_field_name]
             combobox = QtWidgets.QComboBox(self)
-            items = [""] + [item.name for item in project_field]
+            items = [item.name for item in project_field]
             combobox.addItems(items)
-            combobox.setCurrentText(current_data)
+            combobox.setCurrentText(changes.get(current_data, current_data))
             combobox.currentTextChanged.connect(lambda: self.model.set_data(i, field, combobox.currentText()))
             combobox.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
-
+            if current_data not in items:
+                # Data is missing so update model to get better error message
+                combobox.setCurrentIndex(-1)
+                self.model.set_data(i, field, combobox.currentText())
             return combobox
 
         return self.compose_widget(i, data_combobox)
 
     def update_project(self, index, prop, value):
         """Update parent project data and recalculate plots."""
+        selected = self.list.selectionModel().currentIndex()
+        # This clears the selection so we cache the selected index
         self.model.set_data(index, prop, value)
+        self.list.selectionModel().setCurrentIndex(selected, self.list.selectionModel().SelectionFlag.ClearAndSelect)
         if not self.edit_mode:
             presenter = self.parent.parent.parent.presenter
             presenter.model.blockSignals(True)