From dd6fbe44abe16d4be5c03c990208f52c4c5a9199 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 7 Sep 2013 14:02:24 +0000 Subject: [PATCH] added selection box to show only friends (already translated) in message composer git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6708 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/common/FriendSelectionWidget.h | 1 + retroshare-gui/src/gui/msgs/MessageComposer.cpp | 16 +++++++++++++++- retroshare-gui/src/gui/msgs/MessageComposer.h | 1 + retroshare-gui/src/gui/msgs/MessageComposer.ui | 7 +++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h index bf35dfd45..e80b62dff 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h @@ -56,6 +56,7 @@ public: }; enum ShowType { + SHOW_NONE = 0, SHOW_GROUP = 1, SHOW_GPG = 2, SHOW_SSL = 4, diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index cd9758a14..9a6908aad 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -193,6 +193,10 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged())); + connect(ui.onlyTrustedKeys, SIGNAL(clicked(bool)), this, SLOT(toggleShowNonFriend(bool))); + ui.onlyTrustedKeys->setMinimumWidth(20); + ui.onlyTrustedKeys->setChecked(Settings->valueFromGroup("MessageComposer", "ShowOnlyTrustedKeys",false).toBool()); + connect(ui.addToButton, SIGNAL(clicked(void)), this, SLOT(addTo())); connect(ui.addCcButton, SIGNAL(clicked(void)), this, SLOT(addCc())); connect(ui.addBccButton, SIGNAL(clicked(void)), this, SLOT(addBcc())); @@ -209,7 +213,9 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) /* initialize friends list */ ui.friendSelectionWidget->setHeaderText(tr("Send To:")); ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI); - ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP | FriendSelectionWidget::SHOW_SSL | FriendSelectionWidget::SHOW_NON_FRIEND_GPG ); + ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP + | FriendSelectionWidget::SHOW_SSL + | (ui.onlyTrustedKeys->isChecked()? FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_NON_FRIEND_GPG)); //ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP | FriendSelectionWidget::SHOW_SSL ); ui.friendSelectionWidget->start(); @@ -2320,6 +2326,14 @@ void MessageComposer::addContact(enumType type) } } +void MessageComposer::toggleShowNonFriend(bool bValue) +{ + ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP + | FriendSelectionWidget::SHOW_SSL + | (bValue?FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_NON_FRIEND_GPG)); + Settings->setValueToGroup("MessageComposer", "ShowOnlyTrustedKeys", bValue); +} + void MessageComposer::addTo() { addContact(TO); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index ed0b11698..1372de7a3 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -133,6 +133,7 @@ private slots: void titleChanged(); // Add to To/Cc/Bcc address fields + void toggleShowNonFriend(bool bValue); void addTo(); void addCc(); void addBcc(); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 6bbcb226b..57eec1505 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -102,6 +102,13 @@ + + + + Only show people you trusted + + +