Merge pull request #1011 from hypnosis-i2p/openssl

updated qt to build and to reflect some core changes like log dest

qt/i2pd_qt/SignatureTypeComboboxFactory.h

@@ -70,13 +70,6 @@ public:
         addItem(signatureTypeCombobox, QApplication::translate("signatureTypeCombobox", "GOSTR3410_TC26_A_512_GOSTR3411_512", 0), SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512); //10
         if(selectedSigType==SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512){signatureTypeCombobox->setCurrentIndex(index);foundSelected=true;}
         ++index;
-        // TODO: remove later
-        addItem(signatureTypeCombobox, QApplication::translate("signatureTypeCombobox", "GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST", 0), SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST); //65281
-        if(selectedSigType==SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST){signatureTypeCombobox->setCurrentIndex(index);foundSelected=true;}
-        ++index;
-        addItem(signatureTypeCombobox, QApplication::translate("signatureTypeCombobox", "GOSTR3410_TC26_A_512_GOSTR3411_512_TEST", 0), SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST); //65282
-        if(selectedSigType==SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST){signatureTypeCombobox->setCurrentIndex(index);foundSelected=true;}
-        ++index;
         if(!foundSelected){
             addItem(signatureTypeCombobox, QString::number(selectedSigType), selectedSigType); //unknown sigtype
             signatureTypeCombobox->setCurrentIndex(index);

qt/i2pd_qt/mainwindow.cpp

@@ -155,8 +155,9 @@ MainWindow::MainWindow(QWidget *parent) :
 
     uiSettings->logDestinationComboBox->clear();
     uiSettings->logDestinationComboBox->insertItems(0, QStringList()
-     << QApplication::translate("MainWindow", "stdout", 0)
+        << QApplication::translate("MainWindow", "syslog", 0)
-     << QApplication::translate("MainWindow", "file", 0)
+        << QApplication::translate("MainWindow", "stdout", 0)
+        << QApplication::translate("MainWindow", "file", 0)
     );
     initLogDestinationCombobox(   OPTION("","log",[]{return "";}), uiSettings->logDestinationComboBox);
 
@@ -302,9 +303,9 @@ MainWindow::MainWindow(QWidget *parent) :
 }
 
 void MainWindow::logDestinationComboBoxValueChanged(const QString & text) {
-    bool stdout = text==QString("stdout");
+    bool fileEnabled = text==QString("file");
-    uiSettings->logFileLineEdit->setEnabled(!stdout);
+    uiSettings->logFileLineEdit->setEnabled(fileEnabled);
-    uiSettings->logFileBrowsePushButton->setEnabled(!stdout);
+    uiSettings->logFileBrowsePushButton->setEnabled(fileEnabled);
 }
 
 

qt/i2pd_qt/mainwindow.h

@@ -224,7 +224,6 @@ public:
     }
     virtual void saveToStringStream(std::stringstream& out){
         std::string logDest = comboBox->currentText().toStdString();
-        if(logDest==std::string("stdout"))logDest="";
         optionValue=logDest;
         MainWindowItem::saveToStringStream(out);
     }