diff --git a/libretroshare/src/retroshare/rsphoto.h b/libretroshare/src/retroshare/rsphoto.h index f94f50f34..9c41e5377 100644 --- a/libretroshare/src/retroshare/rsphoto.h +++ b/libretroshare/src/retroshare/rsphoto.h @@ -25,8 +25,10 @@ #include #include #include -#include "rsgxsservice.h" -#include "rsgxscommon.h" +#include "retroshare/rsgxsservice.h" +#include "retroshare/rsgxscommon.h" +#include "retroshare/rsgxsifacehelper.h" + /* The Main Interface Class - for information about your Peers */ class RsPhoto; @@ -135,30 +137,13 @@ class RsPhotoAlbum uint32_t mModFlags; }; -class RsGxsPhotoCommentItem; -class RsPhotoComment -{ -public: - RsPhotoComment(); - - explicit RsPhotoComment(const RsGxsPhotoCommentItem& comment); - - RsPhotoComment& operator=(const RsGxsPhotoCommentItem& comment); - - RsMsgMetaData mMeta; - - std::string mComment; - uint32_t mCommentFlag; -}; std::ostream &operator<<(std::ostream &out, const RsPhotoPhoto &photo); std::ostream &operator<<(std::ostream &out, const RsPhotoAlbum &album); typedef std::map > PhotoResult; -typedef std::map > PhotoCommentResult; -typedef std::map > PhotoRelatedCommentResult; -class RsPhoto +class RsPhoto: public RsGxsIfaceHelper, public RsGxsCommentService { public: @@ -168,7 +153,7 @@ public: static const uint32_t FLAG_MSG_TYPE_MASK; - RsPhoto() { return; } + explicit RsPhoto(RsGxsIface &gxs) : RsGxsIfaceHelper(gxs) { return; } virtual ~RsPhoto() { return; } @@ -235,7 +220,7 @@ public: virtual bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo) = 0; - /* Specific Service Data */ + /* Specific Service Data */ /*! * @param token token to be redeemed for album request @@ -252,22 +237,6 @@ public: virtual bool getPhoto(const uint32_t &token, PhotoResult &photo) = 0; - /* details are updated in album - to choose Album ID, and storage path */ - - /*! - * @param token token to be redeemed for photo request - * @param photo the photo returned for given request token - * @return false if request token is invalid, check token status for error report - */ - virtual bool getPhotoComment(const uint32_t &token, - PhotoCommentResult& comments) = 0; - /*! - * @param token token to be redeemed for photo request - * @param photo the photo returned for given request token - * @return false if request token is invalid, check token status for error report - */ - virtual bool getPhotoRelatedComment(const uint32_t &token, PhotoRelatedCommentResult &comments) = 0; - /*! * submits album, which returns a token that needs * to be acknowledge to get album grp id @@ -284,16 +253,6 @@ public: */ virtual bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo) = 0; - /*! - * submits photo comment, which returns a token that needs - * to be acknowledged to get photo msg-grp id pair - * The mParentId needs to be set to an existing msg for which - * commenting is enabled - * @param token token to redeem for acknowledgement - * @param comment comment to be submitted - */ - virtual bool submitComment(uint32_t& token, RsPhotoComment &photo) = 0; - /*! * subscribes to group, and returns token which can be used * to be acknowledged to get group Id diff --git a/libretroshare/src/rsitems/rsphotoitems.cc b/libretroshare/src/rsitems/rsphotoitems.cc index 2791b668c..77a920fd6 100644 --- a/libretroshare/src/rsitems/rsphotoitems.cc +++ b/libretroshare/src/rsitems/rsphotoitems.cc @@ -33,11 +33,10 @@ RsItem *RsGxsPhotoSerialiser::create_item(uint16_t service, uint8_t item_sub_id) switch(item_sub_id) { - case RS_PKT_SUBTYPE_PHOTO_COMMENT_ITEM: return new RsGxsPhotoCommentItem() ; case RS_PKT_SUBTYPE_PHOTO_SHOW_ITEM: return new RsGxsPhotoPhotoItem() ; case RS_PKT_SUBTYPE_PHOTO_ITEM: return new RsGxsPhotoAlbumItem() ; default: - return NULL ; + return RsGxsCommentSerialiser::create_item(service,item_sub_id) ; } } @@ -68,11 +67,6 @@ void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsG photo.mThumbnail.serial_process(j, ctx); } -void RsGxsPhotoCommentItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) -{ - RsTypeSerializer::serial_process (j,ctx,TLV_TYPE_STR_COMMENT,comment.mComment,"mComment"); - RsTypeSerializer::serial_process(j,ctx,comment.mCommentFlag,"mCommentFlag"); -} void RsGxsPhotoAlbumItem::clear() { @@ -88,12 +82,6 @@ void RsGxsPhotoAlbumItem::clear() album.mThumbnail.clear(); } -void RsGxsPhotoCommentItem::clear() -{ - comment.mComment.clear(); - comment.mCommentFlag = 0; -} - void RsGxsPhotoPhotoItem::clear() { photo.mCaption.clear(); diff --git a/libretroshare/src/rsitems/rsphotoitems.h b/libretroshare/src/rsitems/rsphotoitems.h index 92f99843c..a504ae29b 100644 --- a/libretroshare/src/rsitems/rsphotoitems.h +++ b/libretroshare/src/rsitems/rsphotoitems.h @@ -26,6 +26,7 @@ #include "rsitems/rsserviceids.h" #include "rsitems/rsgxsitems.h" +#include "rsitems/rsgxscommentitems.h" #include "serialiser/rsserial.h" #include "serialiser/rsserializer.h" @@ -34,7 +35,6 @@ const uint8_t RS_PKT_SUBTYPE_PHOTO_ITEM = 0x02; const uint8_t RS_PKT_SUBTYPE_PHOTO_SHOW_ITEM = 0x03; -const uint8_t RS_PKT_SUBTYPE_PHOTO_COMMENT_ITEM = 0x04; class RsGxsPhotoAlbumItem : public RsGxsGrpItem { @@ -66,24 +66,11 @@ public: RsPhotoPhoto photo; }; -class RsGxsPhotoCommentItem : public RsGxsMsgItem +class RsGxsPhotoSerialiser : public RsGxsCommentSerialiser { public: - RsGxsPhotoCommentItem(): RsGxsMsgItem(RS_SERVICE_GXS_TYPE_PHOTO, RS_PKT_SUBTYPE_PHOTO_COMMENT_ITEM) {} - virtual ~RsGxsPhotoCommentItem() {} - void clear(); - - virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); - - RsPhotoComment comment; -}; - -class RsGxsPhotoSerialiser : public RsServiceSerializer -{ -public: - - RsGxsPhotoSerialiser() :RsServiceSerializer(RS_SERVICE_GXS_TYPE_PHOTO) {} + RsGxsPhotoSerialiser() :RsGxsCommentSerialiser(RS_SERVICE_GXS_TYPE_PHOTO) {} virtual ~RsGxsPhotoSerialiser() {} virtual RsItem *create_item(uint16_t service, uint8_t item_sub_id) const; diff --git a/libretroshare/src/services/p3photoservice.cc b/libretroshare/src/services/p3photoservice.cc index 72402ddf8..7a0e3bd9c 100644 --- a/libretroshare/src/services/p3photoservice.cc +++ b/libretroshare/src/services/p3photoservice.cc @@ -42,18 +42,6 @@ RsPhotoAlbum::RsPhotoAlbum() return; } -RsPhotoComment::RsPhotoComment() - : mComment(""), mCommentFlag(0) { - -} - -RsPhotoComment::RsPhotoComment(const RsGxsPhotoCommentItem &comment) - : mComment(""), mCommentFlag(0) { - - *this = comment.comment; - (*this).mMeta = comment.meta; - -} std::ostream &operator<<(std::ostream &out, const RsPhotoPhoto &photo) { out << "RsPhotoPhoto [ "; @@ -62,7 +50,6 @@ std::ostream &operator<<(std::ostream &out, const RsPhotoPhoto &photo) return out; } - std::ostream &operator<<(std::ostream &out, const RsPhotoAlbum &album) { out << "RsPhotoAlbum [ "; @@ -73,8 +60,10 @@ std::ostream &operator<<(std::ostream &out, const RsPhotoAlbum &album) p3PhotoService::p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs) : RsGenExchange(gds, nes, new RsGxsPhotoSerialiser(), RS_SERVICE_GXS_TYPE_PHOTO, gixs, photoAuthenPolicy()), + RsPhoto(static_cast(*this)), mPhotoMutex(std::string("Photo Mutex")) { + mCommentService = new p3GxsCommentService(this, RS_SERVICE_GXS_TYPE_PHOTO); } const std::string GXS_PHOTO_APP_NAME = "gxsphoto"; @@ -93,8 +82,6 @@ RsServiceInfo p3PhotoService::getServiceInfo() GXS_PHOTO_MIN_MINOR_VERSION); } - - uint32_t p3PhotoService::photoAuthenPolicy() { uint32_t policy = 0; @@ -124,11 +111,10 @@ bool p3PhotoService::updated() void p3PhotoService::service_tick() { - + mCommentService->comment_tick(); } - void p3PhotoService::groupsChanged(std::list& grpIds) { RsStackMutex stack(mPhotoMutex); @@ -267,54 +253,6 @@ bool p3PhotoService::getPhoto(const uint32_t& token, PhotoResult& photos) return ok; } -bool p3PhotoService::getPhotoComment(const uint32_t &token, PhotoCommentResult &comments) -{ - GxsMsgDataMap msgData; - bool ok = RsGenExchange::getMsgData(token, msgData); - - if(ok) - { - GxsMsgDataMap::iterator mit = msgData.begin(); - - for(; mit != msgData.end(); ++mit) - { - RsGxsGroupId grpId = mit->first; - std::vector& msgItems = mit->second; - std::vector::iterator vit = msgItems.begin(); - - for(; vit != msgItems.end(); ++vit) - { - RsGxsPhotoCommentItem* item = dynamic_cast(*vit); - - if(item) - { - RsPhotoComment comment = item->comment; - comment.mMeta = item->meta; - comments[grpId].push_back(comment); - delete item; - }else - { - std::cerr << "Not a comment Item, deleting!" << std::endl; - delete *vit; - } - } - } - } - - return ok; -} - -RsPhotoComment& RsPhotoComment::operator=(const RsGxsPhotoCommentItem& comment) -{ - *this = comment.comment; - return *this; -} - -bool p3PhotoService::getPhotoRelatedComment(const uint32_t &token, PhotoRelatedCommentResult &comments) -{ - return RsGenExchange::getMsgRelatedDataT(token, comments); -} - bool p3PhotoService::submitAlbumDetails(uint32_t& token, RsPhotoAlbum& album) { RsGxsPhotoAlbumItem* albumItem = new RsGxsPhotoAlbumItem(); @@ -324,8 +262,6 @@ bool p3PhotoService::submitAlbumDetails(uint32_t& token, RsPhotoAlbum& album) return true; } - - void p3PhotoService::notifyChanges(std::vector& changes) { @@ -363,17 +299,6 @@ bool p3PhotoService::submitPhoto(uint32_t& token, RsPhotoPhoto& photo) return true; } -bool p3PhotoService::submitComment(uint32_t &token, RsPhotoComment &comment) -{ - RsGxsPhotoCommentItem* commentItem = new RsGxsPhotoCommentItem(); - commentItem->comment = comment; - commentItem->meta = comment.mMeta; - commentItem->meta.mMsgFlags = FLAG_MSG_TYPE_PHOTO_COMMENT; - - RsGenExchange::publishMsg(token, commentItem); - return true; -} - bool p3PhotoService::acknowledgeMsg(const uint32_t& token, std::pair& msgId) { @@ -397,4 +322,3 @@ bool p3PhotoService::subscribeToAlbum(uint32_t &token, const RsGxsGroupId &grpId return true; } - diff --git a/libretroshare/src/services/p3photoservice.h b/libretroshare/src/services/p3photoservice.h index d5a5ba661..7bbffd2b0 100644 --- a/libretroshare/src/services/p3photoservice.h +++ b/libretroshare/src/services/p3photoservice.h @@ -24,122 +24,154 @@ #include "gxs/rsgenexchange.h" #include "retroshare/rsphoto.h" +#include "services/p3gxscommon.h" -class p3PhotoService : public RsPhoto, public RsGenExchange +class p3PhotoService : public RsGenExchange, public RsPhoto { public: - p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs); -virtual RsServiceInfo getServiceInfo(); + p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs); + virtual RsServiceInfo getServiceInfo(); -static uint32_t photoAuthenPolicy(); + static uint32_t photoAuthenPolicy(); public: - /*! - * @return true if a change has occured - */ - bool updated(); + /*! + * @return true if a change has occured + */ + bool updated(); - /*! - * - */ - void service_tick(); + /*! + * + */ + void service_tick(); protected: - void notifyChanges(std::vector& changes); + void notifyChanges(std::vector& changes); public: - /** Requests **/ + /** Requests **/ - void groupsChanged(std::list& grpIds); + void groupsChanged(std::list& grpIds); - void msgsChanged(GxsMsgIdResult& msgs); + void msgsChanged(GxsMsgIdResult& msgs); - RsTokenService* getTokenService(); + RsTokenService* getTokenService(); - bool getGroupList(const uint32_t &token, - std::list &groupIds); - bool getMsgList(const uint32_t &token, - GxsMsgIdResult& msgIds); + bool getGroupList(const uint32_t &token, std::list &groupIds); + bool getMsgList(const uint32_t &token, GxsMsgIdResult& msgIds); - /* Generic Summary */ - bool getGroupSummary(const uint32_t &token, - std::list &groupInfo); + /* Generic Summary */ + bool getGroupSummary(const uint32_t &token, std::list &groupInfo); - bool getMsgSummary(const uint32_t &token, - MsgMetaResult &msgInfo); + bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo); - /* Specific Service Data */ - bool getAlbum(const uint32_t &token, std::vector &albums); - bool getPhoto(const uint32_t &token, PhotoResult &photos); - bool getPhotoComment(const uint32_t &token, PhotoCommentResult &comments); - bool getPhotoRelatedComment(const uint32_t &token, PhotoRelatedCommentResult &comments); + /* Specific Service Data */ + bool getAlbum(const uint32_t &token, std::vector &albums); + bool getPhoto(const uint32_t &token, PhotoResult &photos); + +public: + /* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */ + virtual bool getCommentData(uint32_t token, std::vector &msgs) override + { + return mCommentService->getGxsCommentData(token, msgs); + } + + virtual bool getRelatedComments( uint32_t token, std::vector &msgs ) override + { + return mCommentService->getGxsRelatedComments(token, msgs); + } + + virtual bool createNewComment(uint32_t &token, RsGxsComment &msg) override + { + return mCommentService->createGxsComment(token, msg); + } + + virtual bool createNewVote(uint32_t &token, RsGxsVote &msg) override + { + return mCommentService->createGxsVote(token, msg); + } + + virtual bool acknowledgeComment(uint32_t token, std::pair& msgId) override + { + return acknowledgeMsg(token, msgId); + } + + virtual bool acknowledgeVote(uint32_t token, std::pair& msgId) override + { + if (mCommentService->acknowledgeVote(token, msgId)) + { + return true; + } + return acknowledgeMsg(token, msgId); + } public: - /** Modifications **/ + /** Modifications **/ - /*! - * submits album, which returns a token that needs - * to be acknowledge to get album grp id - * @param token token to redeem for acknowledgement - * @param album album to be submitted - */ - bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album); + /*! + * submits album, which returns a token that needs + * to be acknowledge to get album grp id + * @param token token to redeem for acknowledgement + * @param album album to be submitted + */ + bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album); - /*! - * submits photo, which returns a token that needs - * to be acknowledge to get photo msg-grp id pair - * @param token token to redeem for acknowledgement - * @param photo photo to be submitted - */ - bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo); + /*! + * submits photo, which returns a token that needs + * to be acknowledge to get photo msg-grp id pair + * @param token token to redeem for acknowledgement + * @param photo photo to be submitted + */ + bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo); - /*! - * submits photo comment, which returns a token that needs - * to be acknowledged to get photo msg-grp id pair - * The mParentId needs to be set to an existing msg for which - * commenting is enabled - * @param token token to redeem for acknowledgement - * @param comment comment to be submitted - */ - bool submitComment(uint32_t& token, RsPhotoComment &photo); + /*! + * submits photo comment, which returns a token that needs + * to be acknowledged to get photo msg-grp id pair + * The mParentId needs to be set to an existing msg for which + * commenting is enabled + * @param token token to redeem for acknowledgement + * @param comment comment to be submitted + */ + // bool submitComment(uint32_t& token, RsPhotoComment &photo); - /*! - * subscribes to group, and returns token which can be used - * to be acknowledged to get group Id - * @param token token to redeem for acknowledgement - * @param grpId the id of the group to subscribe to - */ - bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe); + /*! + * subscribes to group, and returns token which can be used + * to be acknowledged to get group Id + * @param token token to redeem for acknowledgement + * @param grpId the id of the group to subscribe to + */ + bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe); - /*! - * This allows the client service to acknowledge that their msgs has - * been created/modified and retrieve the create/modified msg ids - * @param token the token related to modification/create request - * @param msgIds map of grpid->msgIds of message created/modified - * @return true if token exists false otherwise - */ - bool acknowledgeMsg(const uint32_t& token, std::pair& msgId); + /*! + * This allows the client service to acknowledge that their msgs has + * been created/modified and retrieve the create/modified msg ids + * @param token the token related to modification/create request + * @param msgIds map of grpid->msgIds of message created/modified + * @return true if token exists false otherwise + */ + bool acknowledgeMsg(const uint32_t& token, std::pair& msgId); - /*! + /*! * This allows the client service to acknowledge that their grps has * been created/modified and retrieve the create/modified grp ids * @param token the token related to modification/create request * @param msgIds vector of ids of groups created/modified * @return true if token exists false otherwise */ - bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId); + bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId); private: + p3GxsCommentService* mCommentService; - std::vector mGroupChange; - std::vector mMsgChange; + std::vector mGroupChange; + std::vector mMsgChange; - RsMutex mPhotoMutex; + RsMutex mPhotoMutex; }; #endif // P3PHOTOSERVICEV2_H diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index b139d0113..46d5116e8 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -197,7 +197,7 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)

Chat rooms work pretty much like IRC. \ They allow you to talk anonymously with tons of people without the need to make friends.

\

A chat room can be public (your friends see it) or private (your friends can't see it, unless you \ - invite them with ). \ + invite them with ). \ Once you have been invited to a private room, you will be able to see it when your friends \ are using it.

\

The list at left shows \ diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.h b/retroshare-gui/src/gui/Circles/CirclesDialog.h index 4d39986ac..ac87f9f61 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.h +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.h @@ -27,7 +27,7 @@ #include "util/TokenQueue.h" #include "ui_CirclesDialog.h" -#define IMAGE_CIRCLES ":/images/circles/circles_32.png" +#define IMAGE_CIRCLES ":/icons/png/circles.png" class UIStateHelper; diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp index eba42e4ff..55887b14a 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp @@ -48,11 +48,11 @@ #define IMAGE_REMOVEALL ":/images/deleteall.png" #define IMAGE_DIRECTORY ":/images/folder16.png" #define IMAGE_OPENFOLDER ":/images/folderopen.png" -#define IMAGE_LIBRARY ":/images/library.png" -#define IMAGE_COLLCREATE ":/images/library_add.png" -#define IMAGE_COLLMODIF ":/images/library_edit.png" -#define IMAGE_COLLVIEW ":/images/library_view.png" -#define IMAGE_COLLOPEN ":/images/library.png" +#define IMAGE_LIBRARY ":/icons/collections.png" +#define IMAGE_COLLCREATE ":/iconss/png/add.png" +#define IMAGE_COLLMODIF ":/icons/png/pencil-edit-button.png" +#define IMAGE_COLLVIEW ":/images/find.png" +#define IMAGE_COLLOPEN ":/icons/collections.png" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_BANFILE ":/icons/biohazard_red.png" diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index a1a2f23a9..af5323d1d 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -60,19 +60,18 @@ #define IMAGE_HASH_BUSY ":/images/settings.png" #define IMAGE_HASH_DONE ":/images/accepted16.png" #define IMAGE_MSG ":/images/message-mail.png" -#define IMAGE_ATTACHMENT ":/images/attachment.png" +#define IMAGE_ATTACHMENT ":/icons/png/attachements.png" #define IMAGE_FRIEND ":/images/peers_16x16.png" -#define IMAGE_PROGRESS ":/images/browse-looking.gif" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_OPENFOLDER ":/images/folderopen.png" #define IMAGE_OPENFILE ":/images/fileopen.png" -#define IMAGE_LIBRARY ":/images/library.png" -#define IMAGE_CHANNEL ":/images/channels32.png" +#define IMAGE_LIBRARY ":/icons/collections.png" +#define IMAGE_CHANNEL ":/icons/png/channels.png" #define IMAGE_FORUMS ":/icons/png/forums.png" -#define IMAGE_COLLCREATE ":/images/library_add.png" -#define IMAGE_COLLMODIF ":/images/library_edit.png" -#define IMAGE_COLLVIEW ":/images/library_view.png" -#define IMAGE_COLLOPEN ":/images/library.png" +#define IMAGE_COLLCREATE ":/icons/png/add.png" +#define IMAGE_COLLMODIF ":/icons/png/pencil-edit-button.png" +#define IMAGE_COLLVIEW ":/images/find.png" +#define IMAGE_COLLOPEN ":/icons/collections.png" #define IMAGE_EDITSHARE ":/images/edit_16.png" #define IMAGE_MYFILES ":/icons/svg/folders1.svg" #define IMAGE_REMOVE ":/images/deletemail24.png" diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index 22486fd2c..9a901b809 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -81,11 +81,11 @@ #define IMAGE_SEARCH ":/icons/svg/magnifying-glass.svg" #define IMAGE_EXPAND ":/images/edit_add24.png" #define IMAGE_COLLAPSE ":/images/edit_remove24.png" -#define IMAGE_LIBRARY ":/images/library.png" -#define IMAGE_COLLCREATE ":/images/library_add.png" -#define IMAGE_COLLMODIF ":/images/library_edit.png" -#define IMAGE_COLLVIEW ":/images/library_view.png" -#define IMAGE_COLLOPEN ":/images/library.png" +#define IMAGE_LIBRARY ":/icons/collections.png" +#define IMAGE_COLLCREATE ":/iconss/png/add.png" +#define IMAGE_COLLMODIF ":/icons/png/pencil-edit-button.png" +#define IMAGE_COLLVIEW ":/images/find.png" +#define IMAGE_COLLOPEN ":/icons/collections.png" #define IMAGE_FRIENDSFILES ":/icons/svg/folders.svg" #define IMAGE_MYFILES ":icons/svg/folders1.svg" #define IMAGE_RENAMEFILE ":images/filecomments.png" diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h index 21f642399..9c03e830c 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h @@ -32,7 +32,7 @@ #include #include -#define IMAGE_TRANSFERS ":/icons/ktorrent_128.png" +#define IMAGE_TRANSFERS ":/icons/png/fileshare.png" class QShortcut; class DLListDelegate; diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 7b3d437e2..f52091eac 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -1025,7 +1025,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint ) static const int CANCEL = 3 ; // Admin list: no Subscription request: yes const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ; - const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/images/door_in.png",":/images/cancel.png" } ; + const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ; std::vector< std::vector > ids(4) ; diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 4aa73e097..c881ed39f 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -6,8 +6,8 @@ 0 0 - 1573 - 1177 + 987 + 584 @@ -289,8 +289,8 @@ 0 0 - 1003 - 1094 + 634 + 523 @@ -533,24 +533,14 @@ border-image: url(:/images/closepressed.png) Identity info - - - - true - - - true - - - - - + + - Your opinion: + Owner node ID : - + <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> @@ -560,130 +550,7 @@ border-image: url(:/images/closepressed.png) - - - - Last used: - - - - - - - true - - - - - - - Identity name : - - - - - - - Qt::Horizontal - - - - - - - true - - - true - - - - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can change the thresholds and the time of inactivity to delete identities in preferences -&gt; people. </p> -<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - - - 0 - - - - 20 - 20 - - - - - Negative - - - - :/icons/png/thumbs-down.png:/icons/png/thumbs-down.png - - - - - Neutral - - - - :/icons/png/thumbs-neutral.png:/icons/png/thumbs-neutral.png - - - - - Positive - - - - :/icons/png/thumbs-up.png:/icons/png/thumbs-up.png - - - - - - - - true - - - - - - - Type: - - - - - - - Owner node name : - - - - - - - Owner node ID : - - - - + true @@ -693,50 +560,12 @@ p, li { white-space: pre-wrap; } - - - - Ban-option: + + + + 0 - - - - - - Friend votes: - - - - - - - <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> - - - true - - - - - - - Auto-Ban all identities signed by the same node - - - - - - - true - - - true - - - - - - + @@ -773,18 +602,21 @@ p, li { white-space: pre-wrap; } - + Send Invite - + 6 + + 2 + @@ -862,7 +694,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -877,7 +709,21 @@ p, li { white-space: pre-wrap; } - + + + + true + + + + + + + Type: + + + + @@ -890,27 +736,170 @@ p, li { white-space: pre-wrap; } - + + + + Last used: + + + + Identity ID : - + Created on : - + + + + Owner node name : + + + + + + + Ban-option: + + + + + + + Your opinion: + + + + + + + <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> + + + true + + + + + + + true + + + + + + + <html><head/><body><p><span style=" font-family:'Sans'; font-size:9pt;">Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.</span></p><p><span style=" font-family:'Sans'; font-size:9pt;">The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).</span></p><p><span style=" font-family:'Sans'; font-size:9pt;">You can change the thresholds and the time of inactivity to delete identities in preferences -&gt; people. </span></p></body></html> + + + + 22 + 22 + + + + + Negative + + + + :/icons/png/thumbs-down.png:/icons/png/thumbs-down.png + + + + + Neutral + + + + :/icons/png/thumbs-neutral.png:/icons/png/thumbs-neutral.png + + + + + Positive + + + + :/icons/png/thumbs-up.png:/icons/png/thumbs-up.png + + + + + + + + Identity name : + + + + + + + Auto-Ban all identities signed by the same node + + + + + + + true + + + true + + + + true + + + + Friend votes: + + + + + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + true + + + true + + + diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index 92baf07e1..22ed6ebd9 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -17,8 +17,8 @@ - - :/images/identity/identities_32.png:/images/identity/identities_32.png + + :/icons/png/person.png:/icons/png/person.png @@ -167,13 +167,13 @@ Linked to your profile - - :/images/contact22.png:/images/contact22.png + + :/icons/png/profile.png:/icons/png/profile.png - 22 - 22 + 24 + 24 @@ -190,13 +190,13 @@ Pseudonym - - :/images/tags/anon.png:/images/tags/anon.png + + :/icons/png/anonymous.png:/icons/png/anonymous.png - 22 - 22 + 24 + 24 @@ -528,6 +528,7 @@ + diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 3e2bb53dd..cb4a0fed6 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -141,7 +141,6 @@ #define IMAGE_BWGRAPH ":/icons/png/bandwidth.png" #define IMAGE_MESSENGER ":/images/rsmessenger48.png" -#define IMAGE_BLOCK ":/images/blockdevice.png" #define IMAGE_COLOR ":/images/highlight.png" #define IMAGE_GAMES ":/images/kgames.png" #define IMAGE_PHOTO ":/images/lphoto.png" @@ -153,7 +152,6 @@ #define IMAGE_MAXIMIZE ":/images/window_fullscreen.png" #define IMAGE_PLUGINS ":/images/extension_32.png" -#define IMAGE_BLOGS ":/images/kblogger.png" /*static*/ bool MainWindow::hiddenmode = false; diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index ff41dd658..dd29dec14 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -47,12 +47,10 @@ #include /* Images for context menu icons */ -#define IMAGE_LOADCERT ":/images/loadcert16.png" #define IMAGE_PEERDETAILS ":/images/info16.png" -#define IMAGE_AUTH ":/images/encrypted16.png" #define IMAGE_CLEAN_UNUSED ":/images/deletemail24.png" #define IMAGE_MAKEFRIEND ":/images/user/add_user16.png" -#define IMAGE_EXPORT ":/images/exportpeers_16x16.png" +#define IMAGE_EXPORT "" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_MESSAGE ":/images/mail_new.png" diff --git a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.cpp deleted file mode 100644 index 7481d4a47..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/AddCommentDialog.cpp * - * * - * Copyright (C) 2018 by Retroshare Team * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - *******************************************************************************/ - -#include "AddCommentDialog.h" -#include "ui_AddCommentDialog.h" - -AddCommentDialog::AddCommentDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AddCommentDialog) -{ - ui->setupUi(this); -} - -AddCommentDialog::~AddCommentDialog() -{ - delete ui; -} - -QString AddCommentDialog::getComment() const -{ - return ui->textEditAddComment->document()->toPlainText(); -} diff --git a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.h b/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.h deleted file mode 100644 index f2003c132..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.h +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/AddCommentDialog.h * - * * - * Copyright (C) 2018 by Retroshare Team * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - *******************************************************************************/ - -#ifndef ADDCOMMENTDIALOG_H -#define ADDCOMMENTDIALOG_H - -#include - -namespace Ui { - class AddCommentDialog; -} - -class AddCommentDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AddCommentDialog(QWidget *parent = 0); - ~AddCommentDialog(); - QString getComment() const; - -private: - Ui::AddCommentDialog *ui; -}; - -#endif // ADDCOMMENTDIALOG_H diff --git a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.ui b/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.ui deleted file mode 100644 index d07b9f6dd..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AddCommentDialog.ui +++ /dev/null @@ -1,67 +0,0 @@ - - - AddCommentDialog - - - - 0 - 0 - 370 - 118 - - - - Add Comment - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - AddCommentDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AddCommentDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.cpp deleted file mode 100644 index 42f50c4f0..000000000 --- a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.cpp * - * * - * Copyright (C) 2018 by Retroshare Team * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - *******************************************************************************/ - -#include - -#include "PhotoCommentItem.h" -#include "ui_PhotoCommentItem.h" - - -PhotoCommentItem::PhotoCommentItem(const RsPhotoComment& comment, QWidget *parent): - QWidget(parent), - ui(new Ui::PhotoCommentItem), mComment(comment) -{ - ui->setupUi(this); - setUp(); -} - -PhotoCommentItem::~PhotoCommentItem() -{ - delete ui; -} - -const RsPhotoComment& PhotoCommentItem::getComment() -{ - return mComment; -} - -void PhotoCommentItem::setUp() -{ - ui->labelComment->setText(QString::fromUtf8(mComment.mComment.c_str())); - QDateTime qtime; - qtime.setTime_t(mComment.mMeta.mPublishTs); - QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm"); - ui->datetimelabel->setText(timestamp); -} diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.h b/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.h deleted file mode 100644 index eaf95fae7..000000000 --- a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.h +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.h * - * * - * Copyright (C) 2018 by Retroshare Team * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - *******************************************************************************/ - -#ifndef PHOTOCOMMENTITEM_H -#define PHOTOCOMMENTITEM_H - -#include -#include "retroshare/rsphoto.h" - -namespace Ui { - class PhotoCommentItem; -} - -class PhotoCommentItem : public QWidget -{ - Q_OBJECT - -public: - explicit PhotoCommentItem(const RsPhotoComment& comment, QWidget *parent = 0); - ~PhotoCommentItem(); - - const RsPhotoComment& getComment(); - -private: - - void setUp(); -private: - Ui::PhotoCommentItem *ui; - RsPhotoComment mComment; -}; - -#endif // PHOTOCOMMENTITEM_H diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.ui b/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.ui deleted file mode 100644 index ce00ee85d..000000000 --- a/retroshare-gui/src/gui/PhotoShare/PhotoCommentItem.ui +++ /dev/null @@ -1,200 +0,0 @@ - - - PhotoCommentItem - - - - 0 - 0 - 338 - 60 - - - - Form - - - - 0 - - - - - - 0 - 0 - - - - - 400 - 71 - - - - - - - - - 255 - 255 - 255 - - - - - - - 237 - 239 - 244 - - - - - - - - - 255 - 255 - 255 - - - - - - - 237 - 239 - 244 - - - - - - - - - 237 - 239 - 244 - - - - - - - 237 - 239 - 244 - - - - - - - - true - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 2 - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - - - :/images/no_avatar_70.png - - - true - - - - - - - - 0 - 0 - - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Qt::Vertical - - - - 29 - 13 - - - - - - - - - 75 - true - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:600; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#666666;">DateTime</span></p></body></html> - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp index 0d2112304..6251dc38f 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp @@ -23,235 +23,168 @@ #include "PhotoDialog.h" #include "ui_PhotoDialog.h" #include "retroshare/rsidentity.h" -#include "AddCommentDialog.h" +#include "gui/gxs/GxsCommentDialog.h" PhotoDialog::PhotoDialog(RsPhoto *rs_photo, const RsPhotoPhoto &photo, QWidget *parent) : - QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint), - ui(new Ui::PhotoDialog), mRsPhoto(rs_photo), mPhotoQueue(new TokenQueue(mRsPhoto->getTokenService(), this)), - mPhotoDetails(photo) + QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint), + ui(new Ui::PhotoDialog), mRsPhoto(rs_photo), mPhotoQueue(new TokenQueue(mRsPhoto->getTokenService(), this)), + mPhotoDetails(photo), + mCommentsCreated(false) { - ui->setupUi(this); - setAttribute ( Qt::WA_DeleteOnClose, true ); + ui->setupUi(this); + setAttribute ( Qt::WA_DeleteOnClose, true ); - connect(ui->pushButton_AddComment, SIGNAL(clicked()), this, SLOT(createComment())); - connect(ui->pushButton_AddCommentDlg, SIGNAL(clicked()), this, SLOT(addComment())); - connect(ui->fullscreenButton, SIGNAL(clicked()),this, SLOT(setFullScreen())); + connect(ui->fullscreenButton, SIGNAL(clicked()),this, SLOT(setFullScreen())); + connect(ui->commentsButton, SIGNAL(clicked()),this, SLOT(toggleComments())); + connect(ui->detailsButton, SIGNAL(clicked()),this, SLOT(toggleDetails())); -#if QT_VERSION >= 0x040700 - ui->lineEdit->setPlaceholderText(tr("Write a comment...")) ; -#endif - - setUp(); + setUp(); } PhotoDialog::~PhotoDialog() { - delete ui; - delete mPhotoQueue; + delete ui; + delete mPhotoQueue; } void PhotoDialog::setUp() { - QPixmap qtn; - qtn.loadFromData(mPhotoDetails.mThumbnail.mData, mPhotoDetails.mThumbnail.mSize, "PNG"); - ui->label_Photo->setPixmap(qtn); - ui->lineEdit_Title->setText(QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); + QPixmap qtn; + qtn.loadFromData(mPhotoDetails.mThumbnail.mData, mPhotoDetails.mThumbnail.mSize, "PNG"); + ui->label_Photo->setPixmap(qtn); + ui->label_Photo->setVisible(true); - requestComments(); + // set size of label to match image. + ui->label_Photo->setMinimumSize(ui->label_Photo->sizeHint()); + // alternative is to scale contents. + // ui->label_Photo->setScaledContents(true); + // Neither are ideal. sizeHint is potentially too large. + // scaled contents - doesn't respect Aspect Ratio... + // + // Ideal soln: + // Allow both, depending on Zoom Factor. + // Auto: use Scale, with correct aspect ratio. + // answer here: https://stackoverflow.com/questions/8211982/qt-resizing-a-qlabel-containing-a-qpixmap-while-keeping-its-aspect-ratio + // Fixed %, then manually scale to that, with scroll area. + + ui->lineEdit_Title->setText(QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); + ui->frame_comments->setVisible(false); + ui->frame_details->setVisible(false); } -void PhotoDialog::addComment() +void PhotoDialog::toggleDetails() { - AddCommentDialog dlg(this); - if (dlg.exec() == QDialog::Accepted) { - RsPhotoComment comment; - comment.mComment = dlg.getComment().toUtf8().constData(); - - uint32_t token; - comment.mMeta.mGroupId = mPhotoDetails.mMeta.mGroupId; - comment.mMeta.mParentId = mPhotoDetails.mMeta.mOrigMsgId; - mRsPhoto->submitComment(token, comment); - mPhotoQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, 0); - } + if (ui->frame_details->isVisible()) { + ui->frame_details->setVisible(false); + } else { + ui->frame_details->setVisible(true); + } } -void PhotoDialog::clearComments() +void PhotoDialog::toggleComments() { - //QLayout* l = ui->scrollAreaWidgetContents->layout(); - QSetIterator sit(mComments); - while(sit.hasNext()) - { - PhotoCommentItem* item = sit.next(); - ui->verticalLayout->removeWidget(item); - item->setParent(NULL); - delete item; - } + if (ui->frame_comments->isVisible()) { + ui->frame_comments->setVisible(false); + } else { + if (mCommentsCreated) { + ui->frame_comments->setVisible(true); + } else { + // create CommentDialog. + RsGxsCommentService *commentService = dynamic_cast(mRsPhoto); + GxsCommentDialog *commentDialog = new GxsCommentDialog(this, mRsPhoto->getTokenService(), commentService); - mComments.clear(); + // TODO: Need to fetch all msg versions, otherwise - won't get all the comments. + // For the moment - use current msgid. + // Needs to be passed to PhotoDialog, or fetched here. + + RsGxsGroupId grpId = mPhotoDetails.mMeta.mGroupId; + RsGxsMessageId msgId = mPhotoDetails.mMeta.mMsgId; + + std::set msgv; + msgv.insert(msgId); + msgv.insert(mPhotoDetails.mMeta.mOrigMsgId); // if duplicate will be ignored. + + commentDialog->commentLoad(grpId, msgv,msgId); + + // insert into frame. + QVBoxLayout *vbox = new QVBoxLayout(); + + vbox->addWidget(commentDialog); + ui->frame_comments->setLayout(vbox); + + ui->frame_comments->setVisible(true); + mCommentsCreated = true; + } + } } -void PhotoDialog::resetComments() -{ - QSetIterator sit(mComments); - //QLayout* l = ui->scrollAreaWidgetContents->layout(); - while(sit.hasNext()) - { - PhotoCommentItem* item = sit.next(); - ui->verticalLayout->insertWidget(0,item); - } -} - -void PhotoDialog::requestComments() -{ - RsTokReqOptions opts; - opts.mMsgFlagMask = RsPhoto::FLAG_MSG_TYPE_MASK; - opts.mMsgFlagFilter = RsPhoto::FLAG_MSG_TYPE_PHOTO_COMMENT; - - opts.mReqType = GXS_REQUEST_TYPE_MSG_IDS; - opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA; - opts.mOptions = RS_TOKREQOPT_MSG_PARENT | RS_TOKREQOPT_MSG_LATEST; - RsGxsGrpMsgIdPair msgId; - uint32_t token; - msgId.first = mPhotoDetails.mMeta.mGroupId; - msgId.second = mPhotoDetails.mMeta.mMsgId; - std::vector msgIdV; - msgIdV.push_back(msgId); - mPhotoQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIdV, 0); -} - -void PhotoDialog::createComment() -{ - RsPhotoComment comment; - QString commentString = ui->lineEdit->text(); - - comment.mComment = commentString.toUtf8().constData(); - - uint32_t token; - comment.mMeta.mGroupId = mPhotoDetails.mMeta.mGroupId; - comment.mMeta.mParentId = mPhotoDetails.mMeta.mOrigMsgId; - mRsPhoto->submitComment(token, comment); - mPhotoQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, 0); - - ui->lineEdit->clear(); -} - - /*************** message loading **********************/ void PhotoDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req) { - std::cerr << "PhotoShare::loadRequest()"; - std::cerr << std::endl; + std::cerr << "PhotoShare::loadRequest()"; + std::cerr << std::endl; - if (queue == mPhotoQueue) - { - /* now switch on req */ - switch(req.mType) - { - case TOKENREQ_MSGINFO: - { - switch(req.mAnsType) - { - case RS_TOKREQ_ANSTYPE_DATA: - loadComment(req.mToken); - break; - case RS_TOKREQ_ANSTYPE_LIST: - loadList(req.mToken); - break; - case RS_TOKREQ_ANSTYPE_ACK: - acknowledgeComment(req.mToken); - break; - default: - std::cerr << "PhotoShare::loadRequest() ERROR: MSG INVALID TYPE"; - std::cerr << std::endl; - break; - } - break; - } + if (queue == mPhotoQueue) + { + /* now switch on req */ + switch(req.mType) + { + case TOKENREQ_MSGINFO: + { + switch(req.mAnsType) + { + case RS_TOKREQ_ANSTYPE_LIST: + loadList(req.mToken); + break; + default: + std::cerr << "PhotoShare::loadRequest() ERROR: MSG INVALID TYPE"; + std::cerr << std::endl; + break; + } + break; + } - default: - { - std::cerr << "PhotoShare::loadRequest() ERROR: INVALID TYPE"; - std::cerr << std::endl; - break; - } - } - } + default: + { + std::cerr << "PhotoShare::loadRequest() ERROR: INVALID TYPE"; + std::cerr << std::endl; + break; + } + } + } } -void PhotoDialog::loadComment(uint32_t token) -{ - - clearComments(); - - PhotoRelatedCommentResult results; - mRsPhoto->getPhotoRelatedComment(token, results); - - PhotoRelatedCommentResult::iterator mit = results.begin(); - - for(; mit != results.end(); ++mit) - { - const std::vector& commentV = mit->second; - std::vector::const_iterator vit = commentV.begin(); - - for(; vit != commentV.end(); ++vit) - { - addComment(*vit); - } - } - - resetComments(); -} - void PhotoDialog::loadList(uint32_t token) { - GxsMsgReq msgIds; - mRsPhoto->getMsgList(token, msgIds); - RsTokReqOptions opts; + GxsMsgReq msgIds; + mRsPhoto->getMsgList(token, msgIds); + RsTokReqOptions opts; - // just use data as no need to worry about getting comments - opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; - uint32_t reqToken; - mPhotoQueue->requestMsgInfo(reqToken, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, 0); -} - -void PhotoDialog::addComment(const RsPhotoComment &comment) -{ - PhotoCommentItem* item = new PhotoCommentItem(comment); - mComments.insert(item); -} - -void PhotoDialog::acknowledgeComment(uint32_t token) -{ - RsGxsGrpMsgIdPair msgId; - mRsPhoto->acknowledgeMsg(token, msgId); - - if(msgId.first.isNull() || msgId.second.isNull()){ - - }else - { - requestComments(); - } + // just use data as no need to worry about getting comments + opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; + uint32_t reqToken; + mPhotoQueue->requestMsgInfo(reqToken, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, 0); } void PhotoDialog::setFullScreen() { if (!isFullScreen()) { - // hide menu & toolbars + // hide menu & toolbars #ifdef Q_OS_LINUX - show(); - raise(); - setWindowState( windowState() | Qt::WindowFullScreen ); + show(); + raise(); + setWindowState( windowState() | Qt::WindowFullScreen ); #else - setWindowState( windowState() | Qt::WindowFullScreen ); - show(); - raise(); + setWindowState( windowState() | Qt::WindowFullScreen ); + show(); + raise(); #endif } else { - setWindowState( windowState() ^ Qt::WindowFullScreen ); - show(); + setWindowState( windowState() ^ Qt::WindowFullScreen ); + show(); } } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.h b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.h index abbd0bd7d..4f2c325eb 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.h +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.h @@ -25,58 +25,40 @@ #include #include "retroshare/rsphoto.h" #include "util/TokenQueue.h" -#include "PhotoCommentItem.h" namespace Ui { - class PhotoDialog; + class PhotoDialog; } class PhotoDialog : public QDialog, public TokenResponse { - Q_OBJECT + Q_OBJECT public: - explicit PhotoDialog(RsPhoto* rs_photo, const RsPhotoPhoto& photo, QWidget *parent = 0); - ~PhotoDialog(); + explicit PhotoDialog(RsPhoto* rs_photo, const RsPhotoPhoto& photo, QWidget *parent = 0); + ~PhotoDialog(); private slots: - void addComment(); - void createComment(); void setFullScreen(); + void toggleDetails(); + void toggleComments(); public: - void loadRequest(const TokenQueue *queue, const TokenRequest &req); + void loadRequest(const TokenQueue *queue, const TokenRequest &req); private: - void setUp(); + void setUp(); - /*! - * clears comments - * and places them back in dialog - */ - void resetComments(); + void loadList(uint32_t token); - /*! - * Request comments - */ - void requestComments(); - - /*! - * Simply removes comments but doesn't place them back in dialog - */ - void clearComments(); - - void acknowledgeComment(uint32_t token); - void loadComment(uint32_t token); - void loadList(uint32_t token); - void addComment(const RsPhotoComment& comment); private: - Ui::PhotoDialog *ui; + Ui::PhotoDialog *ui; - RsPhoto* mRsPhoto; - TokenQueue* mPhotoQueue; - RsPhotoPhoto mPhotoDetails; - QSet mComments; + RsPhoto* mRsPhoto; + TokenQueue* mPhotoQueue; + RsPhotoPhoto mPhotoDetails; + + bool mCommentsCreated; }; #endif // PHOTODIALOG_H diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui index a6689f772..b8ab9d67b 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui @@ -6,8 +6,8 @@ 0 0 - 594 - 572 + 790 + 824 @@ -16,313 +16,239 @@ true - - - - - - 0 - 1 - + + + + + Qt::Horizontal - - Photo - - - - - - - 0 - 0 - - - - - 200 - 300 - - - - TextLabel - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - true - - - - - 0 - 0 - 328 - 20 - - + + + + - + + 0 + 1 + + + + Album / Photo Name + + + + + + + 100 + 100 + + + + true + + + + + 0 + 0 + 558 + 551 + + + + + + + + 0 + 0 + + + + + 200 + 300 + + + + TextLabel + + + + + + + + + + + + + + + + + ... + + + + :/images/window_fullscreen.png:/images/window_fullscreen.png + + + true + + + + + + + Details \/ + + + + + + + + 50 % + + + + + 75 % + + + + + 100 % + + + + + 200 % + + + + + + + + <N> Comments >> + + + + + + + + + + 0 0 - - - - - 1 + + + 50 + 0 + + + + + + + false - + + + 0 + 0 + + + + + + + + Caption + + + + + + + false + + + + 0 + 0 + + + + + + + + Where: + + + + + + + false + + + + 0 + 0 + + + + + + + + false + + + + 0 + 0 + + + + + + + + Photo Title: + + + + + + + When + + - - - - - - - - - Comment - - - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - Summary - - - - - - false - - - - 0 - 0 - - - - - - - - Caption - - - - - - - false - - - - 0 - 0 - - - - - - - - Where: - - - - - - - false - - - - 0 - 0 - - - - - - - - false - - - - 0 - 0 - - - - - - - - Photo Title: - - - - - - - When - - - - - - - - - - ... - - - - :/images/window_fullscreen.png:/images/window_fullscreen.png - - - true - - - - - - - Qt::Horizontal - - - - 238 - 20 - - - - - - - - Add Comment - + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui index 1cdea5f8a..bd44c4d0a 100644 --- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui +++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui @@ -176,8 +176,8 @@ - 24 - 24 + 32 + 32 @@ -279,13 +279,6 @@ - - - - Share Orginal Image - - - diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp index 8b3ad07e3..e2352bd41 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.cpp +++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp @@ -26,6 +26,7 @@ #include "rshare.h" #include "PostedItem.h" #include "gui/feeds/FeedHolder.h" +#include "gui/RetroShareLink.h" #include "gui/gxs/GxsIdDetails.h" #include "util/misc.h" #include "util/qtthreadsutils.h" @@ -133,6 +134,7 @@ void PostedItem::setup() ui->clearButton->hide(); ui->readAndClearButton->hide(); + ui->nameLabel->hide(); } bool PostedItem::setGroup(const RsPostedGroup &group, bool doFill) @@ -300,11 +302,9 @@ void PostedItem::loadComment() } void PostedItem::fill() -{ -// if (isLoading()) { -// /* Wait for all requests */ -// return; -// } +{ + RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroup.mMeta.mGroupId, groupName()); + ui->nameLabel->setText(link.toHtml()); QPixmap sqpixmap2 = QPixmap(":/images/thumb-default.png"); @@ -447,11 +447,13 @@ void PostedItem::fill() { ui->clearButton->hide(); ui->readAndClearButton->hide(); + ui->nameLabel->hide(); } else { ui->clearButton->show(); ui->readAndClearButton->show(); + ui->nameLabel->show(); } // disable voting buttons - if they have already voted. diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index f470fea00..f7c69008f 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -320,6 +320,23 @@ 6 + + + + + 75 + true + true + + + + Name + + + true + + + diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 974195746..7fadce49a 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -100,9 +100,9 @@ static bool isNewerThanEpoque(uint32_t ts) void RetroshareDirModel::treeStyle() { - categoryIcon.addPixmap(QPixmap(":/images/folder16.png"), + categoryIcon.addPixmap(QPixmap(":/icons/folder.png"), QIcon::Normal, QIcon::Off); - categoryIcon.addPixmap(QPixmap(":/images/folder_video.png"), + categoryIcon.addPixmap(QPixmap(":/icons/folderopen.png"), QIcon::Normal, QIcon::On); peerIcon = QIcon(":/images/user/identity16.png"); } diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui index 6cfa8774a..3f6074b37 100644 --- a/retroshare-gui/src/gui/TheWire/WireDialog.ui +++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui @@ -315,7 +315,7 @@ - + diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp index 5c23eada5..2fcd431aa 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp @@ -73,7 +73,7 @@ #define IMAGE_NEWFORUM ":/images/new_forum16.png" #define IMAGE_FORUMAUTHD ":/images/konv_message2.png" #define IMAGE_COPYLINK ":/images/copyrslink.png" -#define IMAGE_WIKI ":/images/wikibook_32.png" +#define IMAGE_WIKI ":/icons/png/wiki.png" #define IMAGE_EDIT ":/images/edit_16.png" @@ -107,10 +107,10 @@ WikiDialog::WikiDialog(QWidget *parent) : RsGxsUpdateBroadcastPage(rsWiki, paren /* Setup Group Tree */ - mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(IMAGE_FOLDER), true); - mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(IMAGE_FOLDERRED), true); - mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(IMAGE_FOLDERGREEN), false); - mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(IMAGE_FOLDERYELLOW), false); + mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(), true); + mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(), true); + mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(), false); + mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(), false); } diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui index e40acfcc4..e8666ed09 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui @@ -37,7 +37,7 @@ 0 - + 16777215 @@ -51,7 +51,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -66,7 +75,7 @@ - :/images/wikibook_32.png + :/icons/png/wiki.png true @@ -93,8 +102,8 @@ New Group - - :/images/resource-group-new.png:/images/resource-group-new.png + + :/icons/png/add.png:/icons/png/add.png @@ -123,12 +132,21 @@ 0 0 - 232 - 462 + 241 + 480 - + + 0 + + + 0 + + + 0 + + 0 @@ -186,7 +204,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -261,7 +288,7 @@ - :/images/republish.png:/images/republish.png + :/images/reload.png:/images/reload.png @@ -284,7 +311,7 @@ - :/images/story-editor.png:/images/story-editor.png + :/images/editpage.png:/images/editpage.png @@ -314,7 +341,7 @@ - :/images/appointment-new.png:/images/appointment-new.png + :/images/addpage.png:/images/addpage.png @@ -340,7 +367,7 @@ - :/images/republish.png:/images/republish.png + :/images/reload.png:/images/reload.png @@ -392,8 +419,8 @@ 0 0 - 501 - 462 + 510 + 480 @@ -443,6 +470,7 @@ + diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp index b2f56d2c9..4658bf875 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp @@ -414,7 +414,7 @@ void WikiEditDialog::setNewPage() ui.groupBox_History->hide(); ui.pushButton_History->setText(tr("Show Edit History")); - ui.headerFrame->setHeaderImage(QPixmap(":/images/appointment-new_64.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/images/addpage.png")); ui.headerFrame->setHeaderText(tr("Create New Wiki Page")); setWindowTitle(tr("Create New Wiki Page")); @@ -569,7 +569,7 @@ void WikiEditDialog::setupData(const RsGxsGroupId &groupId, const RsGxsMessageId requestPage(msgId); } - ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/images/editpage.png")); ui.headerFrame->setHeaderText(tr("Edit Wiki Page")); setWindowTitle(tr("Edit Wiki Page")); diff --git a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc index 5bee8bea2..fbd4e69d7 100644 --- a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc +++ b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc @@ -1,17 +1,9 @@ - - images/appointment-new.png - images/appointment-new_64.png - images/arrow-left.png - images/arrow-right.png - images/book2_32.png - images/story-editor.png - images/story-editor_48.png - images/republish.png - images/resource-group-new.png - images/resource-group_64.png - images/resource-group-new_48.png - images/resource-group-new_64.png - images/wikibook_32.png - + + images/arrow-left.png + images/arrow-right.png + images/addpage.png + images/editpage.png + images/reload.png + diff --git a/retroshare-gui/src/gui/WikiPoos/images/addpage.png b/retroshare-gui/src/gui/WikiPoos/images/addpage.png new file mode 100644 index 000000000..298d7eac6 Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/addpage.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/appointment-new.png b/retroshare-gui/src/gui/WikiPoos/images/appointment-new.png deleted file mode 100644 index aa5207585..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/appointment-new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png b/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png deleted file mode 100644 index 7b99cd877..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-left-double.png b/retroshare-gui/src/gui/WikiPoos/images/arrow-left-double.png deleted file mode 100644 index b5f026336..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/arrow-left-double.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png b/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png index befac61d1..d736eeeab 100644 Binary files a/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png and b/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-right-double.png b/retroshare-gui/src/gui/WikiPoos/images/arrow-right-double.png deleted file mode 100644 index 082ba7135..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/arrow-right-double.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png b/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png index a8267ff09..7daac15e4 100644 Binary files a/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png and b/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/book2_128.png b/retroshare-gui/src/gui/WikiPoos/images/book2_128.png deleted file mode 100644 index d612516f2..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/book2_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/book2_16.png b/retroshare-gui/src/gui/WikiPoos/images/book2_16.png deleted file mode 100644 index b6c943717..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/book2_16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/book2_32.png b/retroshare-gui/src/gui/WikiPoos/images/book2_32.png deleted file mode 100644 index 2f2432548..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/book2_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/book2_48.png b/retroshare-gui/src/gui/WikiPoos/images/book2_48.png deleted file mode 100644 index a0ff7814d..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/book2_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/book2_64.png b/retroshare-gui/src/gui/WikiPoos/images/book2_64.png deleted file mode 100644 index ac460f5fd..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/book2_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/editpage.png b/retroshare-gui/src/gui/WikiPoos/images/editpage.png new file mode 100644 index 000000000..aae82487d Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/editpage.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/reload.png b/retroshare-gui/src/gui/WikiPoos/images/reload.png new file mode 100644 index 000000000..13e859134 Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/reload.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/republish.png b/retroshare-gui/src/gui/WikiPoos/images/republish.png deleted file mode 100644 index afa2a9d77..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/republish.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group-new.png deleted file mode 100644 index cd5ea5f14..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_48.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_48.png deleted file mode 100644 index ae785fc54..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_64.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_64.png deleted file mode 100644 index 70b8f13b3..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group-new_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group.png deleted file mode 100644 index 2b37baddd..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group_22.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group_22.png deleted file mode 100644 index 551a2c4a6..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group_22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png deleted file mode 100644 index 84cfa89fa..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/story-editor.png b/retroshare-gui/src/gui/WikiPoos/images/story-editor.png deleted file mode 100644 index 296e08797..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/story-editor.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png b/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png deleted file mode 100644 index 18e300d2e..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/view-refresh.png b/retroshare-gui/src/gui/WikiPoos/images/view-refresh.png deleted file mode 100644 index afa2a9d77..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/view-refresh.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/wikibook_128.png b/retroshare-gui/src/gui/WikiPoos/images/wikibook_128.png deleted file mode 100644 index 2c879d444..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/wikibook_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/wikibook_32.png b/retroshare-gui/src/gui/WikiPoos/images/wikibook_32.png deleted file mode 100644 index a443e7021..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/wikibook_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/wikibook_48.png b/retroshare-gui/src/gui/WikiPoos/images/wikibook_48.png deleted file mode 100644 index 4c7d37d88..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/wikibook_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/wikibook_64.png b/retroshare-gui/src/gui/WikiPoos/images/wikibook_64.png deleted file mode 100644 index 4a98cada7..000000000 Binary files a/retroshare-gui/src/gui/WikiPoos/images/wikibook_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp index 7642f3827..ad15fb905 100644 --- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp @@ -28,7 +28,7 @@ #include "gui/common/StatusDefs.h" #include "rshare.h" -#define IMAGE_TYPING ":/images/typing.png" +#define IMAGE_TYPING ":/icons/png/typing.png" #define IMAGE_CHAT ":/images/chat.png" ChatTabWidget::ChatTabWidget(QWidget *parent) : diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 0922793f6..e8122ad6a 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1860,7 +1860,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent) { ui->typingLabel->setText(QString(statusMask).arg(trUtf8(statusString.toUtf8()))); // displays info for 5 secs. - ui->typingPixmapLabel->setPixmap(QPixmap(":images/typing.png") ); + ui->typingPixmapLabel->setPixmap(QPixmap(":icons/png/typing.png") ); if (statusString == "is typing...") { typing = true; diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp index c6a9f9c0b..4cd9ce049 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.cpp +++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp @@ -45,8 +45,8 @@ AvatarDialog::AvatarDialog(QWidget *parent) : updateInterface(); } -const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W = 64; -const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_H = 64; +const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W = 96; +const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_H = 96; AvatarDialog::~AvatarDialog() { diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp index 190fcccc5..6012bd832 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp @@ -142,7 +142,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName())); - ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png")); if(creation) { diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui index 8b72f68e5..ceaea3b99 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui @@ -308,8 +308,8 @@ - - :/images/Update.png:/images/Update.png + + :/images/update.png:/images/update.png diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index cbab657c4..6111dfb45 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -13,8 +13,8 @@ Dialog - - + + QFrame::NoFrame @@ -24,7 +24,7 @@ - + 0 @@ -33,18 +33,11 @@ Profile info - - + + - - - - Name : - - - @@ -52,13 +45,6 @@ - - - - Fingerprint : - - - @@ -69,13 +55,17 @@ - - + + - Trust level: + Fingerprint : - - true + + + + + + Name : @@ -140,11 +130,65 @@ + + + + Trust level: + + + true + + + + + + + Keysigning: + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> + + + Sign this key + + + + 48 + 48 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> + + + Sign PGP key + + + + + - + @@ -157,7 +201,7 @@ - + Key signatures : @@ -173,7 +217,7 @@ - + 6 @@ -187,43 +231,6 @@ 6 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> - - - Sign this key - - - - :/images/view-certificate-sign-48.png:/images/view-certificate-sign-48.png - - - - 48 - 48 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> - - - Sign PGP key - - - @@ -451,7 +458,7 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal @@ -462,9 +469,6 @@ p, li { white-space: pre-wrap; } - stabWidget - headerFrame - buttonBox diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 16991b72f..d5880dd90 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -19,6 +19,7 @@ *******************************************************************************/ #include +#include #include "util/misc.h" #include "util/DateTime.h" @@ -105,7 +106,6 @@ void GxsGroupDialog::init() connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo())); - connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo())); ui.typePublic->setChecked(true); ui.distributionValueLabel->setText(tr("Public")); @@ -165,7 +165,6 @@ void GxsGroupDialog::injectExtraWidget(QWidget *widget) // add extra widget into layout. QVBoxLayout *vbox = new QVBoxLayout(); vbox->addWidget(widget); - vbox->addStretch(1); ui.extraFrame->setLayout(vbox); } @@ -377,7 +376,6 @@ void GxsGroupDialog::setupVisibility() ui.groupName->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_NAME); ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON); - ui.addLogoButton->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON); ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION); @@ -418,8 +416,6 @@ void GxsGroupDialog::setAllReadonly() void GxsGroupDialog::setupReadonly() { - ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON)); - ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN)); ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS)); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 00e49d8b3..bc417db65 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -59,160 +59,114 @@ - - - 0 - - - 4 - + - 0 - - - 4 + 3 - 4 + 3 - - - + + + + + 64 + 64 + + + + + 64 + 64 + + + + <html><head/><body><p>Click to add a Logo</p></body></html> + + + QFrame::StyledPanel + + + QFrame::Raised + + + :/icons/png/add-image.png + + + true + + + + + + 6 - - 0 + + 6 - - - - - 64 - 64 - - - - - 64 - 64 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - :/images/channels.png - - - true + + + + Name - - - - 6 - - - 6 - - - - - Name - - - - - - - - - - - - 9 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - Add Icon - - - - :/images/add_image24.png:/images/add_image24.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <html><head/><body><p>The identity here can be used to send feedback.</p></body></html> - - - Owner: - - - - - - - - - - - - - Add moderators - - - - :/icons/settings/permissions.svg:/icons/settings/permissions.svg - - - - - - - Key recipients can publish to restricted-type group and can view and publish for private-type channels - - - Share Publish Key - - - - + + + + + + Qt::Horizontal + + + + 132 + 20 + + + + + + + + <html><head/><body><p>The identity here can be used to send feedback.</p></body></html> + + + Owner: + + + + + + + + + + + + + Add moderators + + + + :/icons/settings/permissions.svg:/icons/settings/permissions.svg + + + + + + + Key recipients can publish to restricted-type group and can view and publish for private-type channels + + + Share Publish Key + + + @@ -894,6 +848,11 @@ QComboBox

gui/common/GroupChooser.h
+ + ClickableLabel + QLabel +
util/ClickableLabel.h
+ diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp index edc60012a..a11b7b788 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp @@ -76,14 +76,14 @@ void GroupShareKey::setTyp() if (!rsGxsChannels) return; - ui->headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/channels.png")); ui->headerFrame->setHeaderText(tr("Share channel publish permissions")); ui->sharekeyinfo_label->setText(tr("You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions.")); } else if(mGrpType == FORUM_KEY_SHARE) { - ui->headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png")); ui->headerFrame->setHeaderText(tr("Share forum admin permissions")); ui->sharekeyinfo_label->setText(tr("You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.")); diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp index a7627a967..aa2210bee 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp @@ -36,9 +36,9 @@ /* Images for tag icons */ #define IMAGE_LOADING ":/images/folder-draft.png" -#define IMAGE_PGPKNOWN ":/images/contact.png" +#define IMAGE_PGPKNOWN ":/icons/png/profile.png" #define IMAGE_PGPUNKNOWN ":/images/tags/pgp-unknown.png" -#define IMAGE_ANON ":/images/tags/anon.png" +#define IMAGE_ANON ":/icons/png/anonymous.png" #define IMAGE_BANNED ":/icons/biohazard_red.png" #define IMAGE_DEV_AMBASSADOR ":/images/tags/dev-ambassador.png" diff --git a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp index fab246dd6..ef9c3fdbc 100644 --- a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp @@ -87,7 +87,7 @@ void WikiGroupDialog::initUi() QPixmap WikiGroupDialog::serviceImage() { - return QPixmap(":/images/resource-group-new_64.png"); + return QPixmap(":/icons/png/wiki.png"); } bool WikiGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 5086f4acb..703f43bb1 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -285,48 +285,6 @@ p, li { white-space: pre-wrap; } 0 - - - - - - :/images/attachment.png - - - - - - - - 16777215 - 26 - - - - - 75 - true - - - - Attachments - - - - - - - Qt::Horizontal - - - - 334 - 26 - - - - - @@ -340,6 +298,9 @@ p, li { white-space: pre-wrap; } 34 + + <html><head/><body><p>Add File</p></body></html> + @@ -355,16 +316,6 @@ p, li { white-space: pre-wrap; } - - - - Allow channels to get frame for message thumbnail from movie media attachments or not - - - Auto Thumbnail - - - @@ -378,7 +329,7 @@ p, li { white-space: pre-wrap; } 0 0 - 81 + 632 24 @@ -425,6 +376,29 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + + 334 + 26 + + + + + + + + Allow channels to get frame for message thumbnail from movie media attachments or not + + + Auto Thumbnail + + + diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index 6588d85c2..e449e685d 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -175,7 +175,7 @@ QString GxsChannelDialog::icon(IconType type) case ICON_SEARCH: return ":/images/find.png"; case ICON_DEFAULT: - return ":/images/channels.png"; + return ":/icons/png/channels.png"; } return ""; diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp index 3286c5f8b..7443ee04c 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp @@ -39,7 +39,7 @@ #include -#define CHAN_DEFAULT_IMAGE ":/images/channels.png" +#define CHAN_DEFAULT_IMAGE ":/icons/png/channels.png" #define ROLE_PUBLISH FEED_TREEWIDGET_SORTROLE diff --git a/retroshare-gui/src/gui/help/content/de/peerdetails.html b/retroshare-gui/src/gui/help/content/de/peerdetails.html index f008600c1..b1b0d3db7 100644 --- a/retroshare-gui/src/gui/help/content/de/peerdetails.html +++ b/retroshare-gui/src/gui/help/content/de/peerdetails.html @@ -33,7 +33,7 @@ Peer Details Trust settings and Signing

Trust Settings

- +

The trust settings refers to the gnupg web of trust mecanism.
This trust means how you trust your friends when he is signing other PGP keys.
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 218ecc211..f57a8726f 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -35,14 +35,11 @@ icons/bullet_grey_128.png icons/bullet_red_128.png icons/bullet_yellow_128.png - icons/channels_128.png - icons/channels_red_128.png - icons/chat_128.png - icons/chat_red_128.png - icons/circles_128.png - icons/circles_new_128.png + icons/collections.png icons/flag-green.png icons/friends_128.png + icons/folder.png + icons/folderopen.png icons/global_switch_off_128.png icons/global_switch_on_128.png icons/gmail.png @@ -51,25 +48,15 @@ icons/information_128.png icons/internet_128.png icons/invite64.png - icons/knews_128.png - icons/knews_red_128.png - icons/konversation_128.png - icons/konversation128.png - icons/konversation_red_128.png - icons/ktorrent_128.png - icons/ktorrent_red_128.png icons/logo_0_connected_128.png icons/logo_128.png icons/logo_1_connected_128.png icons/logo_2_connected_128.png - icons/mail_128.png - icons/mail_old_128.png - icons/mail_red_128.png - icons/newsfeed128.png icons/outlook.png icons/question.png icons/plugins_128.png icons/png/add.png + icons/png/anonymous.png icons/png/attach-image.png icons/png/attach.png icons/png/cert.png @@ -124,6 +111,7 @@ icons/png/phone.png icons/png/posted-notify.png icons/png/posted.png + icons/png/profile.png icons/png/search.png icons/png/send-message-blocked.png icons/png/send-message.png @@ -136,8 +124,6 @@ icons/png/thumbs-up.png icons/png/typing.png icons/png/video.png - icons/posted_128.png - icons/posted_red_128.png icons/quit_128.png icons/search_red_128.png icons/security_high_128.png diff --git a/retroshare-gui/src/gui/icons/channels_128.png b/retroshare-gui/src/gui/icons/channels_128.png deleted file mode 100644 index ed21268c2..000000000 Binary files a/retroshare-gui/src/gui/icons/channels_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/channels_red_128.png b/retroshare-gui/src/gui/icons/channels_red_128.png deleted file mode 100644 index 6d384db9d..000000000 Binary files a/retroshare-gui/src/gui/icons/channels_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/chat_128.png b/retroshare-gui/src/gui/icons/chat_128.png deleted file mode 100644 index 7212a977d..000000000 Binary files a/retroshare-gui/src/gui/icons/chat_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/chat_red_128.png b/retroshare-gui/src/gui/icons/chat_red_128.png deleted file mode 100644 index 47860491e..000000000 Binary files a/retroshare-gui/src/gui/icons/chat_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/circles_128.png b/retroshare-gui/src/gui/icons/circles_128.png deleted file mode 100644 index d2664a82c..000000000 Binary files a/retroshare-gui/src/gui/icons/circles_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/circles_new_128.png b/retroshare-gui/src/gui/icons/circles_new_128.png deleted file mode 100644 index 7c2c1099c..000000000 Binary files a/retroshare-gui/src/gui/icons/circles_new_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/collections.png b/retroshare-gui/src/gui/icons/collections.png new file mode 100644 index 000000000..cb02eb5d3 Binary files /dev/null and b/retroshare-gui/src/gui/icons/collections.png differ diff --git a/retroshare-gui/src/gui/icons/folder.png b/retroshare-gui/src/gui/icons/folder.png new file mode 100644 index 000000000..01f942628 Binary files /dev/null and b/retroshare-gui/src/gui/icons/folder.png differ diff --git a/retroshare-gui/src/gui/icons/folderopen.png b/retroshare-gui/src/gui/icons/folderopen.png new file mode 100644 index 000000000..544e5f0b7 Binary files /dev/null and b/retroshare-gui/src/gui/icons/folderopen.png differ diff --git a/retroshare-gui/src/gui/icons/knews_128.png b/retroshare-gui/src/gui/icons/knews_128.png deleted file mode 100644 index 97fd4eb6f..000000000 Binary files a/retroshare-gui/src/gui/icons/knews_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/knews_red_128.png b/retroshare-gui/src/gui/icons/knews_red_128.png deleted file mode 100644 index 82cde6d33..000000000 Binary files a/retroshare-gui/src/gui/icons/knews_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/konversation128.png b/retroshare-gui/src/gui/icons/konversation128.png deleted file mode 100644 index 4398fd869..000000000 Binary files a/retroshare-gui/src/gui/icons/konversation128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/konversation_128.png b/retroshare-gui/src/gui/icons/konversation_128.png deleted file mode 100644 index 4398fd869..000000000 Binary files a/retroshare-gui/src/gui/icons/konversation_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/konversation_red_128.png b/retroshare-gui/src/gui/icons/konversation_red_128.png deleted file mode 100644 index 1f248cbb8..000000000 Binary files a/retroshare-gui/src/gui/icons/konversation_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/ktorrent_128.png b/retroshare-gui/src/gui/icons/ktorrent_128.png deleted file mode 100644 index 764568d35..000000000 Binary files a/retroshare-gui/src/gui/icons/ktorrent_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/ktorrent_red_128.png b/retroshare-gui/src/gui/icons/ktorrent_red_128.png deleted file mode 100644 index 92a45bf54..000000000 Binary files a/retroshare-gui/src/gui/icons/ktorrent_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/mail_128.png b/retroshare-gui/src/gui/icons/mail_128.png deleted file mode 100644 index 1fe0adacf..000000000 Binary files a/retroshare-gui/src/gui/icons/mail_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/mail_old_128.png b/retroshare-gui/src/gui/icons/mail_old_128.png deleted file mode 100644 index 217e18128..000000000 Binary files a/retroshare-gui/src/gui/icons/mail_old_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/mail_red_128.png b/retroshare-gui/src/gui/icons/mail_red_128.png deleted file mode 100644 index 115542019..000000000 Binary files a/retroshare-gui/src/gui/icons/mail_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/newsfeed128.png b/retroshare-gui/src/gui/icons/newsfeed128.png deleted file mode 100644 index 19c256c9f..000000000 Binary files a/retroshare-gui/src/gui/icons/newsfeed128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/png/anonymous.png b/retroshare-gui/src/gui/icons/png/anonymous.png new file mode 100644 index 000000000..06d37d941 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/anonymous.png differ diff --git a/retroshare-gui/src/gui/icons/png/attachements.png b/retroshare-gui/src/gui/icons/png/attachements.png index 1d0941a5d..5fcfd0ae3 100644 Binary files a/retroshare-gui/src/gui/icons/png/attachements.png and b/retroshare-gui/src/gui/icons/png/attachements.png differ diff --git a/retroshare-gui/src/gui/icons/png/message.png b/retroshare-gui/src/gui/icons/png/message.png index ae9da7e01..da8a3b312 100644 Binary files a/retroshare-gui/src/gui/icons/png/message.png and b/retroshare-gui/src/gui/icons/png/message.png differ diff --git a/retroshare-gui/src/gui/icons/png/profile.png b/retroshare-gui/src/gui/icons/png/profile.png new file mode 100644 index 000000000..833cbbee7 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/profile.png differ diff --git a/retroshare-gui/src/gui/icons/posted_128.png b/retroshare-gui/src/gui/icons/posted_128.png deleted file mode 100644 index 94c5a50a5..000000000 Binary files a/retroshare-gui/src/gui/icons/posted_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/posted_red_128.png b/retroshare-gui/src/gui/icons/posted_red_128.png deleted file mode 100644 index 70125b257..000000000 Binary files a/retroshare-gui/src/gui/icons/posted_red_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/svg/anonymous.svg b/retroshare-gui/src/gui/icons/svg/anonymous.svg new file mode 100644 index 000000000..ba7dc60a3 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/anonymous.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/svg/attachments.svg b/retroshare-gui/src/gui/icons/svg/attachments.svg new file mode 100644 index 000000000..4aed39265 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/attachments.svg @@ -0,0 +1,65 @@ + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/message.svg b/retroshare-gui/src/gui/icons/svg/message.svg index 81fcd8254..21916df36 100644 --- a/retroshare-gui/src/gui/icons/svg/message.svg +++ b/retroshare-gui/src/gui/icons/svg/message.svg @@ -12,18 +12,18 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg4155" version="1.1" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" xml:space="preserve" width="80" height="80" viewBox="0 0 80 80" sodipodi:docname="message.svg" - inkscape:export-filename="C:\Users\Mustermann\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\message.png" + inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\message.png" inkscape:export-xdpi="153.60001" inkscape:export-ydpi="153.60001">image/svg+xml \ No newline at end of file + style="fill:#039bd5;fill-opacity:1;stroke-width:1.3458221" /> \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/profile.svg b/retroshare-gui/src/gui/icons/svg/profile.svg index c915ebd49..dd7d555f2 100644 --- a/retroshare-gui/src/gui/icons/svg/profile.svg +++ b/retroshare-gui/src/gui/icons/svg/profile.svg @@ -11,7 +11,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg4155" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" xml:space="preserve" width="80" height="80" @@ -19,7 +19,7 @@ sodipodi:docname="profile.svg">image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/video-camera.svg b/retroshare-gui/src/gui/icons/svg/video-camera.svg new file mode 100644 index 000000000..81d7d9333 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/video-camera.svg @@ -0,0 +1,114 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index a54d7fa26..cae7b1982 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -10,8 +10,6 @@ images/switch01.png images/switch10.png images/switch11.png - images/add_chat24.png - images/RSS_004_32.png images/mail-encrypted-full.png images/mail-signed-full.png images/document-edit-sign.png @@ -19,7 +17,6 @@ images/inbox_22.png images/blue_lock.png images/blue_lock_open.png - images/d-chat64.png images/edit_24.png images/streaming.png images/white-bubble-64.png @@ -33,7 +30,6 @@ images/browsable_128_blue.png images/blank_128_green.png images/blank_128_blue.png - images/door_in.png images/tor-logo.png images/help/addafriend.png images/help/addfriendkey.png @@ -41,29 +37,14 @@ icons/help_64.png images/help/natgreen.png images/help/natred.png - images/attach.png images/pgp.png images/rs_wizard.png images/avatar_request.png images/avatar_refused.png images/avatar_request_unknown.png - images/backblue.png - images/backchat.png images/buttonframe.png - images/btn1.png - images/btn2.png - images/btn3.png - images/btn4.png - images/btn_26.png - images/btn_26_hover.png - images/btn_26_pressed.png - images/btn_27.png - images/btn_27_hover.png images/btn_blue.png images/btn_blue_hover.png - images/btn_green.png - images/btn_green_hover.png - images/btn_green_pressed.png images/connect_creating.png images/dht16.png images/dht32.png @@ -81,10 +62,6 @@ help/licence.html help/thanks.html images/accepted16.png - images/add_image24.png - images/add_channel64.png - images/add_channel24.png - images/add_channel32.png images/admin-16.png images/admin-32.png images/admin-24.png @@ -104,30 +81,12 @@ images/avatarstatus-bg-away-70.png images/avatarstatus-bg-busy-70.png images/avatarstatus-bg-offline-70.png - images/browse-looking.gif images/back.png - images/backgroundl.png - images/blockdevice.png - images/blockdevice2.png images/configure.png - images/channels.png - images/turtle.png - images/channels16.png - images/channels24.png - images/channels32.png - images/channels_new.png - images/channelsred.png - images/channelsyellow.png - images/channelsgreen.png - images/channelsblue.png images/copyrslink.png images/contacts24.png images/contactsclosed24.png images/connection.png - images/contact_new.png - images/contact_new22.png - images/contact.png - images/contact22.png images/Client0.png images/Client1.png images/Client2.png @@ -147,7 +106,6 @@ images/FileTypeProgram.png images/FileTypeVideo.png images/fonts.png - images/folder16.png images/foldermail.png images/folderopen.png images/fileopen.png @@ -157,27 +115,14 @@ images/graph-checking.png images/graph-blue.png images/add-share24.png - images/add_24x24.png - images/advsearch_24x24.png - images/amsn16.png - images/attachment.png images/avatar_background.png - images/backgroundimage.png images/button_cancel.png images/calendar.png images/chat.png - images/chat_22.png images/chat_24.png - images/chat_32.png - images/chat_64.png - images/chat_x24.png - images/chat_red24.png images/cancel.png images/close-down.png images/close_normal.png - images/console-small-down.png - images/console-small-hover.png - images/console-small-up.png images/contact_new128.png images/copy.png images/delete.png @@ -198,16 +143,8 @@ images/edit-italic.png images/edit-underline.png images/edit_remove24.png - images/encrypted16.png - images/encrypted22.png - images/encrypted32.png - images/encrypted48.png images/disabled_plugin_48.png - images/evolution.png - images/exit_24x24.png - images/exit_32.png images/expand_frame.png - images/exportpeers_16x16.png images/extension_32.png images/filefind.png images/fileinfo.png @@ -227,7 +164,6 @@ images/fileshare64.png images/find.png images/find-16.png - images/emoticons/kopete/kopete020.png images/flags/af.png images/flags/bg.png images/flags/zh_CN.png @@ -261,16 +197,7 @@ images/folder-outbox.png images/folder-sent.png images/folder-trash.png - images/folder_doments.png - images/folder_green.png - images/folder_red.png - images/folder_grey.png - images/folder_yellow.png - images/folder_open.png - images/folder_video.png - images/folder_blueshared.png images/forward.png - images/friendsfolder24.png images/kgames.png images/go-down.png images/go-top.png @@ -278,24 +205,17 @@ images/go-bottom.png images/graph-area.png images/graph-line.png - images/groupchat.png - images/genbackground.png images/gohome.png images/gpgp_key_generate.png - images/help.png - images/help24.png images/hide_toolbox_frame.png images/hide_frame.png images/highlight.png - images/hi16-app-ktorrent.png - images/hi24-app-ktorrent.png images/hot_0.png images/hot_1.png images/hot_2.png images/hot_3.png images/hot_4.png images/hot_5.png - images/image16.png images/imageblocked_24.png images/info16.png images/im-user.png @@ -307,37 +227,11 @@ images/connect_friend.png images/kalarm.png images/kbackgammon.png - images/kblogger.png - images/hi48-app-kblogger.png - images/hi64-app-kblogger.png - images/transfers_new.png images/kcmsystem24.png - images/kdmconfig.png - images/konsole.png - images/newsfeed128.png - images/newsfeed128_notify.png - images/konversation.png - images/konversation16.png - images/konversation128.png - images/konv_message2.png - images/konv_message3.png - images/konv_message64.png - images/konversation64.png - images/forums_new.png - images/ksysguard.png - images/ksysguard32.png - images/ktorrent.png - images/ktorrent32.png - images/knewsticker24.png - images/library.png - images/loadcert16.png images/ledoff1.png images/ledon1.png images/locale.png images/looknfeel.png - images/lphoto.png - images/lphoto16.png - images/lphoto24.png images/logo/logo_16.png images/logo/logo_24.png images/logo/logo_24_0.png @@ -352,10 +246,6 @@ images/logo/logo_info.png images/logo/logo_splash.png images/logo/logo_web_nobackground.png - images/logobar/logo_bar_fill.png - images/logobar/logo_bar_start.png - images/logobar/rslogo.png - images/logobar/rslogo2.png images/mail-message-new.png images/mail-signed.png images/mail-signature-unknown.png @@ -382,16 +272,9 @@ images/message-state-header.png images/message-state-new.png images/message-news.png - images/message_new.png images/message.png - images/messenger.png images/mute-off-16.png images/mute-on-16.png - images/my_documents_16.png - images/my_documents_22.png - images/network.png - images/network16.png - images/network32.png images/new-mail-alert.png images/new_forum16.png images/newmsg.png @@ -439,7 +322,6 @@ images/save24.png images/send24.png images/settings.png - images/settings16.png images/show_toolbox_frame.png images/start.png images/stop.png @@ -449,7 +331,6 @@ images/StatisticsDetail.png images/status_unknown.png images/startall.png - images/server_24x24.png images/sort_incr.png images/sort_decrease.png images/sound.png @@ -459,10 +340,7 @@ images/tag24.png images/transferupdown.png images/tools_wizard.png - images/typing.png - images/trustsettings.png images/uploads.png - images/headerFrame.png images/loader/indicator-16.gif images/loader/indicator-32.gif images/loader/circleball-16.gif @@ -473,8 +351,6 @@ images/mimetypes/source_c.png images/mimetypes/source_cpp.png images/mimetypes/source_h.png - images/view-certificate-copy-32.png - images/view-certificate-export-32.png images/textedit/textbold.png images/textedit/textitalic.png images/textedit/textunder.png @@ -507,9 +383,6 @@ images/textedit/hi22-action-format-text-blockquote.png images/textedit/hi22-action-format-text-code.png images/textedit/hi22-action-insert-more-mark.png - images/toaster/chat.png - images/toaster/hangup.png - images/toaster/pickup.png images/toaster/backgroundtoaster.png images/thumb-default-video.png images/user/add_user24.png @@ -556,24 +429,13 @@ images/up1down0.png images/underconstruction.png images/user.png - images/view-certificate-sign-32.png images/view_calendar_day.png images/view_calendar_week.png images/view_calendar_month.png images/view_calendar_list.png images/view_split_top_bottom.png - images/vote_up.png - images/vote_down.png - images/vote_neutral.png images/window_fullscreen.png images/window_nofullscreen.png - images/identity/identities_32.png - images/identity/identity_64.png - images/identity/identity_create_32.png - images/identity/identity_create_64.png - images/identity/identity_delete_32.png - images/identity/identity_edit_32.png - images/identity/identity_edit_64.png qss/chat/standard/private/info.xml qss/chat/standard/private/incoming.htm qss/chat/standard/private/outgoing.htm @@ -633,43 +495,26 @@ qss/chat/compact/history/variants/Colored.css qss/stylesheet/qss.default qss/stylesheet/Standard.qss - images/connect/connectFriendWatermark.png - images/connect/connectFriendLogo.png - images/connect/connectFriendBanner.png - images/connect/connectFriendBanner1.png - images/connect/info16.png - images/connect/mail_send.png images/tags/pgp-known.png images/tags/pgp-unknown.png - images/tags/anon.png images/tags/dev-ambassador.png images/tags/dev-translator.png images/tags/dev-patcher.png images/tags/developer.png - images/circles/circles_32.png - images/circles/circles_64.png - images/newsfeed/news-feed-32.png - images/newsfeed/news-feed-notify-32.png images/share-icon-16.png - images/view-certificate-sign-48.png images/toasterEnable.png images/toasterDisable.png - images/library_edit.png - images/library_view.png - images/library_add.png - images/library64.png - images/library16.png - images/btn_red_pressed.png - images/btn_red_hover.png - images/btn_red.png images/view-feeds.png images/view-files.png images/emblem-web.png - images/rsmessenger16.png - images/rsmessenger32.png images/rsmessenger48.png images/SmileyText.png images/SimpleText.png images/ColoredText.png + images/update.png + images/folder_green.png + images/folder_red.png + images/folder_grey.png + images/folder_yellow.png diff --git a/retroshare-gui/src/gui/images/Eterm.png b/retroshare-gui/src/gui/images/Eterm.png deleted file mode 100644 index b2027f5a9..000000000 Binary files a/retroshare-gui/src/gui/images/Eterm.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/Login Manager.png b/retroshare-gui/src/gui/images/Login Manager.png deleted file mode 100644 index 37371456c..000000000 Binary files a/retroshare-gui/src/gui/images/Login Manager.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/RSS_004_32.png b/retroshare-gui/src/gui/images/RSS_004_32.png deleted file mode 100644 index c6abd93dc..000000000 Binary files a/retroshare-gui/src/gui/images/RSS_004_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_24x24.png b/retroshare-gui/src/gui/images/add_24x24.png deleted file mode 100644 index bbf64ca18..000000000 Binary files a/retroshare-gui/src/gui/images/add_24x24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_channel24.png b/retroshare-gui/src/gui/images/add_channel24.png deleted file mode 100644 index 8ba048f74..000000000 Binary files a/retroshare-gui/src/gui/images/add_channel24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_channel32.png b/retroshare-gui/src/gui/images/add_channel32.png deleted file mode 100644 index 62d178e11..000000000 Binary files a/retroshare-gui/src/gui/images/add_channel32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_channel64.png b/retroshare-gui/src/gui/images/add_channel64.png deleted file mode 100644 index ebc17374c..000000000 Binary files a/retroshare-gui/src/gui/images/add_channel64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_chat24.png b/retroshare-gui/src/gui/images/add_chat24.png deleted file mode 100644 index 95585c957..000000000 Binary files a/retroshare-gui/src/gui/images/add_chat24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/add_image24.png b/retroshare-gui/src/gui/images/add_image24.png deleted file mode 100644 index 396035fe9..000000000 Binary files a/retroshare-gui/src/gui/images/add_image24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/advsearch_24x24.png b/retroshare-gui/src/gui/images/advsearch_24x24.png deleted file mode 100644 index 94182e8fe..000000000 Binary files a/retroshare-gui/src/gui/images/advsearch_24x24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/amsn16.png b/retroshare-gui/src/gui/images/amsn16.png deleted file mode 100644 index 54edfb50e..000000000 Binary files a/retroshare-gui/src/gui/images/amsn16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/attach.png b/retroshare-gui/src/gui/images/attach.png deleted file mode 100644 index 53f31750b..000000000 Binary files a/retroshare-gui/src/gui/images/attach.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/attachment.png b/retroshare-gui/src/gui/images/attachment.png deleted file mode 100644 index 89842af21..000000000 Binary files a/retroshare-gui/src/gui/images/attachment.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/backblue.png b/retroshare-gui/src/gui/images/backblue.png deleted file mode 100644 index 8ca7d7745..000000000 Binary files a/retroshare-gui/src/gui/images/backblue.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/backchat.png b/retroshare-gui/src/gui/images/backchat.png deleted file mode 100644 index 6ea9c9f49..000000000 Binary files a/retroshare-gui/src/gui/images/backchat.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/backgroundimage.png b/retroshare-gui/src/gui/images/backgroundimage.png deleted file mode 100644 index f67e5176f..000000000 Binary files a/retroshare-gui/src/gui/images/backgroundimage.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/backgroundl.png b/retroshare-gui/src/gui/images/backgroundl.png deleted file mode 100644 index 13d166dbe..000000000 Binary files a/retroshare-gui/src/gui/images/backgroundl.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/blockdevice.png b/retroshare-gui/src/gui/images/blockdevice.png deleted file mode 100644 index 77584164f..000000000 Binary files a/retroshare-gui/src/gui/images/blockdevice.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/blockdevice2.png b/retroshare-gui/src/gui/images/blockdevice2.png deleted file mode 100644 index 312d63e40..000000000 Binary files a/retroshare-gui/src/gui/images/blockdevice2.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/browse-looking.gif b/retroshare-gui/src/gui/images/browse-looking.gif deleted file mode 100644 index 6da15f60d..000000000 Binary files a/retroshare-gui/src/gui/images/browse-looking.gif and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn1.png b/retroshare-gui/src/gui/images/btn1.png deleted file mode 100644 index bbe3b7278..000000000 Binary files a/retroshare-gui/src/gui/images/btn1.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn2.png b/retroshare-gui/src/gui/images/btn2.png deleted file mode 100644 index 92100d787..000000000 Binary files a/retroshare-gui/src/gui/images/btn2.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn3.png b/retroshare-gui/src/gui/images/btn3.png deleted file mode 100644 index bbe3b7278..000000000 Binary files a/retroshare-gui/src/gui/images/btn3.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn4.png b/retroshare-gui/src/gui/images/btn4.png deleted file mode 100644 index bbe3b7278..000000000 Binary files a/retroshare-gui/src/gui/images/btn4.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_26.png b/retroshare-gui/src/gui/images/btn_26.png deleted file mode 100644 index 51de8bc89..000000000 Binary files a/retroshare-gui/src/gui/images/btn_26.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_26_hover.png b/retroshare-gui/src/gui/images/btn_26_hover.png deleted file mode 100644 index 391690431..000000000 Binary files a/retroshare-gui/src/gui/images/btn_26_hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_26_pressed.png b/retroshare-gui/src/gui/images/btn_26_pressed.png deleted file mode 100644 index 0aa53120d..000000000 Binary files a/retroshare-gui/src/gui/images/btn_26_pressed.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_27.png b/retroshare-gui/src/gui/images/btn_27.png deleted file mode 100644 index bcdf90ded..000000000 Binary files a/retroshare-gui/src/gui/images/btn_27.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_27_hover.png b/retroshare-gui/src/gui/images/btn_27_hover.png deleted file mode 100644 index 2bc8680d7..000000000 Binary files a/retroshare-gui/src/gui/images/btn_27_hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_green.png b/retroshare-gui/src/gui/images/btn_green.png deleted file mode 100644 index 3c5526233..000000000 Binary files a/retroshare-gui/src/gui/images/btn_green.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_green_hover.png b/retroshare-gui/src/gui/images/btn_green_hover.png deleted file mode 100644 index bb98ebced..000000000 Binary files a/retroshare-gui/src/gui/images/btn_green_hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_green_pressed.png b/retroshare-gui/src/gui/images/btn_green_pressed.png deleted file mode 100644 index 84644b7c4..000000000 Binary files a/retroshare-gui/src/gui/images/btn_green_pressed.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_red.png b/retroshare-gui/src/gui/images/btn_red.png deleted file mode 100644 index 81cad49f5..000000000 Binary files a/retroshare-gui/src/gui/images/btn_red.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_red_hover.png b/retroshare-gui/src/gui/images/btn_red_hover.png deleted file mode 100644 index 92b724c72..000000000 Binary files a/retroshare-gui/src/gui/images/btn_red_hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/btn_red_pressed.png b/retroshare-gui/src/gui/images/btn_red_pressed.png deleted file mode 100644 index 604c96d68..000000000 Binary files a/retroshare-gui/src/gui/images/btn_red_pressed.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channels.png b/retroshare-gui/src/gui/images/channels.png deleted file mode 100644 index 3c53997a0..000000000 Binary files a/retroshare-gui/src/gui/images/channels.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channels16.png b/retroshare-gui/src/gui/images/channels16.png deleted file mode 100644 index e84292c1f..000000000 Binary files a/retroshare-gui/src/gui/images/channels16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channels24.png b/retroshare-gui/src/gui/images/channels24.png deleted file mode 100644 index 9eb351ae7..000000000 Binary files a/retroshare-gui/src/gui/images/channels24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channels32.png b/retroshare-gui/src/gui/images/channels32.png deleted file mode 100644 index ddb19884e..000000000 Binary files a/retroshare-gui/src/gui/images/channels32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channels_new.png b/retroshare-gui/src/gui/images/channels_new.png deleted file mode 100644 index aa8d7a889..000000000 Binary files a/retroshare-gui/src/gui/images/channels_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channelsblue.png b/retroshare-gui/src/gui/images/channelsblue.png deleted file mode 100644 index c385de26b..000000000 Binary files a/retroshare-gui/src/gui/images/channelsblue.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channelsgreen.png b/retroshare-gui/src/gui/images/channelsgreen.png deleted file mode 100644 index 8649075b3..000000000 Binary files a/retroshare-gui/src/gui/images/channelsgreen.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channelsred.png b/retroshare-gui/src/gui/images/channelsred.png deleted file mode 100644 index 5d4e8a35f..000000000 Binary files a/retroshare-gui/src/gui/images/channelsred.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/channelsyellow.png b/retroshare-gui/src/gui/images/channelsyellow.png deleted file mode 100644 index f6dab53cf..000000000 Binary files a/retroshare-gui/src/gui/images/channelsyellow.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_128.png b/retroshare-gui/src/gui/images/chat_128.png deleted file mode 100644 index 7212a977d..000000000 Binary files a/retroshare-gui/src/gui/images/chat_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_22.png b/retroshare-gui/src/gui/images/chat_22.png deleted file mode 100644 index 16d6336f6..000000000 Binary files a/retroshare-gui/src/gui/images/chat_22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_32.png b/retroshare-gui/src/gui/images/chat_32.png deleted file mode 100644 index f9c6f2496..000000000 Binary files a/retroshare-gui/src/gui/images/chat_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_48.png b/retroshare-gui/src/gui/images/chat_48.png deleted file mode 100644 index 4c06659f4..000000000 Binary files a/retroshare-gui/src/gui/images/chat_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_64.png b/retroshare-gui/src/gui/images/chat_64.png deleted file mode 100644 index ef6dc9613..000000000 Binary files a/retroshare-gui/src/gui/images/chat_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_red24.png b/retroshare-gui/src/gui/images/chat_red24.png deleted file mode 100644 index 2384d7ae7..000000000 Binary files a/retroshare-gui/src/gui/images/chat_red24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/chat_x24.png b/retroshare-gui/src/gui/images/chat_x24.png deleted file mode 100644 index 163d0d371..000000000 Binary files a/retroshare-gui/src/gui/images/chat_x24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/circles/circles-hi.png b/retroshare-gui/src/gui/images/circles/circles-hi.png deleted file mode 100644 index 539a8f203..000000000 Binary files a/retroshare-gui/src/gui/images/circles/circles-hi.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/circles/circles_128.png b/retroshare-gui/src/gui/images/circles/circles_128.png deleted file mode 100644 index d2664a82c..000000000 Binary files a/retroshare-gui/src/gui/images/circles/circles_128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/circles/circles_32.png b/retroshare-gui/src/gui/images/circles/circles_32.png deleted file mode 100644 index 97145faa9..000000000 Binary files a/retroshare-gui/src/gui/images/circles/circles_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/circles/circles_64.png b/retroshare-gui/src/gui/images/circles/circles_64.png deleted file mode 100644 index 4bf54616d..000000000 Binary files a/retroshare-gui/src/gui/images/circles/circles_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendBanner.png b/retroshare-gui/src/gui/images/connect/connectFriendBanner.png deleted file mode 100644 index 94f6acfcf..000000000 Binary files a/retroshare-gui/src/gui/images/connect/connectFriendBanner.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png b/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png deleted file mode 100644 index b38760044..000000000 Binary files a/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendLogo.png b/retroshare-gui/src/gui/images/connect/connectFriendLogo.png deleted file mode 100644 index d5ac0af38..000000000 Binary files a/retroshare-gui/src/gui/images/connect/connectFriendLogo.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png b/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png deleted file mode 100644 index b4bacbdff..000000000 Binary files a/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png b/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png deleted file mode 100644 index d68db6277..000000000 Binary files a/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/info16.png b/retroshare-gui/src/gui/images/connect/info16.png deleted file mode 100644 index fb3b689e9..000000000 Binary files a/retroshare-gui/src/gui/images/connect/info16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/connect/mail_send.png b/retroshare-gui/src/gui/images/connect/mail_send.png deleted file mode 100644 index 0366228e9..000000000 Binary files a/retroshare-gui/src/gui/images/connect/mail_send.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-big-down.png b/retroshare-gui/src/gui/images/console-big-down.png deleted file mode 100644 index 4ffbbcf84..000000000 Binary files a/retroshare-gui/src/gui/images/console-big-down.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-big-hover.png b/retroshare-gui/src/gui/images/console-big-hover.png deleted file mode 100644 index a5163017f..000000000 Binary files a/retroshare-gui/src/gui/images/console-big-hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-big-up.png b/retroshare-gui/src/gui/images/console-big-up.png deleted file mode 100644 index c88112c81..000000000 Binary files a/retroshare-gui/src/gui/images/console-big-up.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-small-down.png b/retroshare-gui/src/gui/images/console-small-down.png deleted file mode 100644 index 4c5fa594f..000000000 Binary files a/retroshare-gui/src/gui/images/console-small-down.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-small-hover.png b/retroshare-gui/src/gui/images/console-small-hover.png deleted file mode 100644 index 9dfb61454..000000000 Binary files a/retroshare-gui/src/gui/images/console-small-hover.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/console-small-up.png b/retroshare-gui/src/gui/images/console-small-up.png deleted file mode 100644 index 551d3f923..000000000 Binary files a/retroshare-gui/src/gui/images/console-small-up.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/contact.png b/retroshare-gui/src/gui/images/contact.png deleted file mode 100644 index b86f35012..000000000 Binary files a/retroshare-gui/src/gui/images/contact.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/contact22.png b/retroshare-gui/src/gui/images/contact22.png deleted file mode 100644 index 2bde2b914..000000000 Binary files a/retroshare-gui/src/gui/images/contact22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/contact_new.png b/retroshare-gui/src/gui/images/contact_new.png deleted file mode 100644 index 0a915b51b..000000000 Binary files a/retroshare-gui/src/gui/images/contact_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/contact_new22.png b/retroshare-gui/src/gui/images/contact_new22.png deleted file mode 100644 index c4f7eb816..000000000 Binary files a/retroshare-gui/src/gui/images/contact_new22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/d-chat64.png b/retroshare-gui/src/gui/images/d-chat64.png deleted file mode 100644 index 8de20ed54..000000000 Binary files a/retroshare-gui/src/gui/images/d-chat64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/door_in.png b/retroshare-gui/src/gui/images/door_in.png deleted file mode 100644 index a65ed5884..000000000 Binary files a/retroshare-gui/src/gui/images/door_in.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png deleted file mode 100644 index 53c1819fe..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png deleted file mode 100644 index 563532756..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png deleted file mode 100644 index a4788a820..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png deleted file mode 100644 index fc8dd7218..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png deleted file mode 100644 index 3be11a3de..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png deleted file mode 100644 index 19a7b33a9..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png deleted file mode 100644 index 181c3c776..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png deleted file mode 100644 index 41205b572..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png deleted file mode 100644 index c7a3c013d..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png deleted file mode 100644 index dc113eac5..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png deleted file mode 100644 index d6d6de45c..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png deleted file mode 100644 index 74938a7e5..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png deleted file mode 100644 index 9138b2860..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png deleted file mode 100644 index 11bb359f2..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png deleted file mode 100644 index a113e35cf..000000000 Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/encrypted16.png b/retroshare-gui/src/gui/images/encrypted16.png deleted file mode 100644 index b2619730c..000000000 Binary files a/retroshare-gui/src/gui/images/encrypted16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/encrypted22.png b/retroshare-gui/src/gui/images/encrypted22.png deleted file mode 100644 index 1cf62bf68..000000000 Binary files a/retroshare-gui/src/gui/images/encrypted22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/encrypted32.png b/retroshare-gui/src/gui/images/encrypted32.png deleted file mode 100644 index 974cd6816..000000000 Binary files a/retroshare-gui/src/gui/images/encrypted32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/encrypted48.png b/retroshare-gui/src/gui/images/encrypted48.png deleted file mode 100644 index b09df126a..000000000 Binary files a/retroshare-gui/src/gui/images/encrypted48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/evolution.png b/retroshare-gui/src/gui/images/evolution.png deleted file mode 100644 index a54a36647..000000000 Binary files a/retroshare-gui/src/gui/images/evolution.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/exit_24x24.png b/retroshare-gui/src/gui/images/exit_24x24.png deleted file mode 100644 index 3f77be3e0..000000000 Binary files a/retroshare-gui/src/gui/images/exit_24x24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/exit_32.png b/retroshare-gui/src/gui/images/exit_32.png deleted file mode 100644 index 609d4d8ab..000000000 Binary files a/retroshare-gui/src/gui/images/exit_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/exportpeers_16x16.png b/retroshare-gui/src/gui/images/exportpeers_16x16.png deleted file mode 100644 index c3bd700ba..000000000 Binary files a/retroshare-gui/src/gui/images/exportpeers_16x16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder.png b/retroshare-gui/src/gui/images/folder.png deleted file mode 100644 index 66704bdf3..000000000 Binary files a/retroshare-gui/src/gui/images/folder.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder_blueshared.png b/retroshare-gui/src/gui/images/folder_blueshared.png deleted file mode 100755 index 55c67b931..000000000 Binary files a/retroshare-gui/src/gui/images/folder_blueshared.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder_doments.png b/retroshare-gui/src/gui/images/folder_doments.png deleted file mode 100644 index 8a6f1eff7..000000000 Binary files a/retroshare-gui/src/gui/images/folder_doments.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder_music.png b/retroshare-gui/src/gui/images/folder_music.png deleted file mode 100755 index 32a6c5134..000000000 Binary files a/retroshare-gui/src/gui/images/folder_music.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder_open.png b/retroshare-gui/src/gui/images/folder_open.png deleted file mode 100644 index 723b13b1c..000000000 Binary files a/retroshare-gui/src/gui/images/folder_open.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/folder_video.png b/retroshare-gui/src/gui/images/folder_video.png deleted file mode 100755 index 0e45d0cb9..000000000 Binary files a/retroshare-gui/src/gui/images/folder_video.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/forums_new.png b/retroshare-gui/src/gui/images/forums_new.png deleted file mode 100644 index c3410d99a..000000000 Binary files a/retroshare-gui/src/gui/images/forums_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/friendsfolder24.png b/retroshare-gui/src/gui/images/friendsfolder24.png deleted file mode 100644 index 107e8e70b..000000000 Binary files a/retroshare-gui/src/gui/images/friendsfolder24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/genbackground.png b/retroshare-gui/src/gui/images/genbackground.png deleted file mode 100644 index 24ab3725d..000000000 Binary files a/retroshare-gui/src/gui/images/genbackground.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/groupchat.png b/retroshare-gui/src/gui/images/groupchat.png deleted file mode 100644 index 558f316bd..000000000 Binary files a/retroshare-gui/src/gui/images/groupchat.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/headerFrame.png b/retroshare-gui/src/gui/images/headerFrame.png deleted file mode 100644 index 94f6acfcf..000000000 Binary files a/retroshare-gui/src/gui/images/headerFrame.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/help.png b/retroshare-gui/src/gui/images/help.png deleted file mode 100644 index 9f0c92f23..000000000 Binary files a/retroshare-gui/src/gui/images/help.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/help24.png b/retroshare-gui/src/gui/images/help24.png deleted file mode 100644 index 2c8279b6a..000000000 Binary files a/retroshare-gui/src/gui/images/help24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi128-app-ktorrent.png b/retroshare-gui/src/gui/images/hi128-app-ktorrent.png deleted file mode 100644 index 764568d35..000000000 Binary files a/retroshare-gui/src/gui/images/hi128-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi16-app-ktorrent.png b/retroshare-gui/src/gui/images/hi16-app-ktorrent.png deleted file mode 100644 index 6bdf51399..000000000 Binary files a/retroshare-gui/src/gui/images/hi16-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi24-app-ktorrent.png b/retroshare-gui/src/gui/images/hi24-app-ktorrent.png deleted file mode 100644 index 052fb20bc..000000000 Binary files a/retroshare-gui/src/gui/images/hi24-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi32-app-ktorrent.png b/retroshare-gui/src/gui/images/hi32-app-ktorrent.png deleted file mode 100644 index fe92c486e..000000000 Binary files a/retroshare-gui/src/gui/images/hi32-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi48-app-kblogger.png b/retroshare-gui/src/gui/images/hi48-app-kblogger.png deleted file mode 100644 index da691264b..000000000 Binary files a/retroshare-gui/src/gui/images/hi48-app-kblogger.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi48-app-ktorrent.png b/retroshare-gui/src/gui/images/hi48-app-ktorrent.png deleted file mode 100644 index 9afbadc6f..000000000 Binary files a/retroshare-gui/src/gui/images/hi48-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi64-app-kblogger.png b/retroshare-gui/src/gui/images/hi64-app-kblogger.png deleted file mode 100644 index 2ae6d7ecb..000000000 Binary files a/retroshare-gui/src/gui/images/hi64-app-kblogger.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/hi64-app-ktorrent.png b/retroshare-gui/src/gui/images/hi64-app-ktorrent.png deleted file mode 100644 index 47bbb7ee0..000000000 Binary files a/retroshare-gui/src/gui/images/hi64-app-ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identities_32.png b/retroshare-gui/src/gui/images/identity/identities_32.png deleted file mode 100644 index 8bd056cfe..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identities_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identities_48.png b/retroshare-gui/src/gui/images/identity/identities_48.png deleted file mode 100644 index e5322cfd0..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identities_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identities_64.png b/retroshare-gui/src/gui/images/identity/identities_64.png deleted file mode 100644 index 3fdc7ac39..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identities_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_32.png b/retroshare-gui/src/gui/images/identity/identity_32.png deleted file mode 100644 index 9b6d2856d..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_48.png b/retroshare-gui/src/gui/images/identity/identity_48.png deleted file mode 100644 index 4b771f0bf..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_64.png b/retroshare-gui/src/gui/images/identity/identity_64.png deleted file mode 100644 index ae8ce8e50..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_create_32.png b/retroshare-gui/src/gui/images/identity/identity_create_32.png deleted file mode 100644 index ce2a3ad05..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_create_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_create_64.png b/retroshare-gui/src/gui/images/identity/identity_create_64.png deleted file mode 100644 index 8fab656d5..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_create_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_delete_32.png b/retroshare-gui/src/gui/images/identity/identity_delete_32.png deleted file mode 100644 index 8c1531ce3..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_delete_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_24.png b/retroshare-gui/src/gui/images/identity/identity_edit_24.png deleted file mode 100644 index 47dcfce02..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_32.png b/retroshare-gui/src/gui/images/identity/identity_edit_32.png deleted file mode 100644 index f9040dc07..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_48.png b/retroshare-gui/src/gui/images/identity/identity_edit_48.png deleted file mode 100644 index 910bb6d55..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_64.png b/retroshare-gui/src/gui/images/identity/identity_edit_64.png deleted file mode 100644 index 0e14fea7e..000000000 Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/im-ban-kick-user.png b/retroshare-gui/src/gui/images/im-ban-kick-user.png deleted file mode 100644 index 180582c0a..000000000 Binary files a/retroshare-gui/src/gui/images/im-ban-kick-user.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/im-ban-user.png b/retroshare-gui/src/gui/images/im-ban-user.png deleted file mode 100644 index 37712914a..000000000 Binary files a/retroshare-gui/src/gui/images/im-ban-user.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/im-invisible-user.png b/retroshare-gui/src/gui/images/im-invisible-user.png deleted file mode 100644 index 15bdb5194..000000000 Binary files a/retroshare-gui/src/gui/images/im-invisible-user.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/im-kick-user.png b/retroshare-gui/src/gui/images/im-kick-user.png deleted file mode 100644 index f9f0eec97..000000000 Binary files a/retroshare-gui/src/gui/images/im-kick-user.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/image16.png b/retroshare-gui/src/gui/images/image16.png deleted file mode 100644 index b57e381d0..000000000 Binary files a/retroshare-gui/src/gui/images/image16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/irkickflash.png b/retroshare-gui/src/gui/images/irkickflash.png deleted file mode 100644 index 0d67d3841..000000000 Binary files a/retroshare-gui/src/gui/images/irkickflash.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/kblogger.png b/retroshare-gui/src/gui/images/kblogger.png deleted file mode 100644 index dca1970f8..000000000 Binary files a/retroshare-gui/src/gui/images/kblogger.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/kdmconfig.png b/retroshare-gui/src/gui/images/kdmconfig.png deleted file mode 100644 index 688eb8491..000000000 Binary files a/retroshare-gui/src/gui/images/kdmconfig.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/knewsticker24.png b/retroshare-gui/src/gui/images/knewsticker24.png deleted file mode 100644 index e15b73542..000000000 Binary files a/retroshare-gui/src/gui/images/knewsticker24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konsole.png b/retroshare-gui/src/gui/images/konsole.png deleted file mode 100644 index b74026477..000000000 Binary files a/retroshare-gui/src/gui/images/konsole.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konv_message.png b/retroshare-gui/src/gui/images/konv_message.png deleted file mode 100644 index b11381d2c..000000000 Binary files a/retroshare-gui/src/gui/images/konv_message.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konv_message2.png b/retroshare-gui/src/gui/images/konv_message2.png deleted file mode 100644 index da0dba1e3..000000000 Binary files a/retroshare-gui/src/gui/images/konv_message2.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konv_message3.png b/retroshare-gui/src/gui/images/konv_message3.png deleted file mode 100644 index 40280bb50..000000000 Binary files a/retroshare-gui/src/gui/images/konv_message3.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konv_message64.png b/retroshare-gui/src/gui/images/konv_message64.png deleted file mode 100644 index edecbfc42..000000000 Binary files a/retroshare-gui/src/gui/images/konv_message64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konversation.png b/retroshare-gui/src/gui/images/konversation.png deleted file mode 100644 index 7b9299718..000000000 Binary files a/retroshare-gui/src/gui/images/konversation.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konversation128.png b/retroshare-gui/src/gui/images/konversation128.png deleted file mode 100644 index 4398fd869..000000000 Binary files a/retroshare-gui/src/gui/images/konversation128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konversation16.png b/retroshare-gui/src/gui/images/konversation16.png deleted file mode 100644 index 18565596d..000000000 Binary files a/retroshare-gui/src/gui/images/konversation16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/konversation64.png b/retroshare-gui/src/gui/images/konversation64.png deleted file mode 100644 index 6d3a8e8e3..000000000 Binary files a/retroshare-gui/src/gui/images/konversation64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/ksysguard.png b/retroshare-gui/src/gui/images/ksysguard.png deleted file mode 100644 index 10c196ebf..000000000 Binary files a/retroshare-gui/src/gui/images/ksysguard.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/ksysguard32.png b/retroshare-gui/src/gui/images/ksysguard32.png deleted file mode 100755 index b30f71d2b..000000000 Binary files a/retroshare-gui/src/gui/images/ksysguard32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/ktorrent.png b/retroshare-gui/src/gui/images/ktorrent.png deleted file mode 100644 index 740badb8c..000000000 Binary files a/retroshare-gui/src/gui/images/ktorrent.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/ktorrent32.png b/retroshare-gui/src/gui/images/ktorrent32.png deleted file mode 100644 index fe92c486e..000000000 Binary files a/retroshare-gui/src/gui/images/ktorrent32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library.png b/retroshare-gui/src/gui/images/library.png deleted file mode 100644 index a0465b33d..000000000 Binary files a/retroshare-gui/src/gui/images/library.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library16.png b/retroshare-gui/src/gui/images/library16.png deleted file mode 100644 index ac24d7a74..000000000 Binary files a/retroshare-gui/src/gui/images/library16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library64.png b/retroshare-gui/src/gui/images/library64.png deleted file mode 100644 index 8aec71cf2..000000000 Binary files a/retroshare-gui/src/gui/images/library64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library_add.png b/retroshare-gui/src/gui/images/library_add.png deleted file mode 100644 index 9285a9cdc..000000000 Binary files a/retroshare-gui/src/gui/images/library_add.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library_edit.png b/retroshare-gui/src/gui/images/library_edit.png deleted file mode 100644 index 21906e920..000000000 Binary files a/retroshare-gui/src/gui/images/library_edit.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/library_view.png b/retroshare-gui/src/gui/images/library_view.png deleted file mode 100644 index 86fe9a416..000000000 Binary files a/retroshare-gui/src/gui/images/library_view.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/loadcert16.png b/retroshare-gui/src/gui/images/loadcert16.png deleted file mode 100644 index aa4f287b0..000000000 Binary files a/retroshare-gui/src/gui/images/loadcert16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png b/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png deleted file mode 100644 index fa8257794..000000000 Binary files a/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/logobar/logo_bar_start.png b/retroshare-gui/src/gui/images/logobar/logo_bar_start.png deleted file mode 100644 index 9ebb7d1fe..000000000 Binary files a/retroshare-gui/src/gui/images/logobar/logo_bar_start.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/logobar/rslogo.png b/retroshare-gui/src/gui/images/logobar/rslogo.png deleted file mode 100644 index 18aaa95b2..000000000 Binary files a/retroshare-gui/src/gui/images/logobar/rslogo.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/logobar/rslogo2.png b/retroshare-gui/src/gui/images/logobar/rslogo2.png deleted file mode 100644 index 64266ed20..000000000 Binary files a/retroshare-gui/src/gui/images/logobar/rslogo2.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/logobar/rslogoclean.png b/retroshare-gui/src/gui/images/logobar/rslogoclean.png deleted file mode 100644 index 0ebb66fa9..000000000 Binary files a/retroshare-gui/src/gui/images/logobar/rslogoclean.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/lphoto.png b/retroshare-gui/src/gui/images/lphoto.png deleted file mode 100644 index c7bb01c11..000000000 Binary files a/retroshare-gui/src/gui/images/lphoto.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/lphoto16.png b/retroshare-gui/src/gui/images/lphoto16.png deleted file mode 100644 index f57102985..000000000 Binary files a/retroshare-gui/src/gui/images/lphoto16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/lphoto24.png b/retroshare-gui/src/gui/images/lphoto24.png deleted file mode 100644 index 4eb197db1..000000000 Binary files a/retroshare-gui/src/gui/images/lphoto24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/message_new.png b/retroshare-gui/src/gui/images/message_new.png deleted file mode 100644 index b1c9a4954..000000000 Binary files a/retroshare-gui/src/gui/images/message_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/messenger.png b/retroshare-gui/src/gui/images/messenger.png deleted file mode 100644 index cf15aadc5..000000000 Binary files a/retroshare-gui/src/gui/images/messenger.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/my_documents_16.png b/retroshare-gui/src/gui/images/my_documents_16.png deleted file mode 100644 index 571ad0851..000000000 Binary files a/retroshare-gui/src/gui/images/my_documents_16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/my_documents_22.png b/retroshare-gui/src/gui/images/my_documents_22.png deleted file mode 100644 index 3afad57ab..000000000 Binary files a/retroshare-gui/src/gui/images/my_documents_22.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/my_documents_32.png b/retroshare-gui/src/gui/images/my_documents_32.png deleted file mode 100644 index 7b7661d2c..000000000 Binary files a/retroshare-gui/src/gui/images/my_documents_32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/network.png b/retroshare-gui/src/gui/images/network.png deleted file mode 100644 index 99a04417a..000000000 Binary files a/retroshare-gui/src/gui/images/network.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/network16.png b/retroshare-gui/src/gui/images/network16.png deleted file mode 100644 index e1f1bd7cb..000000000 Binary files a/retroshare-gui/src/gui/images/network16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/network32.png b/retroshare-gui/src/gui/images/network32.png deleted file mode 100644 index e74a67f44..000000000 Binary files a/retroshare-gui/src/gui/images/network32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png b/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png deleted file mode 100644 index b79cd02dc..000000000 Binary files a/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png b/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png deleted file mode 100644 index 4c0b74727..000000000 Binary files a/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/newsfeed128.png b/retroshare-gui/src/gui/images/newsfeed128.png deleted file mode 100644 index 19c256c9f..000000000 Binary files a/retroshare-gui/src/gui/images/newsfeed128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/newsfeed128_notify.png b/retroshare-gui/src/gui/images/newsfeed128_notify.png deleted file mode 100644 index d660fe710..000000000 Binary files a/retroshare-gui/src/gui/images/newsfeed128_notify.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/retrotoolbar.png b/retroshare-gui/src/gui/images/retrotoolbar.png deleted file mode 100644 index 4a8e6cd39..000000000 Binary files a/retroshare-gui/src/gui/images/retrotoolbar.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/rsmessenger16.png b/retroshare-gui/src/gui/images/rsmessenger16.png deleted file mode 100644 index cdc8dd66c..000000000 Binary files a/retroshare-gui/src/gui/images/rsmessenger16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/rsmessenger32.png b/retroshare-gui/src/gui/images/rsmessenger32.png deleted file mode 100644 index d768a5624..000000000 Binary files a/retroshare-gui/src/gui/images/rsmessenger32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/server_24x24.png b/retroshare-gui/src/gui/images/server_24x24.png deleted file mode 100644 index fa4091150..000000000 Binary files a/retroshare-gui/src/gui/images/server_24x24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/settings16.png b/retroshare-gui/src/gui/images/settings16.png deleted file mode 100644 index 5f31eb45a..000000000 Binary files a/retroshare-gui/src/gui/images/settings16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/tags/anon.png b/retroshare-gui/src/gui/images/tags/anon.png deleted file mode 100644 index eb90d1174..000000000 Binary files a/retroshare-gui/src/gui/images/tags/anon.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/toaster/chat.png b/retroshare-gui/src/gui/images/toaster/chat.png deleted file mode 100644 index 1dd453348..000000000 Binary files a/retroshare-gui/src/gui/images/toaster/chat.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/toaster/hangup.png b/retroshare-gui/src/gui/images/toaster/hangup.png deleted file mode 100644 index 2febc25be..000000000 Binary files a/retroshare-gui/src/gui/images/toaster/hangup.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/toaster/pickup.png b/retroshare-gui/src/gui/images/toaster/pickup.png deleted file mode 100644 index 9da541978..000000000 Binary files a/retroshare-gui/src/gui/images/toaster/pickup.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/transfers_new.png b/retroshare-gui/src/gui/images/transfers_new.png deleted file mode 100644 index 81e95b743..000000000 Binary files a/retroshare-gui/src/gui/images/transfers_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/trustsettings.png b/retroshare-gui/src/gui/images/trustsettings.png deleted file mode 100644 index e7386a10c..000000000 Binary files a/retroshare-gui/src/gui/images/trustsettings.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/turtle.png b/retroshare-gui/src/gui/images/turtle.png deleted file mode 100644 index 84ece2205..000000000 Binary files a/retroshare-gui/src/gui/images/turtle.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/typing.png b/retroshare-gui/src/gui/images/typing.png deleted file mode 100644 index 28580e9a6..000000000 Binary files a/retroshare-gui/src/gui/images/typing.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/update.png b/retroshare-gui/src/gui/images/update.png new file mode 100644 index 000000000..cdbd86b4b Binary files /dev/null and b/retroshare-gui/src/gui/images/update.png differ diff --git a/retroshare-gui/src/gui/images/view-certificate-copy-32.png b/retroshare-gui/src/gui/images/view-certificate-copy-32.png deleted file mode 100644 index c5bea2449..000000000 Binary files a/retroshare-gui/src/gui/images/view-certificate-copy-32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/view-certificate-export-32.png b/retroshare-gui/src/gui/images/view-certificate-export-32.png deleted file mode 100644 index f4075b9d6..000000000 Binary files a/retroshare-gui/src/gui/images/view-certificate-export-32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/view-certificate-sign-32.png b/retroshare-gui/src/gui/images/view-certificate-sign-32.png deleted file mode 100644 index 1ea763f14..000000000 Binary files a/retroshare-gui/src/gui/images/view-certificate-sign-32.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/view-certificate-sign-48.png b/retroshare-gui/src/gui/images/view-certificate-sign-48.png deleted file mode 100644 index 012e8aea8..000000000 Binary files a/retroshare-gui/src/gui/images/view-certificate-sign-48.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/vote_down.png b/retroshare-gui/src/gui/images/vote_down.png deleted file mode 100644 index 369abdbda..000000000 Binary files a/retroshare-gui/src/gui/images/vote_down.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/vote_neutral.png b/retroshare-gui/src/gui/images/vote_neutral.png deleted file mode 100644 index a68a43d75..000000000 Binary files a/retroshare-gui/src/gui/images/vote_neutral.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/vote_up.png b/retroshare-gui/src/gui/images/vote_up.png deleted file mode 100644 index 9148aee7c..000000000 Binary files a/retroshare-gui/src/gui/images/vote_up.png and /dev/null differ diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 441b02bbc..2d794a8c7 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -173,7 +173,7 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in { case COLUMN_THREAD_STAR: return QIcon(IMAGE_STAR_ON); case COLUMN_THREAD_READ: return QIcon(":/images/message-state-header.png"); - case COLUMN_THREAD_ATTACHMENT: return QIcon(":/images/attachment.png"); + case COLUMN_THREAD_ATTACHMENT: return QIcon(":/icons/png/attachements.png"); default: return QVariant(); } diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index eca3c6c55..cf5c6a2b5 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -37,7 +37,7 @@ #include -#define IMAGE_EXPORT ":/images/exportpeers_16x16.png" +#define IMAGE_EXPORT "" #define COLUMN_NAME 0 #define COLUMN_EMAIL 1 diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 3e9a063cf..b1ced689a 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -270,39 +270,6 @@ PluginItem > QFrame#frame { } */ -/* SearchDialog */ - -SearchDialog QFrame#searchLineFrame[valid=false] { - border: 2px solid #079E00; - background-color: #DBDBDB; -} - -SearchDialog QFrame#searchLineFrame[valid=true] { - border: 2px solid #079E00; - background-color: white; -} - -SearchDialog QPushButton#pushButtonSearch { - border-image: url(:/images/btn1.png) 4; - border-width: 4; - padding: 0px 6px; - font-size: 12px; - color: black; -} - -SearchDialog QPushButton#pushButtonSearch:hover { - border-image: url(:/images/btn2.png) 4; -} - -SearchDialog QPushButton#pushButtonSearch:pressed { - border-image: url(:/images/btn3.png) 4; -} - -SearchDialog QFrame#searchLineFrame > QLineEdit { - background: transparent; - border: none; -} - /* GetStartedDialog */ GetStartedDialog QTextEdit { @@ -813,6 +780,11 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button { } +GxsGroupDialog QLabel#groupLogo{ + border: 2px solid #CCCCCC; + border-radius: 3px; +} + PostedItem QFrame#frame_notes { background: white; } @@ -880,12 +852,12 @@ PostedCreatePostDialog QPushButton#submitButton { border-radius: 4px; max-height: 27px; min-width: 4em; - padding: 2px; + padding: 2px; } PostedCreatePostDialog QPushButton#submitButton:hover { background: #03b1f3; border-radius: 4px; min-width: 4em; - padding: 2px; -} \ No newline at end of file + padding: 2px; +} diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index a17aa57d4..d28909220 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -38,8 +38,8 @@ #include #define VARIANT_STANDARD "Standard" -#define IMAGE_CHAT_CREATE ":/images/add_24x24.png" -#define IMAGE_CHAT_OPEN ":/images/typing.png" +#define IMAGE_CHAT_CREATE ":/icons/png/add.png" +#define IMAGE_CHAT_OPEN ":/icons/png/typing.png" #define IMAGE_CHAT_DELETE ":/images/deletemail24.png" #define IMAGE_CHAT_COPY ":/images/copyrslink.png" diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp index 72f4b0eaf..e6e5f67e3 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp @@ -60,7 +60,7 @@ FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WindowFlags fla QVBoxLayout* pageLay = new QVBoxLayout(this); toolBar = new QToolBar("actions", this); - newAction = new QAction(QIcon(":/images/add_24x24.png"), tr("&New"), this); + newAction = new QAction(QIcon(":/icons/png/add.png"), tr("&New"), this); //newAction->setShortcut(tr("Ctrl+N")); newAction->setStatusTip(tr("Add new Association")); connect(newAction, SIGNAL(triggered()), this, SLOT(addnew())); diff --git a/retroshare-gui/src/gui/style/StyleDialog.cpp b/retroshare-gui/src/gui/style/StyleDialog.cpp index 8ccae9edc..31e33c730 100644 --- a/retroshare-gui/src/gui/style/StyleDialog.cpp +++ b/retroshare-gui/src/gui/style/StyleDialog.cpp @@ -32,7 +32,7 @@ StyleDialog::StyleDialog(RSStyle &style, QWidget *parent) /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - ui.headerFrame->setHeaderImage(QPixmap(":/images/library.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png")); ui.headerFrame->setHeaderText(tr("Define Style")); /* Load window postion */ diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 9a16582e3..2238b4962 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -49,19 +49,15 @@ /* Images for toolbar icons */ #define IMAGE_RETROSHARE ":/images/RetroShare16.png" #define IMAGE_ABOUT ":/images/informations_24x24.png" -#define IMAGE_STATISTIC ":/images/ksysguard32.png" #define IMAGE_GAMES ":/images/kgames.png" #define IMAGE_PHOTO ":/images/lphoto.png" #define IMAGE_BWGRAPH ":/images/ksysguard.png" #define IMAGE_CLOSE ":/images/close_normal.png" #define IMAGE_CALENDAR ":/images/calendar.png" -#define IMAGE_LIBRARY ":/images/library.png" +#define IMAGE_LIBRARY ":/icons/collections.png" #define IMAGE_PLUGINS ":/images/extension_32.png" -#define IMAGE_GXSFORUMS ":/images/konversation.png" #define IMAGE_WIKI ":/images/wikibook_32.png" #define IMAGE_POSTED ":/images/posted_32.png" -#define IMAGE_GXSCHANNELS ":/images/channels.png" -#define IMAGE_IDENTITY ":/images/identity/identities_32.png" #define IMAGE_CIRCLES ":/images/user/agt_forum24.png" @@ -94,7 +90,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) #if 0 IdDialog *idDialog = NULL; ui.stackPages->add(idDialog = new IdDialog(ui.stackPages), - action = createPageAction(QIcon(IMAGE_IDENTITY), tr("Identities"), grp)); + action = createPageAction(QIcon(), tr("Identities"), grp)); #ifdef RS_USE_CIRCLES CirclesDialog *circlesDialog = NULL; @@ -121,17 +117,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages), action = createPageAction(QIcon(IMAGE_WIKI), tr("Wiki Pages"), grp)); mNotify.push_back(QPair(wikiDialog, action));*/ -#if 0 - GxsForumsDialog *gxsforumsDialog = NULL; - ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages), - action = createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp)); - mNotify.push_back(QPair(gxsforumsDialog, action)); - - ChannelDialog *gxschannelDialog = NULL; - ui.stackPages->add(gxschannelDialog = new ChannelDialog(ui.stackPages), - action = createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("GxsChannels"), grp)); - gxschannelDialog->setup(); -#endif // THESE HAVE TO BE CONVERTED TO VEG FORMAT #if USE_VEG_SERVICE diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp index 1cef2f28b..e263f75e9 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp @@ -41,7 +41,6 @@ /* Images for context menu icons */ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" -#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ #define IMAGE_ONLINE ":/images/im-user.png" @@ -93,7 +92,7 @@ void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point ) QMenu contextMnu( this ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - voteupAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Vote Up" ), this ); + voteupAct = new QAction(QIcon(), tr( "Vote Up" ), this ); connect( voteupAct , SIGNAL( triggered() ), this, SLOT( voteup() ) ); votedownAct = new QAction(QIcon(IMAGE_REMOVEFRIEND), tr( "Vote Down" ), this ); diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp index 7673d5c7e..9b9aee3a6 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp @@ -53,7 +53,6 @@ const uint32_t GAME_PEER_ID = 4; /* Images for context menu icons */ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" -#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ #define IMAGE_ONLINE ":/images/im-user.png" @@ -327,7 +326,7 @@ void GamesDialog::gameListPopupMenu( QPoint point ) QMenu contextMnu( this ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - QAction *deleteAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Cancel Game" ), this ); + QAction *deleteAct = new QAction(QIcon(), tr( "Cancel Game" ), this ); connect( deleteAct , SIGNAL( triggered() ), this, SLOT( deleteGame() ) ); contextMnu.clear(); diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp index 409073aba..ee4256d5e 100644 --- a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp @@ -45,11 +45,9 @@ #define IMAGE_DOWNLOAD ":/images/download16.png" #define IMAGE_PLAY ":/images/start.png" #define IMAGE_HASH_BUSY ":/images/settings.png" -#define IMAGE_HASH_DONE ":/images/friendsfolder24.png" #define IMAGE_MSG ":/images/message-mail.png" -#define IMAGE_ATTACHMENT ":/images/attachment.png" +#define IMAGE_ATTACHMENT ":/icons/png/attachements.png" #define IMAGE_FRIEND ":/images/peers_16x16.png" -#define IMAGE_PROGRESS ":/images/browse-looking.gif" #define IMAGE_LIBRARY ":/images/library.png" diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index 65c644a5d..f266a738c 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -42,12 +42,11 @@ /* Images for context menu icons */ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" -#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_REMOVE ":/images/cancel.png" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ #define IMAGE_PEER ":/images/user/identity16.png" -#define IMAGE_PHOTOS ":/images/image16.png" +#define IMAGE_PHOTOS ":/icons/png/photo.png" #define PHOTO_ICON_SIZE 90 @@ -135,7 +134,7 @@ void PhotoDialog::peerTreeWidgetCustomPopupMenu( QPoint point ) QMenu contextMnu( this ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - QAction *ins = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Insert Show Lists" ), this ); + QAction *ins = new QAction(QIcon(), tr( "Insert Show Lists" ), this ); connect( ins , SIGNAL( triggered() ), this, SLOT( insertShowLists() ) ); contextMnu.clear(); diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index df6b2ec1f..f0a901e39 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1164,10 +1164,8 @@ gxsphotoshare { gui/PhotoShare/PhotoShareItemHolder.h \ gui/PhotoShare/PhotoShare.h \ gui/PhotoShare/PhotoSlideShow.h \ - gui/PhotoShare/PhotoDialog.h \ - gui/PhotoShare/PhotoCommentItem.h \ - gui/PhotoShare/AddCommentDialog.h - + gui/PhotoShare/PhotoDialog.h + FORMS += \ gui/PhotoShare/AlbumExtra.ui \ gui/PhotoShare/PhotoItem.ui \ @@ -1176,10 +1174,8 @@ gxsphotoshare { gui/PhotoShare/AlbumDialog.ui \ gui/PhotoShare/AlbumCreateDialog.ui \ gui/PhotoShare/PhotoShare.ui \ - gui/PhotoShare/PhotoSlideShow.ui \ - gui/PhotoShare/PhotoCommentItem.ui \ - gui/PhotoShare/AddCommentDialog.ui - + gui/PhotoShare/PhotoSlideShow.ui + SOURCES += \ gui/PhotoShare/AlbumGroupDialog.cpp \ gui/PhotoShare/AlbumExtra.cpp \ @@ -1191,10 +1187,8 @@ gxsphotoshare { gui/PhotoShare/AlbumCreateDialog.cpp \ gui/PhotoShare/PhotoShareItemHolder.cpp \ gui/PhotoShare/PhotoShare.cpp \ - gui/PhotoShare/PhotoSlideShow.cpp \ - gui/PhotoShare/PhotoCommentItem.cpp \ - gui/PhotoShare/AddCommentDialog.cpp - + gui/PhotoShare/PhotoSlideShow.cpp + RESOURCES += gui/PhotoShare/Photo_images.qrc } diff --git a/retroshare-gui/src/util/ClickableLabel.h b/retroshare-gui/src/util/ClickableLabel.h index ec1c66b8d..520608668 100644 --- a/retroshare-gui/src/util/ClickableLabel.h +++ b/retroshare-gui/src/util/ClickableLabel.h @@ -38,7 +38,7 @@ signals: protected: void mousePressEvent(QMouseEvent* event); - void enterEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 1px solid #3A3939; }");} + void enterEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 2px solid #039bd5; }");} void leaveEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");}