From 4a1ddccd8e0aa9bceedf80b5da52ac345865da46 Mon Sep 17 00:00:00 2001
From: RetroPooh <RetroPooh@users.noreply.github.com>
Date: Mon, 23 Oct 2017 12:24:56 +0300
Subject: [PATCH] removed show discovery checkbox from network options, it is
 in appearance now

---
 retroshare-gui/src/gui/settings/ServerPage.cpp |  8 --------
 retroshare-gui/src/gui/settings/ServerPage.h   |  1 -
 retroshare-gui/src/gui/settings/ServerPage.ui  | 13 ++-----------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index ae7411c4f..f0af32d27 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -152,7 +152,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
     connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) );
     connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) );
     connect( ui.testIncoming_PB, SIGNAL( clicked( ) ), this, SLOT( saveAndTestInProxy() ) );
-    connect( ui.showDiscStatusBar,SIGNAL(toggled(bool)),this,SLOT(updateShowDiscStatusBar())) ;
 
 #ifdef SERVER_DEBUG
     std::cerr << "ServerPage::ServerPage() called";
@@ -160,7 +159,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
 #endif
 
     connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
-    connect(ui.discComboBox,   SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
     connect(ui.localAddress,   SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
     connect(ui.extAddress,     SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
     connect(ui.dynDNS,         SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
@@ -277,8 +275,6 @@ void ServerPage::toggleTunnelConnection(bool b)
         //rsPeers->allowTunnelConnection(b) ;
 }
 
-void ServerPage::updateShowDiscStatusBar() { Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked()); }
-
 /** Loads the settings for this page */
 void ServerPage::load()
 {
@@ -380,7 +376,6 @@ void ServerPage::load()
         /* set DynDNS */
         whileBlocking(ui.dynDNS) -> setText(QString::fromStdString(detail.dyndns));
 
-        whileBlocking(ui.showDiscStatusBar)->setChecked(Settings->getStatusBarFlags() & STATUSBAR_DISC);
 
         whileBlocking(ui.ipAddressList)->clear();
         for(std::list<std::string>::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
@@ -1048,9 +1043,6 @@ void ServerPage::loadHiddenNode()
 
     whileBlocking(ui.extAddress)->setText(tr("Hidden - See Config"));
 
-    whileBlocking(ui.showDiscStatusBar)->setChecked(Settings->getStatusBarFlags() & STATUSBAR_DISC);
-    ui.showDiscStatusBar->hide() ;	// hidden because not functional at the moment.
-
     //ui._turtle_enabled_CB->setChecked(rsTurtle->enabled()) ;
 
     // show what we have in ipAddresses. (should be nothing!)
diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h
index 87f13400c..ce0e4baa4 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.h
+++ b/retroshare-gui/src/gui/settings/ServerPage.h
@@ -87,7 +87,6 @@ private slots:
     // server
     void saveAddresses();
     void saveRates();
-	void updateShowDiscStatusBar() ;
     void toggleUPnP();
     void toggleIpDetermination(bool) ;
     void toggleTunnelConnection(bool) ;
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 0adb576c6..b1d2a7706 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -482,13 +482,6 @@ These values don't take into account the Relays.</string>
         </widget>
        </item>
        <item row="3" column="0">
-        <widget class="QCheckBox" name="showDiscStatusBar">
-         <property name="text">
-          <string>Show Discovery information in statusbar</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
         <widget class="QCheckBox" name="allowIpDeterminationCB">
          <property name="toolTip">
           <string>If you uncheck this, RetroShare can only determine your IP 
@@ -504,7 +497,7 @@ behind a firewall or a VPN.</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="4" column="0">
         <widget class="QListWidget" name="IPServersLV">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
@@ -517,7 +510,7 @@ behind a firewall or a VPN.</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="5" column="0">
         <spacer name="tabNetConfVSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -531,7 +524,6 @@ behind a firewall or a VPN.</string>
         </spacer>
        </item>
       </layout>
-      <zorder>showDiscStatusBar</zorder>
       <zorder>allowIpDeterminationCB</zorder>
       <zorder>IPServersLV</zorder>
       <zorder>ipAddressList</zorder>
@@ -2097,7 +2089,6 @@ If you have issues connecting over Tor check the Tor logs too.</string>
   <tabstop>extAddress</tabstop>
   <tabstop>extPort</tabstop>
   <tabstop>dynDNS</tabstop>
-  <tabstop>showDiscStatusBar</tabstop>
  </tabstops>
  <resources>
   <include location="../images.qrc"/>