Merge pull request #389 from loathingKernel/next

Fix action button positions in QueueBaseWidgets
RareDevs · Feb 25, 2024 · 784fadb · 784fadb
2 parents 5b6df91 + c768b6a
commit 784fadb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 rare/resources/resources.py binary
+rare/resources/static_css/__init__.py binary
 rare/resources/stylesheets/ChildOfMetropolis/__init__.py binary
 rare/resources/stylesheets/RareStyle/__init__.py binary
diff --git a/rare/components/tabs/games/head_bar.py b/rare/components/tabs/games/head_bar.py
@@ -33,7 +33,7 @@ def __init__(self, parent=None):
             LibraryFilter.ALL: self.tr("All games"),
             LibraryFilter.INSTALLED: self.tr("Installed"),
             LibraryFilter.OFFLINE: self.tr("Offline"),
-            # int(LibraryFilter.HIDDEN): self.tr("Hidden"),
+            # LibraryFilter.HIDDEN: self.tr("Hidden"),
         }
         for data, text in filters.items():
             self.filter.addItem(text, data)

diff --git a/rare/ui/components/tabs/downloads/queue_base_widget.py b/rare/ui/components/tabs/downloads/queue_base_widget.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/queue_base_widget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -14,7 +14,7 @@
 class Ui_QueueBaseWidget(object):
     def setupUi(self, QueueBaseWidget):
         QueueBaseWidget.setObjectName("QueueBaseWidget")
-        QueueBaseWidget.resize(354, 72)
+        QueueBaseWidget.resize(380, 62)
         QueueBaseWidget.setWindowTitle("QueueBaseWidget")
         QueueBaseWidget.setFrameShape(QtWidgets.QFrame.StyledPanel)
         self.queue_base_layout = QtWidgets.QHBoxLayout(QueueBaseWidget)
@@ -59,7 +59,7 @@ def setupUi(self, QueueBaseWidget):
         self.queue_buttons_layout.addWidget(self.force_button)
         self.remove_button = QtWidgets.QPushButton(self.queue_buttons)
         self.remove_button.setObjectName("remove_button")
-        self.queue_buttons_layout.addWidget(self.remove_button, 0, QtCore.Qt.AlignTop)
+        self.queue_buttons_layout.addWidget(self.remove_button, 0, QtCore.Qt.AlignBottom)
         self.queue_base_layout.addWidget(self.queue_buttons)
         self.update_buttons = QtWidgets.QWidget(QueueBaseWidget)
         self.update_buttons.setObjectName("update_buttons")
@@ -68,10 +68,10 @@ def setupUi(self, QueueBaseWidget):
         self.update_buttons_layout.setObjectName("update_buttons_layout")
         self.update_button = QtWidgets.QPushButton(self.update_buttons)
         self.update_button.setObjectName("update_button")
-        self.update_buttons_layout.addWidget(self.update_button, 0, QtCore.Qt.AlignTop)
+        self.update_buttons_layout.addWidget(self.update_button)
         self.settings_button = QtWidgets.QPushButton(self.update_buttons)
         self.settings_button.setObjectName("settings_button")
-        self.update_buttons_layout.addWidget(self.settings_button, 0, QtCore.Qt.AlignTop)
+        self.update_buttons_layout.addWidget(self.settings_button, 0, QtCore.Qt.AlignBottom)
         self.queue_base_layout.addWidget(self.update_buttons)
         self.queue_base_layout.setStretch(0, 1)
 

diff --git a/rare/ui/components/tabs/downloads/queue_base_widget.ui b/rare/ui/components/tabs/downloads/queue_base_widget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
-    <height>72</height>
+    <width>380</width>
+    <height>62</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -104,7 +104,7 @@
         </property>
        </widget>
       </item>
-      <item alignment="Qt::AlignTop">
+      <item alignment="Qt::AlignBottom">
        <widget class="QPushButton" name="remove_button">
         <property name="text">
          <string>Remove from queue</string>
@@ -129,14 +129,14 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item alignment="Qt::AlignTop">
+      <item>
        <widget class="QPushButton" name="update_button">
         <property name="text">
          <string>Update game</string>
         </property>
        </widget>
       </item>
-      <item alignment="Qt::AlignTop">
+      <item alignment="Qt::AlignBottom">
        <widget class="QPushButton" name="settings_button">
         <property name="text">
          <string>Update with settings</string>