Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 18:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed version files from retroshare-gui.

Browse source 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-01-14 23:26:51 +00:00
parent 4e8cc9d49f
commit 94ec83fcdb
27 changed files with 156 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,6 @@
#include "gui/connect/ConnectFriendWizard.h"
#include "gui/common/RsCollectionFile.h"
#include "util/rsguiversion.h"
#include "settings/rsettingswin.h"
#include "settings/rsharesettings.h"
#include "common/StatusDefs.h"
@ -201,8 +200,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
nameAndLocation = QString("%1 (%2)").arg(QString::fromUtf8(pd.name.c_str())).arg(QString::fromUtf8(pd.location.c_str()));
}
setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(retroshareVersion()) + " - " + nameAndLocation);
setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(Rshare::retroshareVersion()) + " - " + nameAndLocation);
/* add url handler for RetroShare links */
QDesktopServices::setUrlHandler(RSLINK_SCHEME, this, "retroshareLinkActivated");

34
retroshare-gui/src/gui/images/retroshare_win.rc
View file

@ -1,3 +1,37 @@
#include <winver.h>
#include "retroshare_win.rc.h"
#include "retroshare/rsversion.h"
IDI_ICON1 ICON "logo/logo_64.ico"
#define STRINGIZER(version) #version
#define VERSION_STRING(major,minor,build,buildadd,revision) STRINGIZER(major) "." STRINGIZER(minor) "." STRINGIZER(build) buildadd "." STRINGIZER(revision)
VS_VERSION_INFO VERSIONINFO
FILEVERSION RS_MAJOR_VERSION,RS_MINOR_VERSION,RS_BUILD_NUMBER,RS_REVISION_NUMBER
PRODUCTVERSION RS_MAJOR_VERSION,RS_MINOR_VERSION,RS_BUILD_NUMBER,RS_REVISION_NUMBER
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080904b0"
BEGIN
VALUE "CompanyName", ""
VALUE "FileDescription", "RetroShare"
VALUE "FileVersion", VERSION_STRING(RS_MAJOR_VERSION, RS_MINOR_VERSION, RS_BUILD_NUMBER, RS_BUILD_NUMBER_ADD, RS_REVISION_NUMBER)
VALUE "InternalName", "RetroShare"
VALUE "OriginalFilename", "RetroShare.exe"
VALUE "ProductName", "RetroShare"
VALUE "ProductVersion", VERSION_STRING(RS_MAJOR_VERSION, RS_MINOR_VERSION, RS_BUILD_NUMBER, RS_BUILD_NUMBER_ADD, RS_REVISION_NUMBER)
VALUE "LegalCopyright", ""
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0809, 1200
END
END

5
retroshare-gui/src/gui/settings/PluginsPage.cpp
View file

@ -98,9 +98,10 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags)
int major = 0;
int minor = 0;
int build = 0;
int svn_rev = 0;
plugin->getPluginVersion(major, minor, svn_rev);
pluginVersion = QString("%1.%2.%3").arg(major).arg(minor).arg(svn_rev);
plugin->getPluginVersion(major, minor, build, svn_rev);
pluginVersion = QString("%1.%2.%3.%4").arg(major).arg(minor).arg(build).arg(svn_rev);
}
PluginItem *item = new PluginItem(pluginVersion, i,pluginTitle,pluginDescription,status_string,

14
retroshare-gui/src/retroshare-gui.pro
View file

@ -204,6 +204,14 @@ win32 {
DEPENDPATH += .
INCLUDEPATH += .
greaterThan(QT_MAJOR_VERSION, 4) {
# Qt 5
RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
} else {
# Qt 4
QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
}
}
##################################### MacOS ######################################
@ -357,7 +365,6 @@ HEADERS += rshare.h \
util/EventFilter.h \
util/EventReceiver.h \
util/Widget.h \
util/rsguiversion.h \
util/RsAction.h \
util/RsUserdata.h \
util/printpreview.h \
@ -486,7 +493,7 @@ HEADERS += rshare.h \
gui/statusbar/SoundStatus.h \
gui/statusbar/OpModeStatus.h \
gui/statusbar/ToasterDisable.h \
gui/statusbar/SysTrayStatus.h \
gui/statusbar/SysTrayStatus.h \
gui/advsearch/advancedsearchdialog.h \
gui/advsearch/expressionwidget.h \
gui/advsearch/guiexprelement.h \
@ -695,7 +702,6 @@ SOURCES += main.cpp \
util/EventReceiver.cpp \
util/Widget.cpp \
util/RsAction.cpp \
util/rsguiversion.cpp \
util/printpreview.cpp \
util/log.cpp \
util/misc.cpp \
@ -809,7 +815,7 @@ SOURCES += main.cpp \
gui/statusbar/SoundStatus.cpp \
gui/statusbar/OpModeStatus.cpp \
gui/statusbar/ToasterDisable.cpp \
gui/statusbar/SysTrayStatus.cpp \
gui/statusbar/SysTrayStatus.cpp \
gui/toaster/MessageToaster.cpp \
gui/toaster/DownloadToaster.cpp \
gui/toaster/OnlineToaster.cpp \

6
retroshare-gui/src/rshare.cpp
View file

@ -37,6 +37,7 @@
#include <iostream>
#include <retroshare/rsinit.h>
#include <retroshare/rsversion.h>
#include <lang/languagesupport.h>
#include "gui/settings/rsharesettings.h"
@ -162,6 +163,11 @@ Rshare::~Rshare()
}
QString Rshare::retroshareVersion()
{
return QString("%1.%2.%3%4").arg(RS_MAJOR_VERSION).arg(RS_MINOR_VERSION).arg(RS_BUILD_NUMBER).arg(RS_BUILD_NUMBER_ADD);
}
/** Enters the main event loop and waits until exit() is called. The signal
* running() will be emitted when the event loop has started. */
int

3
retroshare-gui/src/rshare.h
View file

@ -61,6 +61,9 @@ public:
/** Destructor. */
~Rshare();
/** Return the version info */
static QString retroshareVersion();
/** Return the map of command-line arguments and values. */
static QMap<QString, QString> arguments() { return _args; }
/** Validates that all arguments were well-formed. */

30
retroshare-gui/src/util/rsguiversion.cpp
View file

@ -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.
****************************************************************/
#include "rsguiversion.h"
QString retroshareVersion() {
return QString(GUI_VERSION);
}
QString retroshareRevision() {
return QString(GUI_REVISION);
}

31
retroshare-gui/src/util/rsguiversion.h
View file

@ -1,31 +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 <QString>
QString retroshareVersion();
QString retroshareRevision();
#define GUI_VERSION "0.6.x"
#define GUI_REVISION "Revision: 7669"

31
retroshare-gui/src/util/rsguiversion.in
View file

@ -1,31 +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 <QString>
QString retroshareVersion();
QString retroshareRevision();
#define GUI_VERSION "0.6.x"
#define GUI_REVISION "Revision: $WCREV$"