From ac656d08ab2c0139953265bc9b22885b8fc48b16 Mon Sep 17 00:00:00 2001
From: "dries.k" <k.dries@protonmail.com>
Date: Sun, 30 Jan 2022 19:34:13 +0100
Subject: [PATCH] reorder settings widget

---
 gotify_tray/gui/designs/widget_settings.py | 54 +++++++---------
 gotify_tray/gui/designs/widget_settings.ui | 75 ++++++++++------------
 2 files changed, 57 insertions(+), 72 deletions(-)

diff --git a/gotify_tray/gui/designs/widget_settings.py b/gotify_tray/gui/designs/widget_settings.py
index e1a91b5..c32e056 100644
--- a/gotify_tray/gui/designs/widget_settings.py
+++ b/gotify_tray/gui/designs/widget_settings.py
@@ -12,44 +12,39 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(375, 328)
+        Dialog.resize(375, 292)
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.groupBox_3 = QtWidgets.QGroupBox(Dialog)
-        self.groupBox_3.setObjectName("groupBox_3")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_3)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.cb_icons_notification = QtWidgets.QCheckBox(self.groupBox_3)
-        self.cb_icons_notification.setObjectName("cb_icons_notification")
-        self.verticalLayout_2.addWidget(self.cb_icons_notification)
-        self.verticalLayout.addWidget(self.groupBox_3)
         self.groupBox_5 = QtWidgets.QGroupBox(Dialog)
         self.groupBox_5.setObjectName("groupBox_5")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox_5)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.spin_priority = QtWidgets.QSpinBox(self.groupBox_5)
-        self.spin_priority.setMinimum(1)
-        self.spin_priority.setMaximum(10)
-        self.spin_priority.setProperty("value", 5)
-        self.spin_priority.setObjectName("spin_priority")
-        self.gridLayout_4.addWidget(self.spin_priority, 0, 1, 1, 1)
         spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_4.addItem(spacerItem, 0, 2, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout_4.addWidget(self.label_4, 0, 0, 1, 1)
+        self.gridLayout_4.addItem(spacerItem, 1, 2, 1, 1)
+        self.label_6 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_6.setObjectName("label_6")
+        self.gridLayout_4.addWidget(self.label_6, 2, 2, 1, 1)
+        self.label_5 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout_4.addWidget(self.label_5, 2, 0, 1, 1)
         self.spin_duration = QtWidgets.QSpinBox(self.groupBox_5)
         self.spin_duration.setMinimum(500)
         self.spin_duration.setMaximum(30000)
         self.spin_duration.setSingleStep(100)
         self.spin_duration.setObjectName("spin_duration")
-        self.gridLayout_4.addWidget(self.spin_duration, 1, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout_4.addWidget(self.label_5, 1, 0, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout_4.addWidget(self.label_6, 1, 2, 1, 1)
+        self.gridLayout_4.addWidget(self.spin_duration, 2, 1, 1, 1)
+        self.spin_priority = QtWidgets.QSpinBox(self.groupBox_5)
+        self.spin_priority.setMinimum(1)
+        self.spin_priority.setMaximum(10)
+        self.spin_priority.setProperty("value", 5)
+        self.spin_priority.setObjectName("spin_priority")
+        self.gridLayout_4.addWidget(self.spin_priority, 1, 1, 1, 1)
+        self.label_4 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_4.addWidget(self.label_4, 1, 0, 1, 1)
+        self.cb_icons_notification = QtWidgets.QCheckBox(self.groupBox_5)
+        self.cb_icons_notification.setObjectName("cb_icons_notification")
+        self.gridLayout_4.addWidget(self.cb_icons_notification, 0, 0, 1, 3)
         self.verticalLayout.addWidget(self.groupBox_5)
         self.groupBox_4 = QtWidgets.QGroupBox(Dialog)
         self.groupBox_4.setObjectName("groupBox_4")
@@ -97,12 +92,11 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Dialog"))
-        self.groupBox_3.setTitle(_translate("Dialog", "Icons"))
-        self.cb_icons_notification.setText(_translate("Dialog", "Show notification icons"))
         self.groupBox_5.setTitle(_translate("Dialog", "Notifications"))
-        self.label_4.setText(_translate("Dialog", "Minimum priority to show notifications:"))
-        self.label_5.setText(_translate("Dialog", "Notification duration"))
         self.label_6.setText(_translate("Dialog", "ms"))
+        self.label_5.setText(_translate("Dialog", "Notification duration"))
+        self.label_4.setText(_translate("Dialog", "Minimum priority to show notifications:"))
+        self.cb_icons_notification.setText(_translate("Dialog", "Show notification icons"))
         self.groupBox_4.setTitle(_translate("Dialog", "Server info"))
         self.pb_change_server_info.setText(_translate("Dialog", "Change server info"))
         self.groupBox_7.setTitle(_translate("Dialog", "Logging"))
diff --git a/gotify_tray/gui/designs/widget_settings.ui b/gotify_tray/gui/designs/widget_settings.ui
index 7f2af93..6f80242 100644
--- a/gotify_tray/gui/designs/widget_settings.ui
+++ b/gotify_tray/gui/designs/widget_settings.ui
@@ -7,49 +7,20 @@
     <x>0</x>
     <y>0</y>
     <width>375</width>
-    <height>328</height>
+    <height>292</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
-      <string>Icons</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="cb_icons_notification">
-        <property name="text">
-         <string>Show notification icons</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_5">
      <property name="title">
       <string>Notifications</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="spin_priority">
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>10</number>
-        </property>
-        <property name="value">
-         <number>5</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
+      <item row="1" column="2">
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -62,14 +33,21 @@
         </property>
        </spacer>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+      <item row="2" column="2">
+       <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Minimum priority to show notifications:</string>
+         <string>ms</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Notification duration</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
        <widget class="QSpinBox" name="spin_duration">
         <property name="minimum">
          <number>500</number>
@@ -82,17 +60,30 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Notification duration</string>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="spin_priority">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="label_6">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>ms</string>
+         <string>Minimum priority to show notifications:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="3">
+       <widget class="QCheckBox" name="cb_icons_notification">
+        <property name="text">
+         <string>Show notification icons</string>
         </property>
        </widget>
       </item>