From 18a4bef840b765d39f2303d59b8b90e217e1635b Mon Sep 17 00:00:00 2001 From: electron128 Date: Thu, 21 May 2015 11:18:55 +0000 Subject: [PATCH] added additional button to show statistics window in settings->node git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8283 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- TODO.txt | 2 +- retroshare-gui/src/gui/settings/CryptoPage.cpp | 7 +++++++ retroshare-gui/src/gui/settings/CryptoPage.h | 1 + retroshare-gui/src/gui/settings/CryptoPage.ui | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index e235f869c..36eb65310 100644 --- a/TODO.txt +++ b/TODO.txt @@ -41,7 +41,7 @@ To be done needs the same space as the permission matrix (happens on windows + linux; can be "fixed" by closing and reopen the setting window) (from sehraf) -0015 [ ] The new statistics windows is really nice and everybody should see it -> add a link to it somewhere in settings +0015 [X] The new statistics windows is really nice and everybody should see it -> add a link to it somewhere in settings (or wherever suitable) (from sehraf) cyril: there's a menu in the bottom right corner ofthe main window to get it. Otherwise, we could merge it as tabs in options->server, but I don't really like this option. diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index f704519cf..3fbc9835e 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -32,6 +32,7 @@ #include "util/DateTime.h" #include #include +#include #include //for rsPeers variable #include //for rsPeers variable @@ -47,6 +48,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs())); connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load())); connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink())); + connect(ui.showStats_PB, SIGNAL(clicked()), this, SLOT(showStats())); // hide profile manager as it causes bugs when generating a new profile. //ui.profile_Button->hide() ; @@ -164,3 +166,8 @@ bool CryptoPage::fileSaveAs() } return false; } + +void CryptoPage::showStats() +{ + StatisticsWindow::showYourself(); +} diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index 82676fa63..d970b3c8b 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -51,6 +51,7 @@ class CryptoPage : public ConfigPage void profilemanager(); bool fileSave(); bool fileSaveAs(); + void showStats(); private: QString fileName; diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index c6c694615..68527ab3d 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -397,6 +397,13 @@ + + + + show statistics window + + +