From 390af949a82c1c67f17baca9f70f951f197240b1 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Dec 2017 20:42:25 +0100 Subject: [PATCH] improved display of Tor starting window --- .../src/TorControl/TorControlWindow.cpp | 38 ++++- .../src/TorControl/TorControlWindow.h | 2 +- .../src/TorControl/TorControlWindow.ui | 154 +++++++++++++----- retroshare-gui/src/gui/icons.qrc | 1 + retroshare-gui/src/gui/icons/onion.png | Bin 0 -> 14776 bytes retroshare-gui/src/main.cpp | 18 +- 6 files changed, 152 insertions(+), 61 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/onion.png diff --git a/retroshare-gui/src/TorControl/TorControlWindow.cpp b/retroshare-gui/src/TorControl/TorControlWindow.cpp index 6d31b5a86..835c04f9f 100644 --- a/retroshare-gui/src/TorControl/TorControlWindow.cpp +++ b/retroshare-gui/src/TorControl/TorControlWindow.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -34,6 +35,19 @@ TorControlDialog::TorControlDialog(Tor::TorManager *tm,QWidget *parent) QObject::connect(timer,SIGNAL(timeout()),this,SLOT(showLog())) ; timer->start(500) ; + + // Hide some debug output for the released version +// torLog_TB->hide(); + torBootstrapStatus_LB->hide(); + label_2->hide(); + + setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint ); + + adjustSize(); + +// QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect(this); +// effect->setBlurRadius(30.0); +// setGraphicsEffect(effect); } void TorControlDialog::onIncomingConnection() @@ -66,7 +80,8 @@ void TorControlDialog::statusChanged() case Tor::TorControl::TorReady: torstatus_str = "Tor ready" ; break ; } - torStatus_LB->setText(torstatus_str + "(" + status_str + ")") ; + //torStatus_LB->setText(torstatus_str + "(" + status_str + ")") ; + torStatus_LB->setText(status_str) ; QVariantMap qvm = mTorManager->control()->bootstrapStatus(); QString bootstrapstatus_str ; @@ -79,23 +94,29 @@ void TorControlDialog::statusChanged() QList hidden_services = mTorManager->control()->hiddenServices(); if(hidden_services.empty()) - hiddenService_LB->setText(QString("None")) ; + { + hiddenServiceAddress_LB->setText(QString("[Not ready]")) ; + onionAddress_LB->setText(QString("[Not ready]")) ; + } else { QString hiddenservices_str ; for(auto it(hidden_services.begin());it!=hidden_services.end();++it) { - hiddenservices_str += (*it)->hostname(); + onionAddress_LB->setText((*it)->hostname()); for(auto it2((*it)->targets().begin());it2!=(*it)->targets().end();++it2) - hiddenservices_str += QString::number((*it2).servicePort) + ":" + (*it2).targetAddress.toString() + ":" + QString::number((*it2).targetPort) + " " ; + { + hiddenServiceAddress_LB->setText(QString::number((*it2).servicePort) + ":" + (*it2).targetAddress.toString() + ":" + QString::number((*it2).targetPort)); + break ; + } + break ; } - - hiddenService_LB->setText(hiddenservices_str) ; } showLog(); + adjustSize(); } void TorControlDialog::showLog() @@ -106,10 +127,9 @@ void TorControlDialog::showLog() for(QStringList::const_iterator it(logmsgs.begin());it!=logmsgs.end();++it) s += *it + "\n" ; - torLog_TB->setText(s) ; -// QCoreApplication::processEvents() ; +// torLog_TB->setText(s) ; -// std::cerr << s.toStdString() << std::endl; + std::cerr << s.toStdString() << std::endl; } TorControlDialog::TorStatus TorControlDialog::checkForTor() diff --git a/retroshare-gui/src/TorControl/TorControlWindow.h b/retroshare-gui/src/TorControl/TorControlWindow.h index ac70877b9..c7b6c024f 100644 --- a/retroshare-gui/src/TorControl/TorControlWindow.h +++ b/retroshare-gui/src/TorControl/TorControlWindow.h @@ -7,7 +7,7 @@ namespace Tor { class TorManager ; } -class TorControlDialog: public QDialog, public Ui::TorControlDialog +class TorControlDialog: public QWidget, public Ui::TorControlDialog { Q_OBJECT diff --git a/retroshare-gui/src/TorControl/TorControlWindow.ui b/retroshare-gui/src/TorControl/TorControlWindow.ui index 76985d0e3..7d5f3993a 100644 --- a/retroshare-gui/src/TorControl/TorControlWindow.ui +++ b/retroshare-gui/src/TorControl/TorControlWindow.ui @@ -1,70 +1,134 @@ TorControlDialog - + 0 0 - 739 - 489 + 600 + 188 + + + 0 + 0 + + Dialog - - - + + + + 75 + true + + + + Setting up Tor... + + + Qt::AlignCenter + + + + + + + - TextLabel + + + + :/icons/tor-logo.png + + + false - - - - Tor bootstrap status: - - - - - - - TextLabel - - - - - - - Hidden service: - - - - - - - Tor status: - - - - - - - TextLabel - - + + + + + + Tor status: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + TextLabel + + + + + + + TextLabel + + + + + + + Hidden service address: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Tor bootstrap status: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + TextLabel + + + + + + + Onion address: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + TextLabel + + + + - - - - + + + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 5fe788ba2..8fbbf5465 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -1,5 +1,6 @@ + icons/onion.png icons/svg/hidden.svg icons/svg/randomness.svg icons/svg/password.svg diff --git a/retroshare-gui/src/gui/icons/onion.png b/retroshare-gui/src/gui/icons/onion.png new file mode 100644 index 0000000000000000000000000000000000000000..256dc2403992029472d2d10f22c90e26629a5343 GIT binary patch literal 14776 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 rI3FK1zxm|`O)6f40QaxP* literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 036a702fe..3ce7ec2ec 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -313,8 +313,6 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); // #endif /* Start RetroShare */ - QSplashScreen splashScreen(QPixmap(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/); - QString sDefaultGXSIdToCreate = ""; switch (initResult) { case RS_INIT_OK: @@ -348,13 +346,13 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); sDefaultGXSIdToCreate = gd.getGXSNickname(); } - splashScreen.show(); + //splashScreen.show(); } break; case RS_INIT_HAVE_ACCOUNT: { - splashScreen.show(); - splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom); + //splashScreen.show(); + //splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom); RsPeerId preferredId; RsAccounts::GetPreferredAccountId(preferredId); @@ -394,7 +392,12 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); TorControlDialog tcd(torManager) ; tcd.show(); - while(tcd.checkForHiddenService() != 1+TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails. + while(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails. + { + QCoreApplication::processEvents(); + usleep(0.2*1000*1000) ; + } + for(uint32_t i=0;i<10;++i) // give some time (2 secs) to see what's going on { QCoreApplication::processEvents(); usleep(0.2*1000*1000) ; @@ -410,6 +413,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); } #endif + QSplashScreen splashScreen(QPixmap(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/); + + splashScreen.show(); splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom); /* stop Retroshare if startup fails */