From 442844d3f1df44e66e22fffa71e95111d1cdb5e6 Mon Sep 17 00:00:00 2001
From: niakouu <chatware@proton.me>
Date: Sun, 15 Oct 2023 15:22:32 -0400
Subject: [PATCH 1/4] Add reset to default button

---
 src/tiled/preferencesdialog.cpp |  28 +++++++++
 src/tiled/preferencesdialog.h   |   2 +
 src/tiled/preferencesdialog.ui  | 104 +++++++++++++++++++++++++++++++-
 3 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/src/tiled/preferencesdialog.cpp b/src/tiled/preferencesdialog.cpp
index 426e68dec3..c9d1f6fb57 100644
--- a/src/tiled/preferencesdialog.cpp
+++ b/src/tiled/preferencesdialog.cpp
@@ -35,6 +35,8 @@
 #include <QDesktopServices>
 #include <QSortFilterProxyModel>
 
+#include <QDebug>
+
 using namespace Tiled;
 
 PreferencesDialog::PreferencesDialog(QWidget *parent)
@@ -176,6 +178,21 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
     });
 
     resize(sizeHint());
+
+    connect(mUi->defaultGeneral, &QPushButton::clicked, this, [=] {
+        this->restoreToDefault(QString::fromUtf8("(Export|Storage|Startup)/"));
+    });
+
+    connect(mUi->defaultInterface, &QPushButton::clicked, this, [=] {
+        this->restoreToDefault(QString::fromUtf8(
+            "Interface/(?!(ApplicationStyle|BaseColor|SelectionColor|UseCustomFont|CustomFont))"));
+        this->restoreToDefault(QString::fromUtf8("Install/(DisplayNews|CheckForUpdates)"));
+    });
+
+    connect(mUi->defaultTheme, &QPushButton::clicked, this, [=] {
+        this->restoreToDefault(QString::fromUtf8(
+            "Interface/(ApplicationStyle|BaseColor|SelectionColor|UseCustomFont|CustomFont)"));
+    });
 }
 
 PreferencesDialog::~PreferencesDialog()
@@ -294,4 +311,15 @@ void PreferencesDialog::styleComboChanged()
     mUi->selectionColorLabel->setEnabled(!systemStyle);
 }
 
+void PreferencesDialog::restoreToDefault(QString regexKey)
+{
+    Preferences *prefs = Preferences::instance();
+    QStringList generalKeys = prefs->allKeys().filter(QRegularExpression(regexKey));
+    for ( const auto& key : generalKeys)
+    {
+        prefs->remove(key);
+    }
+    this->fromPreferences();
+}
+
 #include "moc_preferencesdialog.cpp"
diff --git a/src/tiled/preferencesdialog.h b/src/tiled/preferencesdialog.h
index 7962cf6618..94189ce9c4 100644
--- a/src/tiled/preferencesdialog.h
+++ b/src/tiled/preferencesdialog.h
@@ -54,6 +54,8 @@ class PreferencesDialog : public QDialog
 
     void styleComboChanged();
 
+    void restoreToDefault(QString regexKey);
+
     Ui::PreferencesDialog *mUi;
     QStringList mLanguages;
 };
diff --git a/src/tiled/preferencesdialog.ui b/src/tiled/preferencesdialog.ui
index 27c83fbcd0..e345ab15b6 100644
--- a/src/tiled/preferencesdialog.ui
+++ b/src/tiled/preferencesdialog.ui
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -165,6 +165,45 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout_3" rowminimumheight="0,0,0">
+         <property name="sizeConstraint">
+          <enum>QLayout::SetMinimumSize</enum>
+         </property>
+         <item row="2" column="0">
+          <widget class="QPushButton" name="defaultGeneral">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Restore to default</string>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>16</width>
+             <height>16</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <spacer name="horizontalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="interfaceTab">
@@ -398,6 +437,36 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="1" column="0">
+          <widget class="QPushButton" name="defaultInterface">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Restore to default</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <spacer name="horizontalSpacer_7">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
@@ -555,6 +624,39 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout_7">
+         <item row="1" column="0">
+          <widget class="QPushButton" name="defaultTheme">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Restore to default</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <spacer name="horizontalSpacer_8">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="pluginsTab">

From 84384b165f0729f11bb8c30056f69f6f33084622 Mon Sep 17 00:00:00 2001
From: niakouu <chatware@proton.me>
Date: Sun, 15 Oct 2023 15:27:34 -0400
Subject: [PATCH 2/4] Fixed format

---
 src/tiled/preferencesdialog.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/tiled/preferencesdialog.cpp b/src/tiled/preferencesdialog.cpp
index c9d1f6fb57..4a9de93555 100644
--- a/src/tiled/preferencesdialog.cpp
+++ b/src/tiled/preferencesdialog.cpp
@@ -316,9 +316,8 @@ void PreferencesDialog::restoreToDefault(QString regexKey)
     Preferences *prefs = Preferences::instance();
     QStringList generalKeys = prefs->allKeys().filter(QRegularExpression(regexKey));
     for ( const auto& key : generalKeys)
-    {
         prefs->remove(key);
-    }
+
     this->fromPreferences();
 }
 

From 05ae823ab3eb79c04345ed8fc871a9e0a5754912 Mon Sep 17 00:00:00 2001
From: niakouu <chatware@proton.me>
Date: Sun, 15 Oct 2023 16:06:38 -0400
Subject: [PATCH 3/4] Fixed the changing font on the preferencesdialog ui

---
 src/tiled/preferencesdialog.cpp |  4 +++-
 src/tiled/preferencesdialog.ui  | 26 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/tiled/preferencesdialog.cpp b/src/tiled/preferencesdialog.cpp
index 4a9de93555..ccb5c1a496 100644
--- a/src/tiled/preferencesdialog.cpp
+++ b/src/tiled/preferencesdialog.cpp
@@ -187,11 +187,13 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
         this->restoreToDefault(QString::fromUtf8(
             "Interface/(?!(ApplicationStyle|BaseColor|SelectionColor|UseCustomFont|CustomFont))"));
         this->restoreToDefault(QString::fromUtf8("Install/(DisplayNews|CheckForUpdates)"));
+        this->restoreToDefault(QString::fromUtf8("AbstractObjectTool/"));
     });
 
-    connect(mUi->defaultTheme, &QPushButton::clicked, this, [=] {
+    connect(mUi->defaultTheme, &QPushButton::clicked, preferences, [preferences, this] {
         this->restoreToDefault(QString::fromUtf8(
             "Interface/(ApplicationStyle|BaseColor|SelectionColor|UseCustomFont|CustomFont)"));
+        mUi->fontComboBox->setCurrentFont(preferences->customFont());
     });
 }
 
diff --git a/src/tiled/preferencesdialog.ui b/src/tiled/preferencesdialog.ui
index e345ab15b6..61eaea1687 100644
--- a/src/tiled/preferencesdialog.ui
+++ b/src/tiled/preferencesdialog.ui
@@ -20,7 +20,13 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
+     </property>
+     <property name="documentMode">
+      <bool>false</bool>
+     </property>
+     <property name="movable">
+      <bool>false</bool>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -172,6 +178,12 @@
          </property>
          <item row="2" column="0">
           <widget class="QPushButton" name="defaultGeneral">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="minimumSize">
             <size>
              <width>120</width>
@@ -187,6 +199,12 @@
              <height>16</height>
             </size>
            </property>
+           <property name="autoRepeat">
+            <bool>false</bool>
+           </property>
+           <property name="autoExclusive">
+            <bool>false</bool>
+           </property>
           </widget>
          </item>
          <item row="2" column="1">
@@ -628,6 +646,12 @@
         <layout class="QGridLayout" name="gridLayout_7">
          <item row="1" column="0">
           <widget class="QPushButton" name="defaultTheme">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="minimumSize">
             <size>
              <width>120</width>

From c89125b303152641906d3162a0fa66f0685b8a3e Mon Sep 17 00:00:00 2001
From: niakouu <chatware@proton.me>
Date: Sun, 15 Oct 2023 17:57:08 -0400
Subject: [PATCH 4/4] Renamed the buttons from 'Restore to default' to 'Reset
 to default'

---
 src/tiled/preferencesdialog.cpp |  5 ++++-
 src/tiled/preferencesdialog.ui  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/tiled/preferencesdialog.cpp b/src/tiled/preferencesdialog.cpp
index ccb5c1a496..adeebc8be0 100644
--- a/src/tiled/preferencesdialog.cpp
+++ b/src/tiled/preferencesdialog.cpp
@@ -193,7 +193,10 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
     connect(mUi->defaultTheme, &QPushButton::clicked, preferences, [preferences, this] {
         this->restoreToDefault(QString::fromUtf8(
             "Interface/(ApplicationStyle|BaseColor|SelectionColor|UseCustomFont|CustomFont)"));
-        mUi->fontComboBox->setCurrentFont(preferences->customFont());
+
+        QFont customFont = preferences->customFont();
+        mUi->fontComboBox->setCurrentFont(customFont);
+        mUi->fontSize->setValue(customFont.pointSize());
     });
 }
 
diff --git a/src/tiled/preferencesdialog.ui b/src/tiled/preferencesdialog.ui
index 61eaea1687..5ae95abb21 100644
--- a/src/tiled/preferencesdialog.ui
+++ b/src/tiled/preferencesdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>544</width>
-    <height>595</height>
+    <height>626</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <property name="documentMode">
       <bool>false</bool>
@@ -191,7 +191,7 @@
             </size>
            </property>
            <property name="text">
-            <string>Restore to default</string>
+            <string>Reset to default</string>
            </property>
            <property name="iconSize">
             <size>
@@ -466,7 +466,7 @@
             </size>
            </property>
            <property name="text">
-            <string>Restore to default</string>
+            <string>Reset to default</string>
            </property>
           </widget>
          </item>
@@ -659,7 +659,7 @@
             </size>
            </property>
            <property name="text">
-            <string>Restore to default</string>
+            <string>Reset to default</string>
            </property>
           </widget>
          </item>