Merge branch 'application-order'

This commit is contained in:
dries.k
2023-08-17 23:25:00 +02:00
parent bc4c83b71c
commit b4accedd61
8 changed files with 49 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'gotify_tray/gui/designs\widget_settings.ui'
#
# Created by: PyQt6 UI code generator 6.5.1
# Created by: PyQt6 UI code generator 6.5.2
#
# WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing.
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
class Ui_Dialog(object):
def setupUi(self, Dialog):
Dialog.setObjectName("Dialog")
Dialog.resize(415, 426)
Dialog.resize(415, 446)
self.gridLayout = QtWidgets.QGridLayout(Dialog)
self.gridLayout.setObjectName("gridLayout")
self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
@@ -73,6 +73,9 @@ class Ui_Dialog(object):
self.cb_locale = QtWidgets.QCheckBox(parent=self.groupBox_2)
self.cb_locale.setObjectName("cb_locale")
self.verticalLayout_2.addWidget(self.cb_locale)
self.cb_sort_applications = QtWidgets.QCheckBox(parent=self.groupBox_2)
self.cb_sort_applications.setObjectName("cb_sort_applications")
self.verticalLayout_2.addWidget(self.cb_sort_applications)
self.verticalLayout_4.addWidget(self.groupBox_2)
self.groupBox_server_info = QtWidgets.QGroupBox(parent=self.tab_general)
self.groupBox_server_info.setObjectName("groupBox_server_info")
@@ -254,6 +257,7 @@ class Ui_Dialog(object):
"8..10 -> high"))
self.cb_priority_colors.setText(_translate("Dialog", "Show message priority colors"))
self.cb_locale.setText(_translate("Dialog", "Display date in the system locale format"))
self.cb_sort_applications.setText(_translate("Dialog", "Sort the application list alphabetically (requires restart)"))
self.groupBox_server_info.setTitle(_translate("Dialog", "Server info"))
self.pb_change_server_info.setText(_translate("Dialog", "Change server info"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_general), _translate("Dialog", "General"))

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>415</width>
<height>426</height>
<height>446</height>
</rect>
</property>
<property name="windowTitle">
@@ -148,6 +148,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_sort_applications">
<property name="text">
<string>Sort the application list alphabetically (requires restart)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>