Add switch button to gui and set monspace font in logs

2 files changed, 44 insertions, 12 deletions

diff --git a/muddle/gui.py b/muddle/gui.py
index 6c533fc..5ea34f8 100644
--- a/muddle/gui.py
+++ b/muddle/gui.py
@@ -324,6 +324,12 @@ class MuddleWindow(QMainWindow):
         self.loghandler.newLogMessage.connect(self.onNewLogMessage)
         logging.getLogger("muddle").addHandler(self.loghandler)
 
+        ## Set font to be monospaced
+        f = QFont("_monospace")
+        f.setStyleHint(QFont.StyleHint.Monospace)
+        self.logsTab = self.findChild(QPlainTextEdit, "logsTab")
+        self.logsTab.setFont(f)
+
         # moodle tab
         ## set up proxymodel for moodle treeview
         self.moodleTreeModel = MoodleTreeModel()
@@ -430,7 +436,7 @@ class MuddleWindow(QMainWindow):
 
     @pyqtSlot(str)
     def onNewLogMessage(self, msg):
-        self.findChild(QPlainTextEdit, "logsTab").appendPlainText(msg)
+        self.logsTab.appendPlainText(msg)
 
     @pyqtSlot()
     def onDownloadPathEditEditingFinished(self):
diff --git a/muddle/muddle.ui b/muddle/muddle.ui
index f849116..9d5a307 100644
--- a/muddle/muddle.ui
+++ b/muddle/muddle.ui
@@ -150,7 +150,7 @@
        <property name="title">
         <string>Moodle</string>
        </property>
-       <layout class="QFormLayout" name="formLayout_2">
+       <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
          <widget class="QLabel" name="intanceLabel">
           <property name="text">
@@ -158,13 +158,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="instanceUrlEdit">
-          <property name="clearButtonEnabled">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="QLabel" name="tokenLabel">
           <property name="text">
@@ -172,6 +165,13 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="instanceUrlEdit">
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="1">
          <widget class="QLineEdit" name="tokenEdit">
           <property name="clearButtonEnabled">
@@ -179,7 +179,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="1" column="2">
          <widget class="QPushButton" name="requestTokenBtn">
           <property name="enabled">
            <bool>false</bool>
@@ -189,6 +189,13 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="2">
+         <widget class="QPushButton" name="switchLoginBtn">
+          <property name="text">
+           <string>SWITCH Login</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -197,7 +204,7 @@
        <property name="title">
         <string>Muddle</string>
        </property>
-       <layout class="QFormLayout" name="formLayout">
+       <layout class="QGridLayout" name="gridLayout_4">
         <item row="0" column="0">
          <widget class="QLabel" name="configLabel">
           <property name="text">
@@ -221,6 +228,9 @@
         </item>
         <item row="1" column="1">
          <widget class="QLineEdit" name="defaltDownloadPathEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="placeholderText">
            <string>Not set</string>
           </property>
@@ -231,6 +241,9 @@
         </item>
         <item row="2" column="1">
          <widget class="QCheckBox" name="alwaysStartGuiCheckBox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="text">
            <string>Always start GUI</string>
           </property>
@@ -239,6 +252,19 @@
        </layout>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </widget>
   </widget>
@@ -248,7 +274,7 @@
      <x>0</x>
      <y>0</y>
      <width>600</width>
-     <height>23</height>
+     <height>24</height>
     </rect>
    </property>
   </widget>