From 93e383a8f8a345959ca3c456321e2850e340522f Mon Sep 17 00:00:00 2001
From: hugomflavio <hmflavio92@gmail.com>
Date: Fri, 22 Mar 2024 17:24:26 -0400
Subject: [PATCH 1/2] allow using enter to select item on main menu (closes
 #1685)

---
 client/page_main.ui | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/client/page_main.ui b/client/page_main.ui
index 0d6ba061eb..06f596caca 100644
--- a/client/page_main.ui
+++ b/client/page_main.ui
@@ -49,6 +49,9 @@
       <property name="text">
        <string>Start</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -69,6 +72,9 @@
       <property name="text">
        <string>Quit</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -92,6 +98,9 @@
       <property name="text">
        <string>Options</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -102,6 +111,9 @@
       <property name="text">
        <string>Load</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -112,6 +124,9 @@
       <property name="text">
        <string>Scenario</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -122,6 +137,9 @@
       <property name="text">
        <string>Connect</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -132,6 +150,9 @@
       <property name="text">
        <string>Mods</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>
@@ -142,6 +163,9 @@
       <property name="text">
        <string>Tutorial</string>
       </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
       <property name="main_pagebt" stdset="0">
        <bool>true</bool>
       </property>

From 7dff1d725b1e2c2aa77ac2d366864cb5ebe0cd1e Mon Sep 17 00:00:00 2001
From: hugomflavio <hmflavio92@gmail.com>
Date: Fri, 22 Mar 2024 17:33:26 -0400
Subject: [PATCH 2/2] refix #2224 together with this one to avoid conflict
 (closes #2224)

---
 client/page_main.ui | 106 ++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/client/page_main.ui b/client/page_main.ui
index 06f596caca..84908e1de0 100644
--- a/client/page_main.ui
+++ b/client/page_main.ui
@@ -44,10 +44,10 @@
     <property name="verticalSpacing">
      <number>5</number>
     </property>
-    <item row="2" column="0">
-     <widget class="QPushButton" name="bstart">
+    <item row="1" column="0">
+     <widget class="QPushButton" name="btut">
       <property name="text">
-       <string>Start</string>
+       <string>Tutorial</string>
       </property>
       <property name="autoDefault">
        <bool>true</bool>
@@ -57,20 +57,10 @@
       </property>
      </widget>
     </item>
-    <item row="10" column="2">
-     <widget class="QLabel" name="lversion">
-      <property name="text">
-       <string>lversion</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
-      </property>
-     </widget>
-    </item>
-    <item row="10" column="0">
-     <widget class="QPushButton" name="bquit">
+    <item row="2" column="0">
+     <widget class="QPushButton" name="bstart">
       <property name="text">
-       <string>Quit</string>
+       <string>Start</string>
       </property>
       <property name="autoDefault">
        <bool>true</bool>
@@ -80,23 +70,10 @@
       </property>
      </widget>
     </item>
-    <item row="10" column="1">
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="7" column="0">
-     <widget class="QPushButton" name="boptions">
+    <item row="3" column="0">
+     <widget class="QPushButton" name="bconnect">
       <property name="text">
-       <string>Options</string>
+       <string>Connect</string>
       </property>
       <property name="autoDefault">
        <bool>true</bool>
@@ -132,23 +109,23 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QPushButton" name="bconnect">
-      <property name="text">
-       <string>Connect</string>
-      </property>
-      <property name="autoDefault">
-       <bool>true</bool>
+    <item row="6" column="0">
+     <spacer name="verticalSpacer_2">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
       </property>
-      <property name="main_pagebt" stdset="0">
-       <bool>true</bool>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
       </property>
-     </widget>
+     </spacer>
     </item>
-    <item row="8" column="0">
-     <widget class="QPushButton" name="bmods">
+    <item row="7" column="0">
+     <widget class="QPushButton" name="boptions">
       <property name="text">
-       <string>Mods</string>
+       <string>Options</string>
       </property>
       <property name="autoDefault">
        <bool>true</bool>
@@ -158,10 +135,10 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QPushButton" name="btut">
+    <item row="8" column="0">
+     <widget class="QPushButton" name="bmods">
       <property name="text">
-       <string>Tutorial</string>
+       <string>Mods</string>
       </property>
       <property name="autoDefault">
        <bool>true</bool>
@@ -184,19 +161,42 @@
       </property>
      </spacer>
     </item>
-    <item row="6" column="0">
-     <spacer name="verticalSpacer_2">
+    <item row="10" column="0">
+     <widget class="QPushButton" name="bquit">
+      <property name="text">
+       <string>Quit</string>
+      </property>
+      <property name="autoDefault">
+       <bool>true</bool>
+      </property>
+      <property name="main_pagebt" stdset="0">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="10" column="1">
+     <spacer name="horizontalSpacer">
       <property name="orientation">
-       <enum>Qt::Vertical</enum>
+       <enum>Qt::Horizontal</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
-        <width>20</width>
-        <height>40</height>
+        <width>40</width>
+        <height>20</height>
        </size>
       </property>
      </spacer>
     </item>
+    <item row="10" column="2">
+     <widget class="QLabel" name="lversion">
+      <property name="text">
+       <string>lversion</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>