From 14bde0a23c7c882d6002b981be4b0f1fbbc9c8b3 Mon Sep 17 00:00:00 2001
From: loathingKernel <142770+loathingKernel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 16:00:40 +0200
Subject: [PATCH] WishlistWidget: re-order comboboxes to match the order in the
 library

* Move filter combobox at the beginning of the top panel and move the order
combobox after it to replicate the order in the library view.
---
 rare/components/tabs/store/wishlist.py    | 16 +++++------
 rare/ui/components/tabs/store/wishlist.py | 21 ++------------
 rare/ui/components/tabs/store/wishlist.ui | 35 +----------------------
 3 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/rare/components/tabs/store/wishlist.py b/rare/components/tabs/store/wishlist.py
index 04c12868..c2f1bd06 100644
--- a/rare/components/tabs/store/wishlist.py
+++ b/rare/components/tabs/store/wishlist.py
@@ -72,6 +72,14 @@ class WishlistWidget(QWidget, SideTabContents):
         self.wishlist_layout = FlowLayout()
         self.ui.container_layout.addLayout(self.wishlist_layout, stretch=1)
 
+        filters = {
+            WishlistFilter.NONE: self.tr("All items"),
+            WishlistFilter.DISCOUNT: self.tr("Discount"),
+        }
+        for data, text in filters.items():
+            self.ui.filter_combo.addItem(text, data)
+        self.ui.filter_combo.currentIndexChanged.connect(self.filter_wishlist)
+
         sortings = {
             WishlistOrder.NAME: self.tr("Name"),
             WishlistOrder.PRICE: self.tr("Price"),
@@ -82,14 +90,6 @@ class WishlistWidget(QWidget, SideTabContents):
             self.ui.order_combo.addItem(text, data)
         self.ui.order_combo.currentIndexChanged.connect(self.order_wishlist)
 
-        filters = {
-            WishlistFilter.NONE: self.tr("None"),
-            WishlistFilter.DISCOUNT: self.tr("Discount"),
-        }
-        for data, text in filters.items():
-            self.ui.filter_combo.addItem(text, data)
-        self.ui.filter_combo.currentIndexChanged.connect(self.filter_wishlist)
-
         self.ui.reload_button.setIcon(qta_icon("fa.refresh", color="white"))
         self.ui.reload_button.clicked.connect(self.update_wishlist)
 
diff --git a/rare/ui/components/tabs/store/wishlist.py b/rare/ui/components/tabs/store/wishlist.py
index ff93d8d5..a34293d8 100644
--- a/rare/ui/components/tabs/store/wishlist.py
+++ b/rare/ui/components/tabs/store/wishlist.py
@@ -20,14 +20,9 @@ class Ui_Wishlist(object):
         self.main_layout.setObjectName("main_layout")
         self.tool_layout = QtWidgets.QHBoxLayout()
         self.tool_layout.setObjectName("tool_layout")
-        self.order_label = QtWidgets.QLabel(Wishlist)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.order_label.sizePolicy().hasHeightForWidth())
-        self.order_label.setSizePolicy(sizePolicy)
-        self.order_label.setObjectName("order_label")
-        self.tool_layout.addWidget(self.order_label)
+        self.filter_combo = QtWidgets.QComboBox(Wishlist)
+        self.filter_combo.setObjectName("filter_combo")
+        self.tool_layout.addWidget(self.filter_combo)
         self.order_combo = QtWidgets.QComboBox(Wishlist)
         self.order_combo.setObjectName("order_combo")
         self.tool_layout.addWidget(self.order_combo)
@@ -36,14 +31,6 @@ class Ui_Wishlist(object):
         self.tool_layout.addWidget(self.reverse_check)
         spacerItem = QtWidgets.QSpacerItem(0, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.tool_layout.addItem(spacerItem)
-        self.filter_label = QtWidgets.QLabel(Wishlist)
-        self.filter_label.setObjectName("filter_label")
-        self.tool_layout.addWidget(self.filter_label)
-        self.filter_combo = QtWidgets.QComboBox(Wishlist)
-        self.filter_combo.setObjectName("filter_combo")
-        self.tool_layout.addWidget(self.filter_combo)
-        spacerItem1 = QtWidgets.QSpacerItem(0, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.tool_layout.addItem(spacerItem1)
         self.reload_button = QtWidgets.QPushButton(Wishlist)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -73,9 +60,7 @@ class Ui_Wishlist(object):
 
     def retranslateUi(self, Wishlist):
         _translate = QtCore.QCoreApplication.translate
-        self.order_label.setText(_translate("Wishlist", "Sort by"))
         self.reverse_check.setText(_translate("Wishlist", "Reverse"))
-        self.filter_label.setText(_translate("Wishlist", "Filter by"))
         self.no_games_label.setText(_translate("Wishlist", "No games matching your filter"))
 
 
diff --git a/rare/ui/components/tabs/store/wishlist.ui b/rare/ui/components/tabs/store/wishlist.ui
index 2a9e064e..d101e023 100644
--- a/rare/ui/components/tabs/store/wishlist.ui
+++ b/rare/ui/components/tabs/store/wishlist.ui
@@ -17,17 +17,7 @@
    <item>
     <layout class="QHBoxLayout" name="tool_layout">
      <item>
-      <widget class="QLabel" name="order_label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Sort by</string>
-       </property>
-      </widget>
+      <widget class="QComboBox" name="filter_combo"/>
      </item>
      <item>
       <widget class="QComboBox" name="order_combo"/>
@@ -52,29 +42,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QLabel" name="filter_label">
-       <property name="text">
-        <string>Filter by</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="filter_combo"/>
-     </item>
-     <item>
-      <spacer name="hspacer_right">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="reload_button">
        <property name="sizePolicy">