diff --git a/libretroshare/src/gxstunnel/p3gxstunnel.cc b/libretroshare/src/gxstunnel/p3gxstunnel.cc index 08ca943a6..543817ffc 100644 --- a/libretroshare/src/gxstunnel/p3gxstunnel.cc +++ b/libretroshare/src/gxstunnel/p3gxstunnel.cc @@ -113,8 +113,6 @@ int p3GxsTunnelService::tick() flush() ; - rstime::rs_usleep(1000*500); - return 0 ; } diff --git a/libretroshare/src/retroshare/rsgxscommon.h b/libretroshare/src/retroshare/rsgxscommon.h index 96253448e..cf71e0b95 100644 --- a/libretroshare/src/retroshare/rsgxscommon.h +++ b/libretroshare/src/retroshare/rsgxscommon.h @@ -43,6 +43,13 @@ struct RsGxsFile : RsSerializable RS_SERIAL_PROCESS(mHash); RS_SERIAL_PROCESS(mSize); } + + void clear() + { + mName.clear(); + mHash.clear(); + mSize = 0; + } }; struct RsGxsImage : RsSerializable diff --git a/libretroshare/src/retroshare/rsphoto.h b/libretroshare/src/retroshare/rsphoto.h index 9c41e5377..8109164a7 100644 --- a/libretroshare/src/retroshare/rsphoto.h +++ b/libretroshare/src/retroshare/rsphoto.h @@ -34,110 +34,57 @@ class RsPhoto; extern RsPhoto *rsPhoto; -/******************* NEW STUFF FOR NEW CACHE SYSTEM *********/ - -#define RSPHOTO_MODE_NEW 1 -#define RSPHOTO_MODE_OWN 2 -#define RSPHOTO_MODE_REMOTE 3 - -/* If these flags are no set - the Photo inherits values from the Album - */ - -#define RSPHOTO_FLAGS_ATTRIB_TITLE 0x0001 -#define RSPHOTO_FLAGS_ATTRIB_CAPTION 0x0002 -#define RSPHOTO_FLAGS_ATTRIB_DESC 0x0004 -#define RSPHOTO_FLAGS_ATTRIB_PHOTOGRAPHER 0x0008 -#define RSPHOTO_FLAGS_ATTRIB_WHERE 0x0010 -#define RSPHOTO_FLAGS_ATTRIB_WHEN 0x0020 -#define RSPHOTO_FLAGS_ATTRIB_OTHER 0x0040 -#define RSPHOTO_FLAGS_ATTRIB_CATEGORY 0x0080 -#define RSPHOTO_FLAGS_ATTRIB_HASHTAGS 0x0100 -#define RSPHOTO_FLAGS_ATTRIB_ORDER 0x0200 -#define RSPHOTO_FLAGS_ATTRIB_THUMBNAIL 0x0400 -#define RSPHOTO_FLAGS_ATTRIB_MODE 0x0800 -#define RSPHOTO_FLAGS_ATTRIB_AUTHOR 0x1000 // PUSH UP ORDER -#define RSPHOTO_FLAGS_ATTRIB_PHOTO 0x2000 // PUSH UP ORDER. - class RsPhotoPhoto { - public: +public: - RsMsgMetaData mMeta; + RsMsgMetaData mMeta; - RsPhotoPhoto(); + RsPhotoPhoto(); - // THESE ARE IN THE META DATA. - //std::string mAlbumId; - //std::string mId; - //std::string mTitle; // only used by Album. - std::string mCaption; - std::string mDescription; - std::string mPhotographer; - std::string mWhere; - std::string mWhen; - std::string mOther; - std::string mCategory; + // V2 PhotoMsg - keep it simple. + // mMeta.mTitle used for Photo Caption. + // mDescription optional field for addtional notes. + // mLowResImage - < 50k jpg of image. + // mPhotoFile - transfer details for original photo. + std::string mDescription; + uint32_t mOrder; + RsGxsImage mLowResImage; + RsGxsFile mPhotoFile; - std::string mHashTags; - - uint32_t mSetFlags; - - int mOrder; - - RsGxsImage mThumbnail; - - int mMode; - - // These are not saved. - std::string path; // if in Mode NEW. - uint32_t mModFlags; + // These are not saved. + std::string mPath; // if New photo }; -class RsPhotoAlbumShare -{ - public: - - uint32_t mShareType; - std::string mShareGroupId; - std::string mPublishKey; - uint32_t mCommentMode; - uint32_t mResizeMode; -}; +#define RSPHOTO_SHAREMODE_LOWRESONLY (1) +#define RSPHOTO_SHAREMODE_ORIGINAL (2) +#define RSPHOTO_SHAREMODE_DUP_ORIGINAL (3) +#define RSPHOTO_SHAREMODE_DUP_200K (4) +#define RSPHOTO_SHAREMODE_DUP_1M (5) class RsPhotoAlbum { - public: - RsPhotoAlbum(); +public: + RsPhotoAlbum(); - RsGroupMetaData mMeta; + RsGroupMetaData mMeta; - // THESE ARE IN THE META DATA. - //std::string mAlbumId; - //std::string mTitle; // only used by Album. + // V2 Album - keep it simple. + // mMeta.mTitle. + uint32_t mShareMode; - std::string mCaption; - std::string mDescription; - std::string mPhotographer; - std::string mWhere; - std::string mWhen; - std::string mOther; - std::string mCategory; + std::string mCaption; + std::string mDescription; + std::string mPhotographer; + std::string mWhere; + std::string mWhen; - std::string mHashTags; + RsGxsImage mThumbnail; - RsGxsImage mThumbnail; - - int mMode; - - std::string mPhotoPath; - RsPhotoAlbumShare mShareOptions; - - // These aren't saved. - uint32_t mSetFlags; - uint32_t mModFlags; + // Below is not saved. + bool mAutoDownload; }; - std::ostream &operator<<(std::ostream &out, const RsPhotoPhoto &photo); std::ostream &operator<<(std::ostream &out, const RsPhotoAlbum &album); @@ -145,14 +92,7 @@ typedef std::map > PhotoResult; class RsPhoto: public RsGxsIfaceHelper, public RsGxsCommentService { - public: - - static const uint32_t FLAG_MSG_TYPE_PHOTO_POST; - static const uint32_t FLAG_MSG_TYPE_PHOTO_COMMENT; - static const uint32_t FLAG_MSG_TYPE_MASK; - - explicit RsPhoto(RsGxsIface &gxs) : RsGxsIfaceHelper(gxs) { return; } virtual ~RsPhoto() { return; } diff --git a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc index 97b972cf1..ca21804af 100644 --- a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc +++ b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc @@ -642,14 +642,10 @@ void upnphandler::setExternalPort(unsigned short eport_in) dataMtx.unlock(); /*** UNLOCK MUTEX ***/ } - /* as determined by uPnP */ -bool upnphandler::getInternalAddress(struct sockaddr_storage &addr) +/* as determined by uPnP */ +bool upnphandler::getInternalAddress(struct sockaddr_storage &addr) { -// std::cerr << "UPnPHandler::getInternalAddress() pre Lock!" << std::endl; - dataMtx.lock(); /*** LOCK MUTEX ***/ -// std::cerr << "UPnPHandler::getInternalAddress() postLock!" << std::endl; - - std::cerr << "UPnPHandler::getInternalAddress()" << std::endl; + RS_STACK_MUTEX(dataMtx); // copy to universal addr. sockaddr_storage_clear(addr); @@ -657,18 +653,15 @@ bool upnphandler::getInternalAddress(struct sockaddr_storage &addr) bool valid = (upnpState >= RS_UPNP_S_ACTIVE); - dataMtx.unlock(); /*** UNLOCK MUTEX ***/ + Dbg2() << __PRETTY_FUNCTION__ << " valid: " << valid + << " addr: " << addr << std::endl; return valid; } -bool upnphandler::getExternalAddress(struct sockaddr_storage &addr) +bool upnphandler::getExternalAddress(sockaddr_storage &addr) { -// std::cerr << "UPnPHandler::getExternalAddress() pre Lock!" << std::endl; - dataMtx.lock(); /*** LOCK MUTEX ***/ -// std::cerr << "UPnPHandler::getExternalAddress() postLock!" << std::endl; - - std::cerr << "UPnPHandler::getExternalAddress()" << std::endl; + RS_STACK_MUTEX(dataMtx); // copy to universal addr. sockaddr_storage_clear(addr); @@ -676,7 +669,8 @@ bool upnphandler::getExternalAddress(struct sockaddr_storage &addr) bool valid = (upnpState == RS_UPNP_S_ACTIVE); - dataMtx.unlock(); /*** UNLOCK MUTEX ***/ + Dbg2() << __PRETTY_FUNCTION__ << " valid: " << valid + << " addr: " << addr << std::endl; return valid; } diff --git a/libretroshare/src/rs_upnp/upnphandler_miniupnp.h b/libretroshare/src/rs_upnp/upnphandler_miniupnp.h index d07304724..9449661e0 100644 --- a/libretroshare/src/rs_upnp/upnphandler_miniupnp.h +++ b/libretroshare/src/rs_upnp/upnphandler_miniupnp.h @@ -28,7 +28,7 @@ /* platform independent networking... */ #include "pqi/pqinetwork.h" #include "pqi/pqiassist.h" - +#include "util/rsdebug.h" #include "util/rsthreads.h" class upnpentry @@ -97,7 +97,7 @@ bool shutdown_upnp(); bool initUPnPState(); bool printUPnPState(); - private: +private: bool background_setup_upnp(bool, bool); bool checkUPnPActive(); @@ -123,4 +123,5 @@ bool checkUPnPActive(); /* active port forwarding */ std::list activeForwards; + RS_SET_CONTEXT_DEBUG_LEVEL(1) }; diff --git a/libretroshare/src/rsitems/rsphotoitems.cc b/libretroshare/src/rsitems/rsphotoitems.cc index 77a920fd6..f9200a83c 100644 --- a/libretroshare/src/rsitems/rsphotoitems.cc +++ b/libretroshare/src/rsitems/rsphotoitems.cc @@ -42,55 +42,44 @@ RsItem *RsGxsPhotoSerialiser::create_item(uint16_t service, uint8_t item_sub_id) void RsGxsPhotoAlbumItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { + RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_UINT32_PARAM,album.mShareMode,"mShareMode"); RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_CAPTION, album.mCaption, "mCaption"); - RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_CATEGORY, album.mCategory, "mCategory"); RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DESCR, album.mDescription, "mDescription"); - RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_HASH_TAG, album.mHashTags, "mHashTags"); - RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_MSG, album.mOther, "mOther"); - RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_PATH, album.mPhotoPath, "mPhotoPath"); RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_NAME, album.mPhotographer, "mPhotographer"); - RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DATE, album.mWhen, "mWhen"); RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_LOCATION, album.mWhere, "mWhere"); + RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DATE, album.mWhen, "mWhen"); album.mThumbnail.serial_process(j, ctx); } void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) { - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_CAPTION, photo.mCaption, "mCaption"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_CATEGORY, photo.mCategory, "mCategory"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_DESCR, photo.mDescription, "mDescription"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_HASH_TAG, photo.mHashTags, "mHashTags"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_MSG, photo.mOther, "mOther"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_PIC_AUTH, photo.mPhotographer, "mPhotographer"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_DATE, photo.mWhen, "mWhen"); - RsTypeSerializer::serial_process(j, ctx, TLV_TYPE_STR_LOCATION, photo.mWhere, "mWhere"); - - photo.mThumbnail.serial_process(j, ctx); + RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DESCR, photo.mDescription, "mDescription"); + RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_UINT32_PARAM,photo.mOrder,"mOrder"); + photo.mLowResImage.serial_process(j, ctx); + photo.mPhotoFile.serial_process(j, ctx); } void RsGxsPhotoAlbumItem::clear() { + album.mShareMode = RSPHOTO_SHAREMODE_LOWRESONLY; album.mCaption.clear(); - album.mCategory.clear(); album.mDescription.clear(); - album.mHashTags.clear(); - album.mOther.clear(); - album.mPhotoPath.clear(); album.mPhotographer.clear(); - album.mWhen.clear(); album.mWhere.clear(); + album.mWhen.clear(); album.mThumbnail.clear(); + + // not saved + album.mAutoDownload = false; } void RsGxsPhotoPhotoItem::clear() { - photo.mCaption.clear(); - photo.mCategory.clear(); photo.mDescription.clear(); - photo.mHashTags.clear(); - photo.mOther.clear(); - photo.mPhotographer.clear(); - photo.mWhen.clear(); - photo.mWhere.clear(); - photo.mThumbnail.clear(); + photo.mOrder = 0; + photo.mLowResImage.clear(); + photo.mPhotoFile.clear(); + + // not saved + photo.mPath.clear(); } diff --git a/libretroshare/src/services/p3photoservice.cc b/libretroshare/src/services/p3photoservice.cc index 7a0e3bd9c..469fee65e 100644 --- a/libretroshare/src/services/p3photoservice.cc +++ b/libretroshare/src/services/p3photoservice.cc @@ -25,19 +25,14 @@ RsPhoto *rsPhoto = NULL; - -const uint32_t RsPhoto::FLAG_MSG_TYPE_MASK = 0x000f; -const uint32_t RsPhoto::FLAG_MSG_TYPE_PHOTO_POST = 0x0001; -const uint32_t RsPhoto::FLAG_MSG_TYPE_PHOTO_COMMENT = 0x0002; - RsPhotoPhoto::RsPhotoPhoto() - :mSetFlags(0), mOrder(0), mMode(0), mModFlags(0) + :mOrder(0) { return; } RsPhotoAlbum::RsPhotoAlbum() - :mMode(0), mSetFlags(0), mModFlags(0) + :mShareMode(RSPHOTO_SHAREMODE_LOWRESONLY), mAutoDownload(false) { return; } diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index af5323d1d..22c9c2021 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -74,7 +74,6 @@ #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" /*define viewType_CB value */ #define VIEW_TYPE_TREE 0 @@ -228,7 +227,7 @@ SharedFilesDialog::SharedFilesDialog(RetroshareDirModel *_tree_model,RetroshareD sendlinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Send retroshare Links" ), this ); connect( sendlinkAct , SIGNAL( triggered() ), this, SLOT( sendLinkTo( ) ) ); - removeExtraFileAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Stop sharing this file" ), this ); + removeExtraFileAct = new QAction(QIcon(), tr( "Stop sharing this file" ), this ); connect( removeExtraFileAct , SIGNAL( triggered() ), this, SLOT( removeExtraFile() ) ); collCreateAct= new QAction(QIcon(IMAGE_COLLCREATE), tr("Create Collection..."), this) ; diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 75d1dde7c..02819a6b1 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -2119,7 +2119,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) { if(own_identities.size() <= 1) { - QAction *action = contextMenu->addAction(QIcon(":/images/chat_24.png"), tr("Chat with this person"), this, SLOT(chatIdentity())); + QAction *action = contextMenu->addAction(QIcon(":/icons/png/chats.png"), tr("Chat with this person"), this, SLOT(chatIdentity())); if(own_identities.empty()) action->setEnabled(false) ; @@ -2128,7 +2128,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) } else { - QMenu *mnu = contextMenu->addMenu(QIcon(":/images/chat_24.png"),tr("Chat with this person as...")) ; + QMenu *mnu = contextMenu->addMenu(QIcon(":/icons/png/chats.png"),tr("Chat with this person as...")) ; for(std::list::const_iterator it=own_identities.begin();it!=own_identities.end();++it) { @@ -2145,18 +2145,17 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) } } } - - if (n_selected_items==1) - contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ; - // always allow to send messages - contextMenu->addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMsg())); + contextMenu->addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMsg())); contextMenu->addSeparator(); if(n_is_a_contact == 0) contextMenu->addAction(QIcon(), tr("Add to Contacts"), this, SLOT(addtoContacts())); + if (n_selected_items==1) + contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ; + if(n_is_not_a_contact == 0) contextMenu->addAction(QIcon(":/images/cancel.png"), tr("Remove from Contacts"), this, SLOT(removefromContacts())); @@ -2176,7 +2175,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) { contextMenu->addSeparator(); - contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ; + contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ; contextMenu->addAction(ui->editIdentity); contextMenu->addAction(ui->removeIdentity); } diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 06943cdb4..d66421243 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -142,8 +142,6 @@ #define IMAGE_BWGRAPH ":/icons/png/bandwidth.png" #define IMAGE_MESSENGER ":/images/rsmessenger48.png" #define IMAGE_COLOR ":/images/highlight.png" -#define IMAGE_GAMES ":/images/kgames.png" -#define IMAGE_PHOTO ":/images/lphoto.png" #define IMAGE_NEWRSCOLLECTION ":/images/library.png" #define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png" #define IMAGE_OPTIONS ":/images/settings.png" diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index dd29dec14..5dc999740 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -48,11 +48,9 @@ /* Images for context menu icons */ #define IMAGE_PEERDETAILS ":/images/info16.png" -#define IMAGE_CLEAN_UNUSED ":/images/deletemail24.png" #define IMAGE_MAKEFRIEND ":/images/user/add_user16.png" -#define IMAGE_EXPORT "" #define IMAGE_COPYLINK ":/images/copyrslink.png" -#define IMAGE_MESSAGE ":/images/mail_new.png" +#define IMAGE_MESSAGE ":/icons/mail/write-mail.png" /****** * #define NET_DEBUG 1 @@ -130,11 +128,11 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ ) return ; if(peer_id == rsPeers->getGPGOwnId()) - contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated())); + contextMnu->addAction(QIcon(), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated())); contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Profile details..."), this, SLOT(peerdetails())); contextMnu->addSeparator() ; - contextMnu->addAction(QIcon(IMAGE_CLEAN_UNUSED), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys())); + contextMnu->addAction(QIcon(), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys())); contextMnu->exec(QCursor::pos()); } diff --git a/retroshare-gui/src/gui/People/IdentityItem.cpp b/retroshare-gui/src/gui/People/IdentityItem.cpp index 8ae3406c0..e1096d726 100644 --- a/retroshare-gui/src/gui/People/IdentityItem.cpp +++ b/retroshare-gui/src/gui/People/IdentityItem.cpp @@ -14,7 +14,7 @@ #include "IdentityItem.h" #define IMAGE_MAKEFRIEND ":/images/user/add_user16.png" -#define IMAGE_CHAT ":/images/chat_24.png" +#define IMAGE_CHAT ":/icons/png/chats.png" IdentityItem *IdentityItem::_selected_node = NULL ; diff --git a/retroshare-gui/src/gui/People/PeopleDialog.cpp b/retroshare-gui/src/gui/People/PeopleDialog.cpp index ca7075c00..b90b2cfe9 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.cpp +++ b/retroshare-gui/src/gui/People/PeopleDialog.cpp @@ -458,7 +458,7 @@ void PeopleDialog::iw_AddButtonClickedExt() } else { - QMenu *mnu = contextMnu.addMenu(QIcon(":/images/chat_24.png"),tr("Chat with this person as...")) ; + QMenu *mnu = contextMnu.addMenu(QIcon(":/icons/png/chats.png"),tr("Chat with this person as...")) ; for(std::list::const_iterator it=own_identities.begin();it!=own_identities.end();++it) { @@ -475,15 +475,15 @@ void PeopleDialog::iw_AddButtonClickedExt() } } - QAction *actionsendmsg = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMessage())); + QAction *actionsendmsg = contextMnu.addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMessage())); actionsendmsg->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); - QAction *actionsendinvite = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send invite"), this, SLOT(sendInvite())); + QAction *actionsendinvite = contextMnu.addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send invite"), this, SLOT(sendInvite())); actionsendinvite->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); contextMnu.addSeparator(); - QAction *actionaddcontact = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Add to Contacts"), this, SLOT(addtoContacts())); + QAction *actionaddcontact = contextMnu.addAction(QIcon(""), tr("Add to Contacts"), this, SLOT(addtoContacts())); actionaddcontact->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString())); contextMnu.addSeparator(); diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp deleted file mode 100644 index 68c74e221..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.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 "AlbumCreateDialog.h" -#include "ui_AlbumCreateDialog.h" - -#include "util/misc.h" -#include "retroshare/rsgxsflags.h" - -AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo, QWidget *parent): - QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint), - ui(new Ui::AlbumCreateDialog), mPhotoQueue(photoQueue), mRsPhoto(rs_photo), mPhotoSelected(NULL) -{ - ui->setupUi(this); - - ui->headerFrame->setHeaderImage(QPixmap(":/images/album_create_64.png")); - ui->headerFrame->setHeaderText(tr("Create Album")); - - -#if QT_VERSION >= 0x040700 - ui->lineEdit_Title_2->setPlaceholderText(tr("Untitle Album")); - ui->lineEdit_Caption_2->setPlaceholderText(tr("Say something about this album...")); - //ui->textEdit_Description->setPlaceholderText(tr("Say something about this album...")) ; - ui->lineEdit_Where->setPlaceholderText(tr("Where were these taken?")); -#endif - - ui->backButton->hide(); - - connect(ui->publishButton, SIGNAL(clicked()), this, SLOT(publishAlbum())); - connect(ui->AlbumThumbNail, SIGNAL(clicked()), this, SLOT(addAlbumThumbnail())); - - connect(ui->addphotosButton, SIGNAL(clicked()),this, SLOT(changePage())); - connect(ui->backButton, SIGNAL(clicked()),this, SLOT(backPage())); - - - mPhotoDrop = ui->scrollAreaWidgetContents; - mPhotoDrop->setPhotoItemHolder(this); - - -} - -AlbumCreateDialog::~AlbumCreateDialog() -{ - delete ui; -} - -#define PUBLIC_INDEX 0 -#define RESTRICTED_INDEX 1 -#define PRIVATE_INDEX 2 - -void AlbumCreateDialog::publishAlbum() -{ - // get fields for album to publish, publish and then exit dialog - RsPhotoAlbum album; - - album.mCaption = ui->lineEdit_Caption_2->text().toStdString(); - album.mPhotographer = ui->lineEdit_Photographer->text().toStdString(); - album.mMeta.mGroupName = ui->lineEdit_Title_2->text().toStdString(); - album.mDescription = ui->textEdit_Description->toPlainText().toStdString(); - album.mWhere = ui->lineEdit_Where->text().toStdString(); - album.mPhotographer = ui->lineEdit_Photographer->text().toStdString(); - getAlbumThumbnail(album.mThumbnail); - - - int currIndex = ui->privacyComboBox->currentIndex(); - - switch(currIndex) - { - case PUBLIC_INDEX: - album.mMeta.mGroupFlags |= GXS_SERV::FLAG_PRIVACY_PUBLIC; - break; - case RESTRICTED_INDEX: - album.mMeta.mGroupFlags |= GXS_SERV::FLAG_PRIVACY_RESTRICTED; - break; - case PRIVATE_INDEX: - album.mMeta.mGroupFlags |= GXS_SERV::FLAG_PRIVACY_PRIVATE; - break; - } - - uint32_t token; - mRsPhoto->submitAlbumDetails(token, album); - mPhotoQueue->queueRequest(token, TOKENREQ_GROUPINFO, RS_TOKREQ_ANSTYPE_ACK, 0); - - publishPhotos(); - - close(); -} - -void AlbumCreateDialog::publishPhotos() -{ - // get fields for album to publish, publish and then exit dialog - RsPhotoAlbum album; - - QSet photos; - - mPhotoDrop->getPhotos(photos); - - QSetIterator sit(photos); - - while(sit.hasNext()) - { - PhotoItem* item = sit.next(); - uint32_t token; - RsPhotoPhoto photo = item->getPhotoDetails(); - photo.mMeta.mGroupId = album.mMeta.mGroupId; - mRsPhoto->submitPhoto(token, photo); - mPhotoQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, 0); - } - -} - -bool AlbumCreateDialog::getAlbumThumbnail(RsGxsImage &image) -{ - const QPixmap *tmppix = &mThumbNail; - - QByteArray ba; - QBuffer buffer(&ba); - - if(!tmppix->isNull()) - { - // send chan image - - buffer.open(QIODevice::WriteOnly); - tmppix->save(&buffer, "PNG"); // writes image into ba in PNG format - - image.copy((uint8_t *) ba.data(), ba.size()); - return true; - } - - image.clear(); - return false; -} - -void AlbumCreateDialog::addAlbumThumbnail() -{ - QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Album Thumbnail"), 128, 128); - - if (img.isNull()) - return; - - mThumbNail = img; - - // to show the selected - ui->AlbumThumbNail->setIcon(mThumbNail); -} - -void AlbumCreateDialog::changePage() -{ - int nextPage = ui->stackedWidget->currentIndex() + 1; - if (nextPage >= ui->stackedWidget->count()) - nextPage = 0; - ui->stackedWidget->setCurrentIndex(nextPage); - - ui->backButton->show(); - ui->addphotosButton->hide(); -} - -void AlbumCreateDialog::backPage() -{ - int nextPage = ui->stackedWidget->currentIndex() - 1; - if (nextPage >= ui->stackedWidget->count()) - nextPage = 0; - ui->stackedWidget->setCurrentIndex(nextPage); - - ui->backButton->hide(); - ui->addphotosButton->show(); -} - -void AlbumCreateDialog::notifySelection(PhotoShareItem *selection) -{ - - PhotoItem* pItem = dynamic_cast(selection); - - if(mPhotoSelected == NULL) - { - return; - } - else - { - mPhotoSelected->setSelected(false); - mPhotoSelected = pItem; - } - - mPhotoSelected->setSelected(true); -} diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.h b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.h deleted file mode 100644 index d136a374b..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.h +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.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 ALBUMCREATEDIALOG_H -#define ALBUMCREATEDIALOG_H - -#include -#include "util/TokenQueue.h" -#include "retroshare/rsphoto.h" -#include "retroshare/rsphoto.h" -#include "PhotoShareItemHolder.h" -#include "PhotoItem.h" -#include "PhotoDrop.h" - -namespace Ui { - class AlbumCreateDialog; -} - - -class AlbumCreateDialog : public QDialog, public PhotoShareItemHolder -{ - Q_OBJECT - -public: - explicit AlbumCreateDialog(TokenQueue* photoQueue, RsPhoto* rs_photo, QWidget *parent = 0); - ~AlbumCreateDialog(); - - void notifySelection(PhotoShareItem* selection); - - -private slots: - void publishAlbum(); - void publishPhotos(); - void addAlbumThumbnail(); - void changePage(); - void backPage(); - - -private: - - bool getAlbumThumbnail(RsGxsImage &image); -private: - Ui::AlbumCreateDialog *ui; - - TokenQueue* mPhotoQueue; - RsPhoto* mRsPhoto; - QPixmap mThumbNail; - PhotoDrop* mPhotoDrop; - PhotoItem* mPhotoSelected; -}; - - - -#endif // ALBUMCREATEDIALOG_H diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui deleted file mode 100644 index af5729fc9..000000000 --- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui +++ /dev/null @@ -1,539 +0,0 @@ - - - AlbumCreateDialog - - - - 0 - 0 - 643 - 550 - - - - Create Album - - - true - - - - 0 - - - 0 - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 0 - - - - - - - QFrame::NoFrame - - - - 0 - - - 6 - - - - - 3 - - - - - Album Name: - - - - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - -border: 2px solid white; -border-radius: 10px; - - - - - - - - :/images/album_64.png:/images/album_64.png - - - - 64 - 64 - - - - - - - - Category: - - - - - - - - Animals - - - - - Family - - - - - Friends - - - - - Flowers - - - - - Holiday - - - - - Landscapes - - - - - Pets - - - - - Portraits - - - - - Travel - - - - - Work - - - - - Random - - - - - - - - Caption: - - - - - - - - - - Where: - - - - - - - - - - Photographer: - - - - - - - - - - Description: - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - - - - - Qt::Horizontal - - - - - - - - 1 - 0 - - - - Share Options - - - - - - - - Policy: - - - - - - - Quality: - - - - - - - Comments: - - - - - - - Identity: - - - - - - - - - - - - 0 - 0 - - - - - Public - - - - - Restricted - - - - - - - - - 0 - 0 - - - - - Resize Images (< 1Mb) - - - - - Resize Images (< 10Mb) - - - - - Send Original Images - - - - - - - - - 0 - 0 - - - - - No Comments Allowed - - - - - Authenticated Comments - - - - - Any Comments Allowed - - - - - - - - - 0 - 0 - - - - - Publish with Identity - - - - - - - - - - Qt::Horizontal - - - - 168 - 20 - - - - - - - - - - - - - - - - - - - - <!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:400; 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; font-weight:600;"> Drag &amp; Drop to insert pictures. Click on a picture to edit details below.</span></p></body></html> - - - - - - - - 0 - 10 - - - - true - - - Qt::ScrollBarAsNeeded - - - true - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - 0 - 0 - 621 - 458 - - - - QWidget#scrollAreaWidgetContents{border: none;} - - - - - - - - - - - - - - - - 9 - - - - - Qt::Horizontal - - - - 419 - 18 - - - - - - - - QDialogButtonBox::Cancel - - - - - - - Back - - - - - - - Add Photos - - - - - - - Publish Album - - - - - - - - - - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - - PhotoDrop - QWidget -
gui/PhotoShare/PhotoDrop.h
- 1 - - - - - - - - - buttonBox - rejected() - AlbumCreateDialog - close() - - - 353 - 529 - - - 321 - 274 - - - - - diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp index 2115e5899..e163e7104 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp @@ -59,7 +59,6 @@ void AlbumDialog::setUp() { ui->lineEdit_Title->setText(QString::fromStdString(mAlbum.mMeta.mGroupName)); ui->lineEdit_Caption->setText(QString::fromStdString(mAlbum.mCaption)); - ui->lineEdit_Category->setText(QString::fromStdString(mAlbum.mCategory)); if (mAlbum.mThumbnail.mSize != 0) { @@ -121,7 +120,7 @@ void AlbumDialog::updateAlbumPhotos() // flag image as Deleted. // clear image. // clear file URL (todo) - photo.mThumbnail.clear(); + photo.mLowResImage.clear(); } break; } @@ -221,7 +220,6 @@ void AlbumDialog::loadPhotoData(const uint32_t &token) rsPhoto->getPhoto(token, res); PhotoResult::iterator mit = res.begin(); - for (; mit != res.end(); ++mit) { std::vector& photoV = mit->second; @@ -230,8 +228,7 @@ void AlbumDialog::loadPhotoData(const uint32_t &token) for (; vit != photoV.end(); ++vit) { RsPhotoPhoto& photo = *vit; - - if (!photo.mThumbnail.empty()) { + if (!photo.mLowResImage.empty()) { addPhoto(photo); } } @@ -287,5 +284,3 @@ void AlbumDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req) } /**************************** Request / Response Filling of Data ************************/ - - diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.cpp index c6ddf6e17..010e7ded2 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.cpp @@ -22,16 +22,16 @@ #include "ui_AlbumExtra.h" AlbumExtra::AlbumExtra(QWidget *parent) : - QWidget(NULL), - ui(new Ui::AlbumExtra) + QWidget(NULL), + ui(new Ui::AlbumExtra) { - ui->setupUi(this); - setUp(); + ui->setupUi(this); + setUp(); } AlbumExtra::~AlbumExtra() { - delete ui; + delete ui; } void AlbumExtra::setUp() @@ -39,3 +39,53 @@ void AlbumExtra::setUp() } +void AlbumExtra::setShareMode(uint32_t mode) +{ + ui->comboBox_shareMode->setCurrentIndex(mode); +} + +void AlbumExtra::setCaption(const std::string &str) +{ + ui->lineEdit_Caption->setText(QString::fromStdString(str)); +} + +void AlbumExtra::setPhotographer(const std::string &str) +{ + ui->lineEdit_Photographer->setText(QString::fromStdString(str)); +} + +void AlbumExtra::setWhere(const std::string &str) +{ + ui->lineEdit_Where->setText(QString::fromStdString(str)); +} + +void AlbumExtra::setWhen(const std::string &str) +{ + ui->lineEdit_When->setText(QString::fromStdString(str)); +} + +uint32_t AlbumExtra::getShareMode() +{ + return ui->comboBox_shareMode->currentIndex(); +} + +std::string AlbumExtra::getCaption() +{ + return ui->lineEdit_Caption->text().toStdString(); +} + +std::string AlbumExtra::getPhotographer() +{ + return ui->lineEdit_Photographer->text().toStdString(); +} + +std::string AlbumExtra::getWhere() +{ + return ui->lineEdit_Where->text().toStdString(); +} + +std::string AlbumExtra::getWhen() +{ + return ui->lineEdit_When->text().toStdString(); +} + diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.h b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.h index 1a932bcaa..bea24f4b3 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.h +++ b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.h @@ -24,21 +24,33 @@ #include namespace Ui { - class AlbumExtra; + class AlbumExtra; } class AlbumExtra : public QWidget { - Q_OBJECT + Q_OBJECT public: - explicit AlbumExtra(QWidget *parent = 0); - virtual ~AlbumExtra(); + explicit AlbumExtra(QWidget *parent = 0); + virtual ~AlbumExtra(); + + void setShareMode(uint32_t mode); + void setCaption(const std::string &str); + void setPhotographer(const std::string &str); + void setWhere(const std::string &str); + void setWhen(const std::string &str); + + uint32_t getShareMode(); + std::string getCaption(); + std::string getPhotographer(); + std::string getWhere(); + std::string getWhen(); private: - void setUp(); + void setUp(); private: - Ui::AlbumExtra *ui; + Ui::AlbumExtra *ui; }; #endif // ALBUMEXTRA_H diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.ui b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.ui index 09780a77a..23b0a462f 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumExtra.ui +++ b/retroshare-gui/src/gui/PhotoShare/AlbumExtra.ui @@ -6,8 +6,8 @@ 0 0 - 513 - 198 + 516 + 199 @@ -21,119 +21,73 @@ - - - Category: - - - - - - - - Animals - - - - - Family - - - - - Friends - - - - - Flowers - - - - - Holiday - - - - - Landscapes - - - - - Pets - - - - - Portraits - - - - - Travel - - - - - Work - - - - - Random - - - - - Quality: - - + + 0 0 + + + Embedded Only (<50Kb) + + + + + Share Original Images + + + + + Copy Original Images (extra disk space) + + + + + Resize Images (< 200Kb) + + Resize Images (< 1Mb) - - - Resize Images (< 10Mb) - - - - - Send Original Images - - - + Qt::Horizontal - + Caption: + + + + + + + Photographer: + + + - + @@ -146,14 +100,14 @@ - + - Photographer: + When: - + diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp index 33e6cc229..760a6586f 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp @@ -26,8 +26,8 @@ #include const uint32_t AlbumCreateEnabledFlags = ( - GXS_GROUP_FLAGS_NAME | - GXS_GROUP_FLAGS_ICON | + GXS_GROUP_FLAGS_NAME | + GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | GXS_GROUP_FLAGS_DISTRIBUTION | // GXS_GROUP_FLAGS_PUBLISHSIGN | @@ -37,21 +37,26 @@ const uint32_t AlbumCreateEnabledFlags = ( GXS_GROUP_FLAGS_EXTRA | 0); +// Album Requirements: +// - All Photos require Publish signature (PUBLISH THREADS). +// - Comments are in the threads - so these need Author signatures. +// - Author signature required for all groups. uint32_t AlbumCreateDefaultsFlags = ( GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC | //GXS_GROUP_DEFAULTS_DISTRIB_GROUP | //GXS_GROUP_DEFAULTS_DISTRIB_LOCAL | - GXS_GROUP_DEFAULTS_PUBLISH_OPEN | - //GXS_GROUP_DEFAULTS_PUBLISH_THREADS | + //GXS_GROUP_DEFAULTS_PUBLISH_OPEN | + GXS_GROUP_DEFAULTS_PUBLISH_THREADS | //GXS_GROUP_DEFAULTS_PUBLISH_REQUIRED | //GXS_GROUP_DEFAULTS_PUBLISH_ENCRYPTED | //GXS_GROUP_DEFAULTS_PERSONAL_GPG | - GXS_GROUP_DEFAULTS_PERSONAL_REQUIRED | - //GXS_GROUP_DEFAULTS_PERSONAL_IFNOPUB | + //GXS_GROUP_DEFAULTS_PERSONAL_REQUIRED | + GXS_GROUP_DEFAULTS_PERSONAL_IFNOPUB | + GXS_GROUP_DEFAULTS_PERSONAL_GROUP | - //GXS_GROUP_DEFAULTS_COMMENTS_YES | - GXS_GROUP_DEFAULTS_COMMENTS_NO | + GXS_GROUP_DEFAULTS_COMMENTS_YES | + //GXS_GROUP_DEFAULTS_COMMENTS_NO | 0); uint32_t AlbumEditEnabledFlags = AlbumCreateEnabledFlags; @@ -88,7 +93,8 @@ void AlbumGroupDialog::initUi() setUiText(UITYPE_CONTACTS_DOCK, tr("Select Album Admins")); // Inject Extra Widgets. - injectExtraWidget(new AlbumExtra(this)); + mAlbumExtra = new AlbumExtra(this); + injectExtraWidget(mAlbumExtra); } QPixmap AlbumGroupDialog::serviceImage() @@ -115,11 +121,12 @@ void AlbumGroupDialog::prepareAlbumGroup(RsPhotoAlbum &group, const RsGroupMetaD group.mThumbnail.clear(); } - // Additional Fields that we need to fill in. - group.mCaption = "Caption goes here"; - group.mPhotographer = "photographer"; - group.mWhere = "Where?"; - + // Additional Fields. + group.mShareMode = mAlbumExtra->getShareMode(); + group.mCaption = mAlbumExtra->getCaption(); + group.mPhotographer = mAlbumExtra->getPhotographer(); + group.mWhere = mAlbumExtra->getWhere(); + group.mWhen = mAlbumExtra->getWhen(); } bool AlbumGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) @@ -181,6 +188,12 @@ bool AlbumGroupDialog::service_loadGroup(uint32_t token, Mode /*mode*/, RsGroupM setLogo(QPixmap(":/images/album_create_64.png")); } - // NEED TO Load additional data.... + // Load additional data.... + mAlbumExtra->setShareMode(group.mShareMode); + mAlbumExtra->setCaption(group.mCaption); + mAlbumExtra->setPhotographer(group.mPhotographer); + mAlbumExtra->setWhere(group.mWhere); + mAlbumExtra->setWhen(group.mWhen); + return true; } diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.h b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.h index a06ce3461..565363f85 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.h +++ b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.h @@ -25,6 +25,8 @@ #include "gui/gxs/GxsGroupDialog.h" #include +#include "AlbumExtra.h" + class AlbumGroupDialog : public GxsGroupDialog { Q_OBJECT @@ -42,6 +44,7 @@ protected: private: void prepareAlbumGroup(RsPhotoAlbum &group, const RsGroupMetaData &meta); + AlbumExtra *mAlbumExtra; }; #endif diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp index 004c5d4cf..16ac8c4e7 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp @@ -55,7 +55,7 @@ PhotoDialog::~PhotoDialog() void PhotoDialog::setUp() { QPixmap qtn; - qtn.loadFromData(mPhotoDetails.mThumbnail.mData, mPhotoDetails.mThumbnail.mSize, "PNG"); + qtn.loadFromData(mPhotoDetails.mLowResImage.mData, mPhotoDetails.mLowResImage.mSize); ui->label_Photo->setPixmap(qtn); ui->label_Photo->setVisible(true); diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp index f092d2e02..d8fc76e0f 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.cpp @@ -48,16 +48,15 @@ class gridIndex }; - - +#define DEFAULT_ORDER_INCREMENT (100) PhotoDrop::PhotoDrop(QWidget *parent) - : QWidget(parent) + :QWidget(parent), mLastOrder(0) { setAcceptDrops(true); mSelected = NULL; - checkMoveButtons(); + checkMoveButtons(); reorderPhotos(); } @@ -80,7 +79,7 @@ void PhotoDrop::resizeEvent ( QResizeEvent * event ) reorderPhotos(); } -int PhotoDrop::getPhotoCount() +int PhotoDrop::getPhotoCount() { std::cerr << "PhotoDrop::getPhotoCount()"; std::cerr << std::endl; @@ -147,7 +146,7 @@ PhotoItem *PhotoDrop::getPhotoIdx(int idx) void PhotoDrop::getPhotos(QSet &photos) { - photos = mPhotos; + photos = mPhotos; } @@ -453,7 +452,7 @@ void PhotoDrop::checkMoveButtons() int count = alayout->count(); if ((!mSelected) || (count < 2)) { - buttonStatus(PHOTO_SHIFT_NO_BUTTONS); + buttonStatus(PHOTO_SHIFT_NO_BUTTONS); return; } @@ -462,7 +461,7 @@ void PhotoDrop::checkMoveButtons() { std::cerr << "PhotoDrop::checkMoveButtons() not GridLayout... not much we can do!"; std::cerr << std::endl; - buttonStatus(PHOTO_SHIFT_NO_BUTTONS); + buttonStatus(PHOTO_SHIFT_NO_BUTTONS); return; } @@ -477,15 +476,15 @@ void PhotoDrop::checkMoveButtons() int maxCol = (count - 1) % mColumns; if ((selectedRow == 0) && (selectedColumn == 0)) { - buttonStatus(PHOTO_SHIFT_RIGHT_ONLY); + buttonStatus(PHOTO_SHIFT_RIGHT_ONLY); } else if ((selectedRow == maxRow) && (selectedColumn == maxCol)) { - buttonStatus(PHOTO_SHIFT_LEFT_ONLY); + buttonStatus(PHOTO_SHIFT_LEFT_ONLY); } else { - buttonStatus(PHOTO_SHIFT_BOTH); + buttonStatus(PHOTO_SHIFT_BOTH); } } @@ -547,17 +546,6 @@ void PhotoDrop::dragEnterEvent(QDragEnterEvent *event) std::cerr << "PhotoDrop::dragEnterEvent()"; std::cerr << std::endl; - -#if 0 - const QStringList& formats = event->mimeData()->formats(); - std::cerr << "dragEnterEvent() Formats" << std::endl; - QStringList::const_iterator it; - for (it = formats.begin(); it != formats.end(); ++it) { - std::cerr << "Format: " << (*it).toStdString(); - std::cerr << std::endl; - } -#endif - if (event->mimeData()->hasUrls()) { std::cerr << "PhotoDrop::dragEnterEvent() Accepting"; @@ -589,8 +577,8 @@ void PhotoDrop::dragMoveEvent(QDragMoveEvent *event) std::cerr << "PhotoDrop::dragMoveEvent()"; std::cerr << std::endl; - event->accept(); - //event->ignore(); + event->accept(); + //event->ignore(); } void PhotoDrop::dropEvent(QDropEvent *event) @@ -611,11 +599,11 @@ void PhotoDrop::dropEvent(QDropEvent *event) std::cerr << "Whole URL: " << uit->toString().toStdString() << std::endl; std::cerr << "or As Local File: " << localpath.toStdString() << std::endl; - PhotoItem* item = new PhotoItem(mHolder, localpath); - addPhotoItem(item); + PhotoItem* item = new PhotoItem(mHolder, localpath, mLastOrder+DEFAULT_ORDER_INCREMENT); + addPhotoItem(item); } - event->setDropAction(Qt::CopyAction); - event->accept(); + event->setDropAction(Qt::CopyAction); + event->accept(); // Notify Listeners. (only happens for drop - not programmatically added). photosChanged(); @@ -624,17 +612,17 @@ void PhotoDrop::dropEvent(QDropEvent *event) { std::cerr << "PhotoDrop::dropEvent Ignoring"; std::cerr << std::endl; - event->ignore(); + event->ignore(); } - checkMoveButtons(); + checkMoveButtons(); } void PhotoDrop::mousePressEvent(QMouseEvent *event) { /* see if this is in the space of one of our children */ - QPoint pos = event->pos(); + QPoint pos = event->pos(); std::cerr << "PhotoDrop::mousePressEvent(" << pos.x() << ", " << pos.y() << ")"; std::cerr << std::endl; @@ -644,7 +632,7 @@ void PhotoDrop::mousePressEvent(QMouseEvent *event) void PhotoDrop::setPhotoItemHolder(PhotoShareItemHolder *holder) { - mHolder = holder; + mHolder = holder; } void PhotoDrop::addPhotoItem(PhotoItem *item) @@ -652,20 +640,25 @@ void PhotoDrop::addPhotoItem(PhotoItem *item) std::cerr << "PhotoDrop::addPhotoItem()"; std::cerr << std::endl; - mPhotos.insert(item); + // record lastOrder number + // so any new photos can be added after this. + if (item->getPhotoDetails().mOrder > mLastOrder) { + mLastOrder = item->getPhotoDetails().mOrder; + } + + mPhotos.insert(item); layout()->addWidget(item); - //checkMoveButtons(); - + //checkMoveButtons(); } bool PhotoDrop::deletePhoto(PhotoItem *item) { - if(mPhotos.contains(item)){ - mPhotos.remove(item); - layout()->removeWidget(item); - delete item; - } - else - return false; + if (mPhotos.contains(item)) { + mPhotos.remove(item); + layout()->removeWidget(item); + delete item; + } + else + return false; } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.h b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.h index 4b862eaf6..0b2ed55bc 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDrop.h +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDrop.h @@ -55,7 +55,7 @@ public: PhotoItem *getPhotoIdx(int idx); void getPhotos(QSet& photos); - void addPhotoItem(PhotoItem *item); + void addPhotoItem(PhotoItem *item); void setPhotoItemHolder(PhotoShareItemHolder* holder); /*! @@ -91,8 +91,9 @@ private: PhotoItem *mSelected; int mColumns; - PhotoShareItemHolder* mHolder; - QSet mPhotos; + PhotoShareItemHolder* mHolder; + QSet mPhotos; + uint32_t mLastOrder; }; #endif diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp index f98346e00..e30c321dd 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp @@ -49,7 +49,7 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const RsPhotoPhoto &photo, QW ui->idChooser->setVisible(false); } -PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget *parent) : +PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, uint32_t order, QWidget *parent) : QWidget(parent), ui(new Ui::PhotoItem), mHolder(holder) { @@ -57,25 +57,20 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget ui->setupUi(this); + mPhotoDetails.mOrder = order; QPixmap qtn = QPixmap(path); - // TODO need to scale qtn to something reasonable. - // shouldn't be call thumbnail... we can do a lowRes version. - // do we need to to workout what type of file to convert to? - // jpg, png etc. - // seperate fn should handle all of this. - mThumbNail = qtn.scaled(480,480, Qt::KeepAspectRatio, Qt::SmoothTransformation); + mLowResImage = qtn.scaled(512,512, Qt::KeepAspectRatio, Qt::SmoothTransformation); - ui->label_Thumbnail->setPixmap(qtn.scaled(120, 120, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + ui->label_Thumbnail->setPixmap(qtn.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)); setSelected(false); - getThumbnail(mPhotoDetails.mThumbnail); + getLowResImage(mPhotoDetails.mLowResImage); connect(ui->lineEdit_Title, SIGNAL(editingFinished()), this, SLOT(setTitle())); connect(ui->lineEdit_PhotoGrapher, SIGNAL(editingFinished()), this, SLOT(setPhotoGrapher())); ui->idChooser->loadIds(0, RsGxsId()); - } void PhotoItem::markForDeletion() @@ -114,29 +109,6 @@ void PhotoItem::setSelected(bool selected) update(); } -bool PhotoItem::getThumbnail(RsGxsImage &image) -{ - const QPixmap *tmppix = &mThumbNail; - - QByteArray ba; - QBuffer buffer(&ba); - - if(!tmppix->isNull()) - { - // send chan image - - buffer.open(QIODevice::WriteOnly); - tmppix->save(&buffer, "PNG"); // writes image into ba in PNG format - image.copy((uint8_t *) ba.data(), ba.size()); - return true; - } - - image.clear(); - return false; -} - - - void PhotoItem::setTitle(){ mPhotoDetails.mMeta.mMsgName = ui->lineEdit_Title->text().toStdString(); @@ -144,13 +116,11 @@ void PhotoItem::setTitle(){ void PhotoItem::setPhotoGrapher() { - mPhotoDetails.mPhotographer = ui->lineEdit_PhotoGrapher->text().toStdString(); + // mPhotoDetails.mPhotographer = ui->lineEdit_PhotoGrapher->text().toStdString(); } const RsPhotoPhoto& PhotoItem::getPhotoDetails() { - - if (ui->idChooser->isVisible()) { RsGxsId id; switch (ui->idChooser->getChosenId(id)) { @@ -176,18 +146,34 @@ PhotoItem::~PhotoItem() void PhotoItem::setUp() { - mTitleLabel = new QLabel(); mPhotoGrapherLabel = new QLabel(); mTitleLabel->setText(QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); - mPhotoGrapherLabel->setText(QString::fromStdString(mPhotoDetails.mPhotographer)); - ui->editLayOut->addWidget(mPhotoGrapherLabel); ui->editLayOut->addWidget(mTitleLabel); - updateImage(mPhotoDetails.mThumbnail); + updateImage(mPhotoDetails.mLowResImage); +} + +bool PhotoItem::getLowResImage(RsGxsImage &image) +{ + const QPixmap *tmppix = &mLowResImage; + + QByteArray ba; + QBuffer buffer(&ba); + + if(!tmppix->isNull()) + { + buffer.open(QIODevice::WriteOnly); + tmppix->save(&buffer, "JPG"); + image.copy((uint8_t *) ba.data(), ba.size()); + return true; + } + + image.clear(); + return false; } void PhotoItem::updateImage(const RsGxsImage &image) @@ -195,9 +181,9 @@ void PhotoItem::updateImage(const RsGxsImage &image) if (image.mData != NULL) { QPixmap qtn; - qtn.loadFromData(image.mData, image.mSize, "PNG"); - ui->label_Thumbnail->setPixmap(qtn.scaled(120, 120, Qt::KeepAspectRatio, Qt::SmoothTransformation)); - mThumbNail = qtn; + qtn.loadFromData(image.mData, image.mSize); + ui->label_Thumbnail->setPixmap(qtn.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + mLowResImage = qtn; } } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.h b/retroshare-gui/src/gui/PhotoShare/PhotoItem.h index bdf03375e..376973a11 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.h +++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.h @@ -39,12 +39,12 @@ public: enum State { New, Existing, Modified, Deleted }; PhotoItem(PhotoShareItemHolder *holder, const RsPhotoPhoto& photo, QWidget* parent = 0); - PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget* parent = 0); // for new photos. + PhotoItem(PhotoShareItemHolder *holder, const QString& path, uint32_t order, QWidget* parent = 0); // for new photos. ~PhotoItem(); void setSelected(bool selected); bool isSelected(){ return mSelected; } const RsPhotoPhoto& getPhotoDetails(); - bool getThumbnail(RsGxsImage &image); + bool getLowResImage(RsGxsImage &image); void markForDeletion(); State getState() { return mState; } @@ -62,9 +62,9 @@ private: private: Ui::PhotoItem *ui; - QPixmap mThumbNail; + QPixmap mLowResImage; - QPixmap getPixmap() { return mThumbNail; } + QPixmap getPixmap() { return mLowResImage; } bool mSelected; State mState; diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp index 042430fa6..3fe022bde 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp @@ -436,7 +436,7 @@ void PhotoShare::addAlbum(const RsPhotoAlbum &album) void PhotoShare::addPhoto(const RsPhotoPhoto &photo) { - if (!photo.mThumbnail.empty()) + if (!photo.mLowResImage.empty()) { PhotoItem* item = new PhotoItem(this, photo, this); mPhotoItems.insert(item); diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp index 3965bb79a..5213adc52 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp @@ -179,10 +179,10 @@ void PhotoSlideShow::loadImage() if (ptr) { /* load into the slot */ - if (ptr->mThumbnail.mData != NULL) + if (ptr->mLowResImage.mData != NULL) { QPixmap qtn; - GxsIdDetails::loadPixmapFromData(ptr->mThumbnail.mData, ptr->mThumbnail.mSize,qtn, GxsIdDetails::ORIGINAL); + GxsIdDetails::loadPixmapFromData(ptr->mLowResImage.mData, ptr->mLowResImage.mSize,qtn, GxsIdDetails::ORIGINAL); QPixmap sqtn = qtn.scaled(800, 600, Qt::KeepAspectRatio, Qt::SmoothTransformation); ui.imgLabel->setPixmap(sqtn); @@ -221,6 +221,7 @@ void PhotoSlideShow::requestPhotos() { RsTokReqOptions opts; opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; + opts.mOptions = RS_TOKREQOPT_MSG_LATEST; uint32_t token; std::list grpIds; grpIds.push_back(mAlbum.mMeta.mGroupId); @@ -248,8 +249,7 @@ bool PhotoSlideShow::loadPhotoData(const uint32_t &token) RsPhotoPhoto *ptr = new RsPhotoPhoto; *ptr = photo; - ptr->mThumbnail = photo.mThumbnail; // copies data. - ptr->mOrder = i++; + ptr->mLowResImage = photo.mLowResImage; // copies data. mPhotos[photo.mMeta.mMsgId] = ptr; mPhotoOrder[ptr->mOrder] = photo.mMeta.mMsgId; diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui index d06015f9b..c4a6d51cd 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui @@ -223,8 +223,8 @@ - - :/images/arrow-left.png:/images/arrow-left.png + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png @@ -244,8 +244,8 @@ - - :/images/arrow-right.png:/images/arrow-right.png + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png @@ -512,7 +512,7 @@ <!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;"> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; 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-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index beb1175dc..175456b21 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -29,6 +29,7 @@ #include #include +#include #include @@ -46,6 +47,10 @@ StartDialog::StartDialog(QWidget *parent) #endif Settings->loadWidgetInformation(this); + + /* Put the Login dialog in the screen center */ + const QRect screen = QApplication::desktop()->screenGeometry(); + this->move( screen.center() - this->rect().center() ); /* get all available pgp private certificates.... * mark last one as default. diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h index e50823ffd..2433516a1 100644 --- a/retroshare-gui/src/gui/TheWire/WireDialog.h +++ b/retroshare-gui/src/gui/TheWire/WireDialog.h @@ -33,7 +33,7 @@ #include "util/TokenQueue.h" -#define IMAGE_WIRE ":/images/kgames.png" +#define IMAGE_WIRE ":/icons/wire.png" class WireDialog : public MainPage, public TokenResponse, public PulseHolder { diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp index 119d29a9f..edbdf0ca2 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp @@ -89,7 +89,7 @@ void WireGroupDialog::initUi() QPixmap WireGroupDialog::serviceImage() { - return QPixmap(":/images/wire_create_64.png"); + return QPixmap(":/icons/wire-circle.png"); } void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData &meta) diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui index f5ad5ea65..edc707eff 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui @@ -231,8 +231,8 @@ << - - :/images/arrow-left.png:/images/arrow-left.png + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png @@ -260,8 +260,8 @@ >> - - :/images/arrow-right.png:/images/arrow-right.png + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png diff --git a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc index fbd4e69d7..ec2c2118e 100644 --- a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc +++ b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc @@ -1,7 +1,5 @@ - images/arrow-left.png - images/arrow-right.png images/addpage.png images/editpage.png images/reload.png diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index d5bbc3d2b..21784401d 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -93,8 +93,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi voteNegativeAct = new QAction(QIcon(":/icons/png/thumbs-down.png"), tr("Ban this person (Sets negative opinion)"), this); voteNeutralAct = new QAction(QIcon(":/icons/png/thumbs-neutral.png"), tr("Give neutral opinion"), this); votePositiveAct = new QAction(QIcon(":/icons/png/thumbs-up.png"), tr("Give positive opinion"), this); - distantChatAct = new QAction(QIcon(":/images/chat_24.png"), tr("Start private chat"), this); - sendMessageAct = new QAction(QIcon(":/images/mail_new.png"), tr("Send Message"), this); + distantChatAct = new QAction(QIcon(":/icons/png/chats.png"), tr("Start private chat"), this); + sendMessageAct = new QAction(QIcon(":/icons/mail/write-mail.png"), tr("Send Message"), this); showInPeopleAct = new QAction(QIcon(), tr("Show author in people tab"), this); QActionGroup *sortgrp = new QActionGroup(this); diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp index 49bd7ab56..c3cddc5dd 100644 --- a/retroshare-gui/src/gui/common/FriendList.cpp +++ b/retroshare-gui/src/gui/common/FriendList.cpp @@ -65,8 +65,8 @@ #define IMAGE_EXPORTFRIEND ":/images/user/friend_suggestion16.png" #define IMAGE_ADDFRIEND ":/images/user/add_user16.png" #define IMAGE_FRIENDINFO ":/images/info16.png" -#define IMAGE_CHAT ":/images/chat_24.png" -#define IMAGE_MSG ":/images/mail_new.png" +#define IMAGE_CHAT ":/icons/png/chats.png" +#define IMAGE_MSG ":/icons/mail/write-mail.png" #define IMAGE_CONNECT ":/images/connect_friend.png" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_GROUP16 ":/images/user/group16.png" diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp index 302ce9310..428479d84 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.cpp +++ b/retroshare-gui/src/gui/common/NewFriendList.cpp @@ -63,8 +63,8 @@ #define IMAGE_EXPORTFRIEND ":/images/user/friend_suggestion16.png" #define IMAGE_ADDFRIEND ":/images/user/add_user16.png" #define IMAGE_FRIENDINFO ":/images/info16.png" -#define IMAGE_CHAT ":/images/chat_24.png" -#define IMAGE_MSG ":/images/mail_new.png" +#define IMAGE_CHAT ":/icons/png/chats.png" +#define IMAGE_MSG ":/icons/mail/write-mail.png" #define IMAGE_CONNECT ":/images/connect_friend.png" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_GROUP16 ":/images/user/group16.png" diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index 6111dfb45..b178da227 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -182,6 +182,19 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui index c9188d54b..89d8ec85c 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui @@ -6,7 +6,7 @@ 0 0 - 565 + 643 209 @@ -171,8 +171,8 @@ Write a quick Message - - :/images/message-mail.png:/images/message-mail.png + + :/icons/mail/write-mail.png:/icons/mail/write-mail.png false @@ -203,8 +203,8 @@ Write Message - - :/images/mail_send.png:/images/mail_send.png + + :/icons/mail/write-mail.png:/icons/mail/write-mail.png Qt::ToolButtonTextBesideIcon @@ -235,8 +235,8 @@ Start Chat - - :/images/chat.png:/images/chat.png + + :/icons/png/chats.png:/icons/png/chats.png Qt::ToolButtonTextBesideIcon diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index 8baa1c832..27c38211f 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -159,8 +159,8 @@ Send Message - - :/images/mail_new.png:/images/mail_new.png + + :/icons/mail/write-mail.png:/icons/mail/write-mail.png Qt::ToolButtonTextBesideIcon @@ -188,8 +188,8 @@ Start Chat - - :/images/chat_24.png:/images/chat_24.png + + :/icons/png/chats.png:/icons/png/chats.png Qt::ToolButtonTextBesideIcon diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index d5880dd90..ef0099faa 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -585,11 +585,11 @@ void GxsGroupDialog::editGroup() RsGroupMetaData newMeta; newMeta.mGroupId = mGrpMeta.mGroupId; - - if(!prepareGroupMetaData(newMeta)) + QString reason; + if(!prepareGroupMetaData(newMeta, reason)) { /* error message */ - QMessageBox::warning(this, "RetroShare", tr("Failed to Prepare Group MetaData - please Review"), QMessageBox::Ok, QMessageBox::Ok); + QMessageBox::warning(this, "RetroShare", tr("Failed to Prepare Group MetaData: ") + reason, QMessageBox::Ok, QMessageBox::Ok); return; //Don't add a empty name!! } @@ -612,14 +612,22 @@ void GxsGroupDialog::editGroup() close(); } -bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta) +bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta, QString &reason) { std::cerr << "GxsGroupDialog::prepareGroupMetaData()"; std::cerr << std::endl; // here would be the place to check for empty author id // but GXS_SERV::GRP_OPTION_AUTHEN_AUTHOR_SIGN is currently not used by any service + ui.idChooser->getChosenId(meta.mAuthorId); + if ((mDefaultsFlags & GXS_GROUP_DEFAULTS_PERSONAL_GROUP) && (meta.mAuthorId.isNull())) { + std::cerr << "GxsGroupDialog::prepareGroupMetaData()"; + std::cerr << " Group needs a Personal Signature"; + std::cerr << std::endl; + reason = "Missing AuthorId"; + return false; + } QString name = getName(); uint32_t flags = GXS_SERV::FLAG_PRIVACY_PUBLIC; @@ -628,6 +636,7 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta) std::cerr << "GxsGroupDialog::prepareGroupMetaData()"; std::cerr << " Invalid GroupName"; std::cerr << std::endl; + reason = "Missing GroupName"; return false; } @@ -641,6 +650,7 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta) std::cerr << "GxsGroupDialog::prepareGroupMetaData()"; std::cerr << " Invalid Circles"; std::cerr << std::endl; + reason = "Invalid Circle Parameters"; return false; } @@ -668,10 +678,11 @@ void GxsGroupDialog::createGroup() uint32_t token; RsGroupMetaData meta; - if (!prepareGroupMetaData(meta)) + QString reason; + if (!prepareGroupMetaData(meta, reason)) { /* error message */ - QMessageBox::warning(this, "RetroShare", tr("Failed to Prepare Group MetaData - please Review"), QMessageBox::Ok, QMessageBox::Ok); + QMessageBox::warning(this, "RetroShare", tr("Failed to Prepare Group MetaData: ") + reason, QMessageBox::Ok, QMessageBox::Ok); return; //Don't add with invalid circle. } diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h index 709ad4d6f..49225dd1d 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h @@ -84,10 +84,13 @@ public: #define GXS_GROUP_DEFAULTS_PERSONAL_PGP 0x00000100 #define GXS_GROUP_DEFAULTS_PERSONAL_REQUIRED 0x00000200 #define GXS_GROUP_DEFAULTS_PERSONAL_IFNOPUB 0x00000400 +// independent from other PERSONAL FLAGS. If Group requires a AuthorId. +#define GXS_GROUP_DEFAULTS_PERSONAL_GROUP 0x00000800 #define GXS_GROUP_DEFAULTS_COMMENTS_YES 0x00001000 #define GXS_GROUP_DEFAULTS_COMMENTS_NO 0x00002000 + #define GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP 0x00100000 #define GXS_GROUP_DEFAULTS_ANTISPAM_TRACK 0x00200000 #define GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP_KNOWN 0x00400000 @@ -271,7 +274,7 @@ private: void loadGroup(uint32_t token); void updateFromExistingMeta(const QString &description); - bool prepareGroupMetaData(RsGroupMetaData &meta); + bool prepareGroupMetaData(RsGroupMetaData &meta, QString &reason); std::list mShareList; QPixmap mPicture; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index 666d8fc27..65e07087f 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -984,6 +984,7 @@ void GxsGroupFrameDialog::insertGroupsData(const std::mapgroupTreeWidget->fillGroupItems(mYourGroups, adminList); + mYourGroups->setText(2, QString::number(mYourGroups->childCount())); ui->groupTreeWidget->fillGroupItems(mSubscribedGroups, subList); mSubscribedGroups->setText(2, QString::number(mSubscribedGroups->childCount())); // 1 COLUMN_UNREAD 2 COLUMN_POPULARITY ui->groupTreeWidget->fillGroupItems(mPopularGroups, popList); diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp index 230573f95..2db5d8534 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp @@ -285,7 +285,7 @@ void GxsIdChooser::loadPrivateIds() QString str = tr("Create new Identity"); QString id = ""; - addItem(QIcon(":/images/identity/identity_create_32.png"), str, id); + addItem(QIcon(":/icons/png/add-identity.png"), str, id); setItemData(count() - 1, QString("%1_%2").arg(TYPE_CREATE_ID).arg(str), ROLE_SORT); setItemData(count() - 1, TYPE_CREATE_ID, ROLE_TYPE); diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp index f9fcaca21..6c6977eca 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp @@ -249,13 +249,13 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem if(id.isNull()) { str = tr("[Notification]"); - icon = QIcon(":/icons/logo_128.png"); + icon = QIcon(":/icons/notification.png"); } else if(! computeNameIconAndComment(id,str,icon,comment)) if(mReloadPeriod > 3) { str = tr("[Unknown]"); - icon = QIcon(); + icon = QIcon(":/icons/anonymous.png"); } else { diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index e449e685d..2e9ba897b 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -165,13 +165,13 @@ QString GxsChannelDialog::icon(IconType type) case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: - return ":/icons/png/channel.png"; + return ""; case ICON_SUBSCRIBED_GROUP: - return ":/icons/png/channel-subscribed.png"; + return ""; case ICON_POPULAR_GROUP: - return ":/icons/png/channel-popular.png"; + return ""; case ICON_OTHER_GROUP: - return ":/icons/png/channel-other.png"; + return ""; case ICON_SEARCH: return ":/images/find.png"; case ICON_DEFAULT: diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp index 851f6fd16..5124cb177 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp @@ -348,7 +348,6 @@ QVariant RsGxsForumModel::headerData(int section, Qt::Orientation /*orientation* case COLUMN_THREAD_TITLE: return tr("Title"); case COLUMN_THREAD_DATE: return tr("Date"); case COLUMN_THREAD_AUTHOR: return tr("Author"); - case COLUMN_THREAD_DISTRIBUTION: return tr("Distribution"); default: return QVariant(); } @@ -356,7 +355,7 @@ QVariant RsGxsForumModel::headerData(int section, Qt::Orientation /*orientation* if(role == Qt::DecorationRole) switch(section) { - case COLUMN_THREAD_DISTRIBUTION: return QIcon(":/icons/flag_green.png"); + case COLUMN_THREAD_DISTRIBUTION: return QIcon(":/icons/flag-green.png"); case COLUMN_THREAD_READ: return QIcon(":/images/message-state-read.png"); default: return QVariant(); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index e57dbe040..1d246c43f 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -59,8 +59,9 @@ //#define DEBUG_FORUMS /* Images for context menu icons */ -#define IMAGE_MESSAGE ":/images/mail_new.png" -#define IMAGE_MESSAGEREPLY ":/images/mail_reply.png" +#define IMAGE_MESSAGE ":/icons/mail/compose.png" +#define IMAGE_REPLY ":/icons/mail/reply.png" +#define IMAGE_MESSAGEREPLY ":/icons/mail/write-mail.png" #define IMAGE_MESSAGEEDIT ":/images/edit_16.png" #define IMAGE_MESSAGEREMOVE ":/images/mail_delete.png" #define IMAGE_DOWNLOAD ":/images/start.png" @@ -580,7 +581,7 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) QAction *pinUpPostAct = new QAction(QIcon(IMAGE_PINPOST), (is_pinned?tr("Un-pin this post"):tr("Pin this post up")), &contextMnu); connect(pinUpPostAct , SIGNAL(triggered()), this, SLOT(togglePinUpPost())); - QAction *replyAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply"), &contextMnu); + QAction *replyAct = new QAction(QIcon(IMAGE_REPLY), tr("Reply"), &contextMnu); connect(replyAct, SIGNAL(triggered()), this, SLOT(replytoforummessage())); QAction *replyauthorAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply to author with private message"), &contextMnu); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index ee9b71c67..d4b59faac 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -95,7 +95,7 @@ - :/icons/png/add.png:/icons/png/add.png + :/icons/mail/compose.png:/icons/mail/compose.png @@ -264,7 +264,7 @@ - :/icons/global_switch_on_128.png:/icons/global_switch_on_128.png + :/icons/png/download.png:/icons/png/download.png true @@ -289,8 +289,8 @@ - - :/images/replymailall24-hover.png:/images/replymailall24-hover.png + + :/icons/mail/reply.png:/icons/mail/reply.png Qt::ToolButtonIconOnly @@ -376,8 +376,8 @@ - - :/images/back.png:/images/back.png + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png true @@ -417,8 +417,8 @@ - - :/images/forward.png:/images/forward.png + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png true @@ -471,8 +471,11 @@ - - :/images/start.png:/images/start.png + + :/icons/png/next-unread.png:/icons/png/next-unread.png + + + true @@ -524,6 +527,16 @@ + + LineEditClear + QLineEdit +
gui/common/LineEditClear.h
+ + + RSTextBrowser + QTextBrowser +
gui/common/RSTextBrowser.h
+ SubscribeToolButton QToolButton @@ -534,16 +547,6 @@ QLabel
gui/gxs/GxsIdLabel.h
 - - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
- - - RSTextBrowser - QTextBrowser -
gui/common/RSTextBrowser.h
- ElidedLabel QLabel diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index f37d88736..e4c14ae83 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -151,13 +151,13 @@ QString GxsForumsDialog::icon(IconType type) case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: - return ":/icons/png/feedreader.png"; + return ""; case ICON_SUBSCRIBED_GROUP: - return ":/icons/png/feed-subscribed.png"; + return ""; case ICON_POPULAR_GROUP: - return ":/icons/png/feed-popular.png"; + return ""; case ICON_OTHER_GROUP: - return ":/icons/png/feed-other.png"; + return ""; case ICON_SEARCH: return ":/images/find.png"; case ICON_DEFAULT: diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.ui b/retroshare-gui/src/gui/help/browser/helpbrowser.ui index a3d739438..824ffcb80 100644 --- a/retroshare-gui/src/gui/help/browser/helpbrowser.ui +++ b/retroshare-gui/src/gui/help/browser/helpbrowser.ui @@ -14,7 +14,7 @@ RetroShare Help - + :/images/help.png:/images/help.png @@ -25,7 +25,16 @@ 6 - + + 9 + + + 9 + + + 9 + + 9 @@ -58,7 +67,16 @@ QFrame::Raised - + + 9 + + + 9 + + + 9 + + 9 @@ -69,7 +87,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -171,7 +198,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -238,7 +274,7 @@ RetroShare Help - + :/images/help.png:/images/help.png @@ -248,7 +284,16 @@ 6 - + + 6 + + + 6 + + + 6 + + 6 @@ -297,7 +342,16 @@ Search - + + 6 + + + 6 + + + 6 + + 6 @@ -308,7 +362,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -445,8 +508,8 @@ - - :/images/back.png:/images/back.png + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png Back @@ -460,8 +523,8 @@ - - :/images/forward.png:/images/forward.png + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png Forward @@ -475,8 +538,8 @@ - - :/images/gohome.png:/images/gohome.png + + :/icons/png/home.png:/icons/png/home.png Home @@ -514,8 +577,8 @@ - - :/images/exit_24x24.png:/images/exit_24x24.png + + :/icons/png/exit2.png:/icons/png/exit2.png Close @@ -551,6 +614,7 @@ + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 53b572552..5a3696343 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -56,6 +56,7 @@ icons/question.png icons/plugins_128.png icons/png/add.png + icons/png/add-identity.png icons/png/anonymous.png icons/png/attach-image.png icons/png/attach.png @@ -73,9 +74,6 @@ icons/png/exit.png icons/png/feedreader-notify.png icons/png/feedreader.png - icons/png/feed-other.png - icons/png/feed-popular.png - icons/png/feed-subscribed.png icons/png/filesharing-notify.png icons/png/filesharing.png icons/png/font.png @@ -243,9 +241,6 @@ icons/yandex.png icons/png/markdown-mark.png icons/png/channel.png - icons/png/channel-other.png - icons/png/channel-popular.png - icons/png/channel-subscribed.png icons/png/circles-black.png icons/png/circles-gray.png icons/png/circles-notify.png @@ -299,6 +294,9 @@ icons/png/add-file.png icons/png/add-image.png icons/png/attachements.png + icons/png/arrow-right.png + icons/png/arrow-left.png + icons/png/next-unread.png icons/mail/compose.png icons/mail/delete.png icons/mail/tags.png @@ -311,6 +309,7 @@ icons/mail/reply.png icons/mail/reply-all.png icons/mail/attach24.png + icons/mail/write-mail.png icons/textedit/align.png icons/textedit/font-decrease.png icons/textedit/smile.png @@ -318,5 +317,8 @@ icons/textedit/code.png icons/fullscreen.png icons/fullscreen-exit.png + icons/notification.png + icons/wire.png + icons/wire-circle.png diff --git a/retroshare-gui/src/gui/icons/mail/write-mail.png b/retroshare-gui/src/gui/icons/mail/write-mail.png new file mode 100644 index 000000000..a64236d4f Binary files /dev/null and b/retroshare-gui/src/gui/icons/mail/write-mail.png differ diff --git a/retroshare-gui/src/gui/icons/notification.png b/retroshare-gui/src/gui/icons/notification.png new file mode 100644 index 000000000..88f837051 Binary files /dev/null and b/retroshare-gui/src/gui/icons/notification.png differ diff --git a/retroshare-gui/src/gui/icons/png/add-identity.png b/retroshare-gui/src/gui/icons/png/add-identity.png new file mode 100644 index 000000000..7eaf0d5c5 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/add-identity.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png b/retroshare-gui/src/gui/icons/png/arrow-left.png similarity index 100% rename from retroshare-gui/src/gui/WikiPoos/images/arrow-left.png rename to retroshare-gui/src/gui/icons/png/arrow-left.png diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png b/retroshare-gui/src/gui/icons/png/arrow-right.png similarity index 100% rename from retroshare-gui/src/gui/WikiPoos/images/arrow-right.png rename to retroshare-gui/src/gui/icons/png/arrow-right.png diff --git a/retroshare-gui/src/gui/icons/png/next-unread.png b/retroshare-gui/src/gui/icons/png/next-unread.png new file mode 100644 index 000000000..812a12d7d Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/next-unread.png differ diff --git a/retroshare-gui/src/gui/icons/wire-circle.png b/retroshare-gui/src/gui/icons/wire-circle.png new file mode 100644 index 000000000..128159150 Binary files /dev/null and b/retroshare-gui/src/gui/icons/wire-circle.png differ diff --git a/retroshare-gui/src/gui/icons/wire.png b/retroshare-gui/src/gui/icons/wire.png new file mode 100644 index 000000000..ed0c82334 Binary files /dev/null and b/retroshare-gui/src/gui/icons/wire.png differ diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 275998882..5676c0e7b 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -56,8 +56,6 @@ images/list_bullet_arrow.png images/rc_combined.png images/combobox_arrow.png - images/arrow-left.png - images/arrow-right.png help/authors.html help/licence.html help/thanks.html @@ -81,7 +79,6 @@ images/avatarstatus-bg-away-70.png images/avatarstatus-bg-busy-70.png images/avatarstatus-bg-offline-70.png - images/back.png images/configure.png images/copyrslink.png images/contacts24.png @@ -117,18 +114,14 @@ images/add-share24.png images/avatar_background.png images/button_cancel.png - images/calendar.png images/chat.png images/chat_24.png images/cancel.png images/close-down.png images/close_normal.png - images/contact_new128.png images/copy.png images/delete.png images/deleteall.png - images/deletemail-pressed.png - images/deletemail24.png images/directoryadd_24x24_shadow.png images/directoryremove_24x24_shadow.png images/directoryselect_24x24_shadow.png @@ -197,15 +190,12 @@ images/folder-outbox.png images/folder-sent.png images/folder-trash.png - images/forward.png - images/kgames.png images/go-down.png images/go-top.png images/go-up.png images/go-bottom.png images/graph-area.png images/graph-line.png - images/gohome.png images/gpgp_key_generate.png images/hide_toolbox_frame.png images/hide_frame.png @@ -246,17 +236,8 @@ images/logo/logo_info.png images/logo/logo_splash.png images/logo/logo_web_nobackground.png - images/mail-message-new.png images/mail-signed.png images/mail-signature-unknown.png - images/mail_delete.png - images/mail_get.png - images/mail_reply.png - images/mail_replyall.png - images/mail_forward.png - images/mail_send.png - images/mail_new.png - images/mail_send24.png images/mailforward24-hover.png images/message-mail.png images/message-mail-read.png @@ -276,7 +257,6 @@ images/mute-off-16.png images/mute-on-16.png images/new-mail-alert.png - images/new_forum16.png images/newmsg.png images/no_avatar_70.png images/no_avatar_background.png diff --git a/retroshare-gui/src/gui/images/arrow-left.png b/retroshare-gui/src/gui/images/arrow-left.png deleted file mode 100644 index 6a29679ae..000000000 Binary files a/retroshare-gui/src/gui/images/arrow-left.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/arrow-right.png b/retroshare-gui/src/gui/images/arrow-right.png deleted file mode 100644 index 207f7fcf2..000000000 Binary files a/retroshare-gui/src/gui/images/arrow-right.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/back.png b/retroshare-gui/src/gui/images/back.png deleted file mode 100644 index 78dcc7011..000000000 Binary files a/retroshare-gui/src/gui/images/back.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/calendar.png b/retroshare-gui/src/gui/images/calendar.png deleted file mode 100644 index e91b13d73..000000000 Binary files a/retroshare-gui/src/gui/images/calendar.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/contact_new128.png b/retroshare-gui/src/gui/images/contact_new128.png deleted file mode 100644 index ff60d9b48..000000000 Binary files a/retroshare-gui/src/gui/images/contact_new128.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/deletemail-pressed.png b/retroshare-gui/src/gui/images/deletemail-pressed.png deleted file mode 100644 index 8d79b7e61..000000000 Binary files a/retroshare-gui/src/gui/images/deletemail-pressed.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/deletemail24.png b/retroshare-gui/src/gui/images/deletemail24.png deleted file mode 100644 index b584ead3f..000000000 Binary files a/retroshare-gui/src/gui/images/deletemail24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/forward.png b/retroshare-gui/src/gui/images/forward.png deleted file mode 100644 index a7d90d558..000000000 Binary files a/retroshare-gui/src/gui/images/forward.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/gohome.png b/retroshare-gui/src/gui/images/gohome.png deleted file mode 100644 index 6c45397e4..000000000 Binary files a/retroshare-gui/src/gui/images/gohome.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/help/addafriend.png b/retroshare-gui/src/gui/images/help/addafriend.png index 6f37763b3..af52a79e5 100644 Binary files a/retroshare-gui/src/gui/images/help/addafriend.png and b/retroshare-gui/src/gui/images/help/addafriend.png differ diff --git a/retroshare-gui/src/gui/images/help/addfriendkey.png b/retroshare-gui/src/gui/images/help/addfriendkey.png index 55e9535f0..c9cb06011 100644 Binary files a/retroshare-gui/src/gui/images/help/addfriendkey.png and b/retroshare-gui/src/gui/images/help/addfriendkey.png differ diff --git a/retroshare-gui/src/gui/images/kgames.png b/retroshare-gui/src/gui/images/kgames.png deleted file mode 100644 index 2ec077b76..000000000 Binary files a/retroshare-gui/src/gui/images/kgames.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail-message-new.png b/retroshare-gui/src/gui/images/mail-message-new.png deleted file mode 100644 index 5754fdf7b..000000000 Binary files a/retroshare-gui/src/gui/images/mail-message-new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_delete.png b/retroshare-gui/src/gui/images/mail_delete.png deleted file mode 100644 index dc9c020f7..000000000 Binary files a/retroshare-gui/src/gui/images/mail_delete.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_forward.png b/retroshare-gui/src/gui/images/mail_forward.png deleted file mode 100755 index 833360b24..000000000 Binary files a/retroshare-gui/src/gui/images/mail_forward.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_get.png b/retroshare-gui/src/gui/images/mail_get.png deleted file mode 100644 index a8fc27a5c..000000000 Binary files a/retroshare-gui/src/gui/images/mail_get.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_new.png b/retroshare-gui/src/gui/images/mail_new.png deleted file mode 100644 index 55bba1bdd..000000000 Binary files a/retroshare-gui/src/gui/images/mail_new.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_reply.png b/retroshare-gui/src/gui/images/mail_reply.png deleted file mode 100644 index 471a08ebf..000000000 Binary files a/retroshare-gui/src/gui/images/mail_reply.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_replyall.png b/retroshare-gui/src/gui/images/mail_replyall.png deleted file mode 100755 index 6e738a11e..000000000 Binary files a/retroshare-gui/src/gui/images/mail_replyall.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_send.png b/retroshare-gui/src/gui/images/mail_send.png deleted file mode 100644 index 0366228e9..000000000 Binary files a/retroshare-gui/src/gui/images/mail_send.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mail_send24.png b/retroshare-gui/src/gui/images/mail_send24.png deleted file mode 100644 index be6d64f00..000000000 Binary files a/retroshare-gui/src/gui/images/mail_send24.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/new_forum16.png b/retroshare-gui/src/gui/images/new_forum16.png deleted file mode 100644 index 712802dde..000000000 Binary files a/retroshare-gui/src/gui/images/new_forum16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp index 902c364b3..6fc76ed79 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp @@ -60,6 +60,7 @@ #define IMAGE_SYSTEM ":/images/user/user_request16.png" #define IMAGE_DECRYPTMESSAGE ":/images/decrypt-mail.png" #define IMAGE_AUTHOR_INFO ":/images/info16.png" +#define IMAGE_NOTFICATION ":/icons/notification.png" #define IMAGE_INBOX ":/images/folder-inbox.png" #define IMAGE_OUTBOX ":/images/folder-outbox.png" @@ -420,7 +421,7 @@ void MessagesDialog::fillQuickView() } item = new QListWidgetItem(tr("System"), ui.quickViewWidget); - item->setIcon(QIcon(IMAGE_SYSTEM)); + item->setIcon(QIcon(IMAGE_NOTFICATION)); item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC); item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_SYSTEM); item->setData(ROLE_QUICKVIEW_TEXT, item->text()); // for updateMessageSummaryList diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui index a68c56668..2c5568bcc 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui @@ -25,12 +25,6 @@ - - - 24 - 24 - - true diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index cf5c6a2b5..0a8a80df6 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -50,7 +50,7 @@ ProfileManager::ProfileManager(QWidget *parent) /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/profile.png")); ui.headerFrame->setHeaderText(tr("Profile Manager")); connect(ui.identityTreeWidget, SIGNAL( customContextMenuRequested(QPoint)), this, SLOT( identityTreeWidgetCostumPopupMenu(QPoint))); diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui index b5a49cff2..9ec918e89 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.ui +++ b/retroshare-gui/src/gui/profile/ProfileManager.ui @@ -134,7 +134,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 088205ec3..6fa73f661 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -860,3 +860,8 @@ PostedCreatePostDialog QPushButton#submitButton:hover { min-width: 4em; padding: 2px; } + +MessageWidget QTextBrowser#toText , QTextBrowser#ccText , QTextBrowser#bccText { + background: transparent; + border: none; +} diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index bbda9302c..bf986996b 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -14,7 +14,7 @@ - 1 + 0 diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 223820604..5ef7308b1 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -6,8 +6,8 @@ 0 0 - 1283 - 929 + 712 + 502 @@ -26,7 +26,7 @@ - 1 + 0 diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui index 04d1d9400..4c925ebb1 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.ui +++ b/retroshare-gui/src/gui/settings/TransferPage.ui @@ -6,500 +6,534 @@ 0 0 - 1339 - 1519 + 701 + 527 - - - - - Shared Directories + + + + + 0 - - - - - Edit Share - - - - - - - true - - - Automatically share incoming directory (Recommended) - - - true - - - - - - - - - - 0 - 0 - - - - Auto-check shared directories every - - - true - - - - - - - minute(s) - - - 1 - - - 5000 - - - 10 - - - - - - - - - - - <html><head/><body><p>Tells Retroshare to follow the links. Loops and duplicate directories are automatically taken care of. If unchecked, Retroshare will just ignore symbolic links to both files and directories.</p></body></html> - - - follow symbolic links - - - true - - - - - - - - - - - <html><head/><body><p>When following sybolic links, Retroshare can encounter the same directory/file more than once. If checked, this option will make tell Retroshare to silently ignore the file. This option saves Retroshare indexing against directory loops.</p></body></html> - - - Ignore duplicate files/directories - - - - - - - Maximum depth (0=unlimited): - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - <html><head/><body><p>This value allows you to limit the depth of the directory hierarchy you are indexing, starting from the base directory. If you allow Retroshare to follow symbolic links and unchecked &quot;Ignore duplicate files/directories&quot;, this option will avoid that Retroshare loops indefinitly while parsing directories.</p></body></html> - - - - - - - - - - - Ignore files ending with: - - - - - - - <html><head/><body><p>Add any combination of suffixes separated by &quot;;&quot; for instance &quot;~;.bak;.old&quot;</p></body></html> - - - - - - - - - - - ignore files starting with: - - - - - - - <html><head/><body><p>Add any combination of prefixes, separated by &quot;;&quot; for instance &quot;.;~&quot;</p></body></html> - - - - - - - - - - - - Incoming Directory - - - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - Browse - - - - - - - :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - <html><head/><body><p><span style=" font-weight:600;">WARNING</span>: Some collection may contains a lot of files.</p><p>With this option you cannot check the collection contents before download.</p></body></html> - - - Automatically donwload RsCollection file content (Not recommended) - - - - - - - - - - Partials Directory - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - Browse - - - - - - - :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - - Transfer options - - - - - - + + + Directories + + + + + + Shared Directories + + - + - Maximum simultaneous downloads: + Edit Share - + + + true + - Maximum uploads per friend (0 = no limit) + Automatically share incoming directory (Recommended) + + + true - - - Default chunk strategy: - - + + + + + + 0 + 0 + + + + Auto-check shared directories every + + + true + + + + + + + minute(s) + + + 1 + + + 5000 + + + 10 + + + + - - - Safety disk space limit : - - + + + + + <html><head/><body><p>Tells Retroshare to follow the links. Loops and duplicate directories are automatically taken care of. If unchecked, Retroshare will just ignore symbolic links to both files and directories.</p></body></html> + + + follow symbolic links + + + true + + + + - - - Max. tunnel req. forwarded per second: - - + + + + + <html><head/><body><p>When following sybolic links, Retroshare can encounter the same directory/file more than once. If checked, this option will make tell Retroshare to silently ignore the file. This option saves Retroshare indexing against directory loops.</p></body></html> + + + Ignore duplicate files/directories + + + + + + + Maximum depth (0=unlimited): + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p>This value allows you to limit the depth of the directory hierarchy you are indexing, starting from the base directory. If you allow Retroshare to follow symbolic links and unchecked &quot;Ignore duplicate files/directories&quot;, this option will avoid that Retroshare loops indefinitly while parsing directories.</p></body></html> + + + + - - - End-to-end encryption: - - + + + + + Ignore files ending with: + + + + + + + <html><head/><body><p>Add any combination of suffixes separated by &quot;;&quot; for instance &quot;~;.bak;.old&quot;</p></body></html> + + + + - + + + + + ignore files starting with: + + + + + + + <html><head/><body><p>Add any combination of prefixes, separated by &quot;;&quot; for instance &quot;.;~&quot;</p></body></html> + + + + + + + + + + + + Incoming Directory + + + + + + + + true + + + + + + + + 31 + 31 + + + + + 31 + 31 + + + + Browse + + + + + + + :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png + + + + 24 + 24 + + + + + + + + + + <html><head/><body><p><span style=" font-weight:600;">WARNING</span>: Some collection may contains a lot of files.</p><p>With this option you cannot check the collection contents before download.</p></body></html> + - Allow direct download: + Automatically donwload RsCollection file content (Not recommended) - - - - - - + + + + + + Partials Directory + + + + + true - - 1 - - - 1 - - - 5 - - - - - - - - true + + + + + 31 + 31 + + + + + 31 + 31 + - <html><head/><body><p><span style=" font-weight:600;">Streaming </span>causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. <span style=" font-weight:600;">Random</span> is purely random and favors swarming behavior. <span style=" font-weight:600;">Progressive</span> is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.</p></body></html> + Browse - - - Streaming - - - - - Progressive - - - - - Random - - - - - - - - <html><head/><body><p>Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.</p></body></html> + + - - MB + + + :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png - - 50 + + + 24 + 24 + - - 1000 - - - 10 - - - 100 - - - - - - - <html><head/><body><p>This value controls how many tunnel request your peer can forward per second. </p><p>If you have a large internet bandwidth, you may raise this up to 30-40, to allow statistically longer tunnels to pass. Be very careful though, since this generates many small packets that can significantly slow down your own file transfer. </p><p>The default value is 20. If you're not sure, keep it that way.</p></body></html> - - - 5 - - - 100 - - - 1 - - - 20 - - - - - - - <html><head/><body><p>Anonymous tunnels can be end-o-end encrypted. In order to maintain backward compatibility, this can be made optional (choosing &quot;Accepted&quot;), but in the end, all Retroshare nodes will be switched to &quot;Enforced&quot;, meaning that all anonymous transfers will be end-to-end encrypted. With &quot;Accepted&quot;, it is likely that you will transfer using twice as many tunnels, since there is no way to know that an encrypted and a clear tunnel actually transfer from the same source.</p></body></html> - - - - Accepted - - - - - Enforced - - - - - - - - <html><head/><body><p>How RS manage direct download setting.</p></body></html> - - - - Yes - - - - - No - - - - - Per user - - - - - - - - - Trust friend nodes with banned files - - - - - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + + 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:'Sans'; font-size:9pt; font-weight:400; 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; font-weight:600;">RetroShare</span><span style=" font-size:8pt;"> is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></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; font-size:8pt;"><br /></p> -<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;">You can separately setup share flags for each shared directory in the shared files dialog to be:</span></p> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:8pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Browsable by friends</span>: files are seen by your friends.</li> -<li style=" font-size:8pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Anonymously shared</span>: files are anonymously reachable through distant F2F tunnels.</li></ul></body></html> - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; 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-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></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; font-family:'Sans'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory in the shared files dialog to be:</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Browsable by friends</span>: files are seen by your friends.</li> +<li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Anonymously shared</span>: files are anonymously reachable through distant F2F tunnels.</li></ul></body></html> + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Transfer options + + + + + + Transfer options + + + + + + + + + + Maximum simultaneous downloads: + + + + + + + Maximum uploads per friend (0 = no limit) + + + + + + + Default chunk strategy: + + + + + + + Safety disk space limit : + + + + + + + Max. tunnel req. forwarded per second: + + + + + + + End-to-end encryption: + + + + + + + Allow direct download: + + + + + + + + + + + true + + + 1 + + + 1 + + + 5 + + + + + + + + + + true + + + <html><head/><body><p><span style=" font-weight:600;">Streaming </span>causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. <span style=" font-weight:600;">Random</span> is purely random and favors swarming behavior. <span style=" font-weight:600;">Progressive</span> is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.</p></body></html> + + + + Streaming + + + + + Progressive + + + + + Random + + + + + + + + <html><head/><body><p>Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.</p></body></html> + + + MB + + + 50 + + + 1000 + + + 10 + + + 100 + + + + + + + <html><head/><body><p>This value controls how many tunnel request your peer can forward per second. </p><p>If you have a large internet bandwidth, you may raise this up to 30-40, to allow statistically longer tunnels to pass. Be very careful though, since this generates many small packets that can significantly slow down your own file transfer. </p><p>The default value is 20. If you're not sure, keep it that way.</p></body></html> + + + 5 + + + 100 + + + 1 + + + 20 + + + + + + + <html><head/><body><p>Anonymous tunnels can be end-o-end encrypted. In order to maintain backward compatibility, this can be made optional (choosing &quot;Accepted&quot;), but in the end, all Retroshare nodes will be switched to &quot;Enforced&quot;, meaning that all anonymous transfers will be end-to-end encrypted. With &quot;Accepted&quot;, it is likely that you will transfer using twice as many tunnels, since there is no way to know that an encrypted and a clear tunnel actually transfer from the same source.</p></body></html> + + + + Accepted + + + + + Enforced + + + + + + + + <html><head/><body><p>How RS manage direct download setting.</p></body></html> + + + + Yes + + + + + No + + + + + Per user + + + + + + + + + + + + Trust friend nodes with banned files + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 2238b4962..9db4326a4 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -49,11 +49,7 @@ /* Images for toolbar icons */ #define IMAGE_RETROSHARE ":/images/RetroShare16.png" #define IMAGE_ABOUT ":/images/informations_24x24.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 ":/icons/collections.png" #define IMAGE_PLUGINS ":/images/extension_32.png" #define IMAGE_WIKI ":/images/wikibook_32.png" @@ -82,11 +78,11 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) //GamesDialog *gamesDialog = NULL; //ui.stackPages->add(gamesDialog = new GamesDialog(ui.stackPages), - // createPageAction(QIcon(IMAGE_GAMES), tr("Games Launcher"), grp)); + // createPageAction(QIcon(), tr("Games Launcher"), grp)); //CalDialog *calDialog = NULL; //ui.stackPages->add(calDialog = new CalDialog(ui.stackPages), - // createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp)); + // createPageAction(QIcon(), tr("Shared Calendars"), grp)); #if 0 IdDialog *idDialog = NULL; ui.stackPages->add(idDialog = new IdDialog(ui.stackPages), @@ -103,7 +99,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) #ifdef RS_USE_PHOTOSHARE PhotoShare *photoShare = NULL; ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages), - action = createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp)); + action = createPageAction(QIcon(), tr("Photos"), grp)); mNotify.push_back(QPair(photoShare, action)); #endif @@ -122,7 +118,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) #if USE_VEG_SERVICE WireDialog *wireDialog = NULL; ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages), - action = createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp)); + action = createPageAction(QIcon(), tr("The Wire"), grp)); mNotify.push_back(QPair(wireDialog, action)); #endif diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 01bb92012..8806741ee 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1159,7 +1159,6 @@ gxsphotoshare { gui/PhotoShare/PhotoDrop.h \ gui/PhotoShare/AlbumItem.h \ gui/PhotoShare/AlbumDialog.h \ - gui/PhotoShare/AlbumCreateDialog.h \ gui/PhotoShare/PhotoItem.h \ gui/PhotoShare/PhotoShareItemHolder.h \ gui/PhotoShare/PhotoShare.h \ @@ -1172,7 +1171,6 @@ gxsphotoshare { gui/PhotoShare/PhotoDialog.ui \ gui/PhotoShare/AlbumItem.ui \ gui/PhotoShare/AlbumDialog.ui \ - gui/PhotoShare/AlbumCreateDialog.ui \ gui/PhotoShare/PhotoShare.ui \ gui/PhotoShare/PhotoSlideShow.ui @@ -1184,7 +1182,6 @@ gxsphotoshare { gui/PhotoShare/PhotoDrop.cpp \ gui/PhotoShare/AlbumItem.cpp \ gui/PhotoShare/AlbumDialog.cpp \ - gui/PhotoShare/AlbumCreateDialog.cpp \ gui/PhotoShare/PhotoShareItemHolder.cpp \ gui/PhotoShare/PhotoShare.cpp \ gui/PhotoShare/PhotoSlideShow.cpp