From dc4d33d621dc2094d951b0768232361e62b9214a Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Mon, 13 Apr 2015 19:00:09 +0000
Subject: [PATCH] fixed server page: removed hidden node option from combo box.
 Added a label with correct tooltip

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/settings/ServerPage.cpp | 12 ++++++------
 retroshare-gui/src/gui/settings/ServerPage.ui  | 17 +++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index e51b51ca4..9cbddc1fc 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -145,14 +145,13 @@ void ServerPage::load()
 		return;
 	}
 
+	ui.netModeComboBox->show() ;
+	ui.hiddenMode_LB->hide() ;
+
 	/* set net mode */
 	int netIndex = 0;
 	switch(detail.netMode)
 	{
-		case RS_NETMODE_HIDDEN:
-			netIndex = 3;
-			ui.netModeComboBox->setEnabled(false);
-			break;
 		case RS_NETMODE_EXT:
 			netIndex = 2;
 			break;
@@ -467,8 +466,9 @@ void ServerPage::loadHiddenNode()
 	 */
 
 	// FIXED.
-	ui.netModeComboBox->setCurrentIndex(3);
-	ui.netModeComboBox->setEnabled(false);
+	//ui.netModeComboBox->setCurrentIndex(3);
+	ui.netModeComboBox->hide();
+	ui.hiddenMode_LB->show();
 
 	// CHANGE OPTIONS ON 
 	ui.discComboBox->removeItem(3);
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 93faeb24d..86ab2e4bf 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -43,11 +43,16 @@
              <string>Manually Forwarded Port</string>
             </property>
            </item>
-           <item>
-            <property name="text">
-             <string>Hidden Node</string>
-            </property>
-           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="hiddenMode_LB">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This Retroshare node is running in &amp;quot;Hidden Mode&amp;quot;. That means it can only be reached though the TOR network.&lt;/p&gt;&lt;p&gt;As such, some network options are disabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>[Hidden mode]</string>
+           </property>
           </widget>
          </item>
          <item>
@@ -56,7 +61,7 @@
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Minimum</enum>
+            <enum>QSizePolicy::MinimumExpanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>