diff --git a/libresapi/src/api/GxsResponseTask.cpp b/libresapi/src/api/GxsResponseTask.cpp index 10142aa92..581f38ba6 100644 --- a/libresapi/src/api/GxsResponseTask.cpp +++ b/libresapi/src/api/GxsResponseTask.cpp @@ -103,10 +103,8 @@ void GxsResponseTask::streamGxsId(RsGxsId id, StreamBase &stream) { stream << makeKeyValueReference("id", id) << makeKeyValueReference("gxs_id", id) - << makeKeyValueReference("is_own", vit->mIsOwnId) - << makeKeyValueReference("name", vit->mNickname) - << makeKeyValueReference("pgp_linked", vit->mPgpLinked) - << makeKeyValueReference("pgp_known", vit->mPgpKnown); + << makeKeyValueReference("flags", vit->mFlags) + << makeKeyValueReference("name", vit->mNickname); return; } } diff --git a/libretroshare/src/chat/distributedchat.cc b/libretroshare/src/chat/distributedchat.cc index d0fdaab0b..dbecf3346 100644 --- a/libretroshare/src/chat/distributedchat.cc +++ b/libretroshare/src/chat/distributedchat.cc @@ -177,7 +177,7 @@ bool DistributedChatService::handleRecvChatLobbyMsgItem(RsChatMsgItem *ci) return false; } - if(!details.mPgpLinked) + if(!(details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { std::cerr << "(WW) Received a lobby msg/item that is not PGP-authed (id=" << cli->signature.keyId << "), whereas the lobby flags require it. Rejecting!" << std::endl; @@ -688,7 +688,7 @@ void DistributedChatService::handleRecvChatLobbyEventItem(RsChatLobbyEventItem * return ; } - if(!details.mPgpLinked) + if(!(details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { std::cerr << "(WW) Received a lobby msg/item that is not PGP-authed (ID=" << item->signature.keyId << "), whereas the lobby flags require it. Rejecting!" << std::endl; @@ -1727,7 +1727,7 @@ bool DistributedChatService::setIdentityForChatLobby(const ChatLobbyId& lobby_id // Only send a nickname change event if the two Identities are not anonymous - if(rsIdentity->getIdDetails(nick,det1) && rsIdentity->getIdDetails(it->second.gxs_id,det2) && det1.mPgpLinked && det2.mPgpLinked) + if(rsIdentity->getIdDetails(nick,det1) && rsIdentity->getIdDetails(it->second.gxs_id,det2) && (det1.mFlags & det2.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) sendLobbyStatusPeerChangedNickname(lobby_id, nick.toStdString()) ; } diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index 0ee1fb0e8..65ee5dc10 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -33,6 +33,7 @@ #include "retroshare/rsgxsflags.h" #include "retroshare/rsgxscircles.h" #include "retroshare/rsgrouter.h" +#include "retroshare/rsidentity.h" #include "retroshare/rspeers.h" #include "rsgixs.h" #include "rsgxsutil.h" @@ -910,7 +911,7 @@ int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, const uin { // now check reputation of the message author - float reputation_threshold = ( (signFlag & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) && !details.mPgpLinked) ? (RsReputations::REPUTATION_THRESHOLD_ANTI_SPAM): (RsReputations::REPUTATION_THRESHOLD_DEFAULT) ; + float reputation_threshold = ( (signFlag & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) && !(details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) ? (RsReputations::REPUTATION_THRESHOLD_ANTI_SPAM): (RsReputations::REPUTATION_THRESHOLD_DEFAULT) ; if(details.mReputation.mOverallReputationScore < reputation_threshold) { diff --git a/libretroshare/src/retroshare/rsidentity.h b/libretroshare/src/retroshare/rsidentity.h index d3ee14041..965555917 100644 --- a/libretroshare/src/retroshare/rsidentity.h +++ b/libretroshare/src/retroshare/rsidentity.h @@ -65,6 +65,11 @@ extern RsIdentity *rsIdentity; std::string rsIdTypeToString(uint32_t idtype); +static const uint32_t RS_IDENTITY_FLAGS_IS_A_CONTACT = 0x0001; +static const uint32_t RS_IDENTITY_FLAGS_PGP_LINKED = 0x0002; +static const uint32_t RS_IDENTITY_FLAGS_PGP_KNOWN = 0x0004; +static const uint32_t RS_IDENTITY_FLAGS_IS_OWN_ID = 0x0008; + class GxsReputation { public: @@ -115,8 +120,9 @@ class RsGxsIdGroup time_t mLastUsageTS ; // Not Serialised - for GUI's benefit. - bool mPgpKnown; - RsPgpId mPgpId; + bool mPgpKnown; + bool mIsAContact; // change that into flags one day + RsPgpId mPgpId; GxsReputation mReputation; }; @@ -154,22 +160,20 @@ class RsRecognTagDetails bool is_pending; }; - class RsIdentityDetails { public: RsIdentityDetails() - :mIsOwnId(false), mPgpLinked(false), mPgpKnown(false), mLastUsageTS(0) { return; } + : mFlags(0), mLastUsageTS(0) { return; } RsGxsId mId; // identity details. std::string mNickname; - bool mIsOwnId; + + uint32_t mFlags ; // PGP Stuff. - bool mPgpLinked; - bool mPgpKnown; RsPgpId mPgpId; // Recogn details. @@ -245,6 +249,8 @@ virtual bool parseRecognTag(const RsGxsId &id, const std::string &nickname, virtual bool getRecognTagRequest(const RsGxsId &id, const std::string &comment, uint16_t tag_class, uint16_t tag_type, std::string &tag) = 0; + virtual bool setAsRegularContact(const RsGxsId& id,bool is_a_contact) = 0 ; + // Specific RsIdentity Functions.... /* Specific Service Data */ /* We expose these initially for testing / GUI purposes. diff --git a/libretroshare/src/retroshare/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h index edeb0a66e..949494efb 100644 --- a/libretroshare/src/retroshare/rsmsgs.h +++ b/libretroshare/src/retroshare/rsmsgs.h @@ -264,6 +264,12 @@ public: #define RS_DISTANT_CHAT_FLAG_SIGNED 0x0001 #define RS_DISTANT_CHAT_FLAG_SIGNATURE_OK 0x0002 +// flags to define who we accept to talk to + +#define RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_NONE 0x0000 +#define RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_EVERYBODY 0x0001 +#define RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_CONTACT_LIST 0x0002 + struct DistantChatPeerInfo { RsGxsId to_id ; @@ -425,9 +431,9 @@ virtual bool resetMessageStandardTagTypes(Rs::Msgs::MsgTagType& tags) = 0; /* Private distant messages */ /****************************************/ -virtual void enableDistantMessaging(bool b) = 0; -virtual bool distantMessagingEnabled() = 0; - + virtual uint32_t getDistantMessagingPermissionFlags()=0 ; + virtual void setDistantMessagingPermissionFlags(uint32_t flags)=0 ; + /****************************************/ /* Chat */ /****************************************/ diff --git a/libretroshare/src/rsserver/p3msgs.cc b/libretroshare/src/rsserver/p3msgs.cc index e4986467e..6503bcc16 100644 --- a/libretroshare/src/rsserver/p3msgs.cc +++ b/libretroshare/src/rsserver/p3msgs.cc @@ -279,6 +279,16 @@ bool p3Msgs::getMessageSummaries(std::list &msgList) } +uint32_t p3Msgs::getDistantMessagingPermissionFlags() +{ + return mMsgSrv->getDistantMessagingPermissionFlags(); +} + +void p3Msgs::setDistantMessagingPermissionFlags(uint32_t flags) +{ + return mMsgSrv->setDistantMessagingPermissionFlags(flags); +} + bool p3Msgs::getMessage(const std::string &mid, MessageInfo &msg) { @@ -298,15 +308,6 @@ bool p3Msgs::MessageSend(MessageInfo &info) return mMsgSrv->MessageSend(info); } -void p3Msgs::enableDistantMessaging(bool b) -{ - mMsgSrv->enableDistantMessaging(b); -} -bool p3Msgs::distantMessagingEnabled() -{ - return mMsgSrv->distantMessagingEnabled(); -} - bool p3Msgs::SystemMessage(const std::string &title, const std::string &message, uint32_t systemFlag) { return mMsgSrv->SystemMessage(title, message, systemFlag); diff --git a/libretroshare/src/rsserver/p3msgs.h b/libretroshare/src/rsserver/p3msgs.h index 98e9da7de..13211a161 100644 --- a/libretroshare/src/rsserver/p3msgs.h +++ b/libretroshare/src/rsserver/p3msgs.h @@ -80,8 +80,8 @@ class p3Msgs: public RsMsgs virtual bool resetMessageStandardTagTypes(Rs::Msgs::MsgTagType& tags); - virtual void enableDistantMessaging(bool b) ; - virtual bool distantMessagingEnabled() ; + virtual uint32_t getDistantMessagingPermissionFlags() ; + virtual void setDistantMessagingPermissionFlags(uint32_t flags) ; /*! * gets avatar from peer, image data in jpeg format diff --git a/libretroshare/src/serialiser/rsgxsiditems.cc b/libretroshare/src/serialiser/rsgxsiditems.cc index 997517743..c9fdf65af 100644 --- a/libretroshare/src/serialiser/rsgxsiditems.cc +++ b/libretroshare/src/serialiser/rsgxsiditems.cc @@ -101,6 +101,8 @@ uint32_t RsGxsIdLocalInfoItem::serial_size() uint32_t s = 8 ; // header s += 4 ; // number of items s += mTimeStamps.size() * (RsGxsId::SIZE_IN_BYTES + 8) ; + s += 4 ; // number of contacts + s += mContacts.size() * RsGxsId::SIZE_IN_BYTES ; return s; } @@ -176,6 +178,11 @@ bool RsGxsIdLocalInfoItem::serialise(void *data, uint32_t& size) ok &= it->first.serialise(data,tlvsize,offset) ; ok &= setRawTimeT(data,tlvsize,&offset,it->second) ; } + ok &= setRawUInt32(data, tlvsize, &offset, mContacts.size()) ; + + for(std::set::const_iterator it(mContacts.begin());it!=mContacts.end();++it) + ok &= (*it).serialise(data,tlvsize,offset) ; + if(offset != tlvsize) { #ifdef GXSID_DEBUG @@ -386,6 +393,19 @@ RsGxsIdLocalInfoItem *RsGxsIdSerialiser::deserialise_GxsIdLocalInfoItem(void *da item->mTimeStamps[gxsid] = TS ; } + if (offset < rssize) // backward compatibility, making that section optional. + { + ok &= getRawUInt32(data, rssize, &offset, &n) ; + RsGxsId gxsid ; + + for(int i=0;ok && imContacts.insert(gxsid) ; + } + } + if (offset != rssize) { #ifdef GXSID_DEBUG diff --git a/libretroshare/src/serialiser/rsgxsiditems.h b/libretroshare/src/serialiser/rsgxsiditems.h index a499b0c94..483916055 100644 --- a/libretroshare/src/serialiser/rsgxsiditems.h +++ b/libretroshare/src/serialiser/rsgxsiditems.h @@ -97,6 +97,7 @@ public: virtual uint32_t serial_size() ; std::map mTimeStamps ; + std::set mContacts ; }; #if 0 diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index b3b6f908f..017f9376d 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -932,7 +932,7 @@ bool p3GxsCircles::cache_load_for_token(uint32_t token) RsIdentityDetails details; if (mIdentities->getIdDetails(*pit, details)) { - if (details.mPgpLinked && details.mPgpKnown) + if ((details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) &&(details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN)) { #ifdef DEBUG_CIRCLES std::cerr << "p3GxsCircles::cache_load_for_token() Is Known -> AllowedPeer: " << *pit; @@ -1115,7 +1115,7 @@ bool p3GxsCircles::cache_reloadids(const RsGxsCircleId &circleId) RsIdentityDetails details; if (mIdentities->getIdDetails(*pit, details)) { - if (details.mPgpLinked && details.mPgpKnown) + if ((details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) &&(details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN)) { cache.addAllowedPeer(details.mPgpId, *pit); diff --git a/libretroshare/src/services/p3gxsreputation.cc b/libretroshare/src/services/p3gxsreputation.cc index c1eef988a..8715ffad2 100644 --- a/libretroshare/src/services/p3gxsreputation.cc +++ b/libretroshare/src/services/p3gxsreputation.cc @@ -248,8 +248,8 @@ void p3GxsReputation::updateIdentityFlags() } it->second.mIdentityFlags = 0 ; - if(details.mPgpLinked) it->second.mIdentityFlags |= REPUTATION_IDENTITY_FLAG_PGP_LINKED ; - if(details.mPgpKnown ) it->second.mIdentityFlags |= REPUTATION_IDENTITY_FLAG_PGP_KNOWN ; + if(details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) it->second.mIdentityFlags |= REPUTATION_IDENTITY_FLAG_PGP_LINKED ; + if(details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN ) it->second.mIdentityFlags |= REPUTATION_IDENTITY_FLAG_PGP_KNOWN ; #ifdef DEBUG_REPUTATION std::cerr << " updated flags for " << *rit << " to " << std::hex << it->second.mIdentityFlags << std::dec << std::endl; diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc index 64a02fa1b..42f10898a 100644 --- a/libretroshare/src/services/p3idservice.cc +++ b/libretroshare/src/services/p3idservice.cc @@ -212,6 +212,25 @@ uint32_t p3IdService::idAuthenPolicy() return policy; } +bool p3IdService::setAsRegularContact(const RsGxsId& id,bool b) +{ + std::set::iterator it = mContacts.find(id) ; + + if(b && (it == mContacts.end())) + { + mContacts.insert(id) ; + slowIndicateConfigChanged() ; + } + + if( (!b) &&(it != mContacts.end())) + { + mContacts.erase(it) ; + slowIndicateConfigChanged() ; + } + + return true ; +} + void p3IdService::slowIndicateConfigChanged() { time_t now = time(NULL) ; @@ -250,8 +269,13 @@ bool p3IdService::loadList(std::list& items) for(std::list::const_iterator it = items.begin();it!=items.end();++it) if( (lii = dynamic_cast(*it)) != NULL) + { for(std::map::const_iterator it2 = lii->mTimeStamps.begin();it2!=lii->mTimeStamps.end();++it2) mKeysTS.insert(*it2) ; + + mContacts = lii->mContacts ; + } + return true ; } @@ -265,6 +289,7 @@ bool p3IdService::saveList(bool& cleanup,std::list& items) cleanup = true ; RsGxsIdLocalInfoItem *item = new RsGxsIdLocalInfoItem ; item->mTimeStamps = mKeysTS ; + item->mContacts = mContacts ; items.push_back(item) ; return true ; @@ -410,6 +435,9 @@ bool p3IdService:: getIdDetails(const RsGxsId &id, RsIdentityDetails &details) { details = data.details; details.mLastUsageTS = locked_getLastUsageTS(id) ; + + if(mContacts.find(id) != mContacts.end()) + details.mFlags |= RS_IDENTITY_FLAGS_IS_A_CONTACT ; // one utf8 symbol can be at most 4 bytes long - would be better to measure real unicode length !!! if(details.mNickname.length() > RSID_MAXIMUM_NICKNAME_SIZE*4) @@ -426,6 +454,9 @@ bool p3IdService:: getIdDetails(const RsGxsId &id, RsIdentityDetails &details) details = data.details; details.mLastUsageTS = locked_getLastUsageTS(id) ; + if(mContacts.find(id) != mContacts.end()) + details.mFlags |= RS_IDENTITY_FLAGS_IS_A_CONTACT ; + rsReputations->getReputationInfo(id,details.mReputation) ; return true; @@ -1029,33 +1060,33 @@ bool p3IdService::getGroupData(const uint32_t &token, std::vector if (item) { #ifdef DEBUG_IDS - std::cerr << "p3IdService::getGroupData() Item is:"; - std::cerr << std::endl; - item->print(std::cerr); - std::cerr << std::endl; + std::cerr << "p3IdService::getGroupData() Item is:"; + std::cerr << std::endl; + item->print(std::cerr); + std::cerr << std::endl; #endif // DEBUG_IDS - RsGxsIdGroup group ; - item->toGxsIdGroup(group,false) ; + RsGxsIdGroup group ; + item->toGxsIdGroup(group,false) ; - { - RS_STACK_MUTEX(mIdMtx) ; - group.mLastUsageTS = locked_getLastUsageTS(RsGxsId(group.mMeta.mGroupId)) ; - } + { + RS_STACK_MUTEX(mIdMtx) ; + group.mLastUsageTS = locked_getLastUsageTS(RsGxsId(group.mMeta.mGroupId)) ; + } - // Decode information from serviceString. - SSGxsIdGroup ssdata; - if (ssdata.load(group.mMeta.mServiceString)) - { - group.mPgpKnown = ssdata.pgp.idKnown; - group.mPgpId = ssdata.pgp.pgpId; - group.mReputation = ssdata.score.rep; + // Decode information from serviceString. + SSGxsIdGroup ssdata; + if (ssdata.load(group.mMeta.mServiceString)) + { + group.mPgpKnown = ssdata.pgp.idKnown; + group.mPgpId = ssdata.pgp.pgpId; + group.mReputation = ssdata.score.rep; #ifdef DEBUG_IDS - std::cerr << "p3IdService::getGroupData() Success decoding ServiceString"; - std::cerr << std::endl; - std::cerr << "\t mGpgKnown: " << group.mPgpKnown; - std::cerr << std::endl; - std::cerr << "\t mGpgId: " << group.mPgpId; - std::cerr << std::endl; + std::cerr << "p3IdService::getGroupData() Success decoding ServiceString"; + std::cerr << std::endl; + std::cerr << "\t mGpgKnown: " << group.mPgpKnown; + std::cerr << std::endl; + std::cerr << "\t mGpgId: " << group.mPgpId; + std::cerr << std::endl; #endif // DEBUG_IDS } else @@ -1063,13 +1094,15 @@ bool p3IdService::getGroupData(const uint32_t &token, std::vector group.mPgpKnown = false; group.mPgpId.clear(); - std::cerr << "p3IdService::getGroupData() Failed to decode ServiceString \"" - << group.mMeta.mServiceString << "\"" ; + std::cerr << "p3IdService::getGroupData() Failed to decode ServiceString \"" + << group.mMeta.mServiceString << "\"" ; std::cerr << std::endl; } + group.mIsAContact = (mContacts.find(RsGxsId(group.mMeta.mGroupId)) != mContacts.end()); + groups.push_back(group); - delete(item); + delete(item); } else { @@ -1600,8 +1633,10 @@ RsGxsIdCache::RsGxsIdCache(const RsGxsIdGroupItem *item, const RsTlvSecurityKey std::cerr << std::endl; #endif // DEBUG_IDS - details.mIsOwnId = (item->meta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN); - details.mPgpLinked = (item->meta.mGroupFlags & RSGXSID_GROUPFLAG_REALID); + details.mFlags = 0 ; + + if(item->meta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) details.mFlags |= RS_IDENTITY_FLAGS_IS_OWN_ID; + if(item->meta.mGroupFlags & RSGXSID_GROUPFLAG_REALID) details.mFlags |= RS_IDENTITY_FLAGS_PGP_LINKED; /* rest must be retrived from ServiceString */ updateServiceString(item->meta.mServiceString); @@ -1610,21 +1645,19 @@ RsGxsIdCache::RsGxsIdCache(const RsGxsIdGroupItem *item, const RsTlvSecurityKey void RsGxsIdCache::updateServiceString(std::string serviceString) { details.mRecognTags.clear(); + details.mFlags = 0 ; SSGxsIdGroup ssdata; if (ssdata.load(serviceString)) { - if (details.mPgpLinked) + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) { - details.mPgpKnown = ssdata.pgp.idKnown; - if (details.mPgpKnown) - { + if(ssdata.pgp.idKnown) details.mFlags |= RS_IDENTITY_FLAGS_PGP_KNOWN ; + + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN) details.mPgpId = ssdata.pgp.pgpId; - } else - { details.mPgpId.clear(); - } } @@ -1680,7 +1713,7 @@ void RsGxsIdCache::updateServiceString(std::string serviceString) } else { - details.mPgpKnown = false; + details.mFlags &= ~RS_IDENTITY_FLAGS_PGP_KNOWN ; details.mPgpId.clear(); //details.mReputation.updateIdScore(false, false); //details.mReputation.update(); diff --git a/libretroshare/src/services/p3idservice.h b/libretroshare/src/services/p3idservice.h index d38a9117e..93db5ccd8 100644 --- a/libretroshare/src/services/p3idservice.h +++ b/libretroshare/src/services/p3idservice.h @@ -265,6 +265,8 @@ virtual bool parseRecognTag(const RsGxsId &id, const std::string &nickname, virtual bool getRecognTagRequest(const RsGxsId &id, const std::string &comment, uint16_t tag_class, uint16_t tag_type, std::string &tag); +virtual bool setAsRegularContact(const RsGxsId& id,bool is_a_contact) ; + /**************** RsGixs Implementation ***************/ virtual bool getOwnIds(std::list &ownIds); @@ -495,8 +497,11 @@ std::string genRandomId(int len = 20); std::map > mIdsPendingCache; std::map > mGroupNotPresent; - std::map > mIdsNotPresent; - std::map mKeysTS ; + std::map > mIdsNotPresent; + std::map mKeysTS ; + + // keep a list of regular contacts. This is useful to sort IDs, and allow some services to priviledged ids only. + std::set mContacts; RsNetworkExchangeService* mNes; /************************** diff --git a/libretroshare/src/services/p3msgservice.h b/libretroshare/src/services/p3msgservice.h index 78c738318..66c14e209 100644 --- a/libretroshare/src/services/p3msgservice.h +++ b/libretroshare/src/services/p3msgservice.h @@ -90,6 +90,7 @@ class p3MsgService: public p3Service, public p3Config, public pqiServiceMonitor, void loadWelcomeMsg(); /* startup message */ + //std::list &getMsgList(); //std::list &getMsgOutList(); @@ -125,6 +126,8 @@ class p3MsgService: public p3Service, public p3Config, public pqiServiceMonitor, }; void enableDistantMessaging(bool b) ; bool distantMessagingEnabled() ; + void setDistantMessagingPermissionFlags(uint32_t flags) {} + uint32_t getDistantMessagingPermissionFlags() { return 0 ;} private: void sendDistantMsgItem(RsMsgItem *msgitem) ; diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 5111f6734..9e960f364 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -235,7 +235,7 @@ static bool trimAnonIds(std::list& lst) RsIdentityDetails idd ; for(std::list::iterator it = lst.begin();it!=lst.end();) - if(!rsIdentity->getIdDetails(*it,idd) || !idd.mPgpLinked) + if(!rsIdentity->getIdDetails(*it,idd) || !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { it = lst.erase(it) ; removed= true ; @@ -269,7 +269,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) { QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem(); - ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong(); + //ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong(); ChatLobbyFlags flags(item->data(COLUMN_DATA, ROLE_FLAGS).toUInt()); bool removed = false ; @@ -725,7 +725,7 @@ void ChatLobbyWidget::subscribeChatLobbyAs() return ; RsGxsId gxs_id(action->data().toString().toStdString()); - uint32_t error_code ; + //uint32_t error_code ; if(rsMsgs->joinVisibleChatLobby(id,gxs_id)) ChatDialog::chatFriend(ChatId(id),true) ; @@ -795,7 +795,7 @@ void ChatLobbyWidget::subscribeChatLobbyAtItem(QTreeWidgetItem *item) if(!rsIdentity->getIdDetails(gxs_id,idd)) return ; - if( (flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) && !idd.mPgpLinked) + if( (flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { QMessageBox::warning(NULL,tr("Default identity is anonymous"),tr("You cannot join this lobby with your default identity, since it is anonymous and the lobby forbids it.")) ; return ; @@ -844,11 +844,13 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) QString text = tr("You're not subscribed to this lobby; Double click-it to enter and chat.") ; - if(my_ids.empty()) - if( (*it).lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) - text += "\n\n"+tr("You will need to create a non anonymous identity in order to join this chat lobby.") ; - else - text += "\n\n"+tr("You will need to create an identity in order to join chat lobbies.") ; + if(my_ids.empty()) + { + if( (*it).lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) + text += "\n\n"+tr("You will need to create a non anonymous identity in order to join this chat lobby.") ; + else + text += "\n\n"+tr("You will need to create an identity in order to join chat lobbies.") ; + } ui.lobbyInfoLabel->setText(text); return ; diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index ec9eaf1da..7a7705bb4 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -81,6 +81,13 @@ IdDialog::IdDialog(QWidget *parent) : ui->setupUi(this); mIdQueue = NULL; + + allItem = new QTreeWidgetItem(); + allItem->setText(0, tr("All")); + + contactsItem = new QTreeWidgetItem(); + contactsItem->setText(0, tr("Contacts")); + /* Setup UI helper */ mStateHelper = new UIStateHelper(this); @@ -123,7 +130,6 @@ IdDialog::IdDialog(QWidget *parent) : /* Connect signals */ connect(ui->toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity())); - connect(ui->todoPushButton, SIGNAL(clicked()), this, SLOT(todo())); connect(ui->removeIdentity, SIGNAL(triggered()), this, SLOT(removeIdentity())); connect(ui->editIdentity, SIGNAL(triggered()), this, SLOT(editIdentity())); @@ -162,8 +168,7 @@ IdDialog::IdDialog(QWidget *parent) : QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem(); QString headerText = headerItem->text(RSID_COL_NICKNAME); ui->filterLineEdit->addFilter(QIcon(), headerText, RSID_COL_NICKNAME, QString("%1 %2").arg(tr("Search"), headerText)); - headerText = headerItem->text(RSID_COL_KEYID); - ui->filterLineEdit->addFilter(QIcon(), headerItem->text(RSID_COL_KEYID), RSID_COL_KEYID, QString("%1 %2").arg(tr("Search"), headerText)); + ui->filterLineEdit->addFilter(QIcon(), tr("ID"), RSID_COL_KEYID, tr("Search ID")); /* Setup tree */ ui->idTreeWidget->sortByColumn(RSID_COL_NICKNAME, Qt::AscendingOrder); @@ -171,6 +176,8 @@ IdDialog::IdDialog(QWidget *parent) : ui->idTreeWidget->enableColumnCustomize(true); ui->idTreeWidget->setColumnCustomizable(RSID_COL_NICKNAME, false); ui->idTreeWidget->setColumnHidden(RSID_COL_IDTYPE, true); + ui->idTreeWidget->setColumnHidden(RSID_COL_KEYID, true); + /* Set initial column width */ int fontWidth = QFontMetricsF(ui->idTreeWidget->font()).width("W"); ui->idTreeWidget->setColumnWidth(RSID_COL_NICKNAME, 14 * fontWidth); @@ -185,12 +192,6 @@ IdDialog::IdDialog(QWidget *parent) : mStateHelper->setActive(IDDIALOG_IDDETAILS, false); mStateHelper->setActive(IDDIALOG_REPLIST, false); - // Hiding RepList until that part is finished. - //ui->treeWidget_RepList->setVisible(false); - -#ifndef UNFINISHED - ui->todoPushButton->hide() ; -#endif QString hlp_str = tr( "

  Identities

\ @@ -214,9 +215,6 @@ IdDialog::IdDialog(QWidget *parent) : // load settings processSettings(true); - // hide reputation sice it's currently unused - //ui->reputationGroupBox->hide(); - //ui->tweakGroupBox->hide(); } IdDialog::~IdDialog() @@ -228,14 +226,6 @@ IdDialog::~IdDialog() delete(mIdQueue); } -void IdDialog::todo() -{ - QMessageBox::information(this, "Todo", - "Open points:
    " - "
  • Reputation" - "
"); -} - void IdDialog::processSettings(bool load) { Settings->beginGroup("IdDialog"); @@ -448,10 +438,11 @@ void IdDialog::insertIdList(uint32_t token) mStateHelper->setLoading(IDDIALOG_IDLIST, false); int accept = ui->filterComboBox->itemData(ui->filterComboBox->currentIndex()).toInt(); - + RsGxsIdGroup data; std::vector datavector; std::vector::iterator vit; + if (!rsIdentity->getGroupData(token, datavector)) { #ifdef ID_DEBUG @@ -464,53 +455,69 @@ void IdDialog::insertIdList(uint32_t token) return; } + + // turn that vector into a std::set, to avoid a linear search + + std::map ids_set ; + + for(uint32_t i=0;isetActive(IDDIALOG_IDLIST, true); RsPgpId ownPgpId = rsPeers->getGPGOwnId(); - /* Update existing and remove not existing items */ + // Update existing and remove not existing items + // Also remove items that do not have the correct parent + QTreeWidgetItemIterator itemIterator(ui->idTreeWidget); QTreeWidgetItem *item = NULL; - while ((item = *itemIterator) != NULL) { + + while ((item = *itemIterator) != NULL) + { ++itemIterator; + std::map::iterator it = ids_set.find(RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString())) ; - for (vit = datavector.begin(); vit != datavector.end(); ++vit) + if(it == ids_set.end()) { - if (vit->mMeta.mGroupId == RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString())) - { - break; - } - } - if (vit == datavector.end()) - { - delete(item); - } else { - if (!fillIdListItem(*vit, item, ownPgpId, accept)) - { + if(item != allItem && item != contactsItem) delete(item); - } - datavector.erase(vit); - } + + continue ; + } + + QTreeWidgetItem *parent_item = item->parent() ; + + if( (parent_item == allItem && it->second.mIsAContact) || (parent_item == contactsItem && !it->second.mIsAContact)) + { + delete item ; // do not remove from the list, so that it is added again in the correct place. + continue ; + } + + if (!fillIdListItem(it->second, item, ownPgpId, accept)) + delete(item); + + ids_set.erase(it); // erase, so it is not considered to be a new item } /* Insert new items */ - for (vit = datavector.begin(); vit != datavector.end(); ++vit) + for (std::map::const_iterator vit = ids_set.begin(); vit != ids_set.end(); ++vit) { - data = (*vit); + data = vit->second ; item = NULL; - if (fillIdListItem(*vit, item, ownPgpId, accept)) - { - ui->idTreeWidget->addTopLevelItem(item); - } + + ui->idTreeWidget->insertTopLevelItem(0, contactsItem ); + ui->idTreeWidget->insertTopLevelItem(0, allItem); + + if (fillIdListItem(vit->second, item, ownPgpId, accept)) + if(vit->second.mIsAContact) + contactsItem->addChild(item); + else + allItem->addChild(item); } - - /* count items */ - ui->label_count->setText( "(" + QString::number(ui->idTreeWidget->topLevelItemCount()) + ")" ); filterIds(); - updateSelection(); } @@ -916,7 +923,8 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) rsIdentity->getOwnIds(own_identities) ; QTreeWidgetItem *item = ui->idTreeWidget->currentItem(); - if (item) { + + if(item != allItem && item != contactsItem) { uint32_t item_flags = item->data(RSID_COL_KEYID,Qt::UserRole).toUInt() ; if(!(item_flags & RSID_FILTER_OWNED_BY_YOU)) @@ -952,7 +960,29 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message to this person"), this, SLOT(sendMsg())); contextMnu.addSeparator(); + + RsIdentityDetails details; + std::string keyId = item->text(RSID_COL_KEYID).toStdString(); + + rsIdentity->getIdDetails(RsGxsId(keyId), details); + + QAction *addContact = contextMnu.addAction(QIcon(), tr("Add to Contacts"), this, SLOT(addtoContacts())); + QAction *removeContact = contextMnu.addAction(QIcon(":/images/cancel.png"), tr("Remove from Contacts"), this, SLOT(removefromContacts())); + + + if(details.mFlags & RS_IDENTITY_FLAGS_IS_A_CONTACT) + { + addContact->setVisible(false); + removeContact->setVisible(true); + } + else + { + addContact->setVisible(true); + removeContact->setVisible(false); + } + contextMnu.addSeparator(); + RsReputations::ReputationInfo info ; std::string Id = item->text(RSID_COL_KEYID).toStdString(); rsReputations->getReputationInfo(RsGxsId(Id),info) ; @@ -974,12 +1004,13 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) } } + + contextMnu.addSeparator(); + + contextMnu.addAction(ui->editIdentity); + contextMnu.addAction(ui->removeIdentity); } - contextMnu.addSeparator(); - - contextMnu.addAction(ui->editIdentity); - contextMnu.addAction(ui->removeIdentity); contextMnu.addSeparator(); @@ -1064,3 +1095,34 @@ void IdDialog::unbanPerson() requestIdDetails(); requestIdList(); } + +void IdDialog::addtoContacts() +{ + QTreeWidgetItem *item = ui->idTreeWidget->currentItem(); + if (!item) + { + return; + } + + std::string Id = item->text(RSID_COL_KEYID).toStdString(); + + rsIdentity->setAsRegularContact(RsGxsId(Id),true); + + requestIdList(); +} + +void IdDialog::removefromContacts() +{ + QTreeWidgetItem *item = ui->idTreeWidget->currentItem(); + if (!item) + { + return; + } + + std::string Id = item->text(RSID_COL_KEYID).toStdString(); + + rsIdentity->setAsRegularContact(RsGxsId(Id),false); + + requestIdList(); +} + diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h index 8eb2b748f..9b6ba48cc 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.h +++ b/retroshare-gui/src/gui/Identity/IdDialog.h @@ -1,109 +1,114 @@ -/* - * Retroshare Identity. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef IDENTITYDIALOG_H -#define IDENTITYDIALOG_H - -#include "gui/gxs/RsGxsUpdateBroadcastPage.h" - -#include - -#include "util/TokenQueue.h" - -#define IMAGE_IDDIALOG ":/icons/friends_128.png" - -namespace Ui { -class IdDialog; -} - -class UIStateHelper; -class QTreeWidgetItem; - -class IdDialog : public RsGxsUpdateBroadcastPage, public TokenResponse -{ - Q_OBJECT - -public: - IdDialog(QWidget *parent = 0); - ~IdDialog(); - - virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDDIALOG) ; } //MainPage - virtual QString pageName() const { return tr("People") ; } //MainPage - virtual QString helpText() const { return ""; } //MainPage - - void loadRequest(const TokenQueue *queue, const TokenRequest &req); - -protected: - virtual void updateDisplay(bool complete); - -private slots: - void filterComboBoxChanged(); - void filterChanged(const QString &text); - - void addIdentity(); - void removeIdentity(); - void editIdentity(); - void chatIdentity(); - void sendMsg(); - - - void updateSelection(); - - void todo(); - void modifyReputation(); - - /** Create the context popup menu and it's submenus */ - void IdListCustomPopupMenu( QPoint point ); - - void banPerson(); - void unbanPerson(); - -private: - void processSettings(bool load); - - void requestIdDetails(); - void insertIdDetails(uint32_t token); - - void requestIdList(); - void requestIdData(std::list &ids); - bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept); - void insertIdList(uint32_t token); - void filterIds(); - - void requestRepList(); - void insertRepList(uint32_t token); - - void requestIdEdit(std::string &id); - void showIdEdit(uint32_t token); - -private: - TokenQueue *mIdQueue; - UIStateHelper *mStateHelper; - - RsGxsGroupId mId; - - /* UI - Designer */ - Ui::IdDialog *ui; -}; - -#endif +/* + * Retroshare Identity. + * + * Copyright 2012-2012 by Robert Fernie. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "retroshare@lunamutt.com". + * + */ + +#ifndef IDENTITYDIALOG_H +#define IDENTITYDIALOG_H + +#include "gui/gxs/RsGxsUpdateBroadcastPage.h" + +#include + +#include "util/TokenQueue.h" + +#define IMAGE_IDDIALOG ":/icons/friends_128.png" + +namespace Ui { +class IdDialog; +} + +class UIStateHelper; +class QTreeWidgetItem; + +class IdDialog : public RsGxsUpdateBroadcastPage, public TokenResponse +{ + Q_OBJECT + +public: + IdDialog(QWidget *parent = 0); + ~IdDialog(); + + virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDDIALOG) ; } //MainPage + virtual QString pageName() const { return tr("People") ; } //MainPage + virtual QString helpText() const { return ""; } //MainPage + + void loadRequest(const TokenQueue *queue, const TokenRequest &req); + +protected: + virtual void updateDisplay(bool complete); + +private slots: + void filterComboBoxChanged(); + void filterChanged(const QString &text); + + void addIdentity(); + void removeIdentity(); + void editIdentity(); + void chatIdentity(); + void sendMsg(); + + + void updateSelection(); + + void modifyReputation(); + + /** Create the context popup menu and it's submenus */ + void IdListCustomPopupMenu( QPoint point ); + + void addtoContacts(); + void removefromContacts(); + + void banPerson(); + void unbanPerson(); + +private: + void processSettings(bool load); + + void requestIdDetails(); + void insertIdDetails(uint32_t token); + + void requestIdList(); + void requestIdData(std::list &ids); + bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept); + void insertIdList(uint32_t token); + void filterIds(); + + void requestRepList(); + void insertRepList(uint32_t token); + + void requestIdEdit(std::string &id); + void showIdEdit(uint32_t token); + +private: + TokenQueue *mIdQueue; + UIStateHelper *mStateHelper; + + QTreeWidgetItem *contactsItem; + QTreeWidgetItem *allItem; + + RsGxsGroupId mId; + + /* UI - Designer */ + Ui::IdDialog *ui; +}; + +#endif diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 778d218cb..5528ef45f 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -111,13 +111,6 @@ - - - - Todo - - - @@ -221,6 +214,18 @@ Qt::CustomContextMenu + + QAbstractItemView::ExtendedSelection + + + + 22 + 22 + + + + 24 + true @@ -229,7 +234,7 @@ - Identity name + Persons @@ -713,7 +718,6 @@ p, li { white-space: pre-wrap; } - todoPushButton idTreeWidget lineEdit_Nickname lineEdit_KeyId diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index 5754d5831..88e8f6f29 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -1335,7 +1335,7 @@ static void processList(const QStringList &list, const QString &textSingular, co if(!gxs_id.isNull() && rsIdentity->getIdDetails(gxs_id,gxs_details)) { - if(gxs_details.mIsOwnId) + if(gxs_details.mFlags & RS_IDENTITY_FLAGS_IS_OWN_ID) { QMessageBox::warning(NULL,QString("Cannot send message to yourself"),QString("This identity is owned by you. You wouldn't want to send yourself a message right?")); break ; diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 2d1a75829..5aa7fb726 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -110,7 +110,7 @@ void CreateLobbyDialog::checkTextFields() rsIdentity->getIdDetails(id,idd) ; - if( (!idd.mPgpKnown) && ui->pgp_signed_CB->isChecked()) + if( (!(idd.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN)) && ui->pgp_signed_CB->isChecked()) ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false) ; } diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp index 3cc3ff3d0..bbe15e84f 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp @@ -284,6 +284,10 @@ void FriendSelectionWidget::secured_fillList() std::set gxsIdsSelected; if (mShowTypes & SHOW_GXS) selectedIds(gxsIdsSelected,true); + + std::set gxsIdsSelected2; + if (mShowTypes & SHOW_CONTACTS) + selectedIds(gxsIdsSelected2,true); // remove old items ui->friendList->clear(); @@ -525,6 +529,7 @@ void FriendSelectionWidget::secured_fillList() // iterate through gpg ids for (std::vector::const_iterator gxsIt = gxsIds.begin(); gxsIt != gxsIds.end(); ++gxsIt) { + // we fill the not assigned gpg ids if (std::find(filledIds.begin(), filledIds.end(), (*gxsIt).toStdString()) != filledIds.end()) continue; @@ -570,6 +575,61 @@ void FriendSelectionWidget::secured_fillList() setSelected(mListModus, gxsItem, true); } } + if(mShowTypes & SHOW_CONTACTS) + { + // iterate through gpg ids + for (std::vector::const_iterator gxsIt = gxsIds.begin(); gxsIt != gxsIds.end(); ++gxsIt) + { + + // we fill the not assigned gpg ids + if (std::find(filledIds.begin(), filledIds.end(), (*gxsIt).toStdString()) != filledIds.end()) + continue; + + // add equal too, its no problem + filledIds.push_back((*gxsIt).toStdString()); + + RsIdentityDetails detail; + if (!rsIdentity->getIdDetails(RsGxsId(*gxsIt), detail)) + continue; /* BAD */ + + QList icons ; + GxsIdDetails::getIcons(detail,icons,GxsIdDetails::ICON_TYPE_AVATAR) ; + QIcon identicon = icons.front() ; + + if(detail.mFlags & RS_IDENTITY_FLAGS_IS_A_CONTACT) + { + + // make a widget per friend + gxsItem = new RSTreeWidgetItem(mCompareRole, IDTYPE_GXS); + + QString name = QString::fromUtf8(detail.mNickname.c_str()); + gxsItem->setText(COLUMN_NAME, name + " ("+QString::fromStdString( (*gxsIt).toStdString() )+")"); + + //gxsItem->setTextColor(COLUMN_NAME, textColorOnline()); + gxsItem->setFlags(Qt::ItemIsUserCheckable | gxsItem->flags()); + gxsItem->setIcon(COLUMN_NAME, identicon); + gxsItem->setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(detail.mId.toStdString())); + + gxsItem->setData(COLUMN_NAME, ROLE_SORT_GROUP, 1); + gxsItem->setData(COLUMN_NAME, ROLE_SORT_STANDARD_GROUP, 0); + //TODO: online state for gxs items + gxsItem->setData(COLUMN_NAME, ROLE_SORT_STATE, 1); + gxsItem->setData(COLUMN_NAME, ROLE_SORT_NAME, name); + + if (mListModus == MODUS_CHECK) + gxsItem->setCheckState(0, Qt::Unchecked); + + ui->friendList->addTopLevelItem(gxsItem); + + gxsItem->setExpanded(true); + + emit itemAdded(IDTYPE_GXS, QString::fromStdString(detail.mId.toStdString()), gxsItem); + + if (std::find(gxsIdsSelected.begin(), gxsIdsSelected.end(), detail.mId) != gxsIdsSelected.end()) + setSelected(mListModus, gxsItem, true); + } + } + } if (groupIt != groupInfoList.end()) { ++groupIt; } else { diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h index 22e571808..c83aa716e 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h @@ -65,7 +65,8 @@ public: SHOW_GPG = 2, SHOW_SSL = 4, SHOW_NON_FRIEND_GPG = 8, - SHOW_GXS =16 + SHOW_GXS =16, + SHOW_CONTACTS =32 }; Q_DECLARE_FLAGS(ShowTypes, ShowType) diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp index 522f927ec..bffefe99c 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp @@ -160,9 +160,9 @@ static void loadPrivateIdsCallback(GxsIdDetailsType type, const RsIdentityDetail chooser->setItemData(index, (type == GXS_ID_DETAILS_TYPE_DONE) ? TYPE_FOUND_ID : TYPE_UNKNOWN_ID, ROLE_TYPE); chooser->setItemIcon(index, icons.empty() ? QIcon() : icons[0]); - std::cerr << "ID=" << details.mId << ", chooser->flags()=" << chooser->flags() << ", pgpLinked=" << details.mPgpLinked ; + std::cerr << "ID=" << details.mId << ", chooser->flags()=" << chooser->flags() << ", flags=" << details.mFlags ; - if((chooser->flags() & IDCHOOSER_NON_ANONYMOUS) && !(details.mPgpLinked)) + if((chooser->flags() & IDCHOOSER_NON_ANONYMOUS) && !(details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { std::cerr << " - disabling ID - entry = " << index << std::endl; chooser->setEntryEnabled(index,false) ; diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp index 400498823..5666a35b7 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp @@ -912,11 +912,11 @@ QString nickname ; QApplication::translate("GxsIdDetails", "Identity Id"), QString::fromStdString(details.mId.toStdString())); - if (details.mPgpLinked) + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) { comment += QString("
%1:%2 ").arg(QApplication::translate("GxsIdDetails", "Authentication"), QApplication::translate("GxsIdDetails", "Signed by")); - if (details.mPgpKnown) + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN) { /* look up real name */ std::string authorName = rsPeers->getGPGName(details.mPgpId); @@ -962,9 +962,9 @@ void GxsIdDetails::getIcons(const RsIdentityDetails &details, QList &icon { // ICON Logic. QIcon baseIcon; - if (details.mPgpLinked) + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) { - if (details.mPgpKnown) + if (details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN) baseIcon = QIcon(IMAGE_PGPKNOWN); else baseIcon = QIcon(IMAGE_PGPUNKNOWN); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 3b771aa3f..bd4002ed6 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -266,10 +266,11 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags) ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ; /* Add filter types */ - ui.filterComboBox->addItem(tr("All")); + ui.filterComboBox->addItem(tr("All addresses (mixed)")); ui.filterComboBox->addItem(tr("Friend Nodes")); - ui.filterComboBox->addItem(tr("Distant peer identities")); - ui.filterComboBox->setCurrentIndex(0); + ui.filterComboBox->addItem(tr("All people")); + ui.filterComboBox->addItem(tr("My contacts")); + ui.filterComboBox->setCurrentIndex(3); connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int))); connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &))); @@ -2569,6 +2570,11 @@ void MessageComposer::filterComboBoxChanged(int i) case 2: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS) ; break ; + + + case 3: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_CONTACTS) ; + break ; + default: ; } diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 71227edbf..f3a16ac33 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -6,8 +6,8 @@ 0 0 - 925 - 747 + 1679 + 951 @@ -56,14 +56,14 @@ QDockWidget::DockWidgetClosable - Contacts + Address list: - - - 1 - - + + + + + @@ -100,25 +100,8 @@ - + - - - - - - - 0 - 0 - - - - >> To - - - - - @@ -130,7 +113,20 @@ - >> Cc + Cc + + + + + + + + 0 + 0 + + + + To @@ -143,7 +139,7 @@ - >> Bcc + Bcc @@ -160,7 +156,7 @@ - >> Recommend + Recommend this friend @@ -168,23 +164,6 @@ - - - - 0 - - - - - Show: - - - - - - - - @@ -1105,8 +1084,8 @@ border-image: url(:/images/closepressed.png) 0 0 - 925 - 21 + 1679 + 37 @@ -1238,8 +1217,6 @@ border-image: url(:/images/closepressed.png) titleEdit msgText msgFileList - addToButton - addCcButton addBccButton addRecommendButton comboSize diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 6f87dfba0..dfe02ff31 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -100,6 +100,8 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + connect(ui.distantChatcomboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantChatComboBoxChanged(int))); + #if QT_VERSION < 0x040600 ui.minimumContrastLabel->hide(); ui.minimumContrast->hide(); @@ -120,6 +122,8 @@ ChatPage::save(QString &/*errmsg*/) Settings->setValue("EnableItalics", ui.checkBox_enableItalics->isChecked()); Settings->setValue("MinimumContrast", ui.minimumContrast->value()); Settings->endGroup(); + // state of distant Chat combobox + Settings->setValue("DistantChat", ui.distantChatcomboBox->currentIndex()); Settings->setChatScreenFont(fontTempChat.toString()); NotifyQt::getInstance()->notifyChatFontChanged(); @@ -226,6 +230,10 @@ ChatPage::load() ui.minimumContrast->setValue(Settings->value("MinimumContrast", 4.5).toDouble()); Settings->endGroup(); + // state of distant Chat combobox + int index = Settings->value("DistantChat", 0).toInt(); + ui.distantChatcomboBox->setCurrentIndex(index); + fontTempChat.fromString(Settings->getChatScreenFont()); ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn()); @@ -493,3 +501,22 @@ void ChatPage::on_btSearch_FoundColor_clicked() ui.btSearch_FoundColor->setIcon(pix); } } + +void ChatPage::distantChatComboBoxChanged(int i) +{ + switch(i) + { + case 0: ; + break ; + + case 1: ; + break ; + + case 2: ; + break ; + + default: ; + } + +} + diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index 5d4527412..f9a85d72b 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -1,79 +1,81 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006 - 2010 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -#ifndef _CHATPAGE_H -#define _CHATPAGE_H - -#include -#include "ui_ChatPage.h" - -class ChatPage : public ConfigPage -{ - Q_OBJECT - - public: - /** Default Constructor */ - ChatPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); - /** Default Destructor */ - ~ChatPage() {} - - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); - /** Loads the settings for this page */ - virtual void load(); - - virtual QPixmap iconPixmap() const { return QPixmap(":/images/chat_24.png") ; } - virtual QString pageName() const { return tr("Chat") ; } - virtual QString helpText() const { return ""; } - - private slots: - void on_historyComboBoxVariant_currentIndexChanged(int index); - void on_privateComboBoxVariant_currentIndexChanged(int index); - void on_publicComboBoxVariant_currentIndexChanged(int index); - void on_pushButtonChangeChatFont_clicked(); - void on_publicList_currentRowChanged(int currentRow); - void on_privateList_currentRowChanged(int currentRow); - void on_historyList_currentRowChanged(int currentRow); - - void on_cbSearch_WithoutLimit_toggled(bool); - void on_btSearch_FoundColor_clicked(); - - - private: - void setPreviewMessages(QString &stylePath, QString styleVariant, QTextBrowser *textBrowser); - void fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser); - - QFont fontTempChat; - - QString publicStylePath; - QString publicStyleVariant; - QString privateStylePath; - QString privateStyleVariant; - QString historyStylePath; - QString historyStyleVariant; - - QRgb rgbChatSearchFoundColor; - - /** Qt Designer generated object */ - Ui::ChatPage ui; -}; - -#endif +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006 - 2010 RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#ifndef _CHATPAGE_H +#define _CHATPAGE_H + +#include +#include "ui_ChatPage.h" + +class ChatPage : public ConfigPage +{ + Q_OBJECT + + public: + /** Default Constructor */ + ChatPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); + /** Default Destructor */ + ~ChatPage() {} + + /** Saves the changes on this page */ + virtual bool save(QString &errmsg); + /** Loads the settings for this page */ + virtual void load(); + + virtual QPixmap iconPixmap() const { return QPixmap(":/images/chat_24.png") ; } + virtual QString pageName() const { return tr("Chat") ; } + virtual QString helpText() const { return ""; } + + private slots: + void on_historyComboBoxVariant_currentIndexChanged(int index); + void on_privateComboBoxVariant_currentIndexChanged(int index); + void on_publicComboBoxVariant_currentIndexChanged(int index); + void on_pushButtonChangeChatFont_clicked(); + void on_publicList_currentRowChanged(int currentRow); + void on_privateList_currentRowChanged(int currentRow); + void on_historyList_currentRowChanged(int currentRow); + + void on_cbSearch_WithoutLimit_toggled(bool); + void on_btSearch_FoundColor_clicked(); + + void distantChatComboBoxChanged(int); + + + private: + void setPreviewMessages(QString &stylePath, QString styleVariant, QTextBrowser *textBrowser); + void fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser); + + QFont fontTempChat; + + QString publicStylePath; + QString publicStyleVariant; + QString privateStylePath; + QString privateStyleVariant; + QString historyStylePath; + QString historyStyleVariant; + + QRgb rgbChatSearchFoundColor; + + /** Qt Designer generated object */ + Ui::ChatPage ui; +}; + +#endif diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 1b3cfa544..ebf2d8cef 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -20,8 +20,43 @@ General - - + + + + + Distant Chat + + + + + + + Everyone + + + + + Contacts + + + + + Nobody + + + + + + + + Accept encrypted distant chat from + + + + + + + @@ -240,7 +275,7 @@ - + diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index 77bb4e37f..3211300b1 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -1,239 +1,269 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -#include "rshare.h" -#include "rsharesettings.h" -#include "retroshare/rsmsgs.h" - -#include "MessagePage.h" -#include "gui/common/TagDefs.h" -#include -#include "NewTag.h" - -MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags) - : ConfigPage(parent, flags) -{ - ui.setupUi(this); - - m_pTags = new MsgTagType; - - connect (ui.addpushButton, SIGNAL(clicked(bool)), this, SLOT (addTag())); - connect (ui.editpushButton, SIGNAL(clicked(bool)), this, SLOT (editTag())); - connect (ui.deletepushButton, SIGNAL(clicked(bool)), this, SLOT (deleteTag())); - connect (ui.defaultTagButton, SIGNAL(clicked(bool)), this, SLOT (defaultTag())); - connect (ui.encryptedMsgs_CB, SIGNAL(toggled(bool)), this, SLOT (toggleEnableEncryptedDistantMsgs(bool))); - - connect (ui.tags_listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(currentRowChangedTag(int))); - - ui.editpushButton->setEnabled(false); - ui.deletepushButton->setEnabled(false); - - ui.openComboBox->addItem(tr("A new tab"), RshareSettings::MSG_OPEN_TAB); - ui.openComboBox->addItem(tr("A new window"), RshareSettings::MSG_OPEN_WINDOW); - - //ui.encryptedMsgs_CB->setEnabled(false) ; -} - -MessagePage::~MessagePage() -{ - delete(m_pTags); -} - -void MessagePage::toggleEnableEncryptedDistantMsgs(bool b) -{ - rsMail->enableDistantMessaging(b) ; -} - -/** Saves the changes on this page */ -bool -MessagePage::save(QString &/*errmsg*/) -{ - Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); - Settings->setMsgLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked()); - Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt()); - - std::map >::iterator Tag; - for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { - // check for changed tags - std::list::iterator changedTagId; - for (changedTagId = m_changedTagIds.begin(); changedTagId != m_changedTagIds.end(); ++changedTagId) { - if (*changedTagId == Tag->first) { - if (Tag->second.first.empty()) { - // delete tag - rsMail->removeMessageTagType(Tag->first); - continue; - } - - rsMail->setMessageTagType(Tag->first, Tag->second.first, Tag->second.second); - break; - } - } - } - - return true; -} - -/** Loads the settings for this page */ -void -MessagePage::load() -{ - ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate()); - ui.loadEmbeddedImages->setChecked(Settings->getMsgLoadEmbeddedImages()); - ui.openComboBox->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen())); - - ui.encryptedMsgs_CB->setChecked(rsMail->distantMessagingEnabled()) ; - // fill items - rsMail->getMessageTagTypes(*m_pTags); - fillTags(); -} - -// fill tags -void MessagePage::fillTags() -{ - ui.tags_listWidget->clear(); - - std::map >::iterator Tag; - for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { - QString text = TagDefs::name(Tag->first, Tag->second.first); - - QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); - pItemWidget->setTextColor(QColor(Tag->second.second)); - pItemWidget->setData(Qt::UserRole, Tag->first); - } -} - -void MessagePage::addTag() -{ - NewTag TagDlg(*m_pTags); - if (TagDlg.exec() == QDialog::Accepted && TagDlg.m_nId) { - std::map >::iterator Tag; - Tag = m_pTags->types.find(TagDlg.m_nId); - if (Tag != m_pTags->types.end()) { - QString text = TagDefs::name(Tag->first, Tag->second.first); - - QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); - pItemWidget->setTextColor(QColor(Tag->second.second)); - pItemWidget->setData(Qt::UserRole, TagDlg.m_nId); - - m_changedTagIds.push_back(TagDlg.m_nId); - } - } -} - -void MessagePage::editTag() -{ - QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem(); - if (pItemWidget == NULL) { - return; - } - - uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); - if (nId == 0) { - return; - } - - NewTag TagDlg(*m_pTags, nId); - TagDlg.setWindowTitle(tr("Edit Tag")); - if (TagDlg.exec() == QDialog::Accepted && TagDlg.m_nId) { - std::map >::iterator Tag; - Tag = m_pTags->types.find(TagDlg.m_nId); - if (Tag != m_pTags->types.end()) { - if (Tag->first >= RS_MSGTAGTYPE_USER) { - pItemWidget->setText(QString::fromStdString(Tag->second.first)); - } - pItemWidget->setTextColor(QColor(Tag->second.second)); - - if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), TagDlg.m_nId) == m_changedTagIds.end()) { - m_changedTagIds.push_back(TagDlg.m_nId); - } - } - } -} - -void MessagePage::deleteTag() -{ - QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem(); - if (pItemWidget == NULL) { - return; - } - - uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); - if (nId == 0) { - return; - } - - if (nId < RS_MSGTAGTYPE_USER) { - // can't delete standard tag item - return; - } - - std::map >::iterator Tag; - Tag = m_pTags->types.find(nId); - if (Tag != m_pTags->types.end()) { - // erase the text for later delete - Tag->second.first.erase(); - } - - ui.tags_listWidget->removeItemWidget(pItemWidget); - delete (pItemWidget); - - if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), nId) == m_changedTagIds.end()) { - m_changedTagIds.push_back(nId); - } -} - -void MessagePage::defaultTag() -{ - rsMail->resetMessageStandardTagTypes(*m_pTags); - - // add all standard items to changed list - std::map >::iterator Tag; - for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { - if (Tag->first < RS_MSGTAGTYPE_USER) { - if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), Tag->first) == m_changedTagIds.end()) { - m_changedTagIds.push_back(Tag->first); - } - } - } - - fillTags(); -} - -void MessagePage::currentRowChangedTag(int row) -{ - QListWidgetItem *pItemWidget = ui.tags_listWidget->item(row); - - bool bEditEnable = false; - bool bDeleteEnable = false; - - if (pItemWidget) { - bEditEnable = true; - - uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); - - if (nId >= RS_MSGTAGTYPE_USER) { - bDeleteEnable = true; - } - } - - ui.editpushButton->setEnabled(bEditEnable); - ui.deletepushButton->setEnabled(bDeleteEnable); -} +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006, crypton + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#include "rshare.h" +#include "rsharesettings.h" +#include "retroshare/rsmsgs.h" + +#include "MessagePage.h" +#include "gui/common/TagDefs.h" +#include +#include "NewTag.h" + +MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags) + : ConfigPage(parent, flags) +{ + ui.setupUi(this); + + m_pTags = new MsgTagType; + + connect (ui.addpushButton, SIGNAL(clicked(bool)), this, SLOT (addTag())); + connect (ui.editpushButton, SIGNAL(clicked(bool)), this, SLOT (editTag())); + connect (ui.deletepushButton, SIGNAL(clicked(bool)), this, SLOT (deleteTag())); + connect (ui.defaultTagButton, SIGNAL(clicked(bool)), this, SLOT (defaultTag())); + //connect (ui.encryptedMsgs_CB, SIGNAL(toggled(bool)), this, SLOT (toggleEnableEncryptedDistantMsgs(bool))); + + connect (ui.tags_listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(currentRowChangedTag(int))); + + ui.editpushButton->setEnabled(false); + ui.deletepushButton->setEnabled(false); + + ui.openComboBox->addItem(tr("A new tab"), RshareSettings::MSG_OPEN_TAB); + ui.openComboBox->addItem(tr("A new window"), RshareSettings::MSG_OPEN_WINDOW); + + connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantMsgsComboBoxChanged(int))); + + + //ui.encryptedMsgs_CB->setEnabled(false) ; +} + +MessagePage::~MessagePage() +{ + delete(m_pTags); +} + +void MessagePage::distantMsgsComboBoxChanged(int i) +{ + switch(i) + { + case 0: rsMail->setDistantMessagingPermissionFlags(RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_EVERYBODY |RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_CONTACT_LIST) ; + break ; + + case 1: rsMail->setDistantMessagingPermissionFlags(RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_CONTACT_LIST) ; + break ; + + case 2: rsMail->setDistantMessagingPermissionFlags(RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_NONE) ; + break ; + + + default: ; + } + +} + +/** Saves the changes on this page */ +bool +MessagePage::save(QString &/*errmsg*/) +{ + Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); + Settings->setMsgLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked()); + Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt()); + + // state of distant Message combobox + Settings->setValue("DistantMessages", ui.comboBox->currentIndex()); + + std::map >::iterator Tag; + for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { + // check for changed tags + std::list::iterator changedTagId; + for (changedTagId = m_changedTagIds.begin(); changedTagId != m_changedTagIds.end(); ++changedTagId) { + if (*changedTagId == Tag->first) { + if (Tag->second.first.empty()) { + // delete tag + rsMail->removeMessageTagType(Tag->first); + continue; + } + + rsMail->setMessageTagType(Tag->first, Tag->second.first, Tag->second.second); + break; + } + } + } + + return true; +} + +/** Loads the settings for this page */ +void +MessagePage::load() +{ + ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate()); + ui.loadEmbeddedImages->setChecked(Settings->getMsgLoadEmbeddedImages()); + ui.openComboBox->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen())); + + // state of filter combobox + + uint32_t flags = rsMail->getDistantMessagingPermissionFlags() ; + + if(flags == (RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_CONTACT_LIST | RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_EVERYBODY)) + ui.comboBox->setCurrentIndex(2); + else if(flags == RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_CONTACT_LIST) + ui.comboBox->setCurrentIndex(1); + else + ui.comboBox->setCurrentIndex(0); + + // fill items + rsMail->getMessageTagTypes(*m_pTags); + fillTags(); +} + +// fill tags +void MessagePage::fillTags() +{ + ui.tags_listWidget->clear(); + + std::map >::iterator Tag; + for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { + QString text = TagDefs::name(Tag->first, Tag->second.first); + + QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); + pItemWidget->setTextColor(QColor(Tag->second.second)); + pItemWidget->setData(Qt::UserRole, Tag->first); + } +} + +void MessagePage::addTag() +{ + NewTag TagDlg(*m_pTags); + if (TagDlg.exec() == QDialog::Accepted && TagDlg.m_nId) { + std::map >::iterator Tag; + Tag = m_pTags->types.find(TagDlg.m_nId); + if (Tag != m_pTags->types.end()) { + QString text = TagDefs::name(Tag->first, Tag->second.first); + + QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); + pItemWidget->setTextColor(QColor(Tag->second.second)); + pItemWidget->setData(Qt::UserRole, TagDlg.m_nId); + + m_changedTagIds.push_back(TagDlg.m_nId); + } + } +} + +void MessagePage::editTag() +{ + QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem(); + if (pItemWidget == NULL) { + return; + } + + uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); + if (nId == 0) { + return; + } + + NewTag TagDlg(*m_pTags, nId); + TagDlg.setWindowTitle(tr("Edit Tag")); + if (TagDlg.exec() == QDialog::Accepted && TagDlg.m_nId) { + std::map >::iterator Tag; + Tag = m_pTags->types.find(TagDlg.m_nId); + if (Tag != m_pTags->types.end()) { + if (Tag->first >= RS_MSGTAGTYPE_USER) { + pItemWidget->setText(QString::fromStdString(Tag->second.first)); + } + pItemWidget->setTextColor(QColor(Tag->second.second)); + + if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), TagDlg.m_nId) == m_changedTagIds.end()) { + m_changedTagIds.push_back(TagDlg.m_nId); + } + } + } +} + +void MessagePage::deleteTag() +{ + QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem(); + if (pItemWidget == NULL) { + return; + } + + uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); + if (nId == 0) { + return; + } + + if (nId < RS_MSGTAGTYPE_USER) { + // can't delete standard tag item + return; + } + + std::map >::iterator Tag; + Tag = m_pTags->types.find(nId); + if (Tag != m_pTags->types.end()) { + // erase the text for later delete + Tag->second.first.erase(); + } + + ui.tags_listWidget->removeItemWidget(pItemWidget); + delete (pItemWidget); + + if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), nId) == m_changedTagIds.end()) { + m_changedTagIds.push_back(nId); + } +} + +void MessagePage::defaultTag() +{ + rsMail->resetMessageStandardTagTypes(*m_pTags); + + // add all standard items to changed list + std::map >::iterator Tag; + for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { + if (Tag->first < RS_MSGTAGTYPE_USER) { + if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), Tag->first) == m_changedTagIds.end()) { + m_changedTagIds.push_back(Tag->first); + } + } + } + + fillTags(); +} + +void MessagePage::currentRowChangedTag(int row) +{ + QListWidgetItem *pItemWidget = ui.tags_listWidget->item(row); + + bool bEditEnable = false; + bool bDeleteEnable = false; + + if (pItemWidget) { + bEditEnable = true; + + uint32_t nId = pItemWidget->data(Qt::UserRole).toInt(); + + if (nId >= RS_MSGTAGTYPE_USER) { + bDeleteEnable = true; + } + } + + ui.editpushButton->setEnabled(bEditEnable); + ui.deletepushButton->setEnabled(bDeleteEnable); +} diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h index 7bf2752c3..e79405ae8 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.h +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -1,70 +1,71 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -#ifndef MESSAGEPAGE_H -#define MESSAGEPAGE_H - -#include - -#include -#include "ui_MessagePage.h" - -#include "gui/msgs/MessageInterface.h" - -class MessagePage : public ConfigPage -{ - Q_OBJECT - -public: - MessagePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); - ~MessagePage(); - - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); - /** Loads the settings for this page */ - virtual void load(); - - virtual QPixmap iconPixmap() const { return QPixmap(":/images/evolution.png") ; } - virtual QString pageName() const { return tr("Message") ; } - virtual QString helpText() const { return ""; } - - -private slots: - void addTag(); - void editTag(); - void deleteTag(); - void defaultTag(); - - void currentRowChangedTag(int row); - void toggleEnableEncryptedDistantMsgs(bool) ; - -private: - void fillTags(); - - /* Pointer for not include of rsmsgs.h */ - MsgTagType *m_pTags; - std::list m_changedTagIds; - - Ui::MessagePage ui; -}; - -#endif // !MESSAGEPAGE_H - +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006, crypton + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#ifndef MESSAGEPAGE_H +#define MESSAGEPAGE_H + +#include + +#include +#include "ui_MessagePage.h" + +#include "gui/msgs/MessageInterface.h" + +class MessagePage : public ConfigPage +{ + Q_OBJECT + +public: + MessagePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); + ~MessagePage(); + + /** Saves the changes on this page */ + virtual bool save(QString &errmsg); + /** Loads the settings for this page */ + virtual void load(); + + virtual QPixmap iconPixmap() const { return QPixmap(":/images/evolution.png") ; } + virtual QString pageName() const { return tr("Message") ; } + virtual QString helpText() const { return ""; } + + +private slots: + void addTag(); + void editTag(); + void deleteTag(); + void defaultTag(); + + void currentRowChangedTag(int row); + void distantMsgsComboBoxChanged(int); + + +private: + void fillTags(); + + /* Pointer for not include of rsmsgs.h */ + MsgTagType *m_pTags; + std::list m_changedTagIds; + + Ui::MessagePage ui; +}; + +#endif // !MESSAGEPAGE_H + diff --git a/retroshare-gui/src/gui/settings/MessagePage.ui b/retroshare-gui/src/gui/settings/MessagePage.ui index 58fa2be1e..5a02693da 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.ui +++ b/retroshare-gui/src/gui/settings/MessagePage.ui @@ -59,21 +59,30 @@ Distant messages: - - - - - <html><head/><body><p align="justify">The link below allows people in the network to send encrypted messages to you, using tunnels. To do that, they need your public PGP key, which they will get using the Retroshare discovery system. </p></body></html> - - - true - + + + + + + Everyone + + + + + Contacts + + + + + Nobody + + - - + + - Accept encrypted distant messages from everyone + Accept encrypted distant messages from