Fixes for visState -> vs_disc & vs_dht.

Added RTT Gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-29 07:10:19 +00:00
parent 90aa57a0f0
commit ba157e4891
15 changed files with 644 additions and 134 deletions

View file

@ -50,15 +50,15 @@ AboutDialog::AboutDialog(QWidget* parent)
tWidget = NULL;
installAWidget();
QString title = tr("About RetroShare ");
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
std::string version;
if (rsDisc->getPeerVersion(rsPeers->getOwnId(), version))
{
QString version = QString::fromStdString(vit->second);
setWindowTitle(tr("About RetroShare %1").arg(version));
title += QString::fromStdString(version);
}
setWindowTitle(title);
#ifdef Q_OS_WIN
setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
@ -134,20 +134,20 @@ void AboutDialog::sl_levelChanged(int level) {
void AboutDialog::updateTitle() {
if (tWidget == NULL) {
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
{
QString version = QString::fromStdString(vit->second);
setWindowTitle(tr("About RetroShare %1").arg(version));
}
} else {
if (tWidget == NULL)
{
QString title = tr("About RetroShare ");
/* get libretroshare version */
std::string version;
if (rsDisc->getPeerVersion(rsPeers->getOwnId(), version))
{
title += QString::fromStdString(version);
}
setWindowTitle(title);
}
else
{
setWindowTitle(tr("Have fun ;-)"));
}
}
@ -183,18 +183,18 @@ AWidget::AWidget() {
QPainter p(&image);
p.setPen(Qt::lightGray);
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
QString title = tr("About RetroShare ");
/* get libretroshare version */
std::string version;
if (rsDisc->getPeerVersion(rsPeers->getOwnId(), version))
{
QString version = QString::fromStdString("RetroShare version : \n") + QString::fromStdString(vit->second);
p.drawText(QRect(10, 10, width()-10, 60), version);
QString versionq = QString::fromStdString("RetroShare version : \n") + QString::fromStdString(version);
p.drawText(QRect(10, 10, width()-10, 60), versionq);
}
p.end();
image1 = image2 = image;
setFixedSize(image1.size());