Skip to content

Commit

Permalink
Further UI sizing changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Rexeh committed Feb 12, 2024
1 parent a003b77 commit cab548f
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 84 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setupUi(self, Form):
Form.setMinimumSize(QSize(1100, 800))
self.layoutWidget = QWidget(Form)
self.layoutWidget.setObjectName("layoutWidget")
self.layoutWidget.setGeometry(QRect(0, 0, 1021, 601))
self.layoutWidget.setGeometry(QRect(0, 0, 1081, 791))
self.verticalLayout = QVBoxLayout(self.layoutWidget)
self.verticalLayout.setObjectName("verticalLayout")
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
Expand All @@ -63,7 +63,7 @@ def setupUi(self, Form):
self.tab_2.setObjectName("tab_2")
self.verticalLayoutWidget = QWidget(self.tab_2)
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.verticalLayoutWidget.setGeometry(QRect(10, 10, 1001, 521))
self.verticalLayoutWidget.setGeometry(QRect(10, 10, 1091, 521))
self.verticalLayout_4 = QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_4.setObjectName("verticalLayout_4")
self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
Expand Down
52 changes: 9 additions & 43 deletions joystick_diagrams/ui/mock_main/qt_designer/export_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
QLabel,
QPushButton,
QSizePolicy,
QSpacerItem,
QVBoxLayout,
QWidget,
)
Expand All @@ -33,23 +32,26 @@ def setupUi(self, Form):
sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
Form.setSizePolicy(sizePolicy)
Form.setMinimumSize(QSize(1100, 800))
Form.setMaximumSize(QSize(1100, 16777215))
font = QFont()
font.setFamilies(["MS Sans Serif"])
Form.setFont(font)
self.layoutWidget = QWidget(Form)
self.layoutWidget.setObjectName("layoutWidget")
self.layoutWidget.setGeometry(QRect(0, 0, 981, 621))
self.layoutWidget.setGeometry(QRect(0, 0, 1081, 621))
self.layoutWidget.setMaximumSize(QSize(1100, 16777215))
self.verticalLayout = QVBoxLayout(self.layoutWidget)
self.verticalLayout.setObjectName("verticalLayout")
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.label = QLabel(self.layoutWidget)
self.label.setObjectName("label")
self.label.setMaximumSize(QSize(16777215, 23))
self.label.setMaximumSize(QSize(1100, 23))

self.verticalLayout.addWidget(self.label)

self.line = QFrame(self.layoutWidget)
self.line.setObjectName("line")
self.line.setMaximumSize(QSize(1100, 16777215))
self.line.setFrameShape(QFrame.HLine)
self.line.setFrameShadow(QFrame.Sunken)

Expand All @@ -63,6 +65,7 @@ def setupUi(self, Form):
self.verticalLayout_4.setObjectName("verticalLayout_4")
self.label_3 = QLabel(self.layoutWidget)
self.label_3.setObjectName("label_3")
self.label_3.setMaximumSize(QSize(1100, 16777215))
font1 = QFont()
font1.setPointSize(10)
font1.setBold(True)
Expand All @@ -72,6 +75,7 @@ def setupUi(self, Form):

self.label_2 = QLabel(self.layoutWidget)
self.label_2.setObjectName("label_2")
self.label_2.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout_4.addWidget(self.label_2)

Expand All @@ -81,7 +85,7 @@ def setupUi(self, Form):
self.verticalLayout_5.setObjectName("verticalLayout_5")
self.pushButton = QPushButton(self.layoutWidget)
self.pushButton.setObjectName("pushButton")
self.pushButton.setMaximumSize(QSize(250, 16777215))
self.pushButton.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout_5.addWidget(self.pushButton)

Expand All @@ -98,38 +102,10 @@ def setupUi(self, Form):

self.horizontalLayout_3 = QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.horizontalSpacer = QSpacerItem(
40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum
)

self.horizontalLayout_3.addItem(self.horizontalSpacer)

self.horizontalLayout_4 = QHBoxLayout()
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
self.verticalLayout_6 = QVBoxLayout()
self.verticalLayout_6.setObjectName("verticalLayout_6")
self.label_4 = QLabel(self.layoutWidget)
self.label_4.setObjectName("label_4")
self.label_4.setFont(font1)

self.verticalLayout_6.addWidget(self.label_4)

self.label_5 = QLabel(self.layoutWidget)
self.label_5.setObjectName("label_5")

self.verticalLayout_6.addWidget(self.label_5)

self.pushButton_2 = QPushButton(self.layoutWidget)
self.pushButton_2.setObjectName("pushButton_2")
sizePolicy1 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
sizePolicy1.setHorizontalStretch(0)
sizePolicy1.setVerticalStretch(0)
sizePolicy1.setHeightForWidth(
self.pushButton_2.sizePolicy().hasHeightForWidth()
)
self.pushButton_2.setSizePolicy(sizePolicy1)

self.verticalLayout_6.addWidget(self.pushButton_2)

self.horizontalLayout_4.addLayout(self.verticalLayout_6)

Expand All @@ -139,6 +115,7 @@ def setupUi(self, Form):

self.ExportButton = QPushButton(self.layoutWidget)
self.ExportButton.setObjectName("ExportButton")
self.ExportButton.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout.addWidget(self.ExportButton)

Expand Down Expand Up @@ -166,17 +143,6 @@ def retranslateUi(self, Form):
)
)
self.pushButton.setText(QCoreApplication.translate("Form", "PushButton", None))
self.label_4.setText(
QCoreApplication.translate("Form", "Export Location", None)
)
self.label_5.setText(
QCoreApplication.translate(
"Form", "Where your diagrams will be exported", None
)
)
self.pushButton_2.setText(
QCoreApplication.translate("Form", "Sekect Folder", None)
)
self.ExportButton.setText(QCoreApplication.translate("Form", "Export", None))

# retranslateUi
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def setupUi(self, Form):
self.configureLink.sizePolicy().hasHeightForWidth()
)
self.configureLink.setSizePolicy(sizePolicy2)
self.configureLink.setMaximumSize(QSize(400, 16777215))
self.configureLink.setMaximumSize(QSize(500, 16777215))

self.horizontalLayout_2.addWidget(self.configureLink)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def setupUi(self, Form):
Form.setFont(font)
self.verticalLayoutWidget = QWidget(Form)
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.verticalLayoutWidget.setGeometry(QRect(0, 0, 1031, 653))
self.verticalLayoutWidget.setGeometry(QRect(0, 0, 1081, 791))
self.verticalLayout_2 = QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
Expand Down
4 changes: 2 additions & 2 deletions qt_ui/configure_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def setupUi(self, Form):
Form.setMinimumSize(QSize(1100, 800))
self.layoutWidget = QWidget(Form)
self.layoutWidget.setObjectName(u"layoutWidget")
self.layoutWidget.setGeometry(QRect(0, 0, 1021, 601))
self.layoutWidget.setGeometry(QRect(0, 0, 1081, 791))
self.verticalLayout = QVBoxLayout(self.layoutWidget)
self.verticalLayout.setObjectName(u"verticalLayout")
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
Expand All @@ -55,7 +55,7 @@ def setupUi(self, Form):
self.tab_2.setObjectName(u"tab_2")
self.verticalLayoutWidget = QWidget(self.tab_2)
self.verticalLayoutWidget.setObjectName(u"verticalLayoutWidget")
self.verticalLayoutWidget.setGeometry(QRect(10, 10, 1001, 521))
self.verticalLayoutWidget.setGeometry(QRect(10, 10, 1091, 521))
self.verticalLayout_4 = QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_4.setObjectName(u"verticalLayout_4")
self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
Expand Down
43 changes: 10 additions & 33 deletions qt_ui/export_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PySide6.QtWidgets import (QApplication, QFrame, QHBoxLayout, QLabel,
QPushButton, QSizePolicy, QSpacerItem, QVBoxLayout,
QWidget)
QPushButton, QSizePolicy, QVBoxLayout, QWidget)

class Ui_Form(object):
def setupUi(self, Form):
Expand All @@ -30,23 +29,26 @@ def setupUi(self, Form):
sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
Form.setSizePolicy(sizePolicy)
Form.setMinimumSize(QSize(1100, 800))
Form.setMaximumSize(QSize(1100, 16777215))
font = QFont()
font.setFamilies([u"MS Sans Serif"])
Form.setFont(font)
self.layoutWidget = QWidget(Form)
self.layoutWidget.setObjectName(u"layoutWidget")
self.layoutWidget.setGeometry(QRect(0, 0, 981, 621))
self.layoutWidget.setGeometry(QRect(0, 0, 1081, 621))
self.layoutWidget.setMaximumSize(QSize(1100, 16777215))
self.verticalLayout = QVBoxLayout(self.layoutWidget)
self.verticalLayout.setObjectName(u"verticalLayout")
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.label = QLabel(self.layoutWidget)
self.label.setObjectName(u"label")
self.label.setMaximumSize(QSize(16777215, 23))
self.label.setMaximumSize(QSize(1100, 23))

self.verticalLayout.addWidget(self.label)

self.line = QFrame(self.layoutWidget)
self.line.setObjectName(u"line")
self.line.setMaximumSize(QSize(1100, 16777215))
self.line.setFrameShape(QFrame.HLine)
self.line.setFrameShadow(QFrame.Sunken)

Expand All @@ -60,6 +62,7 @@ def setupUi(self, Form):
self.verticalLayout_4.setObjectName(u"verticalLayout_4")
self.label_3 = QLabel(self.layoutWidget)
self.label_3.setObjectName(u"label_3")
self.label_3.setMaximumSize(QSize(1100, 16777215))
font1 = QFont()
font1.setPointSize(10)
font1.setBold(True)
Expand All @@ -69,6 +72,7 @@ def setupUi(self, Form):

self.label_2 = QLabel(self.layoutWidget)
self.label_2.setObjectName(u"label_2")
self.label_2.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout_4.addWidget(self.label_2)

Expand All @@ -79,7 +83,7 @@ def setupUi(self, Form):
self.verticalLayout_5.setObjectName(u"verticalLayout_5")
self.pushButton = QPushButton(self.layoutWidget)
self.pushButton.setObjectName(u"pushButton")
self.pushButton.setMaximumSize(QSize(250, 16777215))
self.pushButton.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout_5.addWidget(self.pushButton)

Expand All @@ -99,35 +103,10 @@ def setupUi(self, Form):

self.horizontalLayout_3 = QHBoxLayout()
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)

self.horizontalLayout_3.addItem(self.horizontalSpacer)

self.horizontalLayout_4 = QHBoxLayout()
self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
self.verticalLayout_6 = QVBoxLayout()
self.verticalLayout_6.setObjectName(u"verticalLayout_6")
self.label_4 = QLabel(self.layoutWidget)
self.label_4.setObjectName(u"label_4")
self.label_4.setFont(font1)

self.verticalLayout_6.addWidget(self.label_4)

self.label_5 = QLabel(self.layoutWidget)
self.label_5.setObjectName(u"label_5")

self.verticalLayout_6.addWidget(self.label_5)

self.pushButton_2 = QPushButton(self.layoutWidget)
self.pushButton_2.setObjectName(u"pushButton_2")
sizePolicy1 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
sizePolicy1.setHorizontalStretch(0)
sizePolicy1.setVerticalStretch(0)
sizePolicy1.setHeightForWidth(self.pushButton_2.sizePolicy().hasHeightForWidth())
self.pushButton_2.setSizePolicy(sizePolicy1)

self.verticalLayout_6.addWidget(self.pushButton_2)


self.horizontalLayout_4.addLayout(self.verticalLayout_6)

Expand All @@ -139,6 +118,7 @@ def setupUi(self, Form):

self.ExportButton = QPushButton(self.layoutWidget)
self.ExportButton.setObjectName(u"ExportButton")
self.ExportButton.setMaximumSize(QSize(1100, 16777215))

self.verticalLayout.addWidget(self.ExportButton)

Expand All @@ -154,8 +134,5 @@ def retranslateUi(self, Form):
self.label_3.setText(QCoreApplication.translate("Form", u"Device Templates", None))
self.label_2.setText(QCoreApplication.translate("Form", u"Only devices with templates will be exported", None))
self.pushButton.setText(QCoreApplication.translate("Form", u"PushButton", None))
self.label_4.setText(QCoreApplication.translate("Form", u"Export Location", None))
self.label_5.setText(QCoreApplication.translate("Form", u"Where your diagrams will be exported", None))
self.pushButton_2.setText(QCoreApplication.translate("Form", u"Sekect Folder", None))
self.ExportButton.setText(QCoreApplication.translate("Form", u"Export", None))
# retranslateUi
2 changes: 1 addition & 1 deletion qt_ui/plugin_settings_ui_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def setupUi(self, Form):
sizePolicy2.setVerticalStretch(0)
sizePolicy2.setHeightForWidth(self.configureLink.sizePolicy().hasHeightForWidth())
self.configureLink.setSizePolicy(sizePolicy2)
self.configureLink.setMaximumSize(QSize(400, 16777215))
self.configureLink.setMaximumSize(QSize(500, 16777215))

self.horizontalLayout_2.addWidget(self.configureLink)

Expand Down
2 changes: 1 addition & 1 deletion qt_ui/setup_page_widget_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def setupUi(self, Form):
Form.setFont(font)
self.verticalLayoutWidget = QWidget(Form)
self.verticalLayoutWidget.setObjectName(u"verticalLayoutWidget")
self.verticalLayoutWidget.setGeometry(QRect(0, 0, 1031, 653))
self.verticalLayoutWidget.setGeometry(QRect(0, 0, 1081, 791))
self.verticalLayout_2 = QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_2.setObjectName(u"verticalLayout_2")
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
Expand Down

0 comments on commit cab548f

Please sign in to comment.