Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-29 01:08:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved display of Tor starting window

Browse source
This commit is contained in:
csoler 2017-12-26 20:42:25 +01:00
parent 355a0b42e9
commit 390af949a8
6 changed files with 152 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

38
retroshare-gui/src/TorControl/TorControlWindow.cpp
View file

@ -3,6 +3,7 @@
#include <QTimer>
#include <QFile>
#include <QTcpServer>
#include <QGraphicsDropShadowEffect>
#include <iostream>
@ -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<Tor::HiddenService*> 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()