From 82d530b9900f089e50e4ee123c66c611b0b542fc Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 15 May 2015 09:35:39 +0000 Subject: [PATCH] disable signature checkbox when the certificate only has self signature git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8250 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- TODO.txt | 9 +++++++-- retroshare-gui/src/gui/connect/ConfCertDialog.cpp | 3 +++ retroshare-gui/src/gui/connect/PGPKeyDialog.cpp | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/TODO.txt b/TODO.txt index c1b314653..6ca4be3b5 100644 --- a/TODO.txt +++ b/TODO.txt @@ -10,11 +10,14 @@ Legend: To be done +0000 [ ] merge the various help systems. there's 3 of them: (1) help buttons on most tabs that pop a flat panel with some + info; (2) help wizard accessible from the "!" button in friends details->Trust; (3) 'getting started tab' + 0001 [X] forums - middle horisontal bar - always shows *by anonymous* (from noname) [fixed, also removed useless thread line] 0002 [X] remove useless column in forums "signed by" (last column) (from electron) 0003 [ ] main window must close on ESC (from noname) 0004 [X] show storage time of forums/channels/posted in gui (from cave) -0005 [ ] if keysigning is not working -> hide or remove it (from cave) cyril: keep it, but add more info about how to use/interpret it. +0005 [X] if keysigning is not working -> hide or remove it (from cave) cyril: keep it, but add more info about how to use/interpret it. 0006 [ ] implement default gxs id (from cave) cyril: you mean system-wide default gxs id? That would be a good thing to have. 0007 [ ] *getting started* - need to say about chatservers (from noname) comment: chatservers are inofficial and may go down at any time. which one should we mention? @@ -26,7 +29,7 @@ To be done 0010 [ ] window and tab sizes not saved on exit or closing (from noname) -0011 [ ] in add friend dialog: include signatures seems to do nothing there. cyril: it does if you have signatures. Show +0011 [X] in add friend dialog: include signatures seems to do nothing there. cyril: it does if you have signatures. Show the checkbox only when the key as signatures => less confusion. (from noname) 0012 [ ] from time to time the location images and the location message is not updated or gets lost, or the location name. (from cave) @@ -84,6 +87,8 @@ To be done 0033 [ ] Selecting different options in messages composer -> contact list then come back, shows disappearing / re-appearing people. What causes this??? +0034 [ ] Show forum/channel/posted admin name in details window + **Not sure** 0021 [ ] too many option tabs. may be some must be hidden when advanced mode is not selected diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index dbdbde7f2..c17e5ba4d 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -285,6 +285,9 @@ void ConfCertDialog::loadInvitePage() close(); return; } + + ui._shouldAddSignatures_CB->setEnabled(detail.gpgSigners.size() > 1) ; + // std::string pgp_key = rsPeers->getPGPKey(detail.gpg_id,ui._shouldAddSignatures_CB_2->isChecked()) ; // this needs to be a SSL id // ui.userCertificateText_2->setReadOnly(true); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index 95af18a16..ef16af9ba 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -296,6 +296,8 @@ void PGPKeyDialog::loadKeyPage() close(); return; } + ui._shouldAddSignatures_CB_2->setEnabled(detail.gpgSigners.size() > 1) ; + std::string pgp_key = rsPeers->getPGPKey(detail.gpg_id,ui._shouldAddSignatures_CB_2->isChecked()) ; // this needs to be a SSL id ui.userCertificateText_2->setReadOnly(true);