Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 11:54:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2479 from csoler/v0.6-BugFixing_13

Browse source 
[WIP] Fixing a few bugs.
This commit is contained in:
csoler 2021-10-06 19:35:57 +02:00 • committed by GitHub
commit 0deb83a5b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
View file

@ -45,6 +45,8 @@
#include "util/DateTime.h"
#include "util/misc.h"
#define FRIEND_OPTIONS_TAB_INDEX 2
QMap<RsPgpId, PGPKeyDialog*> PGPKeyDialog::instances_pgp;
PGPKeyDialog *PGPKeyDialog::instance(const RsPgpId& pgp_id)
@ -199,11 +201,13 @@ void PGPKeyDialog::load()
{
ui.make_friend_button->hide();
ui.denyFriendButton->show();
ui.stabWidget->setTabEnabled(FRIEND_OPTIONS_TAB_INDEX,true);
}
else
{
ui.make_friend_button->show();
ui.denyFriendButton->hide();
ui.stabWidget->setTabEnabled(FRIEND_OPTIONS_TAB_INDEX,false);
}
//web of trust

2
retroshare-gui/src/gui/connect/PGPKeyDialog.ui
View file

@ -393,7 +393,7 @@ p, li { white-space: pre-wrap; }
</widget>
<widget class="QWidget" name="option_Tab">
<attribute name="title">
<string>Options</string>
<string>Friend options</string>
</attribute>
<layout class="QVBoxLayout" name="option_Tab_VL">
<item>