reorder settings widgets

2022-04-04 18:13:12 +02:00
parent 55916d073a
commit d09431f6ad
2 changed files with 119 additions and 108 deletions
--- a/gotify_tray/gui/designs/widget_settings.py
+++ b/gotify_tray/gui/designs/widget_settings.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
    def setupUi(self, Dialog):
        Dialog.setObjectName("Dialog")
-        Dialog.resize(384, 391)
+        Dialog.resize(384, 274)
        self.gridLayout = QtWidgets.QGridLayout(Dialog)
        self.gridLayout.setObjectName("gridLayout")
        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
@@ -67,25 +67,8 @@ class Ui_Dialog(object):
        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
        self.gridLayout_3.addItem(spacerItem1, 0, 1, 1, 1)
        self.verticalLayout_4.addWidget(self.groupBox_4)
-        self.groupBox_7 = QtWidgets.QGroupBox(self.tab_general)
-        self.groupBox_7.setObjectName("groupBox_7")
-        self.gridLayout_6 = QtWidgets.QGridLayout(self.groupBox_7)
-        self.gridLayout_6.setObjectName("gridLayout_6")
-        self.label_7 = QtWidgets.QLabel(self.groupBox_7)
-        self.label_7.setObjectName("label_7")
-        self.gridLayout_6.addWidget(self.label_7, 0, 0, 1, 1)
-        self.combo_logging = QtWidgets.QComboBox(self.groupBox_7)
-        self.combo_logging.setObjectName("combo_logging")
-        self.gridLayout_6.addWidget(self.combo_logging, 0, 1, 1, 1)
-        self.pb_open_log = QtWidgets.QPushButton(self.groupBox_7)
-        self.pb_open_log.setMaximumSize(QtCore.QSize(30, 16777215))
-        self.pb_open_log.setObjectName("pb_open_log")
-        self.gridLayout_6.addWidget(self.pb_open_log, 0, 2, 1, 1)
-        spacerItem2 = QtWidgets.QSpacerItem(190, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_6.addItem(spacerItem2, 0, 3, 1, 1)
-        self.verticalLayout_4.addWidget(self.groupBox_7)
-        spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.verticalLayout_4.addItem(spacerItem3)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.verticalLayout_4.addItem(spacerItem2)
        self.tabWidget.addTab(self.tab_general, "")
        self.tab_fonts = QtWidgets.QWidget()
        self.tab_fonts.setObjectName("tab_fonts")
@@ -110,25 +93,47 @@ class Ui_Dialog(object):
        self.horizontalLayout.addWidget(self.pb_font_message_content)
        self.layout_fonts_message.addLayout(self.horizontalLayout)
        self.verticalLayout_5.addWidget(self.groupBox_2)
-        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.verticalLayout_5.addItem(spacerItem4)
+        spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.verticalLayout_5.addItem(spacerItem3)
        self.tabWidget.addTab(self.tab_fonts, "")
-        self.tab = QtWidgets.QWidget()
-        self.tab.setObjectName("tab")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.tab)
+        self.tab_advanced = QtWidgets.QWidget()
+        self.tab_advanced.setObjectName("tab_advanced")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.tab_advanced)
        self.verticalLayout.setObjectName("verticalLayout")
-        self.pb_export = QtWidgets.QPushButton(self.tab)
+        self.groupBox = QtWidgets.QGroupBox(self.tab_advanced)
+        self.groupBox.setObjectName("groupBox")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.pb_export = QtWidgets.QPushButton(self.groupBox)
        self.pb_export.setObjectName("pb_export")
-        self.verticalLayout.addWidget(self.pb_export)
-        self.pb_import = QtWidgets.QPushButton(self.tab)
+        self.verticalLayout_2.addWidget(self.pb_export)
+        self.pb_import = QtWidgets.QPushButton(self.groupBox)
        self.pb_import.setObjectName("pb_import")
-        self.verticalLayout.addWidget(self.pb_import)
-        self.pb_reset = QtWidgets.QPushButton(self.tab)
+        self.verticalLayout_2.addWidget(self.pb_import)
+        self.pb_reset = QtWidgets.QPushButton(self.groupBox)
        self.pb_reset.setObjectName("pb_reset")
-        self.verticalLayout.addWidget(self.pb_reset)
+        self.verticalLayout_2.addWidget(self.pb_reset)
+        self.verticalLayout.addWidget(self.groupBox)
+        self.groupBox_7 = QtWidgets.QGroupBox(self.tab_advanced)
+        self.groupBox_7.setObjectName("groupBox_7")
+        self.gridLayout_6 = QtWidgets.QGridLayout(self.groupBox_7)
+        self.gridLayout_6.setObjectName("gridLayout_6")
+        self.label_7 = QtWidgets.QLabel(self.groupBox_7)
+        self.label_7.setObjectName("label_7")
+        self.gridLayout_6.addWidget(self.label_7, 0, 0, 1, 1)
+        self.combo_logging = QtWidgets.QComboBox(self.groupBox_7)
+        self.combo_logging.setObjectName("combo_logging")
+        self.gridLayout_6.addWidget(self.combo_logging, 0, 1, 1, 1)
+        self.pb_open_log = QtWidgets.QPushButton(self.groupBox_7)
+        self.pb_open_log.setMaximumSize(QtCore.QSize(30, 16777215))
+        self.pb_open_log.setObjectName("pb_open_log")
+        self.gridLayout_6.addWidget(self.pb_open_log, 0, 2, 1, 1)
+        spacerItem4 = QtWidgets.QSpacerItem(190, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_6.addItem(spacerItem4, 0, 3, 1, 1)
+        self.verticalLayout.addWidget(self.groupBox_7)
        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
        self.verticalLayout.addItem(spacerItem5)
-        self.tabWidget.addTab(self.tab, "")
+        self.tabWidget.addTab(self.tab_advanced, "")
        self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)

        self.retranslateUi(Dialog)
@@ -140,9 +145,7 @@ class Ui_Dialog(object):
        Dialog.setTabOrder(self.spin_priority, self.spin_duration)
        Dialog.setTabOrder(self.spin_duration, self.cb_notify)
        Dialog.setTabOrder(self.cb_notify, self.pb_change_server_info)
-        Dialog.setTabOrder(self.pb_change_server_info, self.combo_logging)
-        Dialog.setTabOrder(self.combo_logging, self.pb_open_log)
-        Dialog.setTabOrder(self.pb_open_log, self.pb_font_message_title)
+        Dialog.setTabOrder(self.pb_change_server_info, self.pb_font_message_title)
        Dialog.setTabOrder(self.pb_font_message_title, self.pb_font_message_date)
        Dialog.setTabOrder(self.pb_font_message_date, self.pb_font_message_content)

@@ -156,20 +159,21 @@ class Ui_Dialog(object):
        self.cb_notify.setText(_translate("Dialog", "Show a notification for missed messages after reconnecting"))
        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"))
-        self.label_7.setText(_translate("Dialog", "Level"))
-        self.pb_open_log.setToolTip(_translate("Dialog", "Open logfile"))
-        self.pb_open_log.setText(_translate("Dialog", "..."))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_general), _translate("Dialog", "General"))
        self.groupBox_2.setTitle(_translate("Dialog", "Message"))
        self.pb_font_message_title.setText(_translate("Dialog", "Title"))
        self.pb_font_message_date.setText(_translate("Dialog", "Date"))
        self.pb_font_message_content.setText(_translate("Dialog", "Message"))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_fonts), _translate("Dialog", "Fonts"))
-        self.pb_export.setText(_translate("Dialog", "Export Settings"))
-        self.pb_import.setText(_translate("Dialog", "Import Settings"))
-        self.pb_reset.setText(_translate("Dialog", "Reset Settings"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("Dialog", "Advanced"))
+        self.groupBox.setTitle(_translate("Dialog", "Settings"))
+        self.pb_export.setText(_translate("Dialog", "Export"))
+        self.pb_import.setText(_translate("Dialog", "Import"))
+        self.pb_reset.setText(_translate("Dialog", "Reset"))
+        self.groupBox_7.setTitle(_translate("Dialog", "Logging"))
+        self.label_7.setText(_translate("Dialog", "Level"))
+        self.pb_open_log.setToolTip(_translate("Dialog", "Open logfile"))
+        self.pb_open_log.setText(_translate("Dialog", "..."))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_advanced), _translate("Dialog", "Advanced"))


 if __name__ == "__main__":
--- a/gotify_tray/gui/designs/widget_settings.ui
+++ b/gotify_tray/gui/designs/widget_settings.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>384</width>
-    <height>391</height>
+    <height>274</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -139,54 +139,6 @@
         </layout>
        </widget>
       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_7">
-         <property name="title">
-          <string>Logging</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_7">
-            <property name="text">
-             <string>Level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="combo_logging"/>
-          </item>
-          <item row="0" column="2">
-           <widget class="QPushButton" name="pb_open_log">
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>16777215</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Open logfile</string>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>190</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">
@@ -271,32 +223,89 @@
       </item>
      </layout>
     </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tab_advanced">
      <attribute name="title">
       <string>Advanced</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QPushButton" name="pb_export">
            <property name="text">
-          <string>Export Settings</string>
+             <string>Export</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="pb_import">
            <property name="text">
-          <string>Import Settings</string>
+             <string>Import</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="pb_reset">
            <property name="text">
-          <string>Reset Settings</string>
+             <string>Reset</string>
            </property>
           </widget>
          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_7">
+         <property name="title">
+          <string>Logging</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>Level</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="combo_logging"/>
+          </item>
+          <item row="0" column="2">
+           <widget class="QPushButton" name="pb_open_log">
+            <property name="maximumSize">
+             <size>
+              <width>30</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Open logfile</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3">
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>190</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
       <item>
        <spacer name="verticalSpacer_2">
         <property name="orientation">
@@ -322,8 +331,6 @@
  <tabstop>spin_duration</tabstop>
  <tabstop>cb_notify</tabstop>
  <tabstop>pb_change_server_info</tabstop>
-  <tabstop>combo_logging</tabstop>
-  <tabstop>pb_open_log</tabstop>
  <tabstop>pb_font_message_title</tabstop>
  <tabstop>pb_font_message_date</tabstop>
  <tabstop>pb_font_message_content</tabstop>