Merge branch 'show_server' into dev

src/controller.cpp

@@ -30,6 +30,12 @@ Controller::Controller(MainWindow* main)
     this->main = main;
     this->ui = main->ui;
 
+    auto current_server = Settings::getInstance()->getSettings().server;
+    main->ui->current_server->setText(current_server);
+
+    auto stickyServer = Settings::getInstance()->getSettings().stickyServer;
+    main->ui->sticky_server->setText( stickyServer ? "True" : "False" );
+
     // Setup balances table model
     balancesTableModel = new BalancesTableModel(main->ui->balancesTable);
     main->ui->balancesTable->setModel(balancesTableModel);
@@ -37,6 +43,7 @@ Controller::Controller(MainWindow* main)
     // Setup transactions table model
     transactionsTableModel = new TxTableModel(ui->transactionsTable);
     main->ui->transactionsTable->setModel(transactionsTableModel);
+
     
     // Set up timer to refresh Price
     priceTimer = new QTimer(main);

src/mainwindow.ui

@@ -1682,6 +1682,7 @@
                </property>
               </widget>
              </item>
+
              <item row="9" column="0">
               <widget class="QLabel" name="label_37">
                <property name="text">
@@ -1689,6 +1690,51 @@
                </property>
               </widget>
              </item>
+
+             <item row="10" column="0">
+              <widget class="QLabel" name="current_server_label">
+               <property name="text">
+                <string>Current Server</string>
+               </property>
+              </widget>
+             </item>
+             <item row="10" column="1">
+              <widget class="QLabel" name="label_23">
+               <property name="text">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+              </widget>
+             </item>
+             <item row="10" column="2">
+              <widget class="QLabel" name="current_server">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+
+             <item row="11" column="0">
+              <widget class="QLabel" name="sticky_server_label">
+               <property name="text">
+                <string>Sticky Server</string>
+               </property>
+              </widget>
+             </item>
+             <item row="11" column="1">
+              <widget class="QLabel" name="label_23">
+               <property name="text">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;|&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+              </widget>
+             </item>
+             <item row="11" column="2">
+              <widget class="QLabel" name="sticky_server">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+
              <item row="3" column="1">
               <widget class="QLabel" name="label_13">
                <property name="text">