mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-22 06:05:08 -05:00
remove old version display
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
92c5fbf6db
commit
6bd87814ea
@ -20,14 +20,14 @@ linux-g++-64 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
version_detail_linux {
|
version_detail_linux {
|
||||||
system(echo "" > gui/help/version.html)
|
system(date > gui/help/version.html)
|
||||||
system(ls /usr/bin/git) {
|
system(ls /usr/bin/git) {
|
||||||
system(/usr/bin/git log) {
|
system(/usr/bin/git log) {
|
||||||
#retrieve git commit
|
#retrieve git commit
|
||||||
system(echo "Git version : " >> gui/help/version.html)
|
system(echo "Git version : " >> gui/help/version.html)
|
||||||
|
system(git status | grep branch >> gui/help/version.html)
|
||||||
system(git log -n 1 | grep commit >> gui/help/version.html)
|
system(git log -n 1 | grep commit >> gui/help/version.html)
|
||||||
system(git log -n 1 | grep svn >> gui/help/version.html)
|
system(git log -n 1 | grep svn >> gui/help/version.html)
|
||||||
system(git status | grep branch >> gui/help/version.html)
|
|
||||||
system(echo "" >> gui/help/version.html)
|
system(echo "" >> gui/help/version.html)
|
||||||
system(echo "" >> gui/help/version.html)
|
system(echo "" >> gui/help/version.html)
|
||||||
}
|
}
|
||||||
@ -185,7 +185,6 @@ 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 \
|
||||||
@ -402,7 +401,6 @@ SOURCES += main.cpp \
|
|||||||
util/MouseEventFilter.cpp \
|
util/MouseEventFilter.cpp \
|
||||||
util/EventFilter.cpp \
|
util/EventFilter.cpp \
|
||||||
util/Widget.cpp \
|
util/Widget.cpp \
|
||||||
util/rsversion.cpp \
|
|
||||||
util/RsAction.cpp \
|
util/RsAction.cpp \
|
||||||
util/printpreview.cpp \
|
util/printpreview.cpp \
|
||||||
util/log.cpp \
|
util/log.cpp \
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
#include "Preferences/PreferencesWindow.h"
|
#include "Preferences/PreferencesWindow.h"
|
||||||
//#include "Settings/gsettingswin.h"
|
//#include "Settings/gsettingswin.h"
|
||||||
#include "util/rsversion.h"
|
|
||||||
|
|
||||||
#include "rsiface/rsiface.h"
|
#include "rsiface/rsiface.h"
|
||||||
|
|
||||||
@ -103,7 +102,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
|
|||||||
/* Invoke the Qt Designer generated QObject setup routine */
|
/* Invoke the Qt Designer generated QObject setup routine */
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
|
|
||||||
setWindowTitle(tr("RetroShare %1").arg(retroshareVersion()));
|
setWindowTitle(tr("RetroShare"));
|
||||||
|
|
||||||
RshareSettings config;
|
RshareSettings config;
|
||||||
config.loadWidgetInformation(this);
|
config.loadWidgetInformation(this);
|
||||||
|
@ -61,8 +61,6 @@
|
|||||||
#include "settings/rsettingswin.h"
|
#include "settings/rsettingswin.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "util/rsversion.h"
|
|
||||||
|
|
||||||
#include "rsiface/rsiface.h"
|
#include "rsiface/rsiface.h"
|
||||||
#include "rsiface/rspeers.h"
|
#include "rsiface/rspeers.h"
|
||||||
#include "rsiface/rsfiles.h"
|
#include "rsiface/rsfiles.h"
|
||||||
@ -131,7 +129,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
|||||||
/* Create RshareSettings object */
|
/* Create RshareSettings object */
|
||||||
_settings = new RshareSettings();
|
_settings = new RshareSettings();
|
||||||
|
|
||||||
setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion()));
|
setWindowTitle(tr("RetroShare a secure decentralised commmunication platform"));
|
||||||
|
|
||||||
mSMPlayer = NULL;
|
mSMPlayer = NULL;
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "rshare.h"
|
#include "rshare.h"
|
||||||
#include "common/vmessagebox.h"
|
#include "common/vmessagebox.h"
|
||||||
#include "util/rsversion.h"
|
|
||||||
#include "NetworkDialog.h"
|
#include "NetworkDialog.h"
|
||||||
#include "NetworkView.h"
|
#include "NetworkView.h"
|
||||||
#include "TrustView.h"
|
#include "TrustView.h"
|
||||||
@ -134,7 +133,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
|
|||||||
ui.networkTab->addTab(new TrustView(),QString(tr("Trust matrix")));
|
ui.networkTab->addTab(new TrustView(),QString(tr("Trust matrix")));
|
||||||
|
|
||||||
// Set Log infos
|
// Set Log infos
|
||||||
setLogInfo(tr("RetroShare %1 started.", "e.g: RetroShare v0.x started.").arg(retroshareVersion()));
|
setLogInfo(tr("RetroShare started."));
|
||||||
|
|
||||||
setLogInfo(tr("Welcome to RetroShare."), QString::fromUtf8("blue"));
|
setLogInfo(tr("Welcome to RetroShare."), QString::fromUtf8("blue"));
|
||||||
|
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
/****************************************************************
|
|
||||||
* 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.4.13e"
|
|
||||||
|
|
||||||
#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
|
|
||||||
}
|
|
@ -1,30 +0,0 @@
|
|||||||
/****************************************************************
|
|
||||||
* 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
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user