From ac4afaf2b09473edb4718303c225d97ce833a635 Mon Sep 17 00:00:00 2001 From: Mitchell Cash Date: Sun, 25 Sep 2016 11:04:12 +1000 Subject: [PATCH] I2P cleanup --- ion-qt.pro | 6 ++-- src/qt/bitcoingui.cpp | 2 +- src/qt/forms/i2poptionswidget.ui | 8 +---- ...howi2paddresses.ui => i2pshowaddresses.ui} | 3 -- src/qt/i2poptionswidget.cpp | 4 +-- ...wi2paddresses.cpp => i2pshowaddresses.cpp} | 4 +-- .../i2pshowaddresses.h} | 4 +-- src/qt/locale/ion_en.ts | 2 +- src/qt/showi2paddresses.h | 22 ------------ src/showi2paddresses.cpp | 34 ------------------- 10 files changed, 11 insertions(+), 78 deletions(-) rename src/qt/forms/{showi2paddresses.ui => i2pshowaddresses.ui} (98%) rename src/qt/{showi2paddresses.cpp => i2pshowaddresses.cpp} (94%) rename src/{showi2paddresses.h => qt/i2pshowaddresses.h} (97%) delete mode 100644 src/qt/showi2paddresses.h delete mode 100644 src/showi2paddresses.cpp diff --git a/ion-qt.pro b/ion-qt.pro index 2cacab3..e01a7f9 100644 --- a/ion-qt.pro +++ b/ion-qt.pro @@ -395,15 +395,15 @@ FORMS += src/qt/forms/coincontroldialog.ui \ contains(DEFINES, USE_NATIVE_I2P) { HEADERS += src/i2p.h \ src/i2psam.h \ - src/qt/showi2paddresses.h \ + src/qt/i2pshowaddresses.h \ src/qt/i2poptionswidget.h SOURCES += src/i2p.cpp \ src/i2psam.cpp \ - src/qt/showi2paddresses.cpp \ + src/qt/i2pshowaddresses.cpp \ src/qt/i2poptionswidget.cpp -FORMS += src/qt/forms/showi2paddresses.ui \ +FORMS += src/qt/forms/i2pshowaddresses.ui \ src/qt/forms/i2poptionswidget.ui } diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index ecd7f89..a5114d8 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -35,7 +35,7 @@ #include "masternodemanager.h" #ifdef USE_NATIVE_I2P -#include "showi2paddresses.h" +#include "i2pshowaddresses.h" #endif #ifdef Q_OS_MAC diff --git a/src/qt/forms/i2poptionswidget.ui b/src/qt/forms/i2poptionswidget.ui index d92f459..de119d2 100644 --- a/src/qt/forms/i2poptionswidget.ui +++ b/src/qt/forms/i2poptionswidget.ui @@ -77,9 +77,6 @@ 127.0.0.1 - - false - @@ -141,10 +138,7 @@ - ion-client - - - false + Ion-client diff --git a/src/qt/forms/showi2paddresses.ui b/src/qt/forms/i2pshowaddresses.ui similarity index 98% rename from src/qt/forms/showi2paddresses.ui rename to src/qt/forms/i2pshowaddresses.ui index 1c07aae..0c899d3 100644 --- a/src/qt/forms/showi2paddresses.ui +++ b/src/qt/forms/i2pshowaddresses.ui @@ -88,9 +88,6 @@ false - - false - true diff --git a/src/qt/i2poptionswidget.cpp b/src/qt/i2poptionswidget.cpp index e4919d7..f42dfba 100644 --- a/src/qt/i2poptionswidget.cpp +++ b/src/qt/i2poptionswidget.cpp @@ -3,7 +3,7 @@ #include "optionsmodel.h" #include "monitoreddatamapper.h" -#include "showi2paddresses.h" +#include "i2pshowaddresses.h" //#include "i2p.h" #include "util.h" #include "clientmodel.h" @@ -96,5 +96,3 @@ void I2POptionsWidget::GenerateNewI2PAddress() i2pCurrDialog.exec(); } } - - diff --git a/src/qt/showi2paddresses.cpp b/src/qt/i2pshowaddresses.cpp similarity index 94% rename from src/qt/showi2paddresses.cpp rename to src/qt/i2pshowaddresses.cpp index 7ccefa3..d3ccb8b 100644 --- a/src/qt/showi2paddresses.cpp +++ b/src/qt/i2pshowaddresses.cpp @@ -1,5 +1,5 @@ -#include "showi2paddresses.h" -#include "ui_showi2paddresses.h" +#include "i2pshowaddresses.h" +#include "ui_i2pshowaddresses.h" ShowI2PAddresses::ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent) : QDialog(parent), diff --git a/src/showi2paddresses.h b/src/qt/i2pshowaddresses.h similarity index 97% rename from src/showi2paddresses.h rename to src/qt/i2pshowaddresses.h index bcd21a1..0c6e65b 100644 --- a/src/showi2paddresses.h +++ b/src/qt/i2pshowaddresses.h @@ -10,11 +10,11 @@ class ShowI2PAddresses; class ShowI2PAddresses : public QDialog { Q_OBJECT - + public: explicit ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent = 0); ~ShowI2PAddresses(); - + private: Ui::ShowI2PAddresses *ui; }; diff --git a/src/qt/locale/ion_en.ts b/src/qt/locale/ion_en.ts index b9f0761..f4b5b2c 100644 --- a/src/qt/locale/ion_en.ts +++ b/src/qt/locale/ion_en.ts @@ -2667,7 +2667,7 @@ I2P-address... ShowI2PAddresses - + Dialog diff --git a/src/qt/showi2paddresses.h b/src/qt/showi2paddresses.h deleted file mode 100644 index bcd21a1..0000000 --- a/src/qt/showi2paddresses.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef SHOWI2PADDRESSES_H -#define SHOWI2PADDRESSES_H - -#include - -namespace Ui { -class ShowI2PAddresses; -} - -class ShowI2PAddresses : public QDialog -{ - Q_OBJECT - -public: - explicit ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent = 0); - ~ShowI2PAddresses(); - -private: - Ui::ShowI2PAddresses *ui; -}; - -#endif // SHOWI2PADDRESSES_H diff --git a/src/showi2paddresses.cpp b/src/showi2paddresses.cpp deleted file mode 100644 index 7ccefa3..0000000 --- a/src/showi2paddresses.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "showi2paddresses.h" -#include "ui_showi2paddresses.h" - -ShowI2PAddresses::ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent) : - QDialog(parent), - ui(new Ui::ShowI2PAddresses) -{ - ui->setupUi(this); - this->setWindowTitle(caption); - ui->pubText->setPlainText(pub); - ui->privText->setText("mydestination=" + priv); - ui->b32Line->setText(b32); - ui->label->setText(ui->label->text() + "\n" + configFileName); - - QObject::connect(ui->privButton, SIGNAL(clicked()), - ui->privText, SLOT(selectAll())); - QObject::connect(ui->privButton, SIGNAL(clicked()), - ui->privText, SLOT(copy())); - - QObject::connect(ui->pubButton, SIGNAL(clicked()), - ui->pubText, SLOT(selectAll())); - QObject::connect(ui->pubButton, SIGNAL(clicked()), - ui->pubText, SLOT(copy())); - - QObject::connect(ui->b32Button, SIGNAL(clicked()), - ui->b32Line, SLOT(selectAll())); - QObject::connect(ui->b32Button, SIGNAL(clicked()), - ui->b32Line, SLOT(copy())); -} - -ShowI2PAddresses::~ShowI2PAddresses() -{ - delete ui; -}