From dfe633255196ebbedcf92e483f4d022ef9a6e529 Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Sun, 30 Aug 2026 13:13:37 -0700
Subject: [PATCH] fixes

---
 .../widgets/settings_page/appearance_settings_page.h        | 6 +++---
 .../widgets/settings_page/general_settings_page.cpp         | 4 ++--
 .../interface/widgets/settings_page/general_settings_page.h | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
index 89e0d44fc..8db71ff8f 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
@@ -84,15 +84,15 @@ private:
 
     QGroupBox *themeGroupBox;
     QGroupBox *homeTabGroupBox;
+    QGroupBox *playmatGroupBox;
     QGroupBox *stylingGroupBox;
     QGroupBox *menuGroupBox;
     QGroupBox *printingsGroupBox;
     QGroupBox *cardsGroupBox;
     QGroupBox *cardLayoutGroupBox;
-    QGroupBox *handGroupBox;
-    QGroupBox *playmatGroupBox;
-    QGroupBox *tableGroupBox;
     QGroupBox *cardCountersGroupBox;
+    QGroupBox *handGroupBox;
+    QGroupBox *tableGroupBox;
 
 public:
     AppearanceSettingsPage();
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
index e59e98897..62b06fb60 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
@@ -478,7 +478,7 @@ void GeneralSettingsPage::retranslateUi()
     startupRoomLabel.setText(tr("Room:"));
     startupRoomNameEdit->setPlaceholderText(tr("Room name"));
 
-    if (SettingsCache::instance().getIsPortableBuild()) {
+    if (settings.getIsPortableBuild()) {
         pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)"));
     } else {
         pathsGroupBox->setTitle(tr("Paths"));
@@ -491,4 +491,4 @@ void GeneralSettingsPage::retranslateUi()
     customCardDatabasePathLabel.setText(tr("Custom database directory:"));
     tokenDatabasePathLabel.setText(tr("Token database:"));
     resetAllPathsButton->setText(tr("Reset all paths"));
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
index cc1a3e10b..e0c1a47bf 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
@@ -46,6 +46,7 @@ private:
     QComboBox languageBox;
     QLabel advertiseTranslationPageLabel;
 
+    QLabel updateReleaseChannelLabel;
     QComboBox updateReleaseChannelBox;
     QCheckBox startupUpdateCheckCheckBox;
     QCheckBox updateNotificationCheckBox;
@@ -57,8 +58,6 @@ private:
     QSpinBox cardUpdateCheckIntervalSpinBox;
     QLabel lastCardUpdateCheckDateLabel;
 
-    QLabel updateReleaseChannelLabel;
-
     QCheckBox showTipsOnStartup;
     QLabel startupTabLabel;
     QComboBox startupTabSelector;