diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 68ff05c42..2aae87d09 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -150,7 +150,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
connect(ui.node_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels()));
connect(ui.reuse_existing_node_CB, SIGNAL(toggled(bool)), this, SLOT(updateCheckLabels()));
- connect(ui.cbUseBob, SIGNAL(clicked(bool)), this, SLOT(useBobChecked(bool)));;
+ connect(ui.cbUseBob, SIGNAL(clicked(bool)), this, SLOT(useI2pChecked(bool)));;
entropy_timer = new QTimer ;
entropy_timer->start(20) ;
@@ -341,9 +341,9 @@ void GenCertDialog::setupState()
ui.hiddenport_spinBox->setVisible(hidden_state && !tor_auto);
ui.cbUseBob->setVisible(hidden_state && !tor_auto);
-#ifndef RS_USE_I2P_BOB
+#ifndef RS_USE_I2P_SAM3
ui.cbUseBob->setDisabled(true);
- ui.cbUseBob->setToolTip(tr("BOB support is not available"));
+ ui.cbUseBob->setToolTip(tr("SAMv3 support is not available"));
#endif
if(!mAllFieldsOk)
@@ -440,10 +440,10 @@ void GenCertDialog::updateCheckLabels()
setupState();
}
-void GenCertDialog::useBobChecked(bool checked)
+void GenCertDialog::useI2pChecked(bool checked)
{
if (checked) {
- ui.hiddenaddr_input->setPlaceholderText(tr("I2P instance address with BOB enabled"));
+ ui.hiddenaddr_input->setPlaceholderText(tr("I2P instance address with SAMv3 enabled"));
ui.hiddenaddr_label->setText(tr("I2P instance address"));
ui.hiddenport_spinBox->setEnabled(false);
diff --git a/retroshare-gui/src/gui/GenCertDialog.h b/retroshare-gui/src/gui/GenCertDialog.h
index afd82e5f0..5bef44485 100644
--- a/retroshare-gui/src/gui/GenCertDialog.h
+++ b/retroshare-gui/src/gui/GenCertDialog.h
@@ -44,7 +44,7 @@ private slots:
void switchReuseExistingNode();
void grabMouse();
void updateCheckLabels();
- void useBobChecked(bool checked);
+ void useI2pChecked(bool checked);
private:
void initKeyList();
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 96f09cae2..482150beb 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -496,7 +496,7 @@
-
- Use BOB
+ Use I2P
@@ -764,8 +764,8 @@
importIdentity_PB
-
+
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 62928f701..ee71a9b44 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -184,10 +184,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
QObject::connect(ui.sbBobVarianceIn, SIGNAL(valueChanged(int)), this, SLOT(tunnelSettingsChanged(int)));
QObject::connect(ui.sbBobVarianceOut, SIGNAL(valueChanged(int)), this, SLOT(tunnelSettingsChanged(int)));
- // These two spin boxes are used for the same thing - keep them in sync!
- QObject::connect(ui.hiddenpage_proxyPort_i2p, SIGNAL(valueChanged(int)), this, SLOT(syncI2PProxyPortNormal(int)));
- QObject::connect(ui.hiddenpage_proxyPort_i2p_2, SIGNAL(valueChanged(int)), this, SLOT(syncI2PProxyPortSam(int)));
-
// These two line edits are used for the same thing - keep them in sync!
QObject::connect(ui.hiddenpage_proxyAddress_i2p, SIGNAL(textChanged(QString)), this, SLOT(syncI2PProxyAddrNormal(QString)));
QObject::connect(ui.hiddenpage_proxyAddress_i2p_2, SIGNAL(textChanged(QString)), this, SLOT(syncI2PProxyAddrSam(QString)));
@@ -1528,20 +1524,6 @@ void ServerPage::toggleSamAdvancedSettings(bool checked)
}
}
-void ServerPage::syncI2PProxyPortNormal(int i)
-{
- ui.hiddenpage_proxyPort_i2p_2->setValue(i);
-}
-
-void ServerPage::syncI2PProxyPortSam(int i)
-{
- ui.hiddenpage_proxyPort_i2p->setValue(i);
-
- // update port, not necessary for same, we just want to keep it consistent
- saveSam();
- rsAutoProxyMonitor::taskSync(autoProxyType::I2PSAM3, autoProxyTask::reloadConfig);
-}
-
void ServerPage::syncI2PProxyAddrNormal(QString t)
{
ui.hiddenpage_proxyAddress_i2p_2->setText(t);
@@ -1639,7 +1621,6 @@ void ServerPage::loadCommon()
whileBlocking(ui.hiddenpage_proxyAddress_i2p) -> setText(QString::fromStdString(proxyaddr));
whileBlocking(ui.hiddenpage_proxyAddress_i2p_2)->setText(QString::fromStdString(proxyaddr)); // this one is for sam tab
whileBlocking(ui.hiddenpage_proxyPort_i2p) -> setValue(proxyport);
- whileBlocking(ui.hiddenpage_proxyPort_i2p_2)->setValue(proxyport); // this one is for sam tab
// don't use whileBlocking here
ui.cb_enableBob->setChecked(mSamSettings.enable);
@@ -1727,7 +1708,7 @@ void ServerPage::updateStatusSam()
QString bobSimpleText = QString();
bobSimpleText.append(tr("RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3\n(id: %4)\n\n"
- "When changing options (e.g. port) use the buttons at the bottom to restart SAMv3.\n\n").
+ "When changing options use the buttons at the bottom to restart SAMv3.\n\n").
arg(mSamSettings.address.privateKey.empty() ? tr("client") : tr("server"),
ui.hiddenpage_proxyAddress_i2p_2->text(),
"7656",
diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h
index a4bacfa40..7d82f2190 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.h
+++ b/retroshare-gui/src/gui/settings/ServerPage.h
@@ -108,9 +108,6 @@ private slots:
void toggleSamAdvancedSettings(bool checked);
- void syncI2PProxyPortNormal(int i);
- void syncI2PProxyPortSam(int i);
-
void syncI2PProxyAddrNormal(QString);
void syncI2PProxyAddrSam(QString);
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 9d506bf38..6fad339c1 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -982,27 +982,17 @@ If you have issues connecting over Tor check the Tor logs too.
-
-
-
- I2P proxy port
+
+
+ Qt::Horizontal
-
-
- -
-
-
- false
+
+
+ 40
+ 20
+
-
- Not required for SAMv3
-
-
- 10
-
-
- 65535
-
-
+
-