From 21c23129525cea3910d925d16c339c63996a0a6a Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 15 Mar 2024 20:10:20 +0100 Subject: [PATCH 1/2] Added export Friendslist to Profile Page --- retroshare-gui/src/gui/common/NewFriendList.h | 4 +- .../src/gui/settings/CryptoPage.cpp | 11 +- retroshare-gui/src/gui/settings/CryptoPage.h | 1 + retroshare-gui/src/gui/settings/CryptoPage.ui | 656 +++++++++--------- 4 files changed, 347 insertions(+), 325 deletions(-) diff --git a/retroshare-gui/src/gui/common/NewFriendList.h b/retroshare-gui/src/gui/common/NewFriendList.h index cf2e892b3..2b5cd1738 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.h +++ b/retroshare-gui/src/gui/common/NewFriendList.h @@ -87,7 +87,8 @@ public slots: void setShowGroups(bool show); void setShowUnconnected(bool hidden); void setShowState(bool show); - void headerContextMenuRequested(QPoint); + void headerContextMenuRequested(QPoint); + void exportFriendlistClicked(); private slots: void sortColumn(int col,Qt::SortOrder so); @@ -164,6 +165,5 @@ private slots: void editGroup(); void removeGroup(); - void exportFriendlistClicked(); void importFriendlistClicked(); }; diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 26d7cecea..296f6aec3 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include //for rsPeers variable #include //for rsPeers variable @@ -58,8 +59,9 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) // hide profile manager as it causes bugs when generating a new profile. //ui.profile_Button->hide() ; - //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager())); - connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile())); + //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager())); + connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile())); + connect(ui.exportfriendslist,SIGNAL(clicked()), this, SLOT(exportFriendsList()) ); // Remove this because it duplicates functionality of the HomePage. ui.retroshareId_LB->hide(); @@ -229,3 +231,8 @@ void CryptoPage::showStats() { StatisticsWindow::showYourself(); } + +void CryptoPage::exportFriendsList() +{ + NewFriendList().exportFriendlistClicked(); +} diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index e595c63c4..e10cbb97a 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 bool fileSave(); bool fileSaveAs(); void showStats(); + void exportFriendsList(); private: QString fileName; diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 29a336721..770526b66 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -13,25 +13,11 @@ - + - - - - Retroshare ID: - - - - - - - Statistics: - - - @@ -51,13 +37,6 @@ - - - - PGP fingerprint: - - - @@ -77,99 +56,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - Export Profile: - - - - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Online since: - - - @@ -189,184 +75,10 @@ - - - - - - - 16 - 16 - - - - :/images/info16.png - - - - - - - - 12 - 75 - true - - - - Public Information - - - - - - - - - - 0 - 0 - - - - - 75 - true - - + + - TextLabel - - - - - - - <html><head/><body><p>Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.</p></body></html> - - - Export - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Software Version: - - - - - - - Show statistics - - - - - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/info16.png - - - - - - - - 12 - 75 - true - - - - Other Information - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Profile path: - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Friend nodes: - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel + Retroshare ID: @@ -407,22 +119,80 @@ - - + + - + 0 0 - - - 100 - 0 - + + + 75 + true + - Name: + TextLabel + + + + + + + PGP fingerprint: + + + + + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + + 12 + 75 + true + + + + Other Information + + + + + + + + + Show statistics + + + + + + + Export Profile: @@ -448,8 +218,8 @@ - - + + 0 @@ -463,23 +233,7 @@ - PGP Id : - - - - - - - - 75 - true - - - - TextLabel - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Friend nodes: @@ -502,6 +256,100 @@ + + + + + 0 + 0 + + + + + 100 + 0 + + + + PGP Id : + + + + + + + <html><head/><body><p>Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.</p></body></html> + + + Export + + + + + + + Statistics: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Online since: + + + + + + + Profile path: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -515,6 +363,172 @@ + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Software Version: + + + + + + + + 75 + true + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Name: + + + + + + + + + + 16 + 16 + + + + :/images/info16.png + + + + + + + + 12 + 75 + true + + + + Public Information + + + + + + + + + Export Friendslist: + + + + + + + Export + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + @@ -533,7 +547,7 @@ - + From 5f748b3131a9e8c1944077eab08f88e977ddd715 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 16 Mar 2024 20:23:28 +0100 Subject: [PATCH 2/2] renaming button text --- retroshare-gui/src/gui/settings/CryptoPage.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 770526b66..c0d602368 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -281,7 +281,7 @@ <html><head/><body><p>Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.</p></body></html> - Export + Export profile @@ -509,7 +509,7 @@ - Export + Export friends list