From 0d33e141476e36f97e758ae07afe583431067880 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 31 Jul 2009 22:24:08 +0000 Subject: [PATCH] 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 --- retroshare-gui/src/RetroShare.pro | 2 ++ retroshare-gui/src/gui/MainWindow.cpp | 5 ++-- retroshare-gui/src/util/rsversion.cpp | 38 +++++++++++++++++++++++++++ retroshare-gui/src/util/rsversion.h | 30 +++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/util/rsversion.cpp create mode 100644 retroshare-gui/src/util/rsversion.h diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index f251810a0..f5f9363a6 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -190,6 +190,7 @@ HEADERS += rshare.h \ util/MouseEventFilter.h \ util/EventFilter.h \ util/Widget.h \ + util/rsversion.h \ util/RsAction.h \ util/printpreview.h \ util/log.h \ @@ -407,6 +408,7 @@ SOURCES += main.cpp \ util/EventFilter.cpp \ util/Widget.cpp \ util/RsAction.cpp \ + util/rsversion.cpp \ util/printpreview.cpp \ util/log.cpp \ gui/bwgraph/bwgraph.cpp \ diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 73b084e1b..1903466f3 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -66,6 +66,7 @@ #include "rsiface/rsfiles.h" #include "gui/connect/ConnectFriendWizard.h" +#include "util/rsversion.h" #include #include @@ -129,8 +130,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /* Create RshareSettings object */ _settings = new RshareSettings(); - setWindowTitle(tr("RetroShare a secure decentralised commmunication platform")); - + setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion())); + mSMPlayer = NULL; // Setting icons diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsversion.cpp new file mode 100644 index 000000000..ee9aa615f --- /dev/null +++ b/retroshare-gui/src/util/rsversion.cpp @@ -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 +} diff --git a/retroshare-gui/src/util/rsversion.h b/retroshare-gui/src/util/rsversion.h new file mode 100644 index 000000000..995459c4b --- /dev/null +++ b/retroshare-gui/src/util/rsversion.h @@ -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 retroshareVersion(); + +#endif +