Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-28 08:07:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed server page: removed hidden node option from combo box. Added a label with correct tooltip

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-13 19:00:09 +00:00
parent 4074efc9db
commit dc4d33d621
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -145,14 +145,13 @@ void ServerPage::load()
return; return;
} }
ui.netModeComboBox->show() ;
ui.hiddenMode_LB->hide() ;
/* set net mode */ /* set net mode */
int netIndex = 0; int netIndex = 0;
switch(detail.netMode) switch(detail.netMode)
{ {
case RS_NETMODE_HIDDEN:
netIndex = 3;
ui.netModeComboBox->setEnabled(false);
break;
case RS_NETMODE_EXT: case RS_NETMODE_EXT:
netIndex = 2; netIndex = 2;
break; break;
@ -467,8 +466,9 @@ void ServerPage::loadHiddenNode()
*/ */
// FIXED. // FIXED.
ui.netModeComboBox->setCurrentIndex(3); //ui.netModeComboBox->setCurrentIndex(3);
ui.netModeComboBox->setEnabled(false); ui.netModeComboBox->hide();
ui.hiddenMode_LB->show();
// CHANGE OPTIONS ON // CHANGE OPTIONS ON
ui.discComboBox->removeItem(3); ui.discComboBox->removeItem(3);

17
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -43,11 +43,16 @@
<string>Manually Forwarded Port</string> <string>Manually Forwarded Port</string>
</property> </property>
</item> </item>
<item> </widget>
<property name="text"> </item>
<string>Hidden Node</string> <item>
</property> <widget class="QLabel" name="hiddenMode_LB">
</item> <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> </widget>
</item> </item>
<item> <item>
@ -56,7 +61,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::MinimumExpanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>