diff --git a/client/layout/mainwindow.ui b/client/layout/mainwindow.ui index ef7d666..69814ae 100644 --- a/client/layout/mainwindow.ui +++ b/client/layout/mainwindow.ui @@ -46,9 +46,9 @@ 40 - 190 - 511 - 211 + 180 + 521 + 221 @@ -57,8 +57,8 @@ - 160 - 140 + 170 + 143 181 31 @@ -70,8 +70,8 @@ - 80 - 70 + 90 + 50 341 24 @@ -83,9 +83,9 @@ - 216 - 100 - 79 + 230 + 80 + 61 24 @@ -116,14 +116,13 @@ 130 - 420 + 430 331 - 71 + 61 - -If you'd like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account. + If you'd like to use this app for Discord Rich Presence purposes, please link an account that is friended with the target account. Qt::AlignCenter @@ -174,7 +173,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 0 211 - 121 + 122 @@ -210,14 +209,17 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 130 - 20 + 26 71 - 61 + 51 NSO-RPC + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -237,7 +239,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 - 121 + 122 211 41 @@ -248,10 +250,10 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an - -1 - 3 + 0 + 0 211 - 41 + 40 @@ -263,7 +265,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 - 161 + 162 211 41 @@ -277,7 +279,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 0 211 - 41 + 40 @@ -289,7 +291,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 - 560 + 558 211 41 @@ -315,7 +317,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 0 - 520 + 518 211 41 @@ -353,7 +355,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 20 150 - 351 + 350 121 @@ -364,7 +366,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 120 - 15 + 20 221 31 @@ -372,6 +374,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + true @@ -411,19 +416,22 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 110 120 - 171 + 170 21 Currently Playing + + Qt::AlignCenter + - 30 - 10 + 35 + 12 91 91 @@ -444,6 +452,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + @@ -461,9 +472,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an - 80 + 78 550 - 111 + 112 41 @@ -476,7 +487,7 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an 200 550 - 111 + 112 41 @@ -490,9 +501,9 @@ If you'd like to use this app for Discord Rich Presence purposes, please link an - 30 + 20 280 - 341 + 351 80 diff --git a/client/layout/qt5_layout.py b/client/layout/qt5_layout.py index eae8574..1f0fd69 100644 --- a/client/layout/qt5_layout.py +++ b/client/layout/qt5_layout.py @@ -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)) @@ -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") @@ -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) @@ -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) @@ -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) @@ -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") @@ -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")) diff --git a/client/layout/qt6_layout.py b/client/layout/qt6_layout.py index efd4265..b2b25e5 100644 --- a/client/layout/qt6_layout.py +++ b/client/layout/qt6_layout.py @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'mainwindow.ui' # -# Created by: PyQt6 UI code generator 6.6.1 +# Created by: PyQt6 UI code generator 6.6.0 # # 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. @@ -24,17 +24,17 @@ def setupUi(self, MainWindow): self.label.setWordWrap(True) self.label.setObjectName("label") self.groupBox = QtWidgets.QGroupBox(parent=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(parent=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(parent=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(parent=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(parent=self.link) self.label_2.setGeometry(QtCore.QRect(100, 20, 391, 61)) @@ -44,7 +44,7 @@ def setupUi(self, MainWindow): self.label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_2.setObjectName("label_2") self.label_18 = QtWidgets.QLabel(parent=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.AlignmentFlag.AlignCenter) self.label_18.setWordWrap(True) self.label_18.setObjectName("label_18") @@ -62,7 +62,7 @@ def setupUi(self, MainWindow): self.groupBox_6.setTitle("") self.groupBox_6.setObjectName("groupBox_6") self.groupBox_2 = QtWidgets.QGroupBox(parent=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(parent=self.groupBox_2) @@ -74,35 +74,36 @@ def setupUi(self, MainWindow): self.label_4.setText("") self.label_4.setObjectName("label_4") self.label_5 = QtWidgets.QLabel(parent=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.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) self.label_5.setObjectName("label_5") self.label_6 = QtWidgets.QLabel(parent=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(parent=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(parent=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(parent=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(parent=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(parent=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(parent=self.groupBox_4) self.pushButton_5.setGeometry(QtCore.QRect(0, 0, 211, 41)) self.pushButton_5.setObjectName("pushButton_5") self.groupBox_8 = QtWidgets.QGroupBox(parent=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(parent=self.groupBox_8) @@ -114,12 +115,13 @@ def setupUi(self, MainWindow): self.page = QtWidgets.QWidget() self.page.setObjectName("page") self.groupBox_7 = QtWidgets.QGroupBox(parent=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(parent=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.AlignmentFlag.AlignBottom|QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft) self.label_7.setWordWrap(True) self.label_7.setObjectName("label_7") self.label_8 = QtWidgets.QLabel(parent=self.groupBox_7) @@ -132,29 +134,31 @@ def setupUi(self, MainWindow): self.label_10.setWordWrap(True) self.label_10.setObjectName("label_10") self.label_9 = QtWidgets.QLabel(parent=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.AlignmentFlag.AlignCenter) self.label_9.setObjectName("label_9") self.label_11 = QtWidgets.QLabel(parent=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(parent=self.page) self.label_13.setGeometry(QtCore.QRect(140, 10, 211, 31)) self.label_13.setText("") + self.label_13.setAlignment(QtCore.Qt.AlignmentFlag.AlignBottom|QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft) self.label_13.setObjectName("label_13") self.label_14 = QtWidgets.QLabel(parent=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(parent=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(parent=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(parent=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.AlignmentFlag.AlignCenter) self.label_20.setWordWrap(True) self.label_20.setObjectName("label_20") @@ -225,8 +229,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"))