fixed PurpleI2P#935

the-holy-church · Sep 8, 2017 · 9441c1c · 9441c1c
1 parent ef30d2d
commit 9441c1c
Show file tree

Hide file tree

Showing 10 changed files with 860 additions and 350 deletions.
diff --git a/qt/i2pd_qt/ClientTunnelPane.cpp b/qt/i2pd_qt/ClientTunnelPane.cpp
@@ -3,8 +3,8 @@
 #include "SignatureTypeComboboxFactory.h"
 #include "QVBoxLayout"
 
-ClientTunnelPane::ClientTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ClientTunnelConfig* tunconf):
-    TunnelPane(tunnelsPageUpdateListener, tunconf) {}
+ClientTunnelPane::ClientTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ClientTunnelConfig* tunconf, QWidget* wrongInputPane_, QLabel* wrongInputLabel_):
+    TunnelPane(tunnelsPageUpdateListener, tunconf, wrongInputPane_, wrongInputLabel_) {}
 
 void ClientTunnelPane::setGroupBoxTitle(const QString & title) {
     clientTunnelNameGroupBox->setTitle(title);

diff --git a/qt/i2pd_qt/ClientTunnelPane.h b/qt/i2pd_qt/ClientTunnelPane.h
@@ -14,7 +14,7 @@ class TunnelPane;
 class ClientTunnelPane : public TunnelPane {
     Q_OBJECT
 public:
-    ClientTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ClientTunnelConfig* tunconf);
+    ClientTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ClientTunnelConfig* tunconf, QWidget* wrongInputPane_, QLabel* wrongInputLabel_);
     virtual ~ClientTunnelPane(){}
     virtual ServerTunnelPane* asServerTunnelPane();
     virtual ClientTunnelPane* asClientTunnelPane();
@@ -68,6 +68,7 @@ protected slots:
     }
 protected:
     virtual bool applyDataFromUIToTunnelConfig() {
+        QString cannotSaveSettings = QApplication::tr("Cannot save settings.");
         bool ok=TunnelPane::applyDataFromUIToTunnelConfig();
         if(!ok)return false;
         ClientTunnelConfig* ctc=tunnelConfig->asClientTunnelConfig();
@@ -78,7 +79,11 @@ protected slots:
 
         auto portStr=portLineEdit->text();
         int portInt=portStr.toInt(&ok);
-        if(!ok)return false;
+
+        if(!ok){
+            highlightWrongInput(QApplication::tr("Bad port, must be int.")+" "+cannotSaveSettings,portLineEdit);
+            return false;
+        }
         ctc->setport(portInt);
 
         ctc->setkeys(keysLineEdit->text().toStdString());
@@ -87,7 +92,10 @@ protected slots:
 
         auto dportStr=destinationPortLineEdit->text();
         int dportInt=dportStr.toInt(&ok);
-        if(!ok)return false;
+        if(!ok){
+            highlightWrongInput(QApplication::tr("Bad destinationPort, must be int.")+" "+cannotSaveSettings,destinationPortLineEdit);
+            return false;
+        }
         ctc->setdestinationPort(dportInt);
 
         ctc->setsigType(readSigTypeComboboxUI(sigTypeComboBox));

diff --git a/qt/i2pd_qt/ServerTunnelPane.cpp b/qt/i2pd_qt/ServerTunnelPane.cpp
@@ -2,8 +2,8 @@
 #include "ClientContext.h"
 #include "SignatureTypeComboboxFactory.h"
 
-ServerTunnelPane::ServerTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ServerTunnelConfig* tunconf):
-    TunnelPane(tunnelsPageUpdateListener, tunconf) {}
+ServerTunnelPane::ServerTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ServerTunnelConfig* tunconf, QWidget* wrongInputPane_, QLabel* wrongInputLabel_):
+    TunnelPane(tunnelsPageUpdateListener, tunconf, wrongInputPane_, wrongInputLabel_) {}
 
 void ServerTunnelPane::setGroupBoxTitle(const QString & title) {
     serverTunnelNameGroupBox->setTitle(title);

diff --git a/qt/i2pd_qt/ServerTunnelPane.h b/qt/i2pd_qt/ServerTunnelPane.h
@@ -31,7 +31,7 @@ class ServerTunnelPane : public TunnelPane {
     Q_OBJECT
 
 public:
-    ServerTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ServerTunnelConfig* tunconf);
+    ServerTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ServerTunnelConfig* tunconf, QWidget* wrongInputPane_, QLabel* wrongInputLabel_);
     virtual ~ServerTunnelPane(){}
 
     virtual ServerTunnelPane* asServerTunnelPane();
@@ -119,6 +119,7 @@ protected slots:
 
 protected:
     virtual bool applyDataFromUIToTunnelConfig() {
+        QString cannotSaveSettings = QApplication::tr("Cannot save settings.");
         bool ok=TunnelPane::applyDataFromUIToTunnelConfig();
         if(!ok)return false;
         ServerTunnelConfig* stc=tunnelConfig->asServerTunnelConfig();
@@ -127,14 +128,20 @@ protected slots:
 
         auto portStr=portLineEdit->text();
         int portInt=portStr.toInt(&ok);
-        if(!ok)return false;
+        if(!ok){
+            highlightWrongInput(QApplication::tr("Bad port, must be int.")+" "+cannotSaveSettings,portLineEdit);
+            return false;
+        }
         stc->setport(portInt);
 
         stc->setkeys(keysLineEdit->text().toStdString());
 
         auto str=inPortLineEdit->text();
         int inPortInt=str.toInt(&ok);
-        if(!ok)return false;
+        if(!ok){
+            highlightWrongInput(QApplication::tr("Bad inPort, must be int.")+" "+cannotSaveSettings,inPortLineEdit);
+            return false;
+        }
         stc->setinPort(inPortInt);
 
         stc->setaccessList(accessListLineEdit->text().toStdString());
@@ -147,7 +154,10 @@ protected slots:
 
         auto mcStr=maxConnsLineEdit->text();
         uint32_t mcInt=(uint32_t)mcStr.toInt(&ok);
-        if(!ok)return false;
+        if(!ok){
+            highlightWrongInput(QApplication::tr("Bad maxConns, must be int.")+" "+cannotSaveSettings,maxConnsLineEdit);
+            return false;
+        }
         stc->setmaxConns(mcInt);
 
         stc->setgzip(gzipCheckBox->isChecked());

diff --git a/qt/i2pd_qt/TunnelConfig.cpp b/qt/i2pd_qt/TunnelConfig.cpp
@@ -6,24 +6,24 @@ void TunnelConfig::saveHeaderToStringStream(std::stringstream& out) {
 }
 
 void TunnelConfig::saveI2CPParametersToStringStream(std::stringstream& out) {
-		if (i2cpParameters.getInbound_length().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNEL_LENGTH)
-				out << i2p::client::I2CP_PARAM_INBOUND_TUNNEL_LENGTH << "="
-						<< i2cpParameters.getInbound_length().toStdString() << "\n";
-		if (i2cpParameters.getOutbound_length().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNEL_LENGTH)
-				out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH << "="
-						<< i2cpParameters.getOutbound_length().toStdString() << "\n";
-		if (i2cpParameters.getInbound_quantity().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNELS_QUANTITY)
-				out << i2p::client::I2CP_PARAM_INBOUND_TUNNELS_QUANTITY << "="
-						<< i2cpParameters.getInbound_quantity().toStdString() << "\n";
-		if (i2cpParameters.getOutbound_quantity().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNELS_QUANTITY)
-				out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY << "="
-						<< i2cpParameters.getOutbound_quantity().toStdString() << "\n";
-		if (i2cpParameters.getCrypto_tagsToSend().toUShort() != i2p::client::DEFAULT_TAGS_TO_SEND)
-				out << i2p::client::I2CP_PARAM_TAGS_TO_SEND << "="
-						<< i2cpParameters.getCrypto_tagsToSend().toStdString() << "\n";
-    if (!i2cpParameters.getExplicitPeers().isEmpty())
-				out << i2p::client::I2CP_PARAM_EXPLICIT_PEERS << "="
-						<< i2cpParameters.getExplicitPeers().toStdString() << "\n";
+    if (i2cpParameters.getInbound_length().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNEL_LENGTH)
+            out << i2p::client::I2CP_PARAM_INBOUND_TUNNEL_LENGTH << "="
+                    << i2cpParameters.getInbound_length().toStdString() << "\n";
+    if (i2cpParameters.getOutbound_length().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNEL_LENGTH)
+            out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH << "="
+                    << i2cpParameters.getOutbound_length().toStdString() << "\n";
+    if (i2cpParameters.getInbound_quantity().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNELS_QUANTITY)
+            out << i2p::client::I2CP_PARAM_INBOUND_TUNNELS_QUANTITY << "="
+                    << i2cpParameters.getInbound_quantity().toStdString() << "\n";
+    if (i2cpParameters.getOutbound_quantity().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNELS_QUANTITY)
+            out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY << "="
+                    << i2cpParameters.getOutbound_quantity().toStdString() << "\n";
+    if (i2cpParameters.getCrypto_tagsToSend().toUShort() != i2p::client::DEFAULT_TAGS_TO_SEND)
+            out << i2p::client::I2CP_PARAM_TAGS_TO_SEND << "="
+                    << i2cpParameters.getCrypto_tagsToSend().toStdString() << "\n";
+    if (!i2cpParameters.getExplicitPeers().isEmpty()) //todo #947
+            out << i2p::client::I2CP_PARAM_EXPLICIT_PEERS << "="
+                    << i2cpParameters.getExplicitPeers().toStdString() << "\n";
     out << "\n";
 }
 

diff --git a/qt/i2pd_qt/TunnelPane.cpp b/qt/i2pd_qt/TunnelPane.cpp
@@ -1,8 +1,10 @@
 #include "TunnelPane.h"
 #include "QMessageBox"
 
-TunnelPane::TunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener_, TunnelConfig* tunnelConfig_):
+TunnelPane::TunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener_, TunnelConfig* tunnelConfig_, QWidget* wrongInputPane_, QLabel* wrongInputLabel_):
     QObject(),
+    wrongInputPane(wrongInputPane_),
+    wrongInputLabel(wrongInputLabel_),
     tunnelConfig(tunnelConfig_),
     tunnelsPageUpdateListener(tunnelsPageUpdateListener_),
     gridLayoutWidget_2(nullptr) {}

diff --git a/qt/i2pd_qt/TunnelPane.h b/qt/i2pd_qt/TunnelPane.h
@@ -28,16 +28,24 @@ class TunnelPane : public QObject {
     Q_OBJECT
 
 public:
-    TunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener_, TunnelConfig* tunconf);
+    TunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener_, TunnelConfig* tunconf, QWidget* wrongInputPane_, QLabel* wrongInputLabel_);
     virtual ~TunnelPane(){}
 
     void deleteTunnelForm();
 
+    void hideWrongInputLabel() { wrongInputPane->setVisible(false); }
+    void highlightWrongInput(QString warningText, QWidget* controlWithWrongInput) {
+        wrongInputPane->setVisible(true);
+        wrongInputLabel->setText(warningText);
+        if(controlWithWrongInput)controlWithWrongInput->setFocus();
+    }
 
     virtual ServerTunnelPane* asServerTunnelPane()=0;
     virtual ClientTunnelPane* asClientTunnelPane()=0;
 
 protected:
+    QWidget * wrongInputPane;
+    QLabel* wrongInputLabel;
     TunnelConfig* tunnelConfig;
     widgetlockregistry widgetlocks;
     TunnelsPageUpdateListener* tunnelsPageUpdateListener;
@@ -87,6 +95,7 @@ public slots:
 
     //returns false when invalid data at UI
     virtual bool applyDataFromUIToTunnelConfig() {
+        hideWrongInputLabel();
         tunnelConfig->setName(nameLineEdit->text().toStdString());
         tunnelConfig->setType(readTunnelTypeComboboxData());
         I2CPParameters& i2cpParams=tunnelConfig->getI2cpParameters();

diff --git a/qt/i2pd_qt/mainwindow.cpp b/qt/i2pd_qt/mainwindow.cpp
@@ -82,6 +82,11 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->settingsContents->setAutoFillBackground(true);
     ui->settingsContents->setPalette(pal);
     */
+    QPalette pal(palette());
+    pal.setColor(QPalette::Background, Qt::red);
+    ui->wrongInputLabel->setAutoFillBackground(true);
+    ui->wrongInputLabel->setPalette(pal);
+    ui->wrongInputLabel->setVisible(false);
 
 #ifndef ANDROID
     createActions();
@@ -565,7 +570,7 @@ void MainWindow::initUInt16Box(ConfigOption option, QLineEdit* numberLineEdit, Q
     configItems.append(new UInt16StringItem(option, numberLineEdit, fieldNameTranslated));
 }
 void MainWindow::initStringBox(ConfigOption option, QLineEdit* lineEdit){
-    configItems.append(new BaseStringItem(option, lineEdit));
+    configItems.append(new BaseStringItem(option, lineEdit, QString()));
 }
 NonGUIOptionItem* MainWindow::initNonGUIOption(ConfigOption option) {
     NonGUIOptionItem * retValue;
@@ -623,6 +628,9 @@ void MainWindow::loadAllConfigs(){
 }
 /** returns false iff not valid items present and save was aborted */
 bool MainWindow::saveAllConfigs(){
+    QString cannotSaveSettings = QApplication::tr("Cannot save settings.");
+    ui->wrongInputLabel->setVisible(false);
+
     programOptionsWriterCurrentSection="";
     /*if(!logFileNameOption->lineEdit->text().trimmed().isEmpty())logOption->optionValue=boost::any(std::string("file"));
     else logOption->optionValue=boost::any(std::string("stdout"));*/
@@ -632,7 +640,10 @@ bool MainWindow::saveAllConfigs(){
     std::stringstream out;
     for(QList<MainWindowItem*>::iterator it = configItems.begin(); it!= configItems.end(); ++it) {
         MainWindowItem* item = *it;
-        if(!item->isValid()) return false;
+        if(!item->isValid()){
+            highlightWrongInput(QApplication::tr("Invalid value for")+" "+item->getConfigOption().section+"::"+item->getConfigOption().option+". "+item->getRequirementToBeValid()+" "+cannotSaveSettings, item->getWidgetToFocus());
+            return false;
+        }
     }
 
     for(QList<MainWindowItem*>::iterator it = configItems.begin(); it!= configItems.end(); ++it) {
@@ -688,27 +699,27 @@ void MainWindow::appendTunnelForms(std::string tunnelNameToFocus) {
         TunnelConfig* tunconf = it->second;
         ServerTunnelConfig* stc = tunconf->asServerTunnelConfig();
         if(stc){
-            ServerTunnelPane * tunnelPane=new ServerTunnelPane(&tunnelsPageUpdateListener, stc);
+            ServerTunnelPane * tunnelPane=new ServerTunnelPane(&tunnelsPageUpdateListener, stc, ui->wrongInputLabel, ui->wrongInputLabel);
             int h=tunnelPane->appendServerTunnelForm(stc, ui->tunnelsScrollAreaWidgetContents, tunnelPanes.size(), height);
             height+=h;
-            qDebug() << "tun.height:" << height << "sz:" <<  tunnelPanes.size();
+            //qDebug() << "tun.height:" << height << "sz:" <<  tunnelPanes.size();
             tunnelPanes.push_back(tunnelPane);
             if(name==tunnelNameToFocus)tunnelPane->getNameLineEdit()->setFocus();
             continue;
         }
         ClientTunnelConfig* ctc = tunconf->asClientTunnelConfig();
         if(ctc){
-            ClientTunnelPane * tunnelPane=new ClientTunnelPane(&tunnelsPageUpdateListener, ctc);
+            ClientTunnelPane * tunnelPane=new ClientTunnelPane(&tunnelsPageUpdateListener, ctc, ui->wrongInputLabel, ui->wrongInputLabel);
             int h=tunnelPane->appendClientTunnelForm(ctc, ui->tunnelsScrollAreaWidgetContents, tunnelPanes.size(), height);
             height+=h;
-            qDebug() << "tun.height:" << height << "sz:" <<  tunnelPanes.size();
+            //qDebug() << "tun.height:" << height << "sz:" <<  tunnelPanes.size();
             tunnelPanes.push_back(tunnelPane);
             if(name==tunnelNameToFocus)tunnelPane->getNameLineEdit()->setFocus();
             continue;
         }
         throw "unknown TunnelConfig subtype";
     }
-    qDebug() << "tun.setting height:" << height;
+    //qDebug() << "tun.setting height:" << height;
     ui->tunnelsScrollAreaWidgetContents->setGeometry(QRect(0, 0, 621, height));
     QList<QWidget*> childWidgets = ui->tunnelsScrollAreaWidgetContents->findChildren<QWidget*>();
     foreach(QWidget* widget, childWidgets)
@@ -833,3 +844,9 @@ void MainWindow::anchorClickedHandler(const QUrl & link) {
 void MainWindow::backClickedFromChild() {
     showStatusPage(statusPage);
 }
+
+void MainWindow::highlightWrongInput(QString warningText, QWidget* widgetToFocus) {
+    ui->wrongInputLabel->setVisible(true);
+    ui->wrongInputLabel->setText(warningText);
+    if(widgetToFocus)widgetToFocus->setFocus();
+}