added rsversion for MainWindow again its usefull to know on MainWindow Title which version im running.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-07-31 22:24:08 +00:00
parent 48b1cd0a0c
commit 0d33e14147
4 changed files with 73 additions and 2 deletions

View File

@ -190,6 +190,7 @@ HEADERS += rshare.h \
util/MouseEventFilter.h \ util/MouseEventFilter.h \
util/EventFilter.h \ util/EventFilter.h \
util/Widget.h \ util/Widget.h \
util/rsversion.h \
util/RsAction.h \ util/RsAction.h \
util/printpreview.h \ util/printpreview.h \
util/log.h \ util/log.h \
@ -407,6 +408,7 @@ SOURCES += main.cpp \
util/EventFilter.cpp \ util/EventFilter.cpp \
util/Widget.cpp \ util/Widget.cpp \
util/RsAction.cpp \ util/RsAction.cpp \
util/rsversion.cpp \
util/printpreview.cpp \ util/printpreview.cpp \
util/log.cpp \ util/log.cpp \
gui/bwgraph/bwgraph.cpp \ gui/bwgraph/bwgraph.cpp \

View File

@ -66,6 +66,7 @@
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include "gui/connect/ConnectFriendWizard.h" #include "gui/connect/ConnectFriendWizard.h"
#include "util/rsversion.h"
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
@ -129,8 +130,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create RshareSettings object */ /* Create RshareSettings object */
_settings = new RshareSettings(); _settings = new RshareSettings();
setWindowTitle(tr("RetroShare a secure decentralised commmunication platform")); setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion()));
mSMPlayer = NULL; mSMPlayer = NULL;
// Setting icons // Setting icons

View File

@ -0,0 +1,38 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2006,2007 crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "rsversion.h"
//#define USE_SVN_VERSIONS 1
#define VERSION "0.5.0"
#if USE_SVN_VERSIONS
#include "svn_revision.h"
#endif
QString retroshareVersion() {
#if USE_SVN_VERSIONS
return QString(QString(VERSION) + "+" + QString(SVN_REVISION));
#else
return QString(VERSION);
#endif
}

View File

@ -0,0 +1,30 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2006,2007 crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifndef _RSVERSION_H_
#define _RSVERSION_H_
#include <QString>
QString retroshareVersion();
#endif