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 d59b5bcf2..1e4382591 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -2106,7 +2106,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) ; @@ -2115,7 +2115,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) { @@ -2132,18 +2132,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())); @@ -2163,7 +2162,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/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/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 b071673b3..bf20e15a4 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