mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 19:12:28 -04:00
now retrieve version for gui directly from lib
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
cb5f22a5c6
commit
a78013b131
5 changed files with 11 additions and 115 deletions
|
@ -64,9 +64,9 @@
|
|||
#include "rsiface/rsiface.h"
|
||||
#include "rsiface/rspeers.h"
|
||||
#include "rsiface/rsfiles.h"
|
||||
#include "rsiface/rsdisc.h"
|
||||
|
||||
#include "gui/connect/ConnectFriendWizard.h"
|
||||
#include "util/rsversion.h"
|
||||
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
|
@ -130,7 +130,14 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
|||
/* Create RshareSettings object */
|
||||
_settings = new RshareSettings();
|
||||
|
||||
setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion()));
|
||||
QString 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()))) {
|
||||
version = QString::fromStdString(vit->second);
|
||||
}
|
||||
setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(version));
|
||||
|
||||
mSMPlayer = NULL;
|
||||
|
||||
|
@ -533,8 +540,8 @@ void MainWindow::createActions()
|
|||
*/
|
||||
void MainWindow::doQuit()
|
||||
{
|
||||
|
||||
if(!_settings->value(QString::fromUtf8("doQuit"), false).toBool())
|
||||
|
||||
if(!_settings->value(QString::fromUtf8("doQuit"), false).toBool())
|
||||
{
|
||||
QString queryWrn;
|
||||
queryWrn.clear();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue