Add word wrap and lower buttons on UI

Once you see it, you can't unsee it.
MCMi460 · May 26, 2023 · ff50a37 · ff50a37
1 parent 3d1e38c
commit ff50a37
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/client/app.py b/client/app.py
@@ -229,7 +229,7 @@ def setLaunchMode(self,mode):
                     os.system('systemctl --user daemon-reload')
             elif platform.system() == "Darwin":
                 applicationPath = os.path.join(os.path.normpath(os.getcwd() + os.sep + os.pardir), "MacOS/NSO-RPC")
-                                
+
                 # Rebuild the path if we're running inside Downloads (This assumes that only Downloads can have /private/var/folders)
                 if applicationPath.startswith("/private"):
                     applicationPathTmp = applicationPath.split("/")
@@ -243,7 +243,7 @@ def setLaunchMode(self,mode):
                         '	<dict>',
                         '		<key>Label</key>',
                         '		<string>NSO-RPC.app</string>',
-                        '		<key>Program</key>',                       
+                        '		<key>Program</key>',
                         '		<string>'+applicationPath+'</string>',
                         '		<key>RunAtLoad</key>',
                         '		<true/>',
@@ -462,7 +462,7 @@ def e(event = None):
 
             # Show notice when you dont have an account selected in friends.
             self.label_20.setHidden(False)
-            self.label_21.setText('<a href=\"https://github.com/MCMi460/NSO-RPC#quickstart-guide\" style=\"color: cyan;\">NSO-RPC Quickstart Guide</a>')
+            self.label_21.setText('<a href="https://github.com/MCMi460/NSO-RPC#quickstart-guide" style="color: cyan;">NSO-RPC Quickstart Guide</a>')
         except:
             zone = '%Y/%m/%d'
             if client.api.userInfo['language'] == 'en-US':

diff --git a/client/layout/__init__.py b/client/layout/__init__.py
@@ -77,14 +77,14 @@ def setupUi(self, MainWindow):
         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, 120, 211, 41))
+        self.groupBox_3.setGeometry(QtCore.QRect(0, 121, 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.setObjectName("pushButton_2")
         self.groupBox_5 = QtWidgets.QGroupBox(self.groupBox_6)
-        self.groupBox_5.setGeometry(QtCore.QRect(0, 160, 211, 41))
+        self.groupBox_5.setGeometry(QtCore.QRect(0, 161, 211, 41))
         self.groupBox_5.setTitle("")
         self.groupBox_5.setObjectName("groupBox_5")
         self.pushButton_3 = QtWidgets.QPushButton(self.groupBox_5)
@@ -152,10 +152,11 @@ def setupUi(self, MainWindow):
         self.label_20.setEnabled(True)
         self.label_20.setGeometry(QtCore.QRect(30, 280, 341, 80))
         self.label_20.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_20.setWordWrap(True)
         self.label_20.setObjectName("label_20")
         self.label_21 = QtWidgets.QLabel(self.page)
         self.label_21.setEnabled(True)
-        self.label_21.setGeometry(QtCore.QRect(100, 340, 201, 20))
+        self.label_21.setGeometry(QtCore.QRect(100, 360, 201, 20))
         self.label_21.setText("")
         self.label_21.setTextFormat(QtCore.Qt.RichText)
         self.label_21.setAlignment(QtCore.Qt.AlignCenter)
@@ -171,7 +172,7 @@ def setupUi(self, MainWindow):
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 382, 599))
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 385, 599))
         self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
         self.scrollArea.setWidget(self.scrollAreaWidgetContents)
         self.stackedWidget_2.addWidget(self.page_2)

diff --git a/client/layout/mainwindow.ui b/client/layout/mainwindow.ui
@@ -215,7 +215,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>120</y>
+        <y>121</y>
         <width>211</width>
         <height>41</height>
        </rect>
@@ -241,7 +241,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>160</y>
+        <y>161</y>
         <width>211</width>
         <height>41</height>
        </rect>
@@ -481,6 +481,9 @@ Please note that NSO-RPC requires two different Nintendo accounts.</string>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
       </widget>
       <widget class="QLabel" name="label_21">
        <property name="enabled">
@@ -489,7 +492,7 @@ Please note that NSO-RPC requires two different Nintendo accounts.</string>
        <property name="geometry">
         <rect>
          <x>100</x>
-         <y>340</y>
+         <y>360</y>
          <width>201</width>
          <height>20</height>
         </rect>
@@ -532,7 +535,7 @@ Please note that NSO-RPC requires two different Nintendo accounts.</string>
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>382</width>
+          <width>385</width>
           <height>599</height>
          </rect>
         </property>