src/Configurator.cpp

@@ -53,10 +53,9 @@ Configurator::Configurator(QWidget *parent) :
         this->setConfig(Config::RPCBindIP, text);
     });
 
-    QString rpcPort = config()->get(Config::RPCBindPort).toString();
-    ui->lineRPCBindPort->setText(rpcPort == "0" ? "" : rpcPort);
+    ui->lineRPCBindPort->setText(config()->get(Config::RPCBindPort).toString());
     connect(ui->lineP2PBindPort, &QLineEdit::textChanged, [this](const QString &text){
-        this->setConfig(Config::RPCBindPort, text);
+        this->setConfig(Config::P2PBindPort, text);
     });
 
     ui->lineP2PBindIP->setText(config()->get(Config::P2PBindIP).toString());
@@ -64,8 +63,7 @@ Configurator::Configurator(QWidget *parent) :
         this->setConfig(Config::P2PBindIP, text);
     });
 
-    QString p2pPort = config()->get(Config::P2PBindPort).toString();
-    ui->lineP2PBindPort->setText(p2pPort == "0" ? "" : p2pPort);
+    ui->lineP2PBindPort->setText(config()->get(Config::P2PBindPort).toString());
     connect(ui->lineP2PBindPort, &QLineEdit::textChanged, [this](const QString &text){
         this->setConfig(Config::P2PBindPort, text);
     });

src/Configurator.ui

@@ -23,7 +23,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -307,23 +307,6 @@
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>lineMonerod</tabstop>
-  <tabstop>btn_BrowseMonerodPath</tabstop>
-  <tabstop>checkPruneBlockchain</tabstop>
-  <tabstop>lineDataDir</tabstop>
-  <tabstop>btn_BrowseDataDir</tabstop>
-  <tabstop>spinLimitSpeedDown</tabstop>
-  <tabstop>comboNetwork</tabstop>
-  <tabstop>comboLogLevel</tabstop>
-  <tabstop>lineRPCBindIP</tabstop>
-  <tabstop>lineRPCBindPort</tabstop>
-  <tabstop>lineP2PBindIP</tabstop>
-  <tabstop>lineP2PBindPort</tabstop>
-  <tabstop>checkNoZeroMQ</tabstop>
-  <tabstop>lineStartupFlags</tabstop>
- </tabstops>
  <resources/>
  <connections>
   <connection>

src/mainwindow.cpp

@@ -34,17 +34,11 @@ MainWindow::MainWindow(QWidget *parent) :
     daemonManager->setMonerodPath(monerodPath);
     connect(daemonManager, &DaemonManager::daemonConsoleUpdated, this, &MainWindow::writeLogLine);
 
-    connect(m_trayIcon, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason){
-        switch (reason) {
-            case QSystemTrayIcon::ActivationReason::Trigger:
-            case QSystemTrayIcon::ActivationReason::DoubleClick:
-            case QSystemTrayIcon::ActivationReason::MiddleClick:
-                this->showWindow();
-            default:
-                break;
-        }
+    connect(m_showWindow, &QAction::triggered, [this]{
+        this->show();
+        this->raise();
+        this->setFocus();
     });
-    connect(m_showWindow, &QAction::triggered, this, &MainWindow::showWindow);
 
     connect(ui->btn_Configure, &QPushButton::clicked, this, &MainWindow::showConfigurator);
     connect(ui->commandPrompt, &CommandLineEdit::commandExecuted, this, &MainWindow::sendCommand);
@@ -233,13 +227,6 @@ QString MainWindow::loadStylesheet(const QString &resource) {
     return data;
 }
 
-void MainWindow::showWindow() {
-    this->show();
-    this->raise();
-    this->activateWindow();
-    this->setFocus();
-}
-
 MainWindow::~MainWindow()
 {
     delete ui;

src/mainwindow.h

@@ -34,7 +34,6 @@ private:
     int getPort();
     QString defaultMonerodPath();
     QString loadStylesheet(const QString &resource);
-    void showWindow();
 
     Ui::MainWindow *ui;
 
@@ -43,6 +42,9 @@ private:
     QAction *m_stopDaemon;
     QAction *m_showWindow;
 
+
+
+
     DaemonManager *daemonManager;
 };