Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Layout Changes #132

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Minor Layout Changes #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
081f104
Adjust positioning in mainwindow.ui (link)
Marcus5408 Feb 25, 2024
6399ebb
Adjust positioning in mainwindow.ui (home)
Marcus5408 Feb 25, 2024
5a1127b
Remove currentIndex property from mainwindow.ui
Marcus5408 Feb 25, 2024
4054308
Remove autogenerated mainwindow_ui.py
Marcus5408 Feb 26, 2024
cd954d5
Update Qt5 and Qt6 layout files
Marcus5408 Feb 26, 2024
5733823
Update label position in main window layout
Marcus5408 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 46 additions & 35 deletions client/layout/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
<property name="geometry">
<rect>
<x>40</x>
<y>190</y>
<width>511</width>
<height>211</height>
<y>180</y>
<width>521</width>
<height>221</height>
</rect>
</property>
<property name="title">
Expand All @@ -57,8 +57,8 @@
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>160</x>
<y>140</y>
<x>170</x>
<y>143</y>
<width>181</width>
<height>31</height>
</rect>
Expand All @@ -70,8 +70,8 @@
<widget class="QLineEdit" name="lineEdit">
<property name="geometry">
<rect>
<x>80</x>
<y>70</y>
<x>90</x>
<y>50</y>
<width>341</width>
<height>24</height>
</rect>
Expand All @@ -83,9 +83,9 @@
<widget class="QComboBox" name="comboBox">
<property name="geometry">
<rect>
<x>216</x>
<y>100</y>
<width>79</width>
<x>230</x>
<y>80</y>
<width>61</width>
<height>24</height>
</rect>
</property>
Expand Down Expand Up @@ -116,14 +116,13 @@
<property name="geometry">
<rect>
<x>130</x>
<y>420</y>
<y>430</y>
<width>331</width>
<height>71</height>
<height>61</height>
</rect>
</property>
<property name="text">
<string>
If you'd like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account.</string>
<string>If you'd like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down Expand Up @@ -174,7 +173,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<x>0</x>
<y>0</y>
<width>211</width>
<height>121</height>
<height>122</height>
</rect>
</property>
<property name="title">
Expand Down Expand Up @@ -210,14 +209,17 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>130</x>
<y>20</y>
<y>26</y>
<width>71</width>
<height>61</height>
<height>51</height>
</rect>
</property>
<property name="text">
<string>NSO-RPC</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
Expand All @@ -237,7 +239,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>0</x>
<y>121</y>
<y>122</y>
<width>211</width>
<height>41</height>
</rect>
Expand All @@ -248,10 +250,10 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>-1</x>
<y>3</y>
<x>0</x>
<y>0</y>
<width>211</width>
<height>41</height>
<height>40</height>
</rect>
</property>
<property name="text">
Expand All @@ -263,7 +265,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>0</x>
<y>161</y>
<y>162</y>
<width>211</width>
<height>41</height>
</rect>
Expand All @@ -277,7 +279,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<x>0</x>
<y>0</y>
<width>211</width>
<height>41</height>
<height>40</height>
</rect>
</property>
<property name="text">
Expand All @@ -289,7 +291,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>0</x>
<y>560</y>
<y>558</y>
<width>211</width>
<height>41</height>
</rect>
Expand All @@ -315,7 +317,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>0</x>
<y>520</y>
<y>518</y>
<width>211</width>
<height>41</height>
</rect>
Expand Down Expand Up @@ -353,7 +355,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<rect>
<x>20</x>
<y>150</y>
<width>351</width>
<width>350</width>
<height>121</height>
</rect>
</property>
Expand All @@ -364,14 +366,17 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="geometry">
<rect>
<x>120</x>
<y>15</y>
<y>20</y>
<width>221</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -411,19 +416,22 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<rect>
<x>110</x>
<y>120</y>
<width>171</width>
<width>170</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Currently Playing</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_11">
<property name="geometry">
<rect>
<x>30</x>
<y>10</y>
<x>35</x>
<y>12</y>
<width>91</width>
<height>91</height>
</rect>
Expand All @@ -444,6 +452,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
<widget class="QLabel" name="label_14">
<property name="geometry">
Expand All @@ -461,9 +472,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<widget class="QPushButton" name="pushButton_7">
<property name="geometry">
<rect>
<x>80</x>
<x>78</x>
<y>550</y>
<width>111</width>
<width>112</width>
<height>41</height>
</rect>
</property>
Expand All @@ -476,7 +487,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
<rect>
<x>200</x>
<y>550</y>
<width>111</width>
<width>112</width>
<height>41</height>
</rect>
</property>
Expand All @@ -490,9 +501,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an
</property>
<property name="geometry">
<rect>
<x>30</x>
<x>20</x>
<y>280</y>
<width>341</width>
<width>351</width>
<height>80</height>
</rect>
</property>
Expand Down
47 changes: 25 additions & 22 deletions client/layout/qt5_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ def setupUi(self, MainWindow):
self.label.setWordWrap(True)
self.label.setObjectName("label")
self.groupBox = QtWidgets.QGroupBox(self.link)
self.groupBox.setGeometry(QtCore.QRect(40, 190, 511, 211))
self.groupBox.setGeometry(QtCore.QRect(40, 180, 521, 221))
self.groupBox.setTitle("")
self.groupBox.setObjectName("groupBox")
self.pushButton = QtWidgets.QPushButton(self.groupBox)
self.pushButton.setGeometry(QtCore.QRect(160, 140, 181, 31))
self.pushButton.setGeometry(QtCore.QRect(170, 143, 181, 31))
self.pushButton.setObjectName("pushButton")
self.lineEdit = QtWidgets.QLineEdit(self.groupBox)
self.lineEdit.setGeometry(QtCore.QRect(80, 70, 341, 24))
self.lineEdit.setGeometry(QtCore.QRect(90, 50, 341, 24))
self.lineEdit.setObjectName("lineEdit")
self.comboBox = QtWidgets.QComboBox(self.groupBox)
self.comboBox.setGeometry(QtCore.QRect(216, 100, 79, 24))
self.comboBox.setGeometry(QtCore.QRect(230, 80, 61, 24))
self.comboBox.setObjectName("comboBox")
self.label_2 = QtWidgets.QLabel(self.link)
self.label_2.setGeometry(QtCore.QRect(100, 20, 391, 61))
Expand All @@ -46,7 +46,7 @@ def setupUi(self, MainWindow):
self.label_2.setAlignment(QtCore.Qt.AlignCenter)
self.label_2.setObjectName("label_2")
self.label_18 = QtWidgets.QLabel(self.link)
self.label_18.setGeometry(QtCore.QRect(130, 420, 331, 71))
self.label_18.setGeometry(QtCore.QRect(130, 430, 331, 61))
self.label_18.setAlignment(QtCore.Qt.AlignCenter)
self.label_18.setWordWrap(True)
self.label_18.setObjectName("label_18")
Expand All @@ -64,7 +64,7 @@ def setupUi(self, MainWindow):
self.groupBox_6.setTitle("")
self.groupBox_6.setObjectName("groupBox_6")
self.groupBox_2 = QtWidgets.QGroupBox(self.groupBox_6)
self.groupBox_2.setGeometry(QtCore.QRect(0, 0, 211, 121))
self.groupBox_2.setGeometry(QtCore.QRect(0, 0, 211, 122))
self.groupBox_2.setTitle("")
self.groupBox_2.setObjectName("groupBox_2")
self.label_3 = QtWidgets.QLabel(self.groupBox_2)
Expand All @@ -76,35 +76,36 @@ def setupUi(self, MainWindow):
self.label_4.setText("")
self.label_4.setObjectName("label_4")
self.label_5 = QtWidgets.QLabel(self.groupBox_2)
self.label_5.setGeometry(QtCore.QRect(130, 20, 71, 61))
self.label_5.setGeometry(QtCore.QRect(130, 26, 71, 51))
self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.label_5.setObjectName("label_5")
self.label_6 = QtWidgets.QLabel(self.groupBox_2)
self.label_6.setGeometry(QtCore.QRect(100, 24, 21, 21))
self.label_6.setText("")
self.label_6.setObjectName("label_6")
self.groupBox_3 = QtWidgets.QGroupBox(self.groupBox_6)
self.groupBox_3.setGeometry(QtCore.QRect(0, 121, 211, 41))
self.groupBox_3.setGeometry(QtCore.QRect(0, 122, 211, 41))
self.groupBox_3.setTitle("")
self.groupBox_3.setObjectName("groupBox_3")
self.pushButton_2 = QtWidgets.QPushButton(self.groupBox_3)
self.pushButton_2.setGeometry(QtCore.QRect(-1, 3, 211, 41))
self.pushButton_2.setGeometry(QtCore.QRect(0, 0, 211, 40))
self.pushButton_2.setObjectName("pushButton_2")
self.groupBox_5 = QtWidgets.QGroupBox(self.groupBox_6)
self.groupBox_5.setGeometry(QtCore.QRect(0, 161, 211, 41))
self.groupBox_5.setGeometry(QtCore.QRect(0, 162, 211, 41))
self.groupBox_5.setTitle("")
self.groupBox_5.setObjectName("groupBox_5")
self.pushButton_3 = QtWidgets.QPushButton(self.groupBox_5)
self.pushButton_3.setGeometry(QtCore.QRect(0, 0, 211, 41))
self.pushButton_3.setGeometry(QtCore.QRect(0, 0, 211, 40))
self.pushButton_3.setObjectName("pushButton_3")
self.groupBox_4 = QtWidgets.QGroupBox(self.groupBox_6)
self.groupBox_4.setGeometry(QtCore.QRect(0, 560, 211, 41))
self.groupBox_4.setGeometry(QtCore.QRect(0, 558, 211, 41))
self.groupBox_4.setTitle("")
self.groupBox_4.setObjectName("groupBox_4")
self.pushButton_5 = QtWidgets.QPushButton(self.groupBox_4)
self.pushButton_5.setGeometry(QtCore.QRect(0, 0, 211, 41))
self.pushButton_5.setObjectName("pushButton_5")
self.groupBox_8 = QtWidgets.QGroupBox(self.groupBox_6)
self.groupBox_8.setGeometry(QtCore.QRect(0, 520, 211, 41))
self.groupBox_8.setGeometry(QtCore.QRect(0, 518, 211, 41))
self.groupBox_8.setTitle("")
self.groupBox_8.setObjectName("groupBox_8")
self.pushButton_4 = QtWidgets.QPushButton(self.groupBox_8)
Expand All @@ -116,12 +117,13 @@ def setupUi(self, MainWindow):
self.page = QtWidgets.QWidget()
self.page.setObjectName("page")
self.groupBox_7 = QtWidgets.QGroupBox(self.page)
self.groupBox_7.setGeometry(QtCore.QRect(20, 150, 351, 121))
self.groupBox_7.setGeometry(QtCore.QRect(20, 150, 350, 121))
self.groupBox_7.setTitle("")
self.groupBox_7.setObjectName("groupBox_7")
self.label_7 = QtWidgets.QLabel(self.groupBox_7)
self.label_7.setGeometry(QtCore.QRect(120, 15, 221, 31))
self.label_7.setGeometry(QtCore.QRect(120, 20, 221, 31))
self.label_7.setText("")
self.label_7.setAlignment(QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft)
self.label_7.setWordWrap(True)
self.label_7.setObjectName("label_7")
self.label_8 = QtWidgets.QLabel(self.groupBox_7)
Expand All @@ -134,29 +136,31 @@ def setupUi(self, MainWindow):
self.label_10.setWordWrap(True)
self.label_10.setObjectName("label_10")
self.label_9 = QtWidgets.QLabel(self.page)
self.label_9.setGeometry(QtCore.QRect(110, 120, 171, 21))
self.label_9.setGeometry(QtCore.QRect(110, 120, 170, 21))
self.label_9.setAlignment(QtCore.Qt.AlignCenter)
self.label_9.setObjectName("label_9")
self.label_11 = QtWidgets.QLabel(self.page)
self.label_11.setGeometry(QtCore.QRect(30, 10, 91, 91))
self.label_11.setGeometry(QtCore.QRect(35, 12, 91, 91))
self.label_11.setText("")
self.label_11.setObjectName("label_11")
self.label_13 = QtWidgets.QLabel(self.page)
self.label_13.setGeometry(QtCore.QRect(140, 10, 211, 31))
self.label_13.setText("")
self.label_13.setAlignment(QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft)
self.label_13.setObjectName("label_13")
self.label_14 = QtWidgets.QLabel(self.page)
self.label_14.setGeometry(QtCore.QRect(140, 60, 231, 41))
self.label_14.setText("")
self.label_14.setObjectName("label_14")
self.pushButton_7 = QtWidgets.QPushButton(self.page)
self.pushButton_7.setGeometry(QtCore.QRect(80, 550, 111, 41))
self.pushButton_7.setGeometry(QtCore.QRect(78, 550, 112, 41))
self.pushButton_7.setObjectName("pushButton_7")
self.pushButton_8 = QtWidgets.QPushButton(self.page)
self.pushButton_8.setGeometry(QtCore.QRect(200, 550, 111, 41))
self.pushButton_8.setGeometry(QtCore.QRect(200, 550, 112, 41))
self.pushButton_8.setObjectName("pushButton_8")
self.label_20 = QtWidgets.QLabel(self.page)
self.label_20.setEnabled(True)
self.label_20.setGeometry(QtCore.QRect(30, 280, 341, 80))
self.label_20.setGeometry(QtCore.QRect(20, 280, 351, 80))
self.label_20.setAlignment(QtCore.Qt.AlignCenter)
self.label_20.setWordWrap(True)
self.label_20.setObjectName("label_20")
Expand Down Expand Up @@ -227,8 +231,7 @@ def retranslateUi(self, MainWindow):
self.pushButton.setText(_translate("MainWindow", "Log In"))
self.lineEdit.setPlaceholderText(_translate("MainWindow", "Paste the URL here!"))
self.label_2.setText(_translate("MainWindow", "Link an account"))
self.label_18.setText(_translate("MainWindow", "\n"
"If you\'d like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account."))
self.label_18.setText(_translate("MainWindow", "If you\'d like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account."))
self.label_22.setText(_translate("MainWindow", "Click here if your browser didn\'t open"))
self.label_5.setText(_translate("MainWindow", "NSO-RPC"))
self.pushButton_2.setText(_translate("MainWindow", "Profile"))
Expand Down
Loading