Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1074 from RetroPooh/sett-nodiscocb

Browse Source 
removed show discovery checkbox from network options, it is in appear…
This commit is contained in:
csoler 2017-10-23 21:11:08 +02:00 committed by GitHub
commit e441caec49
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -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()
{
@ -381,7 +377,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)
@ -1063,9 +1058,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!)

1
retroshare-gui/src/gui/settings/ServerPage.h
View File

@ -87,7 +87,6 @@ private slots:
// server
void saveAddresses();
void saveRates();
void updateShowDiscStatusBar() ;
void toggleUPnP();
void toggleIpDetermination(bool) ;
void toggleTunnelConnection(bool) ;

13
retroshare-gui/src/gui/settings/ServerPage.ui
View File

@ -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"/>