#187 layout the Open File dialog

Author: dmh23

src/ui/open_file_dialog.py

@@ -9,7 +9,8 @@
 # Copyright (c) 2021 dmh23
 #
 
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QMainWindow, QGridLayout
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QMainWindow, QGridLayout, QVBoxLayout, QPushButton
 
 from src.log.log_utils import get_model_info_for_open_model_dialog, OpenFileInfo
 from src.ui.please_wait import PleaseWait
@@ -55,25 +56,20 @@ def __init__(self, parent: QMainWindow, please_wait: PleaseWait, current_track:
             best_best_times = None
             best_average_times = None
 
-        self.layout = QGridLayout()
+        self.setWindowTitle("Open Log File")
 
-        # self._place_in_grid(0, 3, tk.Label(master, text="Episodes", justify=tk.CENTER))
-        # self._place_in_grid(0, 4, tk.Label(master, text="Average\nProgress", justify=tk.CENTER))
-        # self._place_in_grid(0, 5, tk.Label(master, text="Full\nLaps", justify=tk.CENTER))
+        log_layout = QGridLayout()
+        log_layout.setHorizontalSpacing(15)
 
-        self.layout.addWidget(QLabel("Episodes"), 0, 3)
-        self.layout.addWidget(QLabel("Average\nProgress"), 0, 4)
-        self.layout.addWidget(QLabel("Full\nLaps"), 0, 5)
+        log_layout.addWidget(_make_centred_label("Episodes"), 0, 3)
+        log_layout.addWidget(_make_centred_label("Average\nProgress"), 0, 4)
+        log_layout.addWidget(_make_centred_label("Full\nLaps"), 0, 5)
 
         if show_laps:
-            # self._place_in_grid(0, 6, tk.Label(master, text="Best\nLap", justify=tk.CENTER))
-            # self._place_in_grid(0, 7, tk.Label(master, text="Average\nLap", justify=tk.CENTER))
-
-            self.layout.addWidget(QLabel("Best\nLap"), 0, 6)
-            self.layout.addWidget(QLabel("Average\nLap"), 0, 7)
+            log_layout.addWidget(_make_centred_label("Best\nLap"), 0, 6)
+            log_layout.addWidget(_make_centred_label("Average\nLap"), 0, 7)
 
         row = 1
-
         for log in log_info:
             if len(log.source_files) == 1:
                 file_names = log.source_files[0]
@@ -88,51 +84,33 @@ def __init__(self, parent: QMainWindow, please_wait: PleaseWait, current_track:
             progress_percent = self._get_progress_percent(log_meta)
             success_percent = self._get_success_percent(log_meta)
 
-            self.layout.addWidget(QLabel(log.display_name), row, 0)
-            self.layout.addWidget(QLabel(log_meta.race_type.get().name), row, 1)
-            self.layout.addWidget(QLabel(log_meta.job_type.get().name), row, 2)
-
-            self.layout.addWidget(self._make_large_integer_label(log_meta.episode_count.get()), row, 3)
-            self.layout.addWidget(self._make_percent_label(progress_percent, best_progress_percent), row, 4)
-            self.layout.addWidget(self._make_percent_label(success_percent, best_success_percent), row, 5)
-
-
             # self._place_in_grid(row, 0, tk.Button(master, text=log.display_name, command=callback), "E")
-            # self._place_in_grid(row, 1, tk.Label(master, text=log_meta.race_type.get().name), "E")
-            # self._place_in_grid(row, 2, tk.Label(master, text=log_meta.job_type.get().name), "E")
-            # self._place_in_grid(row, 3, self._make_large_integer_label(master, log_meta.episode_count.get()))
-            # self._place_in_grid(row, 4, self._make_percent_label(master, progress_percent, best_progress_percent))
-            # self._place_in_grid(row, 5, self._make_percent_label(master, success_percent, best_success_percent))
+            log_layout.addWidget(QPushButton(log.display_name), row, 0)
 
-            if show_laps:
-                self.layout.addWidget(self._make_lap_time_label(log_meta.best_time.get(), best_best_times), row, 6)
-                self.layout.addWidget(self._make_lap_time_label(log_meta.average_time.get(), best_average_times), row, 7)
+            log_layout.addWidget(_make_centred_label(log_meta.race_type.get().name), row, 1)
+            log_layout.addWidget(_make_centred_label(log_meta.job_type.get().name), row, 2)
+            log_layout.addWidget(self._make_large_integer_label(log_meta.episode_count.get()), row, 3)
+            log_layout.addWidget(self._make_percent_label(progress_percent, best_progress_percent), row, 4)
+            log_layout.addWidget(self._make_percent_label(success_percent, best_success_percent), row, 5)
 
-                # self._place_in_grid(row, 6, self._make_lap_time_label(master,
-                #                                                       log_meta.best_time.get(),
-                #                                                       best_best_times))
-                # self._place_in_grid(row, 7, self._make_lap_time_label(master,
-                #                                                       log_meta.average_time.get(),
-                #                                                       best_average_times))
+            if show_laps:
+                log_layout.addWidget(self._make_lap_time_label(log_meta.best_time.get(), best_best_times), row, 6)
+                log_layout.addWidget(self._make_lap_time_label(log_meta.average_time.get(), best_average_times), row, 7)
 
             row += 1
 
 
         # SAMPLE CODE
 
+        button_box = QDialogButtonBox(QDialogButtonBox.StandardButton.Cancel)
+        button_box.rejected.connect(self.reject)
 
-        self.setWindowTitle("HELLO!")
-
-        QBtn = QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
+        layout = QVBoxLayout()
+        layout.addLayout(log_layout)
+        layout.addSpacing(10)
+        layout.addWidget(button_box, alignment=Qt.AlignmentFlag.AlignCenter)
 
-        self.buttonBox = QDialogButtonBox(QBtn)
-        self.buttonBox.accepted.connect(self.accept)
-        self.buttonBox.rejected.connect(self.reject)
-
-
-
-        self.layout.addWidget(self.buttonBox, row, 4)
-        self.setLayout(self.layout)
+        self.setLayout(layout)
 
     @staticmethod
     def _get_progress_percent(log_meta):
@@ -146,19 +124,20 @@ def _get_success_percent(log_meta):
     def _make_percent_label(value, best_value):
         formatted_text = get_pretty_whole_percentage(value)
         if value >= 0.99 * best_value and value > 0.0:
-            return QLabel(formatted_text)
+            return _make_centred_label(formatted_text, "palegreen")
             # return tk.Label(master, text=formatted_text, background="palegreen", justify=tk.CENTER)
         elif value >= 0.97 * best_value and value > 0.0:
-            return QLabel(formatted_text)
+            return _make_centred_label(formatted_text, "lightskyblue")
             # return tk.Label(master, text=formatted_text, background="lightblue1", justify=tk.CENTER)
         else:
-            return QLabel(formatted_text)
+            return _make_centred_label(formatted_text)
             # return tk.Label(master, text=formatted_text, justify=tk.CENTER)
 
     @staticmethod
     def _make_large_integer_label(value):
-        # return tk.Label(master, text=get_pretty_large_integer(value), justify=tk.CENTER)
-        return QLabel(get_pretty_large_integer(value))
+        label = QLabel(get_pretty_large_integer(value))
+        label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        return label
 
     @staticmethod
     def _make_lap_time_label(seconds, best_seconds):
@@ -169,11 +148,16 @@ def _make_lap_time_label(seconds, best_seconds):
             formatted_text = "---"
 
         if best_seconds >= 0.99 * seconds and seconds > 0.0:
-            return QLabel(formatted_text)
-            # return tk.Label(master, text=formatted_text, background="palegreen", justify=tk.CENTER)
+            return _make_centred_label(formatted_text, "palegreen")
         elif best_seconds >= 0.97 * seconds and seconds > 0.0:
-            return QLabel(formatted_text)
-            # return tk.Label(master, text=formatted_text, background="lightblue1", justify=tk.CENTER)
+            return _make_centred_label(formatted_text, "lightskyblue")
         else:
-            return QLabel(formatted_text)
-            # return tk.Label(master, text=formatted_text, justify=tk.CENTER)
+            return _make_centred_label(formatted_text)
+
+
+def _make_centred_label(display_value: str, colour: str = None):
+    label = QLabel(display_value)
+    label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+    if colour is not None:
+        label.setStyleSheet("background-color: " + colour)
+    return label