From fb34458beebf08c49ee7a2a92317c92462d24f62 Mon Sep 17 00:00:00 2001
From: Imeguras <imeguras@cock.li>
Date: Fri, 30 Aug 2024 19:28:05 +0100
Subject: [PATCH 1/2] Auto stash before merge of "dev" and "origin/dev"

---
 src/mainwindow.ui | 46 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 417982a..6c84801 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -341,7 +341,7 @@
        <number>0</number>
       </property>
       <item>
-       <spacer name="vs_4">
+       <spacer name="vs_2">
         <property name="orientation">
          <enum>Qt::Orientation::Vertical</enum>
         </property>
@@ -434,9 +434,37 @@
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0">
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="FLabel" name="label_4">
+         <layout class="QGridLayout" name="lap_layout">
+          <item row="1" column="1">
+           <widget class="QLabel" name="DiffBestLap_label">
+            <property name="text">
+             <string>00:00:00</string>
+            </property>
+			 <property name="font">
+             <font>
+              <family>Fira Mono</family>
+              <pointsize>32</pointsize>
+              <bold>true</bold>
+             </font>
+            </property>
+           </widget>
+          </item>
+		   <item row="1" column="0">
+           <widget class="QLabel" name="IgnitionTime_label">
+            <property name="text">
+             <string>00:00:00</string>
+            </property>
+			 <property name="font">
+             <font>
+              <family>Fira Mono</family>
+              <pointsize>32</pointsize>
+              <bold>true</bold>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="FLabel" name="DiffLastLap_label">
             <property name="font">
              <font>
               <family>Fira Mono</family>
@@ -445,15 +473,15 @@
              </font>
             </property>
             <property name="text">
-             <string>0</string>
+             <string>00:00:00</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="FLabel" name="label_3">
+          <item row="2" column="0">
+           <widget class="FLabel" name="LapCount_label">
             <property name="font">
              <font>
               <family>Fira Mono</family>
@@ -462,7 +490,7 @@
              </font>
             </property>
             <property name="text">
-             <string>00:00:00</string>
+             <string>0</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
@@ -551,7 +579,7 @@
                  </font>
                 </property>
                 <property name="text">
-                 <string>kW</string>
+                 <string>kWh</string>
                 </property>
                </widget>
               </item>

From 5418ebbcda6751794a9d77e3f4132cd28430b77d Mon Sep 17 00:00:00 2001
From: Imeguras <imeguras@cock.li>
Date: Fri, 30 Aug 2024 19:36:12 +0100
Subject: [PATCH 2/2] Updated Interface

---
 src/mainwindow.ui | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 6c84801..03bcd15 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -437,30 +437,36 @@
          <layout class="QGridLayout" name="lap_layout">
           <item row="1" column="1">
            <widget class="QLabel" name="DiffBestLap_label">
-            <property name="text">
-             <string>00:00:00</string>
-            </property>
-			 <property name="font">
+            <property name="font">
              <font>
               <family>Fira Mono</family>
-              <pointsize>32</pointsize>
+              <pointsize>22</pointsize>
               <bold>true</bold>
              </font>
             </property>
+            <property name="text">
+             <string>+00:00.000</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
+            </property>
            </widget>
           </item>
-		   <item row="1" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="IgnitionTime_label">
-            <property name="text">
-             <string>00:00:00</string>
-            </property>
-			 <property name="font">
+            <property name="font">
              <font>
               <family>Fira Mono</family>
-              <pointsize>32</pointsize>
+              <pointsize>22</pointsize>
               <bold>true</bold>
              </font>
             </property>
+            <property name="text">
+             <string>00:00:00</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
+            </property>
            </widget>
           </item>
           <item row="2" column="1">
@@ -468,12 +474,12 @@
             <property name="font">
              <font>
               <family>Fira Mono</family>
-              <pointsize>32</pointsize>
+              <pointsize>22</pointsize>
               <bold>true</bold>
              </font>
             </property>
             <property name="text">
-             <string>00:00:00</string>
+             <string>-00:00.000</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
@@ -485,7 +491,7 @@
             <property name="font">
              <font>
               <family>Fira Mono</family>
-              <pointsize>32</pointsize>
+              <pointsize>22</pointsize>
               <bold>true</bold>
              </font>
             </property>