Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 11:02:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "now retrieve version for gui directly from lib"

Browse source 
This reverts commit 0aa0d500c001730e05ffecd69cf3068d87138557.

The GUI and LIB could have two different version when compiling, so we
need to keep both version info.

Conflicts:

	retroshare-gui/src/version_detail.sh

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-08-13 15:11:08 +00:00
parent 0043af68c1
commit eef31ea805
4 changed files with 68 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -61,9 +61,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>
@ -123,14 +123,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create RshareSettings object */
_settings = new RshareSettings();
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));
setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion()));
// Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
@ -523,8 +516,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();