Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 03:36:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed display of version information.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-03-08 13:31:44 +00:00
parent 2664cf2f9a
commit 400d3179e8
9 changed files with 33 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

53
retroshare-gui/src/gui/AboutDialog.cpp
View file

@ -22,6 +22,7 @@
#include "AboutDialog.h"
#include "HelpDialog.h"
#include "rshare.h"
#include <retroshare/rsdisc.h>
#include <retroshare/rspeers.h>
@ -47,17 +48,9 @@ AboutDialog::AboutDialog(QWidget* parent)
frame->setLayout(l);
tWidget = NULL;
installAWidget();
QString title = tr("About RetroShare ");
/* get libretroshare version */
std::string version;
if (rsDisc->getPeerVersion(rsPeers->getOwnId(), version))
{
title += QString::fromStdString(version);
}
setWindowTitle(title);
updateTitle();
#ifdef Q_OS_WIN
setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
#endif
@ -130,22 +123,14 @@ void AboutDialog::sl_levelChanged(int level) {
emit si_levelChanged(tr("Level: %1").arg(level));
}
void AboutDialog::updateTitle() {
void AboutDialog::updateTitle()
{
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(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
}
else
{
setWindowTitle(tr("Have fun ;-)"));
}
}
@ -182,25 +167,17 @@ AWidget::AWidget() {
p.setPen(Qt::black);
QFont font = p.font();
font.setBold(true);
font.setPointSizeF(11);
font.setPointSizeF(font.pointSizeF() + 2);
p.setFont(font);
QString title = tr("About RetroShare ");
/* get libretroshare version */
std::string version;
if (rsDisc->getPeerVersion(rsPeers->getOwnId(), version))
{
QString versionq = QString::fromStdString("RetroShare version : \n") + QString::fromStdString(version);
p.drawText(QRect(10, 10, width()-10, 60), versionq);
}
/* Draw RetroShare version */
p.drawText(QRect(10, 10, width()-10, 60), QString("%1 : \n%2").arg(tr("RetroShare version"), Rshare::retroshareVersion(true)));
/* Draw Qt's version number */
p.drawText(QRect(10, 50, width()-10, 60), QString("Qt %1 : \n%2").arg(tr("version"), QT_VERSION_STR));
p.end();
image1 = image2 = image;
setFixedSize(image1.size());