Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
byemaxx committed Jul 25, 2024
2 parents da63be2 + 699aa8a commit 404b571
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions metax/gui/metax_gui/main_window.ui
Original file line number Diff line number Diff line change
Expand Up @@ -8083,8 +8083,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1016</width>
<height>185</height>
<width>775</width>
<height>102</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_69">
Expand Down Expand Up @@ -8773,14 +8773,14 @@
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>120</width>
<height>16777215</height>
</size>
</property>
Expand All @@ -8805,7 +8805,7 @@
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>120</width>
<height>16777215</height>
</size>
</property>
Expand Down
8 changes: 4 additions & 4 deletions metax/gui/metax_gui/ui_main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -4217,7 +4217,7 @@ def setupUi(self, metaX_main):
self.scrollArea_6.setWidgetResizable(True)
self.scrollArea_6.setObjectName("scrollArea_6")
self.scrollAreaWidgetContents_7 = QtWidgets.QWidget()
self.scrollAreaWidgetContents_7.setGeometry(QtCore.QRect(0, 0, 1016, 185))
self.scrollAreaWidgetContents_7.setGeometry(QtCore.QRect(0, 0, 775, 102))
self.scrollAreaWidgetContents_7.setObjectName("scrollAreaWidgetContents_7")
self.gridLayout_69 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_7)
self.gridLayout_69.setObjectName("gridLayout_69")
Expand Down Expand Up @@ -4621,12 +4621,12 @@ def setupUi(self, metaX_main):
self.gridLayout_6.addWidget(self.listWidget_tfnet_focus_list, 8, 1, 1, 3)
self.pushButton_tfnet_add_to_list = QtWidgets.QPushButton(self.tab_9)
self.pushButton_tfnet_add_to_list.setEnabled(False)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.pushButton_tfnet_add_to_list.sizePolicy().hasHeightForWidth())
self.pushButton_tfnet_add_to_list.setSizePolicy(sizePolicy)
self.pushButton_tfnet_add_to_list.setMaximumSize(QtCore.QSize(100, 16777215))
self.pushButton_tfnet_add_to_list.setMaximumSize(QtCore.QSize(120, 16777215))
self.pushButton_tfnet_add_to_list.setObjectName("pushButton_tfnet_add_to_list")
self.gridLayout_6.addWidget(self.pushButton_tfnet_add_to_list, 6, 3, 1, 1)
self.pushButton_tfnet_add_top = QtWidgets.QPushButton(self.tab_9)
Expand All @@ -4636,7 +4636,7 @@ def setupUi(self, metaX_main):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.pushButton_tfnet_add_top.sizePolicy().hasHeightForWidth())
self.pushButton_tfnet_add_top.setSizePolicy(sizePolicy)
self.pushButton_tfnet_add_top.setMaximumSize(QtCore.QSize(100, 16777215))
self.pushButton_tfnet_add_top.setMaximumSize(QtCore.QSize(120, 16777215))
self.pushButton_tfnet_add_top.setObjectName("pushButton_tfnet_add_top")
self.gridLayout_6.addWidget(self.pushButton_tfnet_add_top, 7, 3, 1, 1)
self.comboBox_tfnet_select_list = QtWidgets.QComboBox(self.tab_9)
Expand Down

0 comments on commit 404b571

Please sign in to comment.