From 7742e0ca39b0335ccd2a6b5fd34a06d8c6f559f1 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sun, 28 Oct 2018 22:15:07 +0100 Subject: [PATCH] Removed version.html --- retroshare-gui/src/gui/HelpDialog.cpp | 9 ++------- retroshare-gui/src/gui/help/version.html | 5 ----- retroshare-gui/src/gui/help/version.html.in | 4 ---- retroshare-gui/src/gui/images.qrc | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 retroshare-gui/src/gui/help/version.html delete mode 100644 retroshare-gui/src/gui/help/version.html.in diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp index c27e404a2..9790b6832 100644 --- a/retroshare-gui/src/gui/HelpDialog.cpp +++ b/retroshare-gui/src/gui/HelpDialog.cpp @@ -24,6 +24,7 @@ #include #include +#include "rshare.h" #ifdef ENABLE_WEBUI #include @@ -84,13 +85,7 @@ HelpDialog::HelpDialog(QWidget *parent) : ui->thanks->setText(in.readAll()); } - QFile versionFile(QLatin1String(":/help/version.html")); - if (versionFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream in(&versionFile); - QString version = in.readAll(); - - ui->version->setText(version); - } + ui->version->setText(Rshare::retroshareVersion(true)); /* Add version numbers of libretroshare */ std::list libraries; diff --git a/retroshare-gui/src/gui/help/version.html b/retroshare-gui/src/gui/help/version.html deleted file mode 100644 index af3ae831f..000000000 --- a/retroshare-gui/src/gui/help/version.html +++ /dev/null @@ -1,5 +0,0 @@ -Retroshare Gui version : -Svn version : 8013 -Fr 13. Mär 16:32:53 CET 2015 - - diff --git a/retroshare-gui/src/gui/help/version.html.in b/retroshare-gui/src/gui/help/version.html.in deleted file mode 100644 index 189d71df2..000000000 --- a/retroshare-gui/src/gui/help/version.html.in +++ /dev/null @@ -1,4 +0,0 @@ -Retroshare Gui version : -Git version : $Branch$ -$Hash$ -$Date$ \ No newline at end of file diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 40613280e..8496f899b 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -646,7 +646,6 @@ images/newsfeed/news-feed-32.png images/newsfeed/news-feed-notify-32.png images/share-icon-16.png - help/version.html images/view-certificate-sign-48.png images/toasterEnable.png images/toasterDisable.png