From 5e22ddc93ed2d6de757ef558a863802958fce4f7 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 24 Aug 2016 03:28:57 +0200 Subject: [PATCH 01/19] updating icons more flat replacement improving people page layout --- retroshare-gui/src/gui/ChatLobbyWidget.ui | 4 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 7 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 384 ++++++++---------- .../src/gui/Posted/PostedDialog.cpp | 2 +- .../src/gui/Posted/PostedGroupDialog.cpp | 2 +- .../src/gui/chat/CreateLobbyDialog.cpp | 2 +- .../src/gui/common/GroupTreeWidget.ui | 26 +- .../src/gui/gxschannels/GxsChannelDialog.cpp | 2 +- .../gui/gxschannels/GxsChannelGroupDialog.cpp | 6 +- .../src/gui/gxsforums/GxsForumGroupDialog.cpp | 2 +- .../src/gui/gxsforums/GxsForumsDialog.cpp | 2 +- retroshare-gui/src/gui/icons.qrc | 4 + retroshare-gui/src/gui/icons/png/add.png | Bin 0 -> 3457 bytes .../src/gui/icons/png/thumbs-down.png | Bin 0 -> 4297 bytes .../src/gui/icons/png/thumbs-neutral.png | Bin 0 -> 4170 bytes .../src/gui/icons/png/thumbs-up.png | Bin 0 -> 3908 bytes retroshare-gui/src/gui/icons/svg/add.svg | 54 +++ .../src/gui/icons/svg/thumbs-down.svg | 59 +++ .../src/gui/icons/svg/thumbs-neutral.svg | 59 +++ .../src/gui/icons/svg/thumbs-up.svg | 59 +++ 20 files changed, 445 insertions(+), 229 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/add.png create mode 100644 retroshare-gui/src/gui/icons/png/thumbs-down.png create mode 100644 retroshare-gui/src/gui/icons/png/thumbs-neutral.png create mode 100644 retroshare-gui/src/gui/icons/png/thumbs-up.png create mode 100644 retroshare-gui/src/gui/icons/svg/add.svg create mode 100644 retroshare-gui/src/gui/icons/svg/thumbs-down.svg create mode 100644 retroshare-gui/src/gui/icons/svg/thumbs-neutral.svg create mode 100644 retroshare-gui/src/gui/icons/svg/thumbs-up.svg diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index a7c810475..eb3817345 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -162,8 +162,8 @@ - - :/images/add_chat24.png:/images/add_chat24.png + + :/icons/png/add.png:/icons/png/add.png diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 1ab3a6a38..2abb15768 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -1707,6 +1707,7 @@ void IdDialog::insertIdDetails(uint32_t token) ui->lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId.toStdString()) + tr(" [unverified]")); ui->autoBanIdentities_CB->setVisible(!data.mPgpId.isNull()) ; + ui->banoption_label->setVisible(!data.mPgpId.isNull()) ; time_t now = time(NULL) ; ui->lineEdit_LastUsed->setText(getHumanReadableDuration(now - data.mLastUsageTS)) ; @@ -2206,13 +2207,13 @@ void IdDialog::IdListCustomPopupMenu( QPoint ) contextMenu->addSeparator(); if(n_positive_reputations == 0) // only unban when all items are banned - contextMenu->addAction(QIcon(":/images/vote_up.png"), tr("Set positive opinion"), this, SLOT(positivePerson())); + contextMenu->addAction(QIcon(":/icons/png/thumbs-up.png"), tr("Set positive opinion"), this, SLOT(positivePerson())); if(n_neutral_reputations == 0) // only unban when all items are banned - contextMenu->addAction(QIcon(":/images/vote_neutral.png"), tr("Set neutral opinion"), this, SLOT(neutralPerson())); + contextMenu->addAction(QIcon(":/icons/png/thumbs-neutral.png"), tr("Set neutral opinion"), this, SLOT(neutralPerson())); if(n_negative_reputations == 0) - contextMenu->addAction(QIcon(":/images/vote_down.png"), tr("Set negative opinion"), this, SLOT(negativePerson())); + contextMenu->addAction(QIcon(":/icons/png/thumbs-down.png"), tr("Set negative opinion"), this, SLOT(negativePerson())); } if(one_item_owned_by_you && n_selected_items==1) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index bfcfd95ef..e38c454bb 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -7,7 +7,7 @@ 0 0 800 - 590 + 600 @@ -350,115 +350,25 @@ Identity info - + - - - 6 + + + Identity name : - - 6 - - - 6 - - - 6 - - - 6 - - - - - Identity ID : - - - - - - - Identity name : - - - - - - - Owner node ID : - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - Owner node name : - - - - - - - true - - - true - - - - - - - Type: - - - - - - - - - - Last used: - - - - - - - + + + + true + + + true + + + + @@ -499,81 +409,31 @@ + + + 128 + 16777215 + + Send Invite - - - Qt::Vertical + + + + 0 + 0 + - + - 20 - 2 + 128 + 16777215 - - - - - - - - - - - - 0 - 0 - - - - Reputation - - - - - - 6 - - - 6 - - - 6 - - - 6 - - - - - <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> - - - true - - - - - - - Your opinion: - - - - - - - Neighbor nodes: - - - - - <!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"> @@ -598,8 +458,8 @@ p, li { white-space: pre-wrap; } Negative - - :/images/vote_down.png:/images/vote_down.png + + :/icons/png/thumbs-down.png:/icons/png/thumbs-down.png @@ -607,8 +467,8 @@ p, li { white-space: pre-wrap; } Neutral - - :/images/vote_neutral.png:/images/vote_neutral.png + + :/icons/png/thumbs-neutral.png:/icons/png/thumbs-neutral.png @@ -616,57 +476,159 @@ p, li { white-space: pre-wrap; } Positive - - :/images/vote_up.png:/images/vote_up.png + + :/icons/png/thumbs-up.png:/icons/png/thumbs-up.png - - - - <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> - - - true - - - - - - - - 75 - true - - - - Overall: - - - - - - - Auto-Ban all identities from this node - - - - - + + Qt::Vertical - 128 - 40 + 20 + 2 + + + + Identity ID : + + + + + + + true + + + true + + + + + + + Type: + + + + + + + + + + Owner node ID : + + + + + + + true + + + true + + + + + + + Owner node name : + + + + + + + true + + + true + + + + + + + Last used: + + + + + + + + + + Qt::Horizontal + + + + + + + Ban-option: + + + + + + + Auto-Ban all identities from this node + + + + + + + Neighbor nodes: + + + + + + + <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> + + + true + + + + + + + + 75 + true + + + + Overall: + + + + + + + <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> + + + true + + + diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp index 19feaff06..d69977fd4 100644 --- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp @@ -103,7 +103,7 @@ QString PostedDialog::icon(IconType type) case ICON_NAME: return ":/icons/png/posted.png"; case ICON_NEW: - return ":/images/posted_add_24.png"; + return ":/icons/png/add.png"; case ICON_YOUR_GROUP: return ":/images/folder16.png"; case ICON_SUBSCRIBED_GROUP: diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index 6c1b7b006..09b7cbbc6 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -90,7 +90,7 @@ void PostedGroupDialog::initUi() QPixmap PostedGroupDialog::serviceImage() { - return QPixmap(":/images/posted_add_64.png"); + return QPixmap(":/icons/png/forums.png"); } bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 5aa7fb726..9a59b2913 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -39,7 +39,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set& peer_list, int pr ui = new Ui::CreateLobbyDialog() ; ui->setupUi(this); - ui->headerFrame->setHeaderImage(QPixmap(":/images/chat_64.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/chat-lobbies.png")); ui->headerFrame->setHeaderText(tr("Create Chat Lobby")); RsGxsId default_identity ; diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui index 9b6739c72..c4d3948b1 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui @@ -14,7 +14,16 @@ 2 - + + 0 + + + 0 + + + 0 + + 0 @@ -32,7 +41,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -52,8 +70,8 @@ - 32 - 16 + 24 + 24 diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index 6218a6524..cce28a407 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -107,7 +107,7 @@ QString GxsChannelDialog::icon(IconType type) case ICON_NAME: return ":/icons/png/channels.png"; case ICON_NEW: - return ":/images/add_channel24.png"; + return ":/icons/png/add.png"; case ICON_YOUR_GROUP: return ":/images/folder16.png"; case ICON_SUBSCRIBED_GROUP: diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp index 0568ba511..a9e224f36 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp @@ -95,11 +95,11 @@ QPixmap GxsChannelGroupDialog::serviceImage() switch (mode()) { case MODE_CREATE: - return QPixmap(":/images/add_channel64.png"); + return QPixmap(":/icons/png/channels.png"); case MODE_SHOW: - return QPixmap(":/images/channels.png"); + return QPixmap(":/icons/png/channels.png"); case MODE_EDIT: - return QPixmap(":/images/channels.png"); + return QPixmap(":/icons/png/channels.png"); } return QPixmap(); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp index 433f354c9..d16cbc848 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp @@ -91,7 +91,7 @@ void GxsForumGroupDialog::initUi() QPixmap GxsForumGroupDialog::serviceImage() { - return QPixmap(":/images/konversation64.png"); + return QPixmap(":/icons/png/forums.png"); } bool GxsForumGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index 8dbc5d544..61b0c59c1 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -106,7 +106,7 @@ QString GxsForumsDialog::icon(IconType type) case ICON_NAME: return ":/icons/png/forums.png"; case ICON_NEW: - return ":/images/new_forum16.png"; + return ":/icons/png/add.png"; case ICON_YOUR_GROUP: return ":/images/folder16.png"; case ICON_SUBSCRIBED_GROUP: diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 86e678aa9..fb16a31ed 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -108,5 +108,9 @@ icons/png/people-notify.png icons/png/posted-notify.png icons/png/filesharing-notify.png + icons/png/thumbs-up.png + icons/png/thumbs-down.png + icons/png/thumbs-neutral.png + icons/png/add.png diff --git a/retroshare-gui/src/gui/icons/png/add.png b/retroshare-gui/src/gui/icons/png/add.png new file mode 100644 index 0000000000000000000000000000000000000000..7fce53e0cb3593351e3344d7abee27ac2088fc52 GIT binary patch literal 3457 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/thumbs-neutral.png b/retroshare-gui/src/gui/icons/png/thumbs-neutral.png new file mode 100644 index 0000000000000000000000000000000000000000..c4778110d616e6fd834b9a43545b2f9bfb38198c GIT binary patch literal 4170 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 + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/thumbs-down.svg b/retroshare-gui/src/gui/icons/svg/thumbs-down.svg new file mode 100644 index 000000000..530f2b793 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/thumbs-down.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/thumbs-neutral.svg b/retroshare-gui/src/gui/icons/svg/thumbs-neutral.svg new file mode 100644 index 000000000..96b7bfd72 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/thumbs-neutral.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/thumbs-up.svg b/retroshare-gui/src/gui/icons/svg/thumbs-up.svg new file mode 100644 index 000000000..e10c5d71f --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/thumbs-up.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml \ No newline at end of file From 5e5a8dcd9a2a3061311ec7d49ae1be8176548513 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 24 Aug 2016 12:50:41 +0200 Subject: [PATCH 02/19] put back opinion combobox in the place where other reputation information already is. Removed absolute size on invite button which causes incorrect display on high DPI screens --- retroshare-gui/src/gui/Identity/IdDialog.ui | 184 ++++++++------------ 1 file changed, 76 insertions(+), 108 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index e38c454bb..c133a8b11 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -6,8 +6,8 @@ 0 0 - 800 - 600 + 1269 + 911 @@ -20,16 +20,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -47,16 +38,7 @@ QFrame::Sunken - - 2 - - - 2 - - - 2 - - + 2 @@ -147,16 +129,7 @@ QFrame::Sunken - - 1 - - - 1 - - - 1 - - + 1 @@ -278,7 +251,7 @@ Reputation - AlignLeading|AlignVCenter + AlignLeft|AlignVCenter @@ -368,7 +341,7 @@ - + @@ -409,79 +382,11 @@ - - - 128 - 16777215 - - Send Invite - - - - - 0 - 0 - - - - - 128 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the average of your friend's opinions. If not, your own opinion gives the score.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -0.6, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a higher reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 30 days). </p> -<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - - - 0 - - - - 20 - 20 - - - - - Negative - - - - :/icons/png/thumbs-down.png:/icons/png/thumbs-down.png - - - - - Neutral - - - - :/icons/png/thumbs-neutral.png:/icons/png/thumbs-neutral.png - - - - - Positive - - - - :/icons/png/thumbs-up.png:/icons/png/thumbs-up.png - - - - @@ -575,28 +480,28 @@ p, li { white-space: pre-wrap; } - + Ban-option: - + Auto-Ban all identities from this node - + Neighbor nodes: - + <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> @@ -606,7 +511,7 @@ p, li { white-space: pre-wrap; } - + @@ -619,7 +524,7 @@ p, li { white-space: pre-wrap; } - + <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> @@ -629,6 +534,69 @@ p, li { white-space: pre-wrap; } + + + + + 0 + 0 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the average of your friend's opinions. If not, your own opinion gives the score.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -0.6, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a higher reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 30 days). </p> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + 0 + + + + 20 + 20 + + + + + Negative + + + + :/icons/png/thumbs-down.png:/icons/png/thumbs-down.png + + + + + Neutral + + + + :/icons/png/thumbs-neutral.png:/icons/png/thumbs-neutral.png + + + + + Positive + + + + :/icons/png/thumbs-up.png:/icons/png/thumbs-up.png + + + + + + + + Your opinion: + + + From f58494f9e4aec298c0536931ab8f857a027dba89 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 24 Aug 2016 13:46:31 +0200 Subject: [PATCH 03/19] fixed icon --- retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index 09b7cbbc6..1fb1e39f4 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -90,7 +90,7 @@ void PostedGroupDialog::initUi() QPixmap PostedGroupDialog::serviceImage() { - return QPixmap(":/icons/png/forums.png"); + return QPixmap(":/icons/png/posted.png"); } bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) From 0c36a18aa97302778e1e51c8b3f0afb38be5959c Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 24 Aug 2016 16:48:30 +0200 Subject: [PATCH 04/19] update icon --- .../gui/images/feedreader-notify.png | Bin 5461 -> 4988 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/plugins/FeedReader/gui/images/feedreader-notify.png b/plugins/FeedReader/gui/images/feedreader-notify.png index 3b14a86c5939ee93571e268b02045e5f1031e847..3d0446340c5163adfcdf54aa2c5f8fbaf9db48aa 100644 GIT binary patch delta 4924 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 delta 5401 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 DeK9Q5 From 7706f5f7c66456308b89a732b53a6761700b070c Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 24 Aug 2016 16:55:44 +0200 Subject: [PATCH 05/19] update notify icons now orange color --- retroshare-gui/src/gui/FriendsDialog.cpp | 2 +- retroshare-gui/src/gui/FriendsDialog.ui | 10 ++++++-- retroshare-gui/src/gui/icons.qrc | 1 + .../src/gui/icons/png/channels-notify.png | Bin 3619 -> 3332 bytes .../src/gui/icons/png/chat-bubble-notify.png | Bin 5280 -> 4997 bytes .../src/gui/icons/png/chat-lobbies-notify.png | Bin 5855 -> 5366 bytes .../src/gui/icons/png/feedreader-notify.png | Bin 5461 -> 4988 bytes .../src/gui/icons/png/filesharing-notify.png | Bin 4429 -> 4129 bytes .../src/gui/icons/png/forums-notify.png | Bin 4332 -> 4013 bytes .../src/gui/icons/png/messages-notify.png | Bin 4791 -> 4523 bytes .../src/gui/icons/png/network-notify.png | Bin 5673 -> 5602 bytes .../src/gui/icons/png/newsfeed-notify.png | Bin 3645 -> 3385 bytes .../src/gui/icons/png/people-notify.png | Bin 5401 -> 4915 bytes .../src/gui/icons/png/posted-notify.png | Bin 8953 -> 8731 bytes .../src/gui/icons/svg/channels-notify.svg | 10 ++++---- .../src/gui/icons/svg/chat-bubble-notify.svg | 23 ++++++++++-------- .../src/gui/icons/svg/chat-lobbies-notify.svg | 13 ++++++---- .../src/gui/icons/svg/feedreader-notify.svg | 11 +++++---- .../src/gui/icons/svg/filesharing-notify.svg | 13 +++++----- .../src/gui/icons/svg/forums-notify.svg | 11 +++++---- .../src/gui/icons/svg/messages-notify.svg | 11 +++++---- .../src/gui/icons/svg/network-notify.svg | 13 ++++++---- .../src/gui/icons/svg/newsfeed-notify.svg | 11 +++++---- .../src/gui/icons/svg/people-notify.svg | 13 ++++++---- .../src/gui/icons/svg/posted-notify.svg | 13 ++++++---- 25 files changed, 91 insertions(+), 64 deletions(-) diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 9a5d3a3f0..7f7891514 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -51,7 +51,7 @@ /* Images for Newsfeed icons */ //#define IMAGE_NEWSFEED "" //#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png" -#define IMAGE_NETWORK2 ":/images/logo/logo_16.png" +#define IMAGE_NETWORK2 ":/icons/png/netgraph.png" #define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_IDENTITY ":/images/identity/identities_32.png" #define IMAGE_CIRCLES ":/images/circles/circles_32.png" diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 68091706b..f935355d8 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -220,13 +220,19 @@ 0 + + + 20 + 20 + + true - - :/images/kblogger.png:/images/kblogger.png + + :/icons/png/chat-lobbies.png:/icons/png/chat-lobbies.png Broadcast diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index fb16a31ed..24b21616b 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -112,5 +112,6 @@ icons/png/thumbs-down.png icons/png/thumbs-neutral.png icons/png/add.png + icons/png/netgraph.png diff --git a/retroshare-gui/src/gui/icons/png/channels-notify.png b/retroshare-gui/src/gui/icons/png/channels-notify.png index 538bf865bc789a54badeca12cd5414dec79a5d3a..df46c8857561d9cbf8f156bb0a84553eb4ee396b 100644 GIT binary patch delta 3255 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 delta 3544 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 S2ruFQ0000 diff --git a/retroshare-gui/src/gui/icons/png/chat-bubble-notify.png b/retroshare-gui/src/gui/icons/png/chat-bubble-notify.png index ff83faab6339a6f774e4fbe664a462ef737af557..a9ada88c34a49b752a3b2b05bb278cb677fb7496 100644 GIT binary patch delta 4933 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 diff --git a/retroshare-gui/src/gui/icons/png/chat-lobbies-notify.png b/retroshare-gui/src/gui/icons/png/chat-lobbies-notify.png index c704f4da0f707923f8a86b8ce4855506710eefc0..ff416e811029b9cb551940e30c01dc0654149cbe 100644 GIT binary patch delta 5305 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 LNkvXXu0mjfo~LBW delta 5798 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 delta 5401 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 DeK9Q5 diff --git a/retroshare-gui/src/gui/icons/png/filesharing-notify.png b/retroshare-gui/src/gui/icons/png/filesharing-notify.png index f4986c807fcdb262ec7ea9fea17279fe6639f80a..b396ae65783670b85b8cfa52bc92cd9b6496ad28 100644 GIT binary patch delta 4058 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 M07*qoM6N<$g3QhFhyVZp delta 4361 zcmV+k5%%t(Ak89>ZGRBTNkld30Rmd553(yE7w88rhPG0o&Rovzetiln|Db z5=wvo3895R13iZ%oD!gE3OUV54x}kdl9rUvPy%Hs6jI>e6hcc_PXY-$B_;MHteIC zItJuZh#V=ZhbokNp(QY=BAZn8B~+gkN}jK1ZrSC9mR~G51L&)VM-!Dhj}>E`qN*nY zhXfqbCP5!lhkwW8U0u(~@uUNeCnpw!0aURD+iFfgIa`G@Q1%KsrfCtnapXY}9w=|@ zcv=KI=#b_j)CNeju02eVi%~h7vHSNzq6g6p0yo7QyEX+K%uIyR0Ew2`6CAiq&{GI$ zj5**4`lza2U(vk%>7av|N@)JLsz{=>`U_yL1pT9+h#=z#3W1kx<9uU9!}gZ~jKP0C zc;{mk%VK5MqIxl41rbAtNGsepRGz$Y-+kX7^jq9_0}QrQf7U^625SA*4l@Gn7%qx8 zbUxv;u75xDwAEKe9Q#(_EWb1tBC2}N$mr;fJ0t21vA4AF7Vrk8q$LdW(QJ zapatebsd|%7BXH7^tV=jMO9u|N`6ipjL}#7TWT)wTF5g4sA3YWwf`(Cw*w_!=`3QF z3EVNTwdPt?@2=FIRIHuVrHPc>hw^zZ>Mufm5q~$a})69tRF~v)&~pc*8_FxxBV>hg%i8W`NsgYve8eNtKTj!rkKbHxCI?RBdi$9WE=(T)0+m;<3z#5yM4(7vfjhZL42aNF{k2 zK%XWu=-3Y|we|x<`O}2j_p9drK`n0s4Aj*8P~r4^k6*$il+PzxYW^|b!}Dqc_P5l0 zS>TR*MHd}XLbT$~^FBN^@N>{)ArYu5XMZkl?)*ir2j*;mL`(G{ATN5=_db7wSk>jE z2Oq&nzT>a5RYiH->v1lUGsBH$zeeU6a=fBh&-s9*T-@>C?^9XhOO&B4#+JouQ8OY`XSMZa{v&toPW~Q z|AkdjEZqxtqwtBr(t&GoIcDAl7}&b@c;IU}N98Hm$p@>az z&|uZBOXpK?P6H%bst-}*n}x^Z7Ju_geuiQ-fx*w zb>v$!?VHvBiLKQq0|CEJ^(Oflipc~5r}S^FJ9@f((;7fU{?6Nw=EB?LXDBWcIMZGQ z_Ao$SOZ7V7M9(9d5r2}Op=eAXoYwn?+C94M?O^~xE+Vj3zWydZLy?%kL@fS#kByUm z=;rk?LC^CqrtDCHNPdQ5Fn@uf=TH4c5SjdAprr3qLH71HtTDu@!XA1Cd+3>2%f@$SW^x}&m)&|!vmUVuIPLLlOLay|Je z;3U_T78^d9z{}*1Gk=k512Ej$PzN-7rM9T>*aSW#ACLovwydp&@%FT>Y44i28A)p; zvC2z`l%IxJdx6Z|dpSMyD@JyDK21*UjGLfz-#cA>I`Aj?<64$=6tKYnsN$&sOthJ@ zwT}^9aUl{}J+I`49+$5KekLCPb&i2d8^Flno(V~WW&7SXmVfxghD#>!J^28P<=m)Z zMDorVGl`1i>XAKr4FN>+6h& z@ph<}lzLiyXvon7!6tuLtD-);`2m7S{JQ5>X2X2VqM-03xdlgmewQ1;m&M?w!^IBkzBeRR7(Ky#Lj3 zB_9CYD*~*Xvs{Q6{pkCM$?vPRJvv8kpaL+lgD72n?|=C1pl4#cItfNUyuvfx0$CXW z3hU40GxqSaL5DCSyG`(yStbZEM9aIG!%6uq^P{amslJ7Fu?#=K= z)ge#nb(xYpyH_q2Y&WK7Tga#Z3YwvCiG_>6XoN8Xgz$yEO?qI%%)2FmNXVuubQ4W^ zejCwo1AhzwD?C-ogVFA*NDpQ&tt(~)(G_1I5HSFORN%h^8waqF$mSub2IM$u4ND!-vl8;?Qdhkiqe%}j;?g&bEm}dV2W%Q$~ znEZXhTJ}jwSKmWu=Bn})3o)gr?M2<%Z4mj;i+`%~B|Y>joY6@OW=aVqdtXm+CLf&S zA8=Cb-c+vgp;1+jYR?BH*>io?mgw^HF_G$k;t8H)&kdf{Eh6nk&~2V6hQ{5h2elB7a@7L;N@4o?#XZ0J^cH^Y+ ze1C=N`Ct$KHhcWLEF)HVNpJxLjFW01op@yKf(0NrZ<-bBI@*AKPnG6DvggNHzoQjj zM65vOst5(io*MyAn*JGj%9?j{8W9wcK(7M!@blOszuUb*V#F#h4lba889VzQ_F85$ zjE@Xb)t9_hn~h{o_MFDiinABzNTPX??0>xpkI#Noc?rf1An5a+s?CBu{37s_*qC~O+e8EPpbE)czyN*D#TuZ zaRZDmNB)-As#CE?Ud|pwAyHygf8%!;p}|Ral1luyA5xntnp<|kNAo)RHiSiwxNXFt#rAFZ5d^iLQ-8rnxx@TK`_ zkG_^YBdA1(RsO9X(xF7t+er=F?|+Myz=N`W^F%km?74!~%+d$TJyJc{E&oXQ=P=O_ ztxD%J$=+N1I{U$}A^YbfmXE}r0^Q}MzBBqd>7idw+F}u_D(16)C#iw^{E~aGynFA- zfBb9%$okDmK|Ea+ern4<57l2x zj`}6{aOHj-ty4EnziOE3kEh*U08a8P(t}S-+G2=Re#32<1%uk}d)eK4Pd$}sR}r1o z02S-Ho&jEWGk~#s|L!|Wq<{QmOl+N-5(|oC@9n;w{R*!xZ|<1(gWt?6hYH_yD*z|? z4(Y+ivSedbm$_B_f#GAWje9b@W;?ZL9y+ZY!8t<0QZ z5UUD!QPKcW`y*2QclssQYsC8IT!rQ|K;?cNt%ABTJS9?gJf;}t4xWKj|DC8a=!=%X zRq@8QIY*SvYgnjmX@4$Bn9+^EL4|}=w)PQBNeEV?4*+%g80t6*brPOy3A|F?*m;!5 z+@nh7yaE8ox~-$Ab14P9BDTtoE864(r278Dm*fMEqjK4Nk`MDV06<0a_NN88F5jq% zxu>r>2~z!c`6R~oW_sx}9rHE-K>0|;l_0;*H6{}~0BhMNa(_K+(U9!E#;K=bFuSR0y(v0Ote0i;){x8?=7STeEH({ftA(^=6mVSkdpxb;!Ry|I1XPT zhxULy{1R$=+Rr3(IH?v!-oKdSN8k5D&c^6jW&3w+&-K8(Cx_|ZTJs|jE}yrMS&mhH zB4&{f_*7>YCx7_{_Q-2^IkY=llxr)RJM)^5IBx@}B7?0pw<~-(-#V5k9DzH^8#^x) z$?plRpy{Dhu@bE{8-OnqQqK~3^I*KO^K6m)$CBmT2AGTpc08tE0-h_Ro+a|)*?3IP zD)q$ZGVQq;g&VEX(CU8?(bHeOH70E zwuOCCS@VugH>xZ63Xq|+X-7xem`?)XUD09T^V_s#9qm@~!9@cAR5i5s#+{NAL3|nG zTx4vBJ0+i~YH06uvrc&@GN! zR^HTck6&l~WIS&JOos?gyt(6U5$j-8^>2(+xKLHSM~JK+`&$I_v=oZPVg_5PKdZ=h z6^;x#7N6K?RIey+?h3qN90~(u7}#3(X~g~x$O%Em;t?BFxw@jM^WmV*_^E`-02%t) zs(+6(D&I!=93hP{2OL2kRn_Y&nzuh4bTCs1^&fYzqh^hrlJf<<5NHZIo*ZdWrW5?58y}osm1z~{6=&OfE z6O}uU6=R*EswV?M4>#H*=ws^ec)Y9YIe$4GpC z>5*Iy@Rq_Ws6H!{JfE3$d!e%64KN);Th>-P#yY?er%sT1b+is6t3=rwSOvs^av(N- zNRqL^E(u_l!Y))l6eI15ZZm4yP1<=UpMLjY=l=n*$!ST-rg;wl0000eRNgTmB4@dz5tTsg%>IciUgGp`SN3`rHEDw z;{aMKI)&P4bp|U5fv(QTvg33{G}YR1l_@&Y<(PmjtaT~|1<{JYv?2mlt&1vtGAfN) zMG;8IdkG)OyLG%mrowF~99elUiUoj(eZXZrJL#F&z;|2hhrb$vDn@lxYOi#x!tIRwKGd$`b4S zHl{U!`EpeestT`0oCTog`fZOLbPLFxl*U(ypnh8e0e^7-t&CoY$Q|9c<6EO!P-lV6 zsbB54CB8aBon4e) z(|p2QnSb|1A{WYX;sCm&;A~uH889jr`nmycB6_WqCf>5G$g!2*wGluoa2OQ58~Bke9X$XA{+-hJt+v(;tT=!!qA!KfM^Ub_A-@OmB)#L` zky-3FE!emNXjO4PXkGvU->>llfw96*a05T2(L(oIhYM_C6#tzQAohPs;awl1`(v9syc)NKHoXX89jR1PzfI^U^gq?4X*a*1r=TLA;wvrqi7JEnNQn@)5dhNdzD9OgEkao!H z3!`SiH7~%-S7GcNh@|xh?}*V*^n+Ax?DQ9XXx9HH!suOd6rKj7Z-kNGg}x^pdw*@& z*-&3&K#4Zu=8ci^y5kDV>s*d=FA{cs_6U?r^?v22TmoV{8c*_ZlD`1{wiBy5Mi&=N zL3NE$yLuXZiec10z{u;N-4^nZe3--5B_aAIJNIZn{Ug_lTaVncfuJ9Yq(A6ql2 zyHPk8M$d*3e+T&|`)y5IRBi!McL1#{nhJW3RinB*0;gUIPoAcWqZdkP z{KeK6+8+VLy(wJt>44t-VDt?z;(HJq?zc6mquc^*!}QzqvQ`!iM|4|z*ME96{l~zV zQW!P^dUcRx&IHEa0uJMnbcV~^z1xreuY{>k1mHZ~mc^1WxQbiPWRHO>2A z%iTx*9Xks~UT0sgzsvyII)E)@rLIl2d?Syd|$IDhYE?@y$URaGIK z;JVX*)()UktSRhO0GIs_44!07MMxTm9PVoeKp%*e0K=>(>m7wFo(?-dSe&Ix`VNMc zkg#UA!|lSXi1dLekHJajTM-|U1#V;lv^aoRa)1eU!=Q_-hz`jTWg;973Y9M#S8&SL zyiJpkU?N_hJ6eH*SAS;3pl}B!{s-ZHQlL3U6>%6?bS9>cdJVl2io*j$0Vhgjti%B| z-&5ntjf)JiK*Sy8;E37OE`@_(-~^*0LoA{084l_WH7a!QWWr~E7eQsH19F;Cp#%QP zsJIZD$Pfn@U{q#5I}3^-77!iaV7dlh5W}KFI^s(X(BG)YynlS7;zF#_-vP|_Skibx z>kxYsIFMdWnNB%SXH;B>O|*}B2iW_*QE?$Qkv`@RsqcQnxX2J|r~_VbpfNsu!Kk

#{Z>wh*mxQ2EfBf`(6F_0{2g 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 delta 4725 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 DA8q)r diff --git a/retroshare-gui/src/gui/icons/png/network-notify.png b/retroshare-gui/src/gui/icons/png/network-notify.png index f2d9b3d90d3ab85d839f8c34b930ff50982a816c..62574653406f94a763a4e3d01568d1a563156cad 100644 GIT binary patch delta 5542 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 delta 5613 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 Hu0mjfbPw#- diff --git a/retroshare-gui/src/gui/icons/png/newsfeed-notify.png b/retroshare-gui/src/gui/icons/png/newsfeed-notify.png index a70d7bd772016c28861dbbf586d7ad087fdf77f2..f484eb0b505eacd4cce5cd51c6050240c03851b5 100644 GIT binary patch delta 3308 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 diff --git a/retroshare-gui/src/gui/icons/png/people-notify.png b/retroshare-gui/src/gui/icons/png/people-notify.png index 6e7b94ea7b935febf82057874852b1203d794f1d..2a0b75a7836baabeb52a4afc7aa216e6d029aada 100644 GIT binary patch delta 4850 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

>iA0>H3L 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 LNkvXXu0mjfZ=v*- delta 8909 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 bT;RU}12i6gqeFmz00000NkvXXu0mjfJh5@o diff --git a/retroshare-gui/src/gui/icons/svg/channels-notify.svg b/retroshare-gui/src/gui/icons/svg/channels-notify.svg index 12e5a8228..1219e4988 100644 --- a/retroshare-gui/src/gui/icons/svg/channels-notify.svg +++ b/retroshare-gui/src/gui/icons/svg/channels-notify.svg @@ -18,12 +18,12 @@ height="80" viewBox="0 0 80 80" sodipodi:docname="channels-notify.svg" - inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\svg\newsfeed.png" + inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\channels-notify.png" inkscape:export-xdpi="144" inkscape:export-ydpi="144">image/svg+xmlimage/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/chat-lobbies-notify.svg b/retroshare-gui/src/gui/icons/svg/chat-lobbies-notify.svg index bba8b867d..6486a1236 100644 --- a/retroshare-gui/src/gui/icons/svg/chat-lobbies-notify.svg +++ b/retroshare-gui/src/gui/icons/svg/chat-lobbies-notify.svg @@ -19,7 +19,7 @@ sodipodi:docname="chat-lobbies-notify.svg">image/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xml Date: Wed, 24 Aug 2016 16:57:33 +0200 Subject: [PATCH 06/19] added missed icons --- retroshare-gui/src/gui/icons/png/netgraph.png | Bin 0 -> 6691 bytes retroshare-gui/src/gui/icons/svg/netgraph.svg | 54 ++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 retroshare-gui/src/gui/icons/png/netgraph.png create mode 100644 retroshare-gui/src/gui/icons/svg/netgraph.svg diff --git a/retroshare-gui/src/gui/icons/png/netgraph.png b/retroshare-gui/src/gui/icons/png/netgraph.png new file mode 100644 index 0000000000000000000000000000000000000000..e75a06549d9c15bffe4e7feb306d94f76867e9ab GIT binary patch literal 6691 zcmV+;8rp zP-`u~P9en>2_GAVb0fEpI3A$3fFTvcte;h)f4mAF+&)kR;VY!+5l|N zmy9q?aR)F1NDQ?;UQ!P%Q!)SAF=yD$P%Gn(urvT|ap^=UnGZ}QOm*}E6U4hhF`v|D z4P6&%WjYf+e_Sbry13*A66FyABSWoDAds+K2=SOPD}Omc$WZG8VPXL4;*x1nibpTh zj_-_w?E>+LF{j|&Q0o#>1JD-jx?Bq7X<$?+^#~b)t%?-)IOh~>37ra|;Q2jqs%b0) z?f}$~=ny{WLW=*=Bb|@%vk@)9ZanA)pca>11M*oQGuUm1HG*n0L)Qei*Ji-*W^EH3Xlj#ih3dp{)S1Kq^{V+2a!K3s@T$K2pHH>$3|U4%E3p zU<}~N$|yCi=~ZBQK;(bZki2EsqGxhTPMg)Dtv7(8g9)nAwj8*^a@pT##CpSwxPf_j zjh0HaQW($fO;a>|wSb|P$_)}Rn!?rTv0RxNO?IpeAp}R7ooqPP!s^Oqnw+7H1(C4J zRMaWVy7;J7GOaU!qS8!F;XMgMERz{TW(`T?(Mtv}FiLazeOUhYyaaB{i4TBAo+DtGsz%(Q zc(wn~$fS_GYaQ}RRd4+VOQp{aHJ=SYOB?VwFwNKZLrqGw#<*nPgNH}-i)2WG-9n9g zX1dl`_B&r+_Q?R$#ih4OxYyT4!-4Pgi$w8rBEO`6lr_ruiG*LPi_32CGPf$z+X#ar74yWCQ-yzU`Tkjtj_26 zi}%!r`ZUlT3Z_^@(PuW#9`*n&LOcv)`K4AE@>Izw_WLjuRJZ8-`X!P#j1UqZ5%_b$am?^ZE9ZZH!xSxHoh@K(wmKKlb!cwI-y6uF`15yC)h#*?Y^!D2p+=0boc7%#6gi>0oJ98{zyhh5LOc-= zt-=rqyjAXCbM5Ia-|ehx;~ximU*`izQ!MQ6d$$IlrtQ9|w|e=$8mX+ogyV80;kfqbY@ilD1MX|&)|4F5vszmR-M&V4&Ewv z(C+WtBbll#+I6`;ci5)RU%4~@X^Q`gMPcYRMKCTon(R0mNs$^YPLs+OCmW8n($Eq1 z6;uLFMvRT;#-%Vhy=&pJpAJr-qS?tkn`>BE;qa>+sVEQNB22%l0X$bW7$GP5)f#8~ z?GKDdV&kJf!|#+fVmfYA7lyeFG*3nb#(?2>NjH~`1wWN2lS5WA4Nf;=SJg#6jek_KKFz3 zf2P9s-2F@XNBJEndHKL-?k?=>myF&(gen-(&$nRS@A)?kfDq^P@&6jYlEaZmd9AN< z7hW>J5?}HCBa-M7!l}USB2dt#2uuCo{UTJK<@JyB_irPnof|du^$J8aPESPOQ?Pqp zyq$?@)MfDi6A5;OALS-+eO4To^p7IR#UJ>pv=~nOYzW(qpJsJc zGp`+NqV}}!!6a>d?Ca~={oXqF(Hi7<9oE3PBYqe?PU0)5sGhrN#2e^*KK4{h1Y8W<`A6 z*XQg(uasNbI}yRuSX{Fz=$ND7n~8Q;1?Gq@{>Uc{H3gp-+p$Y z#{kic7#n}QY#=}MBcrIKuALpHEHD7c*L{6v1Xx^_1q||4o~OYSo{}7;5s1w|W~_}* zre*V+@AkK3x1lM5dxrL7+YfTxZt3ib;DHfIl-!i(SLaLM!B1;_e!r8fiz(ib4qq97 zD$UFN5omR2oFatfDcF||h+^~foPZ>A3`wxFVOlodO*(&NKQS$a?LW+A;iv(`cz7=2 zj>op2V0EQ+g~L>#jfS&RfE1Vev&{7;y4D?kpODVV3J0qyoBdw+4C@=oyHm1Au)FVs z+BlZQU7<=HZ87sUd`0Luh`T3osb811XDdHH?#>zEX) zbUP2-lzdX#%E}4{D=V5g<2vZJuHC?{2x4vB|KiskZQ<@sHSB3<$F2xwMNW*mimB2WdCJDjXN+QKUb z8vWXFbn}n-#F$+;POv~KYFb$neq{TkMr)MMyvXldJ5MO7YiGp~2P-NZe176|k5k1P zlQP`yDqcCz$ekOH(d=dEmnco}$IFs^I`ur-s&n7g8eTit8?35w zpTE*x9-qd|UKCoef}^cEZy#~6vckc-qb*(b*FVaO=aup4UEY(x!=E1KKX#n-tNl9) z`ttPXWRDDAHzj{5tK-qnPlUYI&{+&!$r0+}l4(e>!e3!IaW;0`nCGz*$ZDFMCht`> zv+{_8caJpVaGI3dlt*q{*S-3G>^RB)`_!7do*o>L#P3IS?>^aB)5=|&YQis?SaOX} z7M1-UA>`9m$eWp$z)R!3PEh@tR}M6?vckdjS#eCwi1qnM*pRTlv7L)uEUea4H8X9^ z5loA=83K59VmkloVvBdG-QfPMwY<2mA*6+++#!*7X^Jqjr9~&*uO4h9Jw{{UsDWOu z2bNbjn6=?3x+(eR;U+Xi@crayre(!3Ei;bnIFB-&08j-kJKt$a?%7;pS?9x<>Ezxm zHC&Ss+hz1S*=F$H`x>lk%wiNNvQ;tt&N)DVRYEt_p61KCHpV7L6L0VN7u@VLd0<;D z_ie2`ZxwDzIP7q;rmC4gm)5bo!a+@|PJ&$}Ia>3{WQ+GS@bZ33>nsA`aGJ#06vie; zpZ9rEq{>_6j=-$qtw2zvD%0+~6N~fy_BD1;w5OhvZ3c;UmDFe(qEnBRJDmKfq>ecs zALWDUmL7-5+S584YFa7YQ_tV_HgL${#HI++V{NFNg}dR-jWq!|vjC`UadMXnSN4IX z4z?WcnrjdiNRA7oxU@t-VIbS-7on0KYa=OA#gtIta8lmfVaZUOU{{!u5zFOJ(J4{|X z*u-lGo3JT@D^j9)Zft6oHN%$Lp3e;YWm9cy7X!E`JPJvx8GfDRXni}-FFK~|CIV%HO;DZDl@oznVtO6uDwscYk4QwMqRcGgeJ={Cem5itAW zKIF#RnYyYX5Xq?#VN>VKN*Y~c9HqK(-dKsNxCm9ijXCk$cuo*dn<42iCGkBtjLtG4 zHHHUACb94f|BkL*AQd3&N?rNOfu^qiB&(yATrteUNTx_tc-;ACxqn1bAo3>KFGvH} z>0;qDqFCr@*v+1cguUky+4J2cA`c15^MifQODDB4}m$2F~1 zgmb%GWcq`YoKnOEXaJ^!mt36rr$lSqJG`Ie?cGt(mpm6C;xFzy6L2#A?Q#aZw3m#( z?_=_+3aVPV8mA}JSiF@Lf>R0t%a@knz%ylaE(-?#->)@s-f>$S`GrX_=^XWwi zc9vb0?lQ!D(VlwtxhX=qWUu!w;)-S`>yKG`xww$BTrnjTmP!pH9{=(rhaFvq+ddI0 z8>VG5-H!~UtJ7oIG(Cr87y13wEjkN6cV9_#{jnC_D)+qNhXn4~T;qSKm`<2NDOZFd z%Po}}Ml?H3e!Q;A<;h^IO<~zp87#RX&8uLO^cWk@jZI5>8>)L;^xgVV zwMRp`1RmU4>vxG5R|qM~1uyK(RSor^<*@$q@P|)bje_ zz(f!ms+lQ}QmDmc4Zdau_XcL<#`DtnbdS@`PPH3n5<}z}Z=Ro|vj zQ5rwYiQ|%_C?Zwmt0G!0taTCTY$5f=oWj1AB!+}D|C$reD-%5Le1ExbYb{Uh>IFON zuM$HP03pSeQ0o&2rewtO;`p?nbw0qO|1yBVVH^Z<7GbglzDf?2m>WZ@j`dv9KZ;i; zq`R#6(d;yN_|xMqokpHg?r^$X#6@X>XU3$2{mmLu5gXwv129x=b7d61hwtYYb*CXcdpT6L4x4>vL6!zwObc7PweU+FT)bbM+I zb9^k86(pqLbZ&xk>H%ttN=v1%E<8L`#cGiAL!**s#M%_br^YaPKon_T`Sy>t>U>hu%Fa`5teBkXHVyo~ ztu?$^9+>^~eOqdnoF3a{yLe?v3_rgpk-vpoc91aFeEpwaf4Jmur0Q&~4af5URlqL` z`|9TF@ zxgT^nuh15i{y_>teqBsTw8p*}gMBU|?{Jz7`p5o&rKEMo%E_5bbrHb%L3ImTkDq36 zf*nObL%Ts$i_Yq*W{=9<_=`Y1rq3z(&H0~o=1j?$y)M5CBEKx`>vwtdJ2xJqXm@Z* z&Ynwp%$aH_-Bl&)Ou56!V_%%$<^4SutMU=kP>sPoUKqh`1^W@K42TL|U`6fWD^fyp z%Y9Xg)9qB?j_f!a&woFa53kL(pdhqMmUr%aaC2*zkmgf?(7+q4h~dxiBGAKXKB#VX z8HmyoW0RxVG(Fey^@0$tZxMBA0Q#I^>!oCer5bpN-2xY0Fv`}sB1Thqb5e#&N0cYz z#MyX#l9iWdh|l!dLtQ%j+)h#ge&g=DU{GU0I(MiJU+x{=k70fWonAU1ire$8DcvB1 ze8k;%ZVkYgTet!US)9No7gxA?%VrNQgtnS~5i0YCS(AJ4;7CgnSw7Nd7rMRwxm)Q% z$_4(m?kle!Zt`neWJ-9`i^yB6xIQbc$1<^=k`#I7jskxW@Mw46cdMyBcjy{mxnCOi z$j-VpR`?MK`^tevzXCpd<=RYZ^ABB}CwRfj`kcbG-96BwsT!&=A87YS3tySPxrP&M z-XG*tx9B|N#`i0|N~}D7 zTIUDvAF(`-&QtnFTDyH4;Nx~s3i&8=hV}R>@MyBqTW!A;k}{t(@smxptz5qRFdIC` zr+dG;nah?R4(V024vPyxJ34%lx6Q07{F5gSdbV1*dvH6dybD4T+;X6)g9-1HbM?Cw zys)={LyivG4N1EpIndO>qCNFo`F1%|R~-p?2-eY7YuooBlh_nO&S!z}$Z|X$U-Vf+ z*J+DNo{&P^@2y5wvG(YhWQlNQZFLJ*T6hG#&dY>QiCkc~IrMRbSNjz`Q9L5yORqHg zhVhn#IednMw=2B5C+K~%x^SU4FL<|Mol)4Knaal2HPdHK759}}YWKyP5d=O<|G;U2-BsBbsCDGO%^soccvL#n-P$EPDJ zV@~060Z;n!?l*zm4eiYMu*zq@eupW!;r&XFfBga;*XQPcmPIwGh%sESL*~T_kb1@an-v#;!Qb zM;@-^S5-DMdii1AKH}*@QoLa#6wE^ipQmI09nMcyMyc^l?;#oMx2y}8ammsAcu)e@ zWX6&5)r}{ngz8o&D=Hkka-flI-d!y5vEhiH%=`?$+@{t<926Z)P(<5DLNLM-c^5dE zB8amoG<6t0trH}CX_}E&GB3~X`){m^nJFsG)D+&6FvK#M-_ivEyLHu^%&o&Jt&nG3 z+01!`M|7>@GT>v&WPVF$Ht1T%;nu)56AX&>CaJ3aB9f^=X|J~< zdB>32FPJwZ;Dx+{H#AErl;YiY3n8DN^PO(ra+VG$#r@`-{67b3$nQ+h=VtBs-J?xY zJ|~dFgWYyGBjF2GaGP^>;kID58=A%00;#BJyMF@mNx=FW9C{b0K+HF0=f4!JU;Vj+ zc6Gj_G+A}>p9p>$QawV0MDnsB%=&0i4BFRC=kY@DOl4VXC7S zm>}L2iut5IYv{UAE7O_q{^LHsCsi@@p9&%70C}NS$4d@MDT__1yvV$QW1&{Y9pP;N zXIUy$%~3K@n#v5|2Eupea0(&b5GG6Y#Qb%EIJ>u+-eCaeQuLWk(;~-Wim4_{5il&2 z>PW;+MX(BKtk$bfe!_zBVN(*+6MCNkbf$RMKo!Oa#5jo<1r!2-s>)aolnE)eN%+_> zoEy1)MA+0-^o8DU0In$Bk*-PG#Zr(ZgqbZ(k%geYgaHEj1F=91aQ14C4$dUIGy}&G t9LMCO5TaZ{g%Gk_cWQfliMtPX{s*B_0_+|cZAt(D002ovPDHLkV1mM^9$Nqa literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/svg/netgraph.svg b/retroshare-gui/src/gui/icons/svg/netgraph.svg new file mode 100644 index 000000000..87709e74a --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/netgraph.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file From 7a2ae6e979793a7596120bbab26e797996b7eb79 Mon Sep 17 00:00:00 2001 From: Gio Date: Thu, 25 Aug 2016 11:33:11 +0200 Subject: [PATCH 07/19] Remove some clutter from libretroshare Removed SearchInterface that was an historical remain that make no sense anymore Fixed some clang warning Fix includes on some files --- libretroshare/src/pqi/pqi.h | 34 ++++------------------------ libretroshare/src/pqi/pqihandler.cc | 21 +++++++++++------ libretroshare/src/pqi/pqihandler.h | 19 ++++++++++------ libretroshare/src/pqi/pqiloopback.cc | 5 +++- libretroshare/src/pqi/pqiloopback.h | 13 +++++------ libretroshare/src/pqi/pqistreamer.cc | 27 ++++++++++++++-------- libretroshare/src/pqi/pqistreamer.h | 27 ++++++++++++++-------- 7 files changed, 74 insertions(+), 72 deletions(-) diff --git a/libretroshare/src/pqi/pqi.h b/libretroshare/src/pqi/pqi.h index 6109d4761..a7aa5854c 100644 --- a/libretroshare/src/pqi/pqi.h +++ b/libretroshare/src/pqi/pqi.h @@ -27,31 +27,10 @@ #ifndef PQI_TOP_HEADER #define PQI_TOP_HEADER -/* This just includes the standard headers required. - */ - - -#include "pqi/pqi_base.h" -#include "pqi/pqinetwork.h" #include "serialiser/rsserial.h" -#include -#include -#include -/********************** SEARCH INTERFACE ***************************/ -// this is an interface.... so should be -// classified as virtual = 0; - -class SearchInterface -{ -public: - SearchInterface() { return; } - - virtual ~SearchInterface() { return; } -}; - -class P3Interface: public SearchInterface +class P3Interface { public: P3Interface() {return; } @@ -61,16 +40,13 @@ virtual int tick() { return 1; } virtual int status() { return 1; } virtual int SendRsRawItem(RsRawItem *) = 0; -#ifdef TO_BE_REMOVED -virtual RsRawItem *GetRsRawItem() = 0; -#endif }; -/* interface to allow outgoing messages to be sent directly - * through to the pqiperson, rather than being queued +/** + * @brief Interface to allow outgoing messages to be sent directly through to + * the pqiperson, rather than being queued */ - class pqiPublisher { public: @@ -80,6 +56,4 @@ virtual bool sendItem(RsRawItem *item) = 0; }; - #endif // PQI_TOP_HEADER - diff --git a/libretroshare/src/pqi/pqihandler.cc b/libretroshare/src/pqi/pqihandler.cc index 718e877c1..f5494be15 100644 --- a/libretroshare/src/pqi/pqihandler.cc +++ b/libretroshare/src/pqi/pqihandler.cc @@ -25,16 +25,23 @@ #include "pqi/pqihandler.h" -#include "util/rsdebug.h" -#include "util/rsstring.h" -#include "retroshare/rspeers.h" -#include -#include +#include // for NULL +#include // for time, time_t +#include // for sort +#include // for dec +#include // for string, char_traits, operator+, bas... +#include // for pair + +#include "pqi/pqi_base.h" // for PQInterface, RsBwRates +#include "retroshare/rsconfig.h" // for RSTrafficClue +#include "retroshare/rsids.h" // for t_RsGenericIdType +#include "retroshare/rspeers.h" // for RsPeers, rsPeers +#include "serialiser/rsserial.h" // for RsItem, RsRawItem +#include "util/rsdebug.h" // for pqioutput, PQL_DEBUG_BASIC, PQL_ALERT +#include "util/rsstring.h" // for rs_sprintf_append using std::dec; -#include -#include #ifdef WINDOWS_SYS #include #endif diff --git a/libretroshare/src/pqi/pqihandler.h b/libretroshare/src/pqi/pqihandler.h index d2e5ce51f..cf1f19429 100644 --- a/libretroshare/src/pqi/pqihandler.h +++ b/libretroshare/src/pqi/pqihandler.h @@ -26,15 +26,20 @@ #ifndef MRK_PQI_HANDLER_HEADER #define MRK_PQI_HANDLER_HEADER -#include "pqi/pqi.h" -#include "pqi/pqiqos.h" +#include // for uint32_t +#include // for time_t, NULL +#include // for list +#include // for map -#include "util/rsthreads.h" -#include "retroshare/rstypes.h" -#include "retroshare/rsconfig.h" +#include "pqi/pqi.h" // for P3Interface, pqiPublisher +#include "retroshare/rstypes.h" // for RsPeerId +#include "util/rsthreads.h" // for RsStackMutex, RsMutex -#include -#include +class PQInterface; +class RSTrafficClue; +class RsBwRates; +class RsItem; +class RsRawItem; class SearchModule { diff --git a/libretroshare/src/pqi/pqiloopback.cc b/libretroshare/src/pqi/pqiloopback.cc index 4eedb7fda..ba4078ce2 100644 --- a/libretroshare/src/pqi/pqiloopback.cc +++ b/libretroshare/src/pqi/pqiloopback.cc @@ -23,9 +23,12 @@ * */ -#include "pqi/pqi.h" #include "pqi/pqiloopback.h" +#include // for NULL + +class RsItem; + /*** #define LOOPBACK_DEBUG 1 ***/ diff --git a/libretroshare/src/pqi/pqiloopback.h b/libretroshare/src/pqi/pqiloopback.h index ff5b983db..7186dd440 100644 --- a/libretroshare/src/pqi/pqiloopback.h +++ b/libretroshare/src/pqi/pqiloopback.h @@ -26,12 +26,12 @@ #ifndef MRK_PQI_LOOPBACK_HEADER #define MRK_PQI_LOOPBACK_HEADER -// The standard data types and the search interface. -#include "pqi/pqi.h" +#include // for list -#include -#include -#include +#include "pqi/pqi_base.h" // for NetInterface (ptr only), PQInterface +#include "retroshare/rstypes.h" // for RsPeerId + +class RsItem; class pqiloopback: public PQInterface { @@ -47,8 +47,7 @@ virtual RsItem *GetItem(); virtual int tick(); virtual int status(); -virtual int notifyEvent(NetInterface */*ni*/, int /*event*/) { return 0; } /* Not used */ - private: +private: std::list objs; }; diff --git a/libretroshare/src/pqi/pqistreamer.cc b/libretroshare/src/pqi/pqistreamer.cc index 166cc6b1e..9d68a50b2 100644 --- a/libretroshare/src/pqi/pqistreamer.cc +++ b/libretroshare/src/pqi/pqistreamer.cc @@ -24,18 +24,25 @@ */ -#include -#include -#include -#include "util/rsdebug.h" -#include "util/rsstring.h" -#include "util/rsprint.h" -#include "util/rsscopetimer.h" - #include "pqi/pqistreamer.h" -#include "rsserver/p3face.h" -#include "serialiser/rsserial.h" +#include // for free, realloc, exit +#include // for memcpy, memset, memcmp +#include // for NULL, time, time_t +#include // for min +#include // for operator<<, ostream, basic_ostream +#include // for string, allocator, operator<<, oper... +#include // for pair + +#include "pqi/p3notify.h" // for p3Notify +#include "retroshare/rsids.h" // for operator<< +#include "retroshare/rsnotify.h" // for RS_SYS_WARNING +#include "rsserver/p3face.h" // for RsServer +#include "serialiser/rsserial.h" // for RsItem, RsSerialiser, getRsItemSize +#include "util/rsdebug.h" // for pqioutput, PQL_ALERT, PQL_DEBUG_ALL +#include "util/rsmemory.h" // for rs_malloc +#include "util/rsprint.h" // for BinToHex +#include "util/rsstring.h" // for rs_sprintf_append, rs_sprintf static struct RsLog::logInfo pqistreamerzoneInfo = {RsLog::Default, "pqistreamer"}; #define pqistreamerzone &pqistreamerzoneInfo diff --git a/libretroshare/src/pqi/pqistreamer.h b/libretroshare/src/pqi/pqistreamer.h index 52a376062..5cdbab9d7 100644 --- a/libretroshare/src/pqi/pqistreamer.h +++ b/libretroshare/src/pqi/pqistreamer.h @@ -27,18 +27,19 @@ #ifndef MRK_PQI_STREAMER_HEADER #define MRK_PQI_STREAMER_HEADER -// Only dependent on the base stuff. -#include "pqi/pqi_base.h" -#include "util/rsthreads.h" -#include "retroshare/rstypes.h" +#include // for uint32_t +#include // for time_t +#include // for operator<<, basic_ostream, cerr, endl +#include // for list +#include // for map -#include +#include "pqi/pqi_base.h" // for BinInterface (ptr only), PQInterface +#include "retroshare/rsconfig.h" // for RSTrafficClue +#include "retroshare/rstypes.h" // for RsPeerId +#include "util/rsthreads.h" // for RsMutex -// Fully implements the PQInterface. -// and communicates with peer etc via the BinInterface. -// -// The interface does not handle connection, just communication. -// possible bioflags: BIN_FLAGS_NO_CLOSE | BIN_FLAGS_NO_DELETE +class RsItem; +class RsSerialiser; struct PartialPacketRecord { @@ -46,6 +47,12 @@ struct PartialPacketRecord uint32_t size ; }; +/** + * @brief Fully implements the PQInterface and communicates with peer etc via + * the BinInterface. + * The interface does not handle connection, just communication. + * Possible BIN_FLAGS: BIN_FLAGS_NO_CLOSE | BIN_FLAGS_NO_DELETE + */ class pqistreamer: public PQInterface { public: From 45198121f74899bd5ba08103a59a32cb26a30eed Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 25 Aug 2016 17:09:33 +0200 Subject: [PATCH 08/19] updating replacements icons --- .../src/gui/Circles/CirclesDialog.ui | 1 + .../src/gui/Circles/CreateCircleDialog.cpp | 2 +- retroshare-gui/src/gui/FriendsDialog.cpp | 2 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 2 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 43 +++- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 226 ++++++++++++------ retroshare-gui/src/gui/icons.qrc | 3 + retroshare-gui/src/gui/icons/png/circles.png | Bin 0 -> 6399 bytes .../src/gui/icons/png/network-puplic.png | Bin 0 -> 8482 bytes retroshare-gui/src/gui/icons/png/person.png | Bin 0 -> 4450 bytes retroshare-gui/src/gui/icons/svg/circles.svg | 77 ++++++ .../src/gui/icons/svg/network-puplic.svg | 54 +++++ retroshare-gui/src/gui/icons/svg/person.svg | 57 +++++ 13 files changed, 378 insertions(+), 89 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/circles.png create mode 100644 retroshare-gui/src/gui/icons/png/network-puplic.png create mode 100644 retroshare-gui/src/gui/icons/png/person.png create mode 100644 retroshare-gui/src/gui/icons/svg/circles.svg create mode 100644 retroshare-gui/src/gui/icons/svg/network-puplic.svg create mode 100644 retroshare-gui/src/gui/icons/svg/person.svg diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.ui b/retroshare-gui/src/gui/Circles/CirclesDialog.ui index 762d507f9..da9da0b8b 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.ui +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.ui @@ -256,6 +256,7 @@ + diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index f7dfb91f8..79e85d1cc 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -55,7 +55,7 @@ CreateCircleDialog::CreateCircleDialog() mCircleQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); - ui.headerFrame->setHeaderImage(QPixmap(":/images/circles/circles_64.png")); + ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/circles.png")); // connect up the buttons. connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember())); diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 7f7891514..905f79906 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -54,7 +54,7 @@ #define IMAGE_NETWORK2 ":/icons/png/netgraph.png" #define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_IDENTITY ":/images/identity/identities_32.png" -#define IMAGE_CIRCLES ":/images/circles/circles_32.png" +#define IMAGE_CIRCLES ":/icons/png/circles.png" /****** * #define FRIENDS_DEBUG 1 diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 2abb15768..04b7a205f 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -211,7 +211,7 @@ IdDialog::IdDialog(QWidget *parent) : ui->avLabel_Person->setPixmap(QPixmap(":/icons/png/people.png")); - ui->avlabel_Circles->setPixmap(QPixmap(":/icons/circles_128.png")); + ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png")); ui->headerTextLabel_Person->setText(tr("People")); ui->headerTextLabel_Circles->setText(tr("Circles")); diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index c133a8b11..eee1cf7b9 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -20,7 +20,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -38,7 +47,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -129,7 +147,16 @@ QFrame::Sunken - + + 1 + + + 1 + + + 1 + + 1 @@ -251,7 +278,7 @@ Reputation - AlignLeft|AlignVCenter + AlignLeading|AlignVCenter @@ -264,8 +291,8 @@ - - :/images/no_avatar_background.png:/images/no_avatar_background.png + + :/icons/png/person.png:/icons/png/person.png Person @@ -620,8 +647,8 @@ p, li { white-space: pre-wrap; } - - :/images/circles/circles_64.png:/images/circles/circles_64.png + + :/icons/png/circles.png:/icons/png/circles.png Circles diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 42133262d..42b31221a 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,22 +7,31 @@ 0 0 1237 - 790 + 622 Create New + + 0 + + + 0 + + + 0 + + + 0 + 6 0 - - 0 - @@ -38,7 +47,7 @@ 0 - + @@ -48,7 +57,16 @@ 0 - + + 4 + + + 4 + + + 4 + + 4 @@ -112,7 +130,16 @@ 9 - + + 3 + + + 3 + + + 3 + + 3 @@ -169,29 +196,7 @@ - - - - Description - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - + true @@ -234,7 +239,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -289,39 +303,36 @@ Message Distribution - - - 0 - - - - - - 0 - 0 - - - - <html><head/><body><p>Messsages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you're creating.</p></body></html> - - - Public - - - - :/images/network.png:/images/network.png - - - - 24 - 24 - - - - - - - + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Messsages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you're creating.</p></body></html> + + + Public + + + + :/icons/png/network-puplic.png:/icons/png/network-puplic.png + + + + 24 + 24 + + + + + @@ -336,8 +347,8 @@ Restricted to Circle - - :/images/circles/circles_32.png:/images/circles/circles_32.png + + :/icons/png/circles.png:/icons/png/circles.png @@ -347,14 +358,7 @@ - - - - - - - - + @@ -369,8 +373,8 @@ Only For Your Friends - - :/images/user/friends24.png:/images/user/friends24.png + + :/icons/png/network.png:/icons/png/network.png @@ -380,14 +384,69 @@ - - + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 68 + 20 + + + + + + + + + 0 + 0 + + + + + + + Description + + + + + + + + @@ -598,6 +657,16 @@ + + + + QFrame::StyledPanel + + + QFrame::Raised + + + @@ -849,6 +918,7 @@ + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 24b21616b..142e37671 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -113,5 +113,8 @@ icons/png/thumbs-neutral.png icons/png/add.png icons/png/netgraph.png + icons/png/network-puplic.png + icons/png/circles.png + icons/png/person.png diff --git a/retroshare-gui/src/gui/icons/png/circles.png b/retroshare-gui/src/gui/icons/png/circles.png new file mode 100644 index 0000000000000000000000000000000000000000..95cbb2d3b1cad553e01e313b6cb7f607cbd64d1d GIT binary patch literal 6399 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

p9n!`>blb!LFBjryc*$8 zbH?GmoWYlv9H$drxq2+_&vhXypX6H||2$&=Lyy}6hGUc8yc*$uXOG2o;}e|60 z=}Si70cTBc(nzE;5B=Y^0E;G_0@3SED9}ZF#l(TF9oOiIi>xGDKXslg3qDwvV7pCL9WVQOkRb|QK z6gxJ@+2bJfRDu;n4La_hnuZt)t{ftM zw6DMQX#jJX@6Q0j&J%DdU+-)rEmpJQHt?RY)YoS>f4`*@b78pAqqqwJkN5ZYehpwO z%XtgH21^x1agsk6`Myp49WY?~Vru3C09q}R6vZiOO~{`NbkM*zn8j18i0FAsBt>xy zCVm|GxnB=-TtH74MziPV#Ha{gRuqTWArJX}9ms)!J!0N>ZYwmt7dCVeN3k49#1Ej5 z0$SfT;CBpTNzP_sekOEXQJjFmg?)AU^hQuGnMMjd%E0d6Wkqp_x8-5qlfj%2Tra~y zUz;w)4*^8RiK>Rknl-Buk^_3| zGKs|k+%@@du;qu`(X1Dj{}%)Q7V7y?tb>3jjeOrDA)Xr|?X!wkfv`B_GNM?)YIA9J zK8QkkLkoSRfr!nN>}6=b6-03bT4yF_7lc~*KsW{ffQ4k54N13wur;i5qJ+X0vmxTon+iVz^9g!7o|@K zsFa$#!HUWUtTF%q6!;DpdfTM{wpdnXlebM=~W=qT*5dLIo zxlsV%RkJ1LyI6F7t(Aq^ld4(5npR)A0?hfglt0*D6qza6_k{bv*Bkcb>K3xlM^`+- zgnzd+&e@G5(38f}te=PTs@EU3SB$>0@+v0z3V_je$2zMZR0|Wg_zQd=+8f3Rias5t zX~yrtnD0ouNQdz^ll6Z^!Q>NmhjOlIW+qWwc^?r!10b3!-aBo~^pMQY`i)&pes>(d zH|wh_FO!mAB=A(HW2+1UA8Uj={Y!m2oQ&(v!&xB z2ycSTjmF^ + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/network-puplic.svg b/retroshare-gui/src/gui/icons/svg/network-puplic.svg new file mode 100644 index 000000000..56b77b907 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/network-puplic.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/person.svg b/retroshare-gui/src/gui/icons/svg/person.svg new file mode 100644 index 000000000..f43c9dc71 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/person.svg @@ -0,0 +1,57 @@ + + + +image/svg+xml \ No newline at end of file From cc8f2c6e394370f24a471508736919df830a2ff7 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 26 Aug 2016 02:48:46 +0200 Subject: [PATCH 09/19] changed to one plus button for Create ID/Circle with menu. --- .../src/gui/Circles/CreateCircleDialog.ui | 31 +++++++++ retroshare-gui/src/gui/Identity/IdDialog.cpp | 15 ++++- retroshare-gui/src/gui/Identity/IdDialog.ui | 66 +++++-------------- 3 files changed, 60 insertions(+), 52 deletions(-) diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui index e083a11af..d26158b43 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui @@ -373,6 +373,16 @@ Public + + + :/icons/png/network-puplic.png:/icons/png/network-puplic.png + + + + 24 + 24 + + @@ -383,6 +393,16 @@ Private + + + :/icons/png/person.png:/icons/png/person.png + + + + 24 + 24 + + @@ -393,6 +413,16 @@ Only visible to members of: + + + :/icons/png/circles.png:/icons/png/circles.png + + + + 24 + 24 + + @@ -459,6 +489,7 @@ + diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 04b7a205f..6818e2f84 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -194,8 +194,6 @@ IdDialog::IdDialog(QWidget *parent) : //mStateHelper->addClear(IDDIALOG_REPLIST, ui->treeWidget_RepList); /* Connect signals */ - connect(ui->toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity())); - connect(ui->toolButton_NewCircle, SIGNAL(clicked()), this, SLOT(createExternalCircle())); connect(ui->removeIdentity, SIGNAL(triggered()), this, SLOT(removeIdentity())); connect(ui->editIdentity, SIGNAL(triggered()), this, SLOT(editIdentity())); @@ -280,7 +278,18 @@ IdDialog::IdDialog(QWidget *parent) : idTWHAction->setData(RSID_FILTER_BANNED); connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool))); idTWHMenu->addAction(idTWHAction); - + + QAction *CreateIDAction = new QAction(QIcon(":/icons/png/person.png"),tr("Create new Identity"), this); + connect(CreateIDAction, SIGNAL(triggered()), this, SLOT(addIdentity())); + + QAction *CreateCircleAction = new QAction(QIcon(":/icons/png/circles.png"),tr("Create new circle"), this); + connect(CreateCircleAction, SIGNAL(triggered()), this, SLOT(createExternalCircle())); + + QMenu *menu = new QMenu(); + menu->addAction(CreateIDAction); + menu->addAction(CreateCircleAction); + ui->toolButton_New->setMenu(menu); + /* Add filter actions */ QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem(); QString headerText = headerItem->text(RSID_COL_NICKNAME); diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index eee1cf7b9..bb075b56f 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -163,9 +163,9 @@ - + - + 0 0 @@ -174,46 +174,11 @@ Qt::NoFocus - Create new Identity - - - New ID - - - - :/images/identity/identity_create_32.png:/images/identity/identity_create_32.png - - - - 24 - 24 - - - - true - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Create new circle - - - New ID + Create new... - :/icons/circles_new_128.png:/icons/circles_new_128.png + :/icons/png/add.png:/icons/png/add.png @@ -221,6 +186,9 @@ 24 + + QToolButton::InstantPopup + true @@ -772,6 +740,16 @@ p, li { white-space: pre-wrap; } + + LineEditClear + QLineEdit +

gui/common/LineEditClear.h
+ + + RSTreeWidget + QTreeWidget +
gui/common/RSTreeWidget.h
+ StyledElidedLabel QLabel @@ -782,16 +760,6 @@ p, li { white-space: pre-wrap; } QLabel
gui/common/StyledLabel.h
 - - RSTreeWidget - QTreeWidget -
gui/common/RSTreeWidget.h
- - - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
- idTreeWidget From 04162f90d287468243c6697248111b54c9cdfeed Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 17 Aug 2016 23:58:22 +0200 Subject: [PATCH 10/19] Fix Msys2 build when MINGW_PREFIX is not defined. Please look at AppVeyor success before merging. --- retroshare.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index 95c784512..fe7d77df2 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -47,19 +47,19 @@ win32 { } # Check for msys2 - isEmpty(MINGW_PREFIX) { + PREFIX_MSYS2 = $$(MINGW_PREFIX) + isEmpty(PREFIX_MSYS2) { exists(C:/msys32/mingw32/include) { message(MINGW_PREFIX is empty. Set it in your environment variables.) message(Found it here:C:\msys32\mingw32) - MINGW_PREFIX = "C:\msys32\mingw32" + PREFIX_MSYS2 = "C:\msys32\mingw32" } exists(C:/msys64/mingw32/include) { message(MINGW_PREFIX is empty. Set it in your environment variables.) message(Found it here:C:\msys64\mingw32) - MINGW_PREFIX = "C:\msys64\mingw32" + PREFIX_MSYS2 = "C:\msys64\mingw32" } } - PREFIX_MSYS2 = $$(MINGW_PREFIX) !isEmpty(PREFIX_MSYS2) { message(msys2 is installed.) BIN_DIR += "$${PREFIX_MSYS2}/bin" From 57c9bef9937ee7393433e5daacffa61f80ac255c Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 27 Aug 2016 18:15:13 +0200 Subject: [PATCH 11/19] updated settings icons and some missed one --- retroshare-gui/src/gui/FriendsDialog.cpp | 2 +- .../src/gui/Identity/IdEditDialog.cpp | 4 +- retroshare-gui/src/gui/icons.qrc | 173 ++++++++++-------- .../src/gui/icons/settings/appearance.svg | 59 ++++++ .../src/gui/icons/settings/channels.svg | 87 +++++++++ .../src/gui/icons/settings/chat.svg | 108 +++++++++++ .../src/gui/icons/settings/directories.svg | 60 ++++++ .../src/gui/icons/settings/filesharing.svg | 89 +++++++++ .../src/gui/icons/settings/forums.svg | 60 ++++++ .../src/gui/icons/settings/general.svg | 62 +++++++ .../src/gui/icons/settings/messages.svg | 75 ++++++++ .../src/gui/icons/settings/network.svg | 68 +++++++ .../src/gui/icons/settings/notify.svg | 82 +++++++++ .../src/gui/icons/settings/people.svg | 105 +++++++++++ .../src/gui/icons/settings/permissions.svg | 56 ++++++ .../src/gui/icons/settings/plugins.svg | 57 ++++++ .../src/gui/icons/settings/posted.svg | 78 ++++++++ .../src/gui/icons/settings/profile.svg | 77 ++++++++ .../src/gui/icons/settings/server.svg | 60 ++++++ .../src/gui/icons/settings/sound.svg | 56 ++++++ .../src/gui/icons/settings/webinterface.svg | 96 ++++++++++ retroshare-gui/src/gui/icons/svg/keyring.svg | 7 + .../src/gui/settings/AppearancePage.h | 2 +- retroshare-gui/src/gui/settings/ChannelPage.h | 2 +- retroshare-gui/src/gui/settings/ChatPage.h | 2 +- retroshare-gui/src/gui/settings/CryptoPage.h | 2 +- .../src/gui/settings/DirectoriesPage.h | 2 +- retroshare-gui/src/gui/settings/ForumPage.h | 2 +- retroshare-gui/src/gui/settings/GeneralPage.h | 2 +- retroshare-gui/src/gui/settings/MessagePage.h | 2 +- retroshare-gui/src/gui/settings/NetworkPage.h | 2 +- retroshare-gui/src/gui/settings/NotifyPage.h | 2 +- retroshare-gui/src/gui/settings/PeoplePage.h | 2 +- retroshare-gui/src/gui/settings/PluginsPage.h | 2 +- retroshare-gui/src/gui/settings/PostedPage.h | 2 +- retroshare-gui/src/gui/settings/RelayPage.h | 2 +- retroshare-gui/src/gui/settings/ServerPage.h | 2 +- .../src/gui/settings/ServicePermissionsPage.h | 2 +- retroshare-gui/src/gui/settings/SoundPage.h | 2 +- .../src/gui/settings/TransferPage.h | 2 +- retroshare-gui/src/gui/settings/WebuiPage.h | 2 +- retroshare-gui/src/gui/settings/settings.ui | 6 + 42 files changed, 1466 insertions(+), 99 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/settings/appearance.svg create mode 100644 retroshare-gui/src/gui/icons/settings/channels.svg create mode 100644 retroshare-gui/src/gui/icons/settings/chat.svg create mode 100644 retroshare-gui/src/gui/icons/settings/directories.svg create mode 100644 retroshare-gui/src/gui/icons/settings/filesharing.svg create mode 100644 retroshare-gui/src/gui/icons/settings/forums.svg create mode 100644 retroshare-gui/src/gui/icons/settings/general.svg create mode 100644 retroshare-gui/src/gui/icons/settings/messages.svg create mode 100644 retroshare-gui/src/gui/icons/settings/network.svg create mode 100644 retroshare-gui/src/gui/icons/settings/notify.svg create mode 100644 retroshare-gui/src/gui/icons/settings/people.svg create mode 100644 retroshare-gui/src/gui/icons/settings/permissions.svg create mode 100644 retroshare-gui/src/gui/icons/settings/plugins.svg create mode 100644 retroshare-gui/src/gui/icons/settings/posted.svg create mode 100644 retroshare-gui/src/gui/icons/settings/profile.svg create mode 100644 retroshare-gui/src/gui/icons/settings/server.svg create mode 100644 retroshare-gui/src/gui/icons/settings/sound.svg create mode 100644 retroshare-gui/src/gui/icons/settings/webinterface.svg create mode 100644 retroshare-gui/src/gui/icons/svg/keyring.svg diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 905f79906..4590ccdc5 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -52,7 +52,7 @@ //#define IMAGE_NEWSFEED "" //#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png" #define IMAGE_NETWORK2 ":/icons/png/netgraph.png" -#define IMAGE_PEERS ":/images/groupchat.png" +#define IMAGE_PEERS ":/icons/png/keyring.png" #define IMAGE_IDENTITY ":/images/identity/identities_32.png" #define IMAGE_CIRCLES ":/icons/png/circles.png" diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index 97b10ac4e..f99ebaf03 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -49,7 +49,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) : ui->setupUi(this); - ui->headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_create_64.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png")); ui->headerFrame->setHeaderText(tr("Create New Identity")); /* Setup UI helper */ @@ -202,7 +202,7 @@ void IdEditDialog::setAvatar(const QPixmap &avatar) void IdEditDialog::setupExistingId(const RsGxsGroupId &keyId) { setWindowTitle(tr("Edit identity")); - ui->headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_edit_64.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png")); ui->headerFrame->setHeaderText(tr("Edit identity")); mIsNew = false; diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 142e37671..c0958e29e 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -1,80 +1,98 @@ - - icons/add_user_256.png - icons/anonymous_blue_128.png - icons/anonymous_green_128.png - icons/aol.png - icons/avatar_128.png - icons/avatar_grey_128.png - icons/blank_blue_128.png - icons/blank_green_128.png - icons/browsable_blue_128.png - icons/browsable_green_128.png - icons/bullet_blue_128.png - icons/bullet_green_128.png - icons/bullet_grey_128.png - icons/bullet_red_128.png - icons/bullet_yellow_128.png - icons/channels_128.png - icons/channels_red_128.png - icons/chat_128.png - icons/chat_red_128.png - icons/circles_128.png - icons/circles_new_128.png - icons/friends_128.png - icons/global_switch_off_128.png - icons/global_switch_on_128.png - icons/gmail.png - icons/help_128.png - icons/help_64.png - icons/information_128.png - icons/internet_128.png - icons/knews_128.png - icons/knews_red_128.png - icons/konversation_128.png - icons/konversation128.png - icons/konversation_red_128.png - icons/ktorrent_128.png - icons/ktorrent_red_128.png - icons/logo_0_connected_128.png - icons/logo_128.png - icons/logo_1_connected_128.png - icons/logo_2_connected_128.png - icons/mail_128.png - icons/mail_old_128.png - icons/mail_red_128.png - icons/newsfeed128.png - icons/outlook.png - icons/plugins_128.png - icons/posted_128.png - icons/posted_red_128.png - icons/quit_128.png - icons/security_high_128.png - icons/security_low_128.png - icons/security_medium_128.png - icons/star_overlay_128.png - icons/switch00_128.png - icons/switch01_128.png - icons/switch10_128.png - icons/switch11_128.png - icons/system_128.png - icons/tile_checking_48.png - icons/tile_downloaded_48.png - icons/tile_downloading_48.png - icons/tile_inactive_48.png - icons/tor-logo.png - icons/tor-off.png - icons/tor-on.png - icons/tor-starting.png - icons/tor-stopping.png - icons/user-away_64.png - icons/user-away-extended_64.png - icons/user-busy_64.png - icons/user-offline_64.png - icons/user-online_64.png - icons/yahoo.png - icons/yandex.png - icons/yellow_biohazard64.png + + icons/settings/appearance.svg + icons/settings/channels.svg + icons/settings/chat.svg + icons/settings/directories.svg + icons/settings/filesharing.svg + icons/settings/forums.svg + icons/settings/general.svg + icons/settings/messages.svg + icons/settings/network.svg + icons/settings/notify.svg + icons/settings/people.svg + icons/settings/permissions.svg + icons/settings/plugins.svg + icons/settings/posted.svg + icons/settings/profile.svg + icons/settings/server.svg + icons/settings/sound.svg + icons/settings/webinterface.svg + icons/add_user_256.png + icons/anonymous_blue_128.png + icons/anonymous_green_128.png + icons/aol.png + icons/avatar_128.png + icons/avatar_grey_128.png + icons/blank_blue_128.png + icons/blank_green_128.png + icons/browsable_blue_128.png + icons/browsable_green_128.png + icons/bullet_blue_128.png + icons/bullet_green_128.png + icons/bullet_grey_128.png + icons/bullet_red_128.png + icons/bullet_yellow_128.png + icons/channels_128.png + icons/channels_red_128.png + icons/chat_128.png + icons/chat_red_128.png + icons/circles_128.png + icons/circles_new_128.png + icons/friends_128.png + icons/global_switch_off_128.png + icons/global_switch_on_128.png + icons/gmail.png + icons/help_128.png + icons/help_64.png + icons/information_128.png + icons/internet_128.png + icons/knews_128.png + icons/knews_red_128.png + icons/konversation_128.png + icons/konversation128.png + icons/konversation_red_128.png + icons/ktorrent_128.png + icons/ktorrent_red_128.png + icons/logo_0_connected_128.png + icons/logo_128.png + icons/logo_1_connected_128.png + icons/logo_2_connected_128.png + icons/mail_128.png + icons/mail_old_128.png + icons/mail_red_128.png + icons/newsfeed128.png + icons/outlook.png + icons/plugins_128.png + icons/posted_128.png + icons/posted_red_128.png + icons/quit_128.png + icons/security_high_128.png + icons/security_low_128.png + icons/security_medium_128.png + icons/star_overlay_128.png + icons/switch00_128.png + icons/switch01_128.png + icons/switch10_128.png + icons/switch11_128.png + icons/system_128.png + icons/tile_checking_48.png + icons/tile_downloaded_48.png + icons/tile_downloading_48.png + icons/tile_inactive_48.png + icons/tor-logo.png + icons/tor-off.png + icons/tor-on.png + icons/tor-starting.png + icons/tor-stopping.png + icons/user-away_64.png + icons/user-away-extended_64.png + icons/user-busy_64.png + icons/user-offline_64.png + icons/user-online_64.png + icons/yahoo.png + icons/yandex.png + icons/yellow_biohazard64.png icons/png/attach.png icons/png/attach-image.png icons/png/highlight.png @@ -116,5 +134,6 @@ icons/png/network-puplic.png icons/png/circles.png icons/png/person.png - + icons/png/keyring.png + diff --git a/retroshare-gui/src/gui/icons/settings/appearance.svg b/retroshare-gui/src/gui/icons/settings/appearance.svg new file mode 100644 index 000000000..ca56d4d2d --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/appearance.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/channels.svg b/retroshare-gui/src/gui/icons/settings/channels.svg new file mode 100644 index 000000000..75b880846 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/channels.svg @@ -0,0 +1,87 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/chat.svg b/retroshare-gui/src/gui/icons/settings/chat.svg new file mode 100644 index 000000000..c57b16c05 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/chat.svg @@ -0,0 +1,108 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/directories.svg b/retroshare-gui/src/gui/icons/settings/directories.svg new file mode 100644 index 000000000..7dad5c30d --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/directories.svg @@ -0,0 +1,60 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/filesharing.svg b/retroshare-gui/src/gui/icons/settings/filesharing.svg new file mode 100644 index 000000000..99fea17dd --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/filesharing.svg @@ -0,0 +1,89 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/forums.svg b/retroshare-gui/src/gui/icons/settings/forums.svg new file mode 100644 index 000000000..c2df1e642 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/forums.svg @@ -0,0 +1,60 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/general.svg b/retroshare-gui/src/gui/icons/settings/general.svg new file mode 100644 index 000000000..fd4153991 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/general.svg @@ -0,0 +1,62 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/messages.svg b/retroshare-gui/src/gui/icons/settings/messages.svg new file mode 100644 index 000000000..9b60cc9f8 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/messages.svg @@ -0,0 +1,75 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/network.svg b/retroshare-gui/src/gui/icons/settings/network.svg new file mode 100644 index 000000000..861b298bd --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/network.svg @@ -0,0 +1,68 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/notify.svg b/retroshare-gui/src/gui/icons/settings/notify.svg new file mode 100644 index 000000000..9edd93369 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/notify.svg @@ -0,0 +1,82 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/people.svg b/retroshare-gui/src/gui/icons/settings/people.svg new file mode 100644 index 000000000..05ebc1032 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/people.svg @@ -0,0 +1,105 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/permissions.svg b/retroshare-gui/src/gui/icons/settings/permissions.svg new file mode 100644 index 000000000..5c52870d9 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/permissions.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/plugins.svg b/retroshare-gui/src/gui/icons/settings/plugins.svg new file mode 100644 index 000000000..93bdd8dbe --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/plugins.svg @@ -0,0 +1,57 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/posted.svg b/retroshare-gui/src/gui/icons/settings/posted.svg new file mode 100644 index 000000000..11083d58c --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/posted.svg @@ -0,0 +1,78 @@ + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/profile.svg b/retroshare-gui/src/gui/icons/settings/profile.svg new file mode 100644 index 000000000..5060830cc --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/profile.svg @@ -0,0 +1,77 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/server.svg b/retroshare-gui/src/gui/icons/settings/server.svg new file mode 100644 index 000000000..b1c0ace27 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/server.svg @@ -0,0 +1,60 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/sound.svg b/retroshare-gui/src/gui/icons/settings/sound.svg new file mode 100644 index 000000000..ba6fd8c2d --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/sound.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/settings/webinterface.svg b/retroshare-gui/src/gui/icons/settings/webinterface.svg new file mode 100644 index 000000000..45e903455 --- /dev/null +++ b/retroshare-gui/src/gui/icons/settings/webinterface.svg @@ -0,0 +1,96 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/keyring.svg b/retroshare-gui/src/gui/icons/svg/keyring.svg new file mode 100644 index 000000000..3f2568f95 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/keyring.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index 00a248199..ae711eed0 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -38,7 +38,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/looknfeel.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/appearance.svg") ; } virtual QString pageName() const { return tr("Appearance") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h index 2e603bb36..40e343fc0 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.h +++ b/retroshare-gui/src/gui/settings/ChannelPage.h @@ -38,7 +38,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/channels.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/channels.svg") ; } virtual QString pageName() const { return tr("Channels") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index f9a85d72b..f6445d4d5 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -40,7 +40,7 @@ class ChatPage : public ConfigPage /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/chat_24.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/chat.svg") ; } virtual QString pageName() const { return tr("Chat") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index d970b3c8b..a1bcb42f0 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -39,7 +39,7 @@ class CryptoPage : public ConfigPage virtual bool save(QString &errmsg); /** Loads the settings for this page */ - virtual QPixmap iconPixmap() const { return QPixmap(":/images/contact22.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/profile.svg") ; } virtual QString pageName() const { return tr("Node") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.h b/retroshare-gui/src/gui/settings/DirectoriesPage.h index 4115015bb..97eedad6b 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.h +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.h @@ -37,7 +37,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/folder_doments.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/directories.svg") ; } virtual QString pageName() const { return tr("Directories") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/ForumPage.h b/retroshare-gui/src/gui/settings/ForumPage.h index e4df841ca..6e1082a19 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.h +++ b/retroshare-gui/src/gui/settings/ForumPage.h @@ -38,7 +38,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/konversation.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/forums.svg") ; } virtual QString pageName() const { return tr("Forum") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index 5460923ad..fd7b90a33 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -41,7 +41,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/icons/system_128.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/general.svg") ; } virtual QString pageName() const { return tr("General") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h index e79405ae8..99d3ca5f2 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.h +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -42,7 +42,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/evolution.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/messages.svg") ; } virtual QString pageName() const { return tr("Message") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/NetworkPage.h b/retroshare-gui/src/gui/settings/NetworkPage.h index 781bdc3be..9244e99a0 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.h +++ b/retroshare-gui/src/gui/settings/NetworkPage.h @@ -36,7 +36,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/server_24x24.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/network.svg") ; } virtual QString pageName() const { return tr("Network") ; } private: diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index 408bd7cfe..900c8efb6 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -81,7 +81,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/status_unknown.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/notify.svg") ; } virtual QString pageName() const { return tr("Notify") ; } virtual QString helpText() const ; diff --git a/retroshare-gui/src/gui/settings/PeoplePage.h b/retroshare-gui/src/gui/settings/PeoplePage.h index 94a576198..393436f57 100644 --- a/retroshare-gui/src/gui/settings/PeoplePage.h +++ b/retroshare-gui/src/gui/settings/PeoplePage.h @@ -38,7 +38,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/icons/friends_128.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/people.svg") ; } virtual QString pageName() const { return tr("People") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/PluginsPage.h b/retroshare-gui/src/gui/settings/PluginsPage.h index 9b9dd8349..08354ca68 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.h +++ b/retroshare-gui/src/gui/settings/PluginsPage.h @@ -37,7 +37,7 @@ class PluginsPage : public ConfigPage /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/extension_32.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/plugins.svg") ; } virtual QString pageName() const { return tr("Plugins") ; } virtual QString helpText() const ; diff --git a/retroshare-gui/src/gui/settings/PostedPage.h b/retroshare-gui/src/gui/settings/PostedPage.h index d04850f5e..73a454c5f 100644 --- a/retroshare-gui/src/gui/settings/PostedPage.h +++ b/retroshare-gui/src/gui/settings/PostedPage.h @@ -41,7 +41,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/posted_32.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/posted.svg") ; } virtual QString pageName() const { return tr("Posted") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/RelayPage.h b/retroshare-gui/src/gui/settings/RelayPage.h index 82825175f..d88dbd07b 100644 --- a/retroshare-gui/src/gui/settings/RelayPage.h +++ b/retroshare-gui/src/gui/settings/RelayPage.h @@ -40,7 +40,7 @@ class RelayPage: public ConfigPage /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/server_24x24.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/server.svg") ; } virtual QString pageName() const { return tr("Relay") ; } virtual QString helpText() const ; diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h index 6d8399974..686c1b3d9 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.h +++ b/retroshare-gui/src/gui/settings/ServerPage.h @@ -45,7 +45,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/server_24x24.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/png/network.png") ; } virtual QString pageName() const { return tr("Network") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h index 1e4f5c973..abc54c9b0 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h @@ -40,7 +40,7 @@ public: /** Loads the settings for this page */ virtual void load() {} - virtual QPixmap iconPixmap() const { return QPixmap(":/images/admin-24.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/permissions.svg") ; } virtual QString pageName() const { return tr("Permissions") ; } virtual QString helpText() const ; diff --git a/retroshare-gui/src/gui/settings/SoundPage.h b/retroshare-gui/src/gui/settings/SoundPage.h index 8889bd897..831233784 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.h +++ b/retroshare-gui/src/gui/settings/SoundPage.h @@ -42,7 +42,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/sound.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/sound.svg") ; } virtual QString pageName() const { return tr("Sound") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h index 4cb66e13c..3a28f41ac 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.h +++ b/retroshare-gui/src/gui/settings/TransferPage.h @@ -40,7 +40,7 @@ class TransferPage: public ConfigPage /** Loads the settings for this page */ virtual void load() {} - virtual QPixmap iconPixmap() const { return QPixmap(":/images/ktorrent32.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/filesharing.svg") ; } virtual QString pageName() const { return tr("File transfer") ; } virtual QString helpText() const { return ""; } diff --git a/retroshare-gui/src/gui/settings/WebuiPage.h b/retroshare-gui/src/gui/settings/WebuiPage.h index 7da68c21d..3ff6a45a9 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.h +++ b/retroshare-gui/src/gui/settings/WebuiPage.h @@ -25,7 +25,7 @@ public: /** Loads the settings for this page */ virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/emblem-web.png") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/webinterface.svg") ; } virtual QString pageName() const { return tr("Webinterface") ; } virtual QString helpText() const; diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui index 569738f45..8d774dce2 100755 --- a/retroshare-gui/src/gui/settings/settings.ui +++ b/retroshare-gui/src/gui/settings/settings.ui @@ -120,6 +120,12 @@ Qt::IgnoreAction + + + 24 + 24 + + Qt::ElideRight From 19443dabf992de0c502031c5090808a76570bf72 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 27 Aug 2016 20:16:04 +0200 Subject: [PATCH 12/19] added missed icon --- retroshare-gui/src/gui/icons/png/keyring.png | Bin 0 -> 4853 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/keyring.png diff --git a/retroshare-gui/src/gui/icons/png/keyring.png b/retroshare-gui/src/gui/icons/png/keyring.png new file mode 100644 index 0000000000000000000000000000000000000000..d14be9a988a579763a1f7a1d3bf1e4a592139910 GIT binary patch literal 4853 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 btq%BqQ}jUHGA;yt00000NkvXXu0mjfS>kB% literal 0 HcmV?d00001 From a82f3149d301e64c4ef921c205435ae9b36bd309 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 29 Aug 2016 20:51:44 +0200 Subject: [PATCH 13/19] removed (unfinished) GettingStarted tab --- retroshare-gui/src/gui/MainWindow.cpp | 1 + retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index d23a2e954..4f8cfb37e 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -404,6 +404,7 @@ void MainWindow::initStackedPage() #endif #endif +#undef GETSTARTED_GUI #ifdef GETSTARTED_GUI MainPage *getStartedPage = NULL; diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index cb49de349..f995029ee 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -38,13 +38,13 @@ #include "gui/common/PeerDefs.h" #include "gui/notifyqt.h" #include "gui/common/GroupDefs.h" -#include "gui/GetStartedDialog.h" #include "gui/msgs/MessageComposer.h" #include #include #include "ConnectProgressDialog.h" +#include "gui/GetStartedDialog.h" //#define FRIEND_WIZARD_DEBUG From 3b37fcc4a8d8f8f3fed16fd166468bfe04c642eb Mon Sep 17 00:00:00 2001 From: cyril soler Date: Tue, 30 Aug 2016 14:18:36 +0200 Subject: [PATCH 14/19] updated help text for circles --- retroshare-gui/src/gui/Identity/IdDialog.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 6818e2f84..20bef5ccf 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -335,12 +335,10 @@ IdDialog::IdDialog(QWidget *parent) : Signed identities are easier to trust but are easily linked to your node's IP address.

\

Anonymous identities allow you to anonymously interact with other users. They cannot be \ spoofed, but noone can prove who really owns a given identity.

\ -

External circles are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be \ +

Circles are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be \ used to restrict the visibility to forums, channels, etc.

\ -

An external circle can be restricted to another circle, thereby limiting its visibility to members of that circle \ - or even self-restricted, meaning that it is only visible to its members.

\ -

A local circle is a group of friend nodes (represented by their PGP Ids), and can also be used to restrict the \ - visibility of forums and channels. They are not shared over the network, and their list of members is only visible to you.

") ; +

An circle can be restricted to another circle, thereby limiting its visibility to members of that circle \ + or even self-restricted, meaning that it is only visible to invited members.

") ; registerHelpButton(ui->helpButton, hlp_str) ; From 7ffe59cb2d1e175af4c1e358c20bb6cef31ecd14 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 28 Aug 2016 22:28:51 +0200 Subject: [PATCH 15/19] Added build scripts for external libraries with MSYS --- win_build_libs/.gitignore | 6 + win_build_libs/1-prepare.bat | 43 +++ win_build_libs/2-install-msys.bat | 70 ++++ win_build_libs/3-build-libs.bat | 29 ++ win_build_libs/Makefile | 142 +++---- win_build_libs/Tools/winhttpjs.bat | 584 +++++++++++++++++++++++++++++ win_build_libs/_env.bat | 9 + win_build_libs/clean-all.bat | 30 ++ win_build_libs/clean.bat | 36 ++ win_build_libs/update-msys.bat | 16 + 10 files changed, 894 insertions(+), 71 deletions(-) create mode 100644 win_build_libs/.gitignore create mode 100644 win_build_libs/1-prepare.bat create mode 100644 win_build_libs/2-install-msys.bat create mode 100644 win_build_libs/3-build-libs.bat create mode 100644 win_build_libs/Tools/winhttpjs.bat create mode 100644 win_build_libs/_env.bat create mode 100644 win_build_libs/clean-all.bat create mode 100644 win_build_libs/clean.bat create mode 100644 win_build_libs/update-msys.bat diff --git a/win_build_libs/.gitignore b/win_build_libs/.gitignore new file mode 100644 index 000000000..9f502e129 --- /dev/null +++ b/win_build_libs/.gitignore @@ -0,0 +1,6 @@ +/download +/msys +/libs +/tools/7z.dll +/tools/7z.exe +/tools/curl.exe \ No newline at end of file diff --git a/win_build_libs/1-prepare.bat b/win_build_libs/1-prepare.bat new file mode 100644 index 000000000..4c93d54ef --- /dev/null +++ b/win_build_libs/1-prepare.bat @@ -0,0 +1,43 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +set SevenZipUrl=http://7-zip.org/a/7z1602.msi +set SevenZipInstall=7z1602.msi +set CurlUrl=https://bintray.com/artifact/download/vszakats/generic/curl-7.50.1-win32-mingw.7z +set CurlInstall=curl-7.50.1-win32-mingw.7z + +if not exist "%DownloadPath%" mkdir "%DownloadPath%" + +call :remove_dir "%TempPath%" + +echo Download installation files +if not exist "%DownloadPath%\%SevenZipInstall%" call "%ToolsPath%\winhttpjs.bat" %SevenZipUrl% -saveTo "%DownloadPath%\%SevenZipInstall%" +if not exist "%DownloadPath%\%SevenZipInstall%" echo Cannot download 7z& goto :exit + +if not exist "%DownloadPath%\%CurlInstall%" call "%ToolsPath%\winhttpjs.bat" %CurlUrl% -saveTo "%DownloadPath%\%CurlInstall%" +if not exist "%DownloadPath%\%CurlInstall%" echo Cannot download Curl& goto :exit + +echo Unpack 7z +msiexec /a "%DownloadPath%\%SevenZipInstall%" /qb TARGETDIR="%TempPath%" +copy "%TempPath%\Files\7-Zip\7z.dll" "%ToolsPath%" +copy "%TempPath%\Files\7-Zip\7z.exe" "%ToolsPath%" +call :remove_dir "%TempPath%" + +echo Unpack Curl +"%SevenZipExe%" x -o"%TempPath%" "%DownloadPath%\%CurlInstall%" +copy "%TempPath%\curl-7.50.1-win32-mingw\bin\curl.exe" "%ToolsPath%" +call :remove_dir "%TempPath%" + +:exit +endlocal +exit /B 0 + +:remove_dir +if not exist %1 goto :EOF +del /s /f /q %1 >nul +rmdir /s /q %1 +goto :EOF diff --git a/win_build_libs/2-install-msys.bat b/win_build_libs/2-install-msys.bat new file mode 100644 index 000000000..7e17a2dc0 --- /dev/null +++ b/win_build_libs/2-install-msys.bat @@ -0,0 +1,70 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +set MSYSInstall=mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip +set CMakeInstall=cmake-3.1.0-win32-x86.zip +set CMakeUnpackPath=%MSYSPath%\msys\1.0 + +if not exist "%DownloadPath%" mkdir "%DownloadPath%" + +echo Check existing installation +if not exist "%MSYSPath%\bin\mingw-get.exe" goto proceed +choice /M "Found existing MSYS version. Do you want to proceed?" +if %ERRORLEVEL%==2 goto exit + +:proceed +echo Remove previous MSYS version +call :remove_dir "%MSYSPath%" + +echo Download installation files +if not exist "%DownloadPath%\%MSYSInstall%" "%CurlExe%" -L -k http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/%MSYSInstall%/download -o "%DownloadPath%\%MSYSInstall%" +if not exist "%DownloadPath%%\MSYSInstall%" echo Cannot download MSYS& goto :exit + +if not exist "%DownloadPath%\%CMakeInstall%" "%CurlExe%" -L -k http://www.cmake.org/files/v3.1/cmake-3.1.0-win32-x86.zip -o "%DownloadPath%\%CMakeInstall%" +if not exist "%DownloadPath%\%CMakeInstall%" echo Cannot download CMake& goto :exit + +echo Unpack MSYS +"%SevenZipExe%" x -o"%MSYSPath%" "%DownloadPath%\%MSYSInstall%" + +echo Install MSYS +if not exist "%MSYSPath%\var\lib\mingw-get\data\profile.xml" copy "%MSYSPath%\var\lib\mingw-get\data\defaults.xml" "%MSYSPath%\var\lib\mingw-get\data\profile.xml" +pushd "%MSYSPath%\bin" +mingw-get.exe install mingw32-mingw-get +mingw-get.exe install msys-coreutils +mingw-get.exe install msys-base +mingw-get.exe install msys-autoconf +mingw-get.exe install msys-automake +mingw-get.exe install msys-autogen +mingw-get.exe install msys-mktemp +mingw-get.exe install msys-wget +popd + +echo Unpack CMake +"%SevenZipExe%" x -o"%CMakeUnpackPath%" "%DownloadPath%\%CMakeInstall%" + +echo Install CMake +set CMakeVersion= +for /D %%F in (%CMakeUnpackPath%\cmake*) do set CMakeVersion=%%~nxF +if "%CMakeVersion%"=="" echo CMake version not found.& goto :exit +echo Found CMake version %CMakeVersion% + +set FoundProfile= +for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%MSYSPath%\msys\1.0\etc\profile"') do set FoundProfile=%%F + +if "%FoundProfile%"=="0" ( + echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%MSYSPath%\msys\1.0\etc\profile" +) + +:exit +endlocal +exit /B 0 + +:remove_dir +if not exist %1 goto :EOF +del /s /f /q %1 >nul +rmdir /s /q %1 +goto :EOF diff --git a/win_build_libs/3-build-libs.bat b/win_build_libs/3-build-libs.bat new file mode 100644 index 000000000..3b7a3c92c --- /dev/null +++ b/win_build_libs/3-build-libs.bat @@ -0,0 +1,29 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +set MSYSSH=%MSYSPath%\msys\1.0\bin\sh.exe +set MSYSCurPath=/%CurPath:~0,1%/%CurPath:~3% +set MSYSCurPath=%MSYSCurPath:\=/% + +if not exist "%MSYSSH%" echo Please install MSYS first.&& exit /B 1 + +set GCCPath= +call :FIND_IN_PATH g++.exe GCCPath +if "%GCCPath%"=="" echo Please run %~nx0 in the Qt Command Prompt or add the path to MinGW bin folder to PATH variable.&& exit /B 1 + +"%MSYSSH%" --login -i -c "cd "%MSYSCurPath%" && make -f makefile %*" + +exit /B %ERRORLEVEL% + +:FIND_IN_PATH +SET PathTemp="%Path:;=";"%" +FOR %%P IN (%PathTemp%) DO ( + IF EXIST "%%~P.\%~1" ( + set %2=%%~P + goto :EOF + ) +) diff --git a/win_build_libs/Makefile b/win_build_libs/Makefile index fc619d7bc..e1d1cdae4 100755 --- a/win_build_libs/Makefile +++ b/win_build_libs/Makefile @@ -1,4 +1,3 @@ -CURL=curl.exe ZLIB_VERSION=1.2.3 BZIP2_VERSION=1.0.6 MINIUPNPC_VERSION=2.0 @@ -17,31 +16,32 @@ FFMPEG_VERSION=3.1.2 all: dirs zlib bzip2 miniupnpc openssl speex speexdsp opencv libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg copylibs download: \ - zlib-$(ZLIB_VERSION).tar.gz \ - bzip2-$(BZIP2_VERSION).tar.gz \ - miniupnpc-$(MINIUPNPC_VERSION).tar.gz \ - openssl-$(OPENSSL_VERSION).tar.gz \ - speex-$(SPEEX_VERSION).tar.gz \ - speexdsp-$(SPEEXDSP_VERSION).tar.gz \ - opencv-$(OPENCV_VERSION).tar.gz \ - libxml2-$(LIBXML2_VERSION).tar.gz \ - libxslt-$(LIBXSLT_VERSION).tar.gz \ - curl-$(CURL_VERSION).tar.gz \ - tcl$(TCL_VERSION)-src.tar.gz \ - sqlcipher-$(SQLCIPHER_VERSION).tar.gz \ - libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \ - ffmpeg-$(FFMPEG_VERSION).tar.gz + download/zlib-$(ZLIB_VERSION).tar.gz \ + download/bzip2-$(BZIP2_VERSION).tar.gz \ + download/miniupnpc-$(MINIUPNPC_VERSION).tar.gz \ + download/openssl-$(OPENSSL_VERSION).tar.gz \ + download/speex-$(SPEEX_VERSION).tar.gz \ + download/speexdsp-$(SPEEXDSP_VERSION).tar.gz \ + download/opencv-$(OPENCV_VERSION).tar.gz \ + download/libxml2-$(LIBXML2_VERSION).tar.gz \ + download/libxslt-$(LIBXSLT_VERSION).tar.gz \ + download/curl-$(CURL_VERSION).tar.gz \ + download/tcl$(TCL_VERSION)-src.tar.gz \ + download/sqlcipher-$(SQLCIPHER_VERSION).tar.gz \ + download/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \ + download/ffmpeg-$(FFMPEG_VERSION).tar.gz dirs: + mkdir -p download mkdir -p libs/include mkdir -p libs/lib mkdir -p libs/bin -zlib-$(ZLIB_VERSION).tar.gz: - $(CURL) -L -k http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.gz/download -o zlib-$(ZLIB_VERSION).tar.gz +download/zlib-$(ZLIB_VERSION).tar.gz: + wget --no-check-certificate http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.gz/download -O download/zlib-$(ZLIB_VERSION).tar.gz -zlib: zlib-$(ZLIB_VERSION).tar.gz - tar xvf zlib-$(ZLIB_VERSION).tar.gz +zlib: download/zlib-$(ZLIB_VERSION).tar.gz + tar xvf download/zlib-$(ZLIB_VERSION).tar.gz cd zlib-$(ZLIB_VERSION) && ./configure #cd zlib-$(ZLIB_VERSION) && make install prefix="`pwd`/../libs" cd zlib-$(ZLIB_VERSION) && make @@ -51,11 +51,11 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz rm -r -f zlib-$(ZLIB_VERSION) touch zlib -bzip2-$(BZIP2_VERSION).tar.gz: - $(CURL) http://bzip.org/$(BZIP2_VERSION)/bzip2-$(BZIP2_VERSION).tar.gz -o bzip2-$(BZIP2_VERSION).tar.gz +download/bzip2-$(BZIP2_VERSION).tar.gz: + wget http://bzip.org/$(BZIP2_VERSION)/bzip2-$(BZIP2_VERSION).tar.gz -O download/bzip2-$(BZIP2_VERSION).tar.gz -bzip2: bzip2-$(BZIP2_VERSION).tar.gz - tar xvf bzip2-$(BZIP2_VERSION).tar.gz +bzip2: download/bzip2-$(BZIP2_VERSION).tar.gz + tar xvf download/bzip2-$(BZIP2_VERSION).tar.gz #cd bzip2-$(BZIP2_VERSION) && make install PREFIX="`pwd`/../libs" cd bzip2-$(BZIP2_VERSION) && make cp bzip2-$(BZIP2_VERSION)/bzlib.h libs/include/ @@ -63,11 +63,11 @@ bzip2: bzip2-$(BZIP2_VERSION).tar.gz rm -r -f bzip2-$(BZIP2_VERSION) touch bzip2 -miniupnpc-$(MINIUPNPC_VERSION).tar.gz: - $(CURL) -L http://miniupnp.free.fr/files/download.php?file=miniupnpc-$(MINIUPNPC_VERSION).tar.gz -o miniupnpc-$(MINIUPNPC_VERSION).tar.gz +download/miniupnpc-$(MINIUPNPC_VERSION).tar.gz: + wget http://miniupnp.free.fr/files/download.php?file=miniupnpc-$(MINIUPNPC_VERSION).tar.gz -O download/miniupnpc-$(MINIUPNPC_VERSION).tar.gz -miniupnpc: miniupnpc-$(MINIUPNPC_VERSION).tar.gz - tar xvf miniupnpc-$(MINIUPNPC_VERSION).tar.gz +miniupnpc: download/miniupnpc-$(MINIUPNPC_VERSION).tar.gz + tar xvf download/miniupnpc-$(MINIUPNPC_VERSION).tar.gz cd miniupnpc-$(MINIUPNPC_VERSION) && CC=gcc && export CC && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll mkdir -p libs/include/miniupnpc && cp miniupnpc-$(MINIUPNPC_VERSION)/*.h libs/include/miniupnpc/ cp miniupnpc-$(MINIUPNPC_VERSION)/miniupnpc.lib libs/lib/ @@ -75,11 +75,11 @@ miniupnpc: miniupnpc-$(MINIUPNPC_VERSION).tar.gz rm -r -f miniupnpc-$(MINIUPNPC_VERSION) touch miniupnpc -openssl-$(OPENSSL_VERSION).tar.gz: - $(CURL) -k https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -o openssl-$(OPENSSL_VERSION).tar.gz +download/openssl-$(OPENSSL_VERSION).tar.gz: + wget --no-check-certificate https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -O download/openssl-$(OPENSSL_VERSION).tar.gz -openssl: openssl-$(OPENSSL_VERSION).tar.gz - tar xvf openssl-$(OPENSSL_VERSION).tar.gz +openssl: download/openssl-$(OPENSSL_VERSION).tar.gz + tar xvf download/openssl-$(OPENSSL_VERSION).tar.gz #cd openssl-$(OPENSSL_VERSION) && ./config --prefix="`pwd`/../libs" #cd openssl-$(OPENSSL_VERSION) && make install cd openssl-$(OPENSSL_VERSION) && ./config shared @@ -92,11 +92,11 @@ openssl: openssl-$(OPENSSL_VERSION).tar.gz rm -r -f openssl-$(OPENSSL_VERSION) touch openssl -speex-$(SPEEX_VERSION).tar.gz: - $(CURL) http://downloads.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz -o speex-$(SPEEX_VERSION).tar.gz +download/speex-$(SPEEX_VERSION).tar.gz: + wget http://downloads.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz -O download/speex-$(SPEEX_VERSION).tar.gz -speex: speex-$(SPEEX_VERSION).tar.gz - tar xvf speex-$(SPEEX_VERSION).tar.gz +speex: download/speex-$(SPEEX_VERSION).tar.gz + tar xvf download/speex-$(SPEEX_VERSION).tar.gz cd speex-$(SPEEX_VERSION) && ./configure #cd speex-$(SPEEX_VERSION) && make install exec_prefix="`pwd`/../libs" cd speex-$(SPEEX_VERSION) && make @@ -105,11 +105,11 @@ speex: speex-$(SPEEX_VERSION).tar.gz rm -r -f speex-$(SPEEX_VERSION) touch speex -speexdsp-$(SPEEXDSP_VERSION).tar.gz: - $(CURL) http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz -o speexdsp-$(SPEEXDSP_VERSION).tar.gz +download/speexdsp-$(SPEEXDSP_VERSION).tar.gz: + wget http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz -O download/speexdsp-$(SPEEXDSP_VERSION).tar.gz -speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz - tar xvf speexdsp-$(SPEEXDSP_VERSION).tar.gz +speexdsp: download/speexdsp-$(SPEEXDSP_VERSION).tar.gz + tar xvf download/speexdsp-$(SPEEXDSP_VERSION).tar.gz cd speexdsp-$(SPEEXDSP_VERSION) && ./configure cd speexdsp-$(SPEEXDSP_VERSION) && make mkdir -p libs/include/speex && cp speexdsp-$(SPEEXDSP_VERSION)/include/speex/*.h libs/include/speex/ @@ -117,11 +117,11 @@ speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz rm -r -f speexdsp-$(SPEEXDSP_VERSION) touch speexdsp -opencv-$(OPENCV_VERSION).tar.gz: - $(CURL) -L -k https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).tar.gz -o opencv-$(OPENCV_VERSION).tar.gz +download/opencv-$(OPENCV_VERSION).tar.gz: + wget --no-check-certificate https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).tar.gz -O download/opencv-$(OPENCV_VERSION).tar.gz -opencv: opencv-$(OPENCV_VERSION).tar.gz - tar xvf opencv-$(OPENCV_VERSION).tar.gz +opencv: download/opencv-$(OPENCV_VERSION).tar.gz + tar xvf download/opencv-$(OPENCV_VERSION).tar.gz mkdir -p opencv-$(OPENCV_VERSION)/build #cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/../../libs" cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/install" @@ -131,11 +131,11 @@ opencv: opencv-$(OPENCV_VERSION).tar.gz rm -r -f opencv-$(OPENCV_VERSION) touch opencv -libxml2-$(LIBXML2_VERSION).tar.gz: - $(CURL) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -o libxml2-$(LIBXML2_VERSION).tar.gz +download/libxml2-$(LIBXML2_VERSION).tar.gz: + wget ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -O download/libxml2-$(LIBXML2_VERSION).tar.gz -libxml2: libxml2-$(LIBXML2_VERSION).tar.gz - tar xvf libxml2-$(LIBXML2_VERSION).tar.gz +libxml2: download/libxml2-$(LIBXML2_VERSION).tar.gz + tar xvf download/libxml2-$(LIBXML2_VERSION).tar.gz cd libxml2-$(LIBXML2_VERSION) && ./configure --without-iconv -enable-shared=no #cd libxml2-$(LIBXML2_VERSION) && make install exec_prefix="`pwd`/../libs" cd libxml2-$(LIBXML2_VERSION) && make @@ -143,12 +143,12 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz cp libxml2-$(LIBXML2_VERSION)/.libs/libxml2.a libs/lib/ touch libxml2 -libxslt-$(LIBXSLT_VERSION).tar.gz: - $(CURL) ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -o libxslt-$(LIBXSLT_VERSION).tar.gz +download/libxslt-$(LIBXSLT_VERSION).tar.gz: + wget ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -O download/libxslt-$(LIBXSLT_VERSION).tar.gz -libxslt: libxml2-$(LIBXML2_VERSION).tar.gz libxslt-$(LIBXSLT_VERSION).tar.gz - tar xvf libxml2-$(LIBXML2_VERSION).tar.gz - tar xvf libxslt-$(LIBXSLT_VERSION).tar.gz +libxslt: download/libxml2-$(LIBXML2_VERSION).tar.gz download/libxslt-$(LIBXSLT_VERSION).tar.gz + tar xvf download/libxml2-$(LIBXML2_VERSION).tar.gz + tar xvf download/libxslt-$(LIBXSLT_VERSION).tar.gz tar xvf libxslt-$(LIBXSLT_VERSION)-fix.tar.gz cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC cd libxslt-$(LIBXSLT_VERSION) && make @@ -159,11 +159,11 @@ libxslt: libxml2-$(LIBXML2_VERSION).tar.gz libxslt-$(LIBXSLT_VERSION).tar.gz rm -r -f libxslt-$(LIBXSLT_VERSION) touch libxslt -curl-$(CURL_VERSION).tar.gz: - $(CURL) -L -k http://curl.haxx.se/download/curl-$(CURL_VERSION).tar.gz -o curl-$(CURL_VERSION).tar.gz +download/curl-$(CURL_VERSION).tar.gz: + wget --no-check-certificate http://curl.haxx.se/download/curl-$(CURL_VERSION).tar.gz -O download/curl-$(CURL_VERSION).tar.gz -curl: curl-$(CURL_VERSION).tar.gz - tar xvf curl-$(CURL_VERSION).tar.gz +curl: download/curl-$(CURL_VERSION).tar.gz + tar xvf download/curl-$(CURL_VERSION).tar.gz cd curl-$(CURL_VERSION) && ./configure --disable-shared --with-ssl="`pwd`/../libs" #cd curl-$(CURL_VERSION) && make install exec_prefix="`pwd`/../libs" cd curl-$(CURL_VERSION) && make @@ -172,20 +172,20 @@ curl: curl-$(CURL_VERSION).tar.gz rm -r -f curl-$(CURL_VERSION) touch curl -tcl$(TCL_VERSION)-src.tar.gz: - $(CURL) -L http://prdownloads.sourceforge.net/tcl/tcl$(TCL_VERSION)-src.tar.gz -o tcl$(TCL_VERSION)-src.tar.gz +download/tcl$(TCL_VERSION)-src.tar.gz: + wget http://prdownloads.sourceforge.net/tcl/tcl$(TCL_VERSION)-src.tar.gz -O download/tcl$(TCL_VERSION)-src.tar.gz -sqlcipher-$(SQLCIPHER_VERSION).tar.gz: - $(CURL) -L -k https://github.com/sqlcipher/sqlcipher/archive/v$(SQLCIPHER_VERSION).tar.gz -o sqlcipher-$(SQLCIPHER_VERSION).tar.gz +download/sqlcipher-$(SQLCIPHER_VERSION).tar.gz: + wget --no-check-certificate https://github.com/sqlcipher/sqlcipher/archive/v$(SQLCIPHER_VERSION).tar.gz -O download/sqlcipher-$(SQLCIPHER_VERSION).tar.gz -sqlcipher: tcl$(TCL_VERSION)-src.tar.gz sqlcipher-$(SQLCIPHER_VERSION).tar.gz +sqlcipher: download/tcl$(TCL_VERSION)-src.tar.gz download/sqlcipher-$(SQLCIPHER_VERSION).tar.gz # tcl - tar xvf tcl$(TCL_VERSION)-src.tar.gz + tar xvf download/tcl$(TCL_VERSION)-src.tar.gz mkdir -p tcl$(TCL_VERSION)/build cd tcl$(TCL_VERSION)/build && ../win/configure cd tcl$(TCL_VERSION)/build && make #sqlcipher - tar xvf sqlcipher-$(SQLCIPHER_VERSION).tar.gz + tar xvf download/sqlcipher-$(SQLCIPHER_VERSION).tar.gz cd sqlcipher-$(SQLCIPHER_VERSION) && ln -s ../tcl$(TCL_VERSION)/build/tclsh86.exe tclsh mkdir -p tcl$(TCL_VERSION)/lib ln -s `pwd`/tcl$(TCL_VERSION)/library `pwd`/tcl$(TCL_VERSION)/lib/tcl8.6 @@ -197,21 +197,21 @@ sqlcipher: tcl$(TCL_VERSION)-src.tar.gz sqlcipher-$(SQLCIPHER_VERSION).tar.gz rm -r -f tcl$(TCL_VERSION) touch sqlcipher -libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz: - $(CURL) -L -k http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz -o libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz +download/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz: + wget --no-check-certificate http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz -O download/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz -libmicrohttpd: libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz - tar xvf libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz +libmicrohttpd: download/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz + tar xvf download/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && ./configure --disable-shared --enable-static --prefix="`pwd`/../libs" cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && make install rm -r -f libmicrohttpd-$(LIBMICROHTTPD_VERSION) touch libmicrohttpd -ffmpeg-$(FFMPEG_VERSION).tar.gz: - $(CURL) -L -k https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -o ffmpeg-$(FFMPEG_VERSION).tar.gz +download/ffmpeg-$(FFMPEG_VERSION).tar.gz: + wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -O download/ffmpeg-$(FFMPEG_VERSION).tar.gz -ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz - tar xvf ffmpeg-$(FFMPEG_VERSION).tar.gz +ffmpeg: download/ffmpeg-$(FFMPEG_VERSION).tar.gz + tar xvf download/ffmpeg-$(FFMPEG_VERSION).tar.gz cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../libs" cd ffmpeg-$(FFMPEG_VERSION) && make install rm -r -f ffmpeg-$(FFMPEG_VERSION) diff --git a/win_build_libs/Tools/winhttpjs.bat b/win_build_libs/Tools/winhttpjs.bat new file mode 100644 index 000000000..0c1847fac --- /dev/null +++ b/win_build_libs/Tools/winhttpjs.bat @@ -0,0 +1,584 @@ +@if (@X) == (@Y) @end /* JScript comment + @echo off + + rem :: the first argument is the script name as it will be used for proper help message + cscript //E:JScript //nologo "%~f0" "%~nx0" %* + + exit /b %errorlevel% + +@if (@X)==(@Y) @end JScript comment */ + +// used resources + +// update 12.10.15 +// osvikvi(https://github.com/osvikvi) has nodited that the -password option is not set , so this is fixed + +//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384058(v=vs.85).aspx +//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384055(v=vs.85).aspx +//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384059(v=vs.85).aspx + +// global variables and constants + + +// ---------------------------------- +// -- asynch requests not included -- +// ---------------------------------- + + +//todo - save responceStream instead of responceBody !! +//todo - set all winthttp options ->//https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx +//todo - log all options +//todo - improve help message . eventual verbose option + + +var ARGS = WScript.Arguments; +var scriptName = ARGS.Item(0); + +var url = ""; +var saveTo = ""; + +var user = 0; +var pass = 0; + +var proxy = 0; +var bypass = 0; +var proxy_user = 0; +var proxy_pass = 0; + +var certificate = 0; + +var force = true; + +var body = ""; + +//ActiveX objects +var WinHTTPObj = new ActiveXObject("WinHttp.WinHttpRequest.5.1"); +var FileSystemObj = new ActiveXObject("Scripting.FileSystemObject"); +var AdoDBObj = new ActiveXObject("ADODB.Stream"); + +// HttpRequest SetCredentials flags. +var proxy_settings = 0; + +// +HTTPREQUEST_SETCREDENTIALS_FOR_SERVER = 0; +HTTPREQUEST_SETCREDENTIALS_FOR_PROXY = 1; + +//timeouts and their default values +var RESOLVE_TIMEOUT = 0; +var CONNECT_TIMEOUT = 90000; +var SEND_TIMEOUT = 90000; +var RECEIVE_TIMEOUT = 90000; + +//HttpRequestMethod +var http_method = 'GET'; + +//header +var header_file = ""; + +//report +var reportfile = ""; + +//test-this: +var use_stream = false; + +//autologon policy +var autologon_policy = 1; //0,1,2 + + +//headers will be stored as multi-dimensional array +var headers = []; + +//user-agent +var ua = ""; + +//escape URL +var escape = false; + +function printHelp() { + WScript.Echo(scriptName + " - sends HTTP request and saves the request body as a file and/or a report of the sent request"); + WScript.Echo(scriptName + " url [-force yes|no] [-user username -password password] [-proxy proxyserver:port] [-bypass bypass_list]"); + WScript.Echo(" [-proxyuser proxy_username -proxypassword proxy_password] [-certificate certificateString]"); + WScript.Echo(" [-method GET|POST|PATCH|DELETE|HEAD|OPTIONS|CONNECT]"); + WScript.Echo(" [-saveTo file] - to print response to console use con"); + + WScript.Echo(" [-sendTimeout int(milliseconds)]"); + WScript.Echo(" [-resolveTimeout int(milliseconds)]"); + WScript.Echo(" [-connectTimeout int(milliseconds)]"); + WScript.Echo(" [-receiveTimeout int(milliseconds)]"); + + WScript.Echo(" [-autologonPolicy 1|2|3]"); + WScript.Echo(" [-proxySettings 1|2|3] (https://msdn.microsoft.com/en-us/library/windows/desktop/aa384059(v=vs.85).aspx)"); + + //header + WScript.Echo(" [-headers-file header_file]"); + //reportfile + WScript.Echo(" [-reportfile reportfile]"); + WScript.Echo(" [-ua user-agent]"); + WScript.Echo(" [-ua-file user-agent-file]"); + + WScript.Echo(" [-escape yes|no]"); + + WScript.Echo(" [-body body-string]"); + WScript.Echo(" [-body-file body-file]"); + + WScript.Echo("-force - decide to not or to overwrite if the local files exists"); + + WScript.Echo("proxyserver:port - the proxy server"); + WScript.Echo("bypass- bypass list"); + WScript.Echo("proxy_user , proxy_password - credentials for proxy server"); + WScript.Echo("user , password - credentials for the server"); + WScript.Echo("certificate - location of SSL certificate"); + WScript.Echo("method - what HTTP method will be used.Default is GET"); + WScript.Echo("saveTo - save the responce as binary file"); + WScript.Echo(" "); + WScript.Echo("Header file should contain key:value pairs.Lines starting with \"#\" will be ignored."); + WScript.Echo("value should NOT be enclosed with quotes"); + WScript.Echo(" "); + WScript.Echo("Examples:"); + + WScript.Echo(scriptName + " http://somelink.com/somefile.zip -saveTo c:\\somefile.zip -certificate \"LOCAL_MACHINE\\Personal\\My Middle-Tier Certificate\""); + WScript.Echo(scriptName + " http://somelink.com/something.html -method POST -certificate \"LOCAL_MACHINE\\Personal\\My Middle-Tier Certificate\" -header c:\\header_file -reportfile c:\\reportfile.txt"); + WScript.Echo(scriptName + "\"http://somelink\" -method POST -header hdrs.txt -reportfile reportfile2.txt -saveTo responsefile2 -ua \"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36\" -body-file some.json"); + +} + +function parseArgs() { + // + if (ARGS.Length < 2) { + WScript.Echo("insufficient arguments"); + printHelp(); + WScript.Quit(43); + } + // !!! + url = ARGS.Item(1); + // !!! + if (ARGS.Length % 2 != 0) { + WScript.Echo("illegal arguments"); + printHelp(); + WScript.Quit(44); + } + + for (var i = 2; i < ARGS.Length - 1; i = i + 2) { + var arg = ARGS.Item(i).toLowerCase(); + var next = ARGS.Item(i + 1); + + + try { + switch (arg) { // the try-catch is set mainly because of the parseInts + case "-force": + if (next == "no") { + force = false; + } + break; + case "-escape": + if (next == "yes") { + escape = true; + } + break; + case "-saveto": + saveTo = next; + break; + case "-user": + case "-u": + user = next; + break; + case "-pass": + case "-password": + case "-p": + pass = next; + break; + case "-proxy": + proxy = next; + break; + case "-bypass": + bypass = next; + break; + case "-proxyuser": + case "-pu": + proxy_user = next; + break; + case "-proxypassword": + case "-pp": + proxy_pass = next; + break; + case "-ua": + ua = next; + break; + case "-ua-file": + ua = readFile(next); + break; + case "-body": + body = next; + break; + case "-usestream": + //WScript.Echo("~~"); + if (next.toLowerCase() === "yes") { + use_stream = true + }; + break; + case "-body-file": + body = readFile(next); + break; + case "-certificate": + certificate = next; + break; + case "-method": + switch (next.toLowerCase()) { + case "post": + http_method = 'POST'; + break; + case "get": + http_method = 'GET'; + break; + case "head": + http_method = 'HEAD'; + break; + case "put": + http_method = 'PUT'; + break; + case "options": + http_method = 'OPTIONS'; + break; + case "connect": + http_method = 'CONNECT'; + break; + case "patch": + http_method = 'PATCH'; + break; + case "delete": + http_method = 'DELETE'; + break; + default: + WScript.Echo("Invalid http method passed " + next); + WScript.Echo("possible values are GET,POST,DELETE,PUT,CONNECT,PATCH,HEAD,OPTIONS"); + WScript.Quit(1326); + break; + } + break; + case "-headers-file": + case "-header": + headers = readPropFile(next); + break; + case "-reportfile": + reportfile = next; + break; + //timeouts + case "-sendtimeout": + SEND_TIMEOUT = parseInt(next); + break; + case "-connecttimeout": + CONNECT_TIMEOUT = parseint(next); + break; + case "-resolvetimeout": + RESOLVE_TIMEOUT = parseInt(next); + break; + case "-receivetimeout": + RECEIVE_TIMEOUT = parseInt(next); + break; + + case "-autologonpolicy": + autologon_policy = parseInt(next); + if (autologon_policy > 2 || autologon_policy < 0) { + WScript.Echo("out of autologon policy range"); + WScript.Quit(87); + }; + break; + case "-proxysettings": + proxy_settings = parseInt(next); + if (proxy_settings > 2 || proxy_settings < 0) { + WScript.Echo("out of proxy settings range"); + WScript.Quit(87); + }; + break; + default: + WScript.Echo("Invalid command line switch: " + arg); + WScript.Quit(1405); + break; + } + } catch (err) { + WScript.Echo(err.message); + WScript.Quit(1348); + } + } +} + +stripTrailingSlash = function(path) { + while (path.substr(path.length - 1, path.length) == '\\') { + path = path.substr(0, path.length - 1); + } + return path; +} + +function existsItem(path) { + return FileSystemObj.FolderExists(path) || FileSystemObj.FileExists(path); +} + +function deleteItem(path) { + if (FileSystemObj.FileExists(path)) { + FileSystemObj.DeleteFile(path); + return true; + } else if (FileSystemObj.FolderExists(path)) { + FileSystemObj.DeleteFolder(stripTrailingSlash(path)); + return true; + } else { + return false; + } +} + +//------------------------------- +//---------------------- +//---------- +//----- +//-- +function request(url) { + + try { + + WinHTTPObj.Open(http_method, url, false); + if (proxy != 0 && bypass != 0) { + WinHTTPObj.SetProxy(proxy_settings, proxy, bypass); + } + + if (proxy != 0) { + WinHTTPObj.SetProxy(proxy_settings, proxy); + } + + if (user != 0 && pass != 0) { + WinHTTPObj.SetCredentials(user, pass, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER); + } + + if (proxy_user != 0 && proxy_pass != 0) { + WinHTTPObj.SetCredentials(proxy_user, proxy_pass, HTTPREQUEST_SETCREDENTIALS_FOR_PROXY); + } + + if (certificate != 0) { + WinHTTPObj.SetClientCertificate(certificate); + } + + //set autologin policy + WinHTTPObj.SetAutoLogonPolicy(autologon_policy); + //set timeouts + WinHTTPObj.SetTimeouts(RESOLVE_TIMEOUT, CONNECT_TIMEOUT, SEND_TIMEOUT, RECEIVE_TIMEOUT); + + if (headers.length !== 0) { + WScript.Echo("Sending with headers:"); + for (var i = 0; i < headers.length; i++) { + WinHTTPObj.SetRequestHeader(headers[i][0], headers[i][1]); + WScript.Echo(headers[i][0] + ":" + headers[i][1]); + } + WScript.Echo(""); + } + + if (ua !== "") { + //user-agent option from: + //WinHttpRequestOption enumeration + // other options can be added like bellow + //https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx + WinHTTPObj.Option(0) = ua; + } + if (escape) { + WinHTTPObj.Option(3) = true; + } + if (trim(body) === "") { + WinHTTPObj.Send(); + } else { + WinHTTPObj.Send(body); + } + + var status = WinHTTPObj.Status + } catch (err) { + WScript.Echo(err.message); + WScript.Quit(666); + } + + //////////////////////// + // report // + //////////////////////// + + if (reportfile != "") { + + //var report_string=""; + var n = "\r\n"; + var report_string = "Status:" + n; + report_string = report_string + " " + WinHTTPObj.Status; + report_string = report_string + " " + WinHTTPObj.StatusText + n; + report_string = report_string + " " + n; + report_string = report_string + "Response:" + n; + report_string = report_string + WinHTTPObj.ResponseText + n; + report_string = report_string + " " + n; + report_string = report_string + "Headers:" + n; + report_string = report_string + WinHTTPObj.GetAllResponseHeaders() + n; + + WinHttpRequestOption_UserAgentString = 0; // Name of the user agent + WinHttpRequestOption_URL = 1; // Current URL + WinHttpRequestOption_URLCodePage = 2; // Code page + WinHttpRequestOption_EscapePercentInURL = 3; // Convert percents + // in the URL + // rest of the options can be seen and eventually added using this as reference + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa384108(v=vs.85).aspx + + report_string = report_string + "URL:" + n; + report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_URL) + n; + + report_string = report_string + "URL Code Page:" + n; + report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_URLCodePage) + n; + + report_string = report_string + "User Agent:" + n; + report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_UserAgentString) + n; + + report_string = report_string + "Escapped URL:" + n; + report_string = report_string + WinHTTPObj.Option(WinHttpRequestOption_EscapePercentInURL) + n; + + prepareateFile(force, reportfile); + + WScript.Echo("Writing report to " + reportfile); + + writeFile(reportfile, report_string); + + } + + switch (status) { + case 200: + WScript.Echo("Status: 200 OK"); + break; + default: + WScript.Echo("Status: " + status); + WScript.Echo("Status was not OK. More info -> https://en.wikipedia.org/wiki/List_of_HTTP_status_codes"); + } + + //if as binary + if (saveTo.toLowerCase() === "con") { + WScript.Echo(WinHTTPObj.ResponseText); + } + if (saveTo !== "" && saveTo.toLowerCase() !== "con") { + prepareateFile(force, saveTo); + try { + + if (use_stream) { + writeBinFile(saveTo, WinHTTPObj.ResponseStream); + } else { + writeBinFile(saveTo, WinHTTPObj.ResponseBody); + } + + } catch (err) { + WScript.Echo("Failed to save the file as binary.Attempt to save it as text"); + AdoDBObj.Close(); + prepareateFile(true, saveTo); + writeFile(saveTo, WinHTTPObj.ResponseText); + } + } + WScript.Quit(status); +} + +//-- +//----- +//---------- +//---------------------- +//------------------------------- + +function prepareateFile(force, file) { + if (force && existsItem(file)) { + if (!deleteItem(file)) { + WScript.Echo("Unable to delete " + file); + WScript.Quit(8); + } + } else if (existsItem(file)) { + WScript.Echo("Item " + file + " already exist"); + WScript.Quit(9); + } +} + +function writeBinFile(fileName, data) { + AdoDBObj.Type = 1; + AdoDBObj.Open(); + AdoDBObj.Position = 0; + AdoDBObj.Write(data); + AdoDBObj.SaveToFile(fileName, 2); + AdoDBObj.Close(); +} + +function writeFile(fileName, data) { + AdoDBObj.Type = 2; + AdoDBObj.CharSet = "iso-8859-1"; + AdoDBObj.Open(); + AdoDBObj.Position = 0; + AdoDBObj.WriteText(data); + AdoDBObj.SaveToFile(fileName, 2); + AdoDBObj.Close(); +} + + +function readFile(fileName) { + //check existence + try { + if (!FileSystemObj.FileExists(fileName)) { + WScript.Echo("file " + fileName + " does not exist!"); + WScript.Quit(13); + } + if (FileSystemObj.GetFile(fileName).Size === 0) { + return ""; + } + var fileR = FileSystemObj.OpenTextFile(fileName, 1); + var content = fileR.ReadAll(); + fileR.Close(); + return content; + } catch (err) { + WScript.Echo("Error while reading file: " + fileName); + WScript.Echo(err.message); + WScript.Echo("Will return empty string"); + return ""; + } +} + +function readPropFile(fileName) { + //check existence + resultArray = []; + if (!FileSystemObj.FileExists(fileName)) { + WScript.Echo("(headers)file " + fileName + " does not exist!"); + WScript.Quit(15); + } + if (FileSystemObj.GetFile(fileName).Size === 0) { + return resultArray; + } + var fileR = FileSystemObj.OpenTextFile(fileName, 1); + var line = ""; + var k = ""; + var v = ""; + var lineN = 0; + var index = 0; + try { + WScript.Echo("parsing headers form " + fileName + " property file "); + while (!fileR.AtEndOfStream) { + line = fileR.ReadLine(); + lineN++; + index = line.indexOf(":"); + if (line.indexOf("#") === 0 || trim(line) === "") { + continue; + } + if (index === -1 || index === line.length - 1 || index === 0) { + WScript.Echo("Invalid line " + lineN); + WScript.Quit(93); + } + k = trim(line.substring(0, index)); + v = trim(line.substring(index + 1, line.length)); + resultArray.push([k, v]); + } + fileR.Close(); + return resultArray; + } catch (err) { + WScript.Echo("Error while reading headers file: " + fileName); + WScript.Echo(err.message); + WScript.Echo("Will return empty array"); + return resultArray; + } +} + +function trim(str) { + return str.replace(/^\s+/, '').replace(/\s+$/, ''); +} + +function main() { + parseArgs(); + request(url); +} +main(); diff --git a/win_build_libs/_env.bat b/win_build_libs/_env.bat new file mode 100644 index 000000000..8ca4f15ec --- /dev/null +++ b/win_build_libs/_env.bat @@ -0,0 +1,9 @@ +set CurPath=%~dp0 +set DownloadPath=%CurPath%download +set ToolsPath=%CurPath%tools +set TempPath=%CurPath%tmp +set MSYSPath=%CurPath%msys +set LibsPath=%CurPath%libs + +set CurlExe=%ToolsPath%\curl.exe +set SevenZipExe=%ToolsPath%\7z.exe diff --git a/win_build_libs/clean-all.bat b/win_build_libs/clean-all.bat new file mode 100644 index 000000000..740bf9d3e --- /dev/null +++ b/win_build_libs/clean-all.bat @@ -0,0 +1,30 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +::call :remove_dir "%DownloadPath%" +call :remove_dir "%MSYSPath%" +call :remove_dir "%TempPath%" + +call :remove_file "%ToolsPath%\7z.exe" +call :remove_file "%ToolsPath%\7z.dll" +call :remove_file "%ToolsPath%\curl.exe" + +call "%~dp0clean.bat" + +endlocal +exit /B 0 + +:remove_dir +if not exist %1 goto :EOF +del /s /f /q %1 >nul +rmdir /s /q %1 +goto :EOF + +:remove_file +if not exist %1 goto :EOF +del /q %1 >nul +goto :EOF diff --git a/win_build_libs/clean.bat b/win_build_libs/clean.bat new file mode 100644 index 000000000..171130fc2 --- /dev/null +++ b/win_build_libs/clean.bat @@ -0,0 +1,36 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +call :remove_dir "%LibsPath%" + +call :remove_file "%CurPath%bzip2" +call :remove_file "%CurPath%curl" +call :remove_file "%CurPath%ffmpeg" +call :remove_file "%CurPath%libmicrohttpd" +call :remove_file "%CurPath%libxml2" +call :remove_file "%CurPath%libxslt" +call :remove_file "%CurPath%miniupnpc" +call :remove_file "%CurPath%opencv" +call :remove_file "%CurPath%openssl" +call :remove_file "%CurPath%speex" +call :remove_file "%CurPath%speexdsp" +call :remove_file "%CurPath%sqlcipher" +call :remove_file "%CurPath%zlib" + +endlocal +exit /B 0 + +:remove_dir +if not exist %1 goto :EOF +del /s /f /q %1 >nul +rmdir /s /q %1 +goto :EOF + +:remove_file +if not exist %1 goto :EOF +del /q %1 >nul +goto :EOF diff --git a/win_build_libs/update-msys.bat b/win_build_libs/update-msys.bat new file mode 100644 index 000000000..6ecc30eff --- /dev/null +++ b/win_build_libs/update-msys.bat @@ -0,0 +1,16 @@ +@setlocal + +@echo off + +:: Initialize environment +call "%~dp0_env.bat" + +if not exist "%MSYSPath%\bin\mingw-get.exe" exit /B 0 + +echo Update MSYS +pushd "%MSYSPath%\bin" +mingw-get.exe update +mingw-get.exe upgrade +popd + +exit /B %ERRORLEVEL% From 5944f1fea2d1b46cb01b238e341f8a43bd7c7c52 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 29 Aug 2016 19:08:14 +0200 Subject: [PATCH 16/19] Moved MSYS build scripts to folder build_scripts --- .../Windows/build_libs}/.gitignore | 0 .../Windows/build_libs}/1-prepare.bat | 0 .../Windows/build_libs}/2-install-msys.bat | 0 .../Windows/build_libs}/3-build-libs.bat | 0 .../Windows/build_libs}/Makefile | 2 +- .../Windows/build_libs}/Tools/winhttpjs.bat | 0 .../Windows/build_libs}/_env.bat | 0 .../Windows/build_libs}/clean-all.bat | 0 .../Windows/build_libs}/clean.bat | 0 .../Windows/build_libs}/libxslt-1.1.28-fix.tar.gz | Bin .../Windows/build_libs}/update-msys.bat | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename {win_build_libs => build_scripts/Windows/build_libs}/.gitignore (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/1-prepare.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/2-install-msys.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/3-build-libs.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/Makefile (99%) rename {win_build_libs => build_scripts/Windows/build_libs}/Tools/winhttpjs.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/_env.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/clean-all.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/clean.bat (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/libxslt-1.1.28-fix.tar.gz (100%) rename {win_build_libs => build_scripts/Windows/build_libs}/update-msys.bat (100%) diff --git a/win_build_libs/.gitignore b/build_scripts/Windows/build_libs/.gitignore similarity index 100% rename from win_build_libs/.gitignore rename to build_scripts/Windows/build_libs/.gitignore diff --git a/win_build_libs/1-prepare.bat b/build_scripts/Windows/build_libs/1-prepare.bat similarity index 100% rename from win_build_libs/1-prepare.bat rename to build_scripts/Windows/build_libs/1-prepare.bat diff --git a/win_build_libs/2-install-msys.bat b/build_scripts/Windows/build_libs/2-install-msys.bat similarity index 100% rename from win_build_libs/2-install-msys.bat rename to build_scripts/Windows/build_libs/2-install-msys.bat diff --git a/win_build_libs/3-build-libs.bat b/build_scripts/Windows/build_libs/3-build-libs.bat similarity index 100% rename from win_build_libs/3-build-libs.bat rename to build_scripts/Windows/build_libs/3-build-libs.bat diff --git a/win_build_libs/Makefile b/build_scripts/Windows/build_libs/Makefile similarity index 99% rename from win_build_libs/Makefile rename to build_scripts/Windows/build_libs/Makefile index e1d1cdae4..c53ada54f 100755 --- a/win_build_libs/Makefile +++ b/build_scripts/Windows/build_libs/Makefile @@ -221,6 +221,6 @@ ffmpeg: download/ffmpeg-$(FFMPEG_VERSION).tar.gz copylibs: read -p "Do you want to copy libs to retroshare? (yes|no)" answer; \ if [ "$$answer" = "yes" ] ; then \ - cp -r libs ../../ ; \ + cp -r libs ../../../../ ; \ fi diff --git a/win_build_libs/Tools/winhttpjs.bat b/build_scripts/Windows/build_libs/Tools/winhttpjs.bat similarity index 100% rename from win_build_libs/Tools/winhttpjs.bat rename to build_scripts/Windows/build_libs/Tools/winhttpjs.bat diff --git a/win_build_libs/_env.bat b/build_scripts/Windows/build_libs/_env.bat similarity index 100% rename from win_build_libs/_env.bat rename to build_scripts/Windows/build_libs/_env.bat diff --git a/win_build_libs/clean-all.bat b/build_scripts/Windows/build_libs/clean-all.bat similarity index 100% rename from win_build_libs/clean-all.bat rename to build_scripts/Windows/build_libs/clean-all.bat diff --git a/win_build_libs/clean.bat b/build_scripts/Windows/build_libs/clean.bat similarity index 100% rename from win_build_libs/clean.bat rename to build_scripts/Windows/build_libs/clean.bat diff --git a/win_build_libs/libxslt-1.1.28-fix.tar.gz b/build_scripts/Windows/build_libs/libxslt-1.1.28-fix.tar.gz similarity index 100% rename from win_build_libs/libxslt-1.1.28-fix.tar.gz rename to build_scripts/Windows/build_libs/libxslt-1.1.28-fix.tar.gz diff --git a/win_build_libs/update-msys.bat b/build_scripts/Windows/build_libs/update-msys.bat similarity index 100% rename from win_build_libs/update-msys.bat rename to build_scripts/Windows/build_libs/update-msys.bat From 5241a7d4c085dcee14a72b62d690a2009ac11cd6 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 30 Aug 2016 17:18:27 +0200 Subject: [PATCH 17/19] Added last icon changes for transfers page --- .../src/gui/FileTransfer/TransfersDialog.cpp | 6 +- .../src/gui/FileTransfer/TransfersDialog.ui | 20 ++- retroshare-gui/src/gui/SharedFilesDialog.cpp | 2 +- retroshare-gui/src/gui/SharedFilesDialog.ui | 25 ++- retroshare-gui/src/gui/help/licence.html | 2 + retroshare-gui/src/gui/icons.qrc | 5 + retroshare-gui/src/gui/icons/svg/download.svg | 53 +++++++ retroshare-gui/src/gui/icons/svg/folders.svg | 142 ++++++++++++++++++ retroshare-gui/src/gui/icons/svg/folders1.svg | 56 +++++++ .../src/gui/icons/svg/magnifying-glass.svg | 63 ++++++++ retroshare-gui/src/gui/icons/svg/upload.svg | 53 +++++++ 11 files changed, 416 insertions(+), 11 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/svg/download.svg create mode 100644 retroshare-gui/src/gui/icons/svg/folders.svg create mode 100644 retroshare-gui/src/gui/icons/svg/folders1.svg create mode 100644 retroshare-gui/src/gui/icons/svg/magnifying-glass.svg create mode 100644 retroshare-gui/src/gui/icons/svg/upload.svg diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index 3a7f5cf61..b9dee9b28 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -76,7 +76,7 @@ #define IMAGE_PRIORITYNORMAL ":/images/prioritynormal.png" #define IMAGE_PRIORITYHIGH ":/images/priorityhigh.png" #define IMAGE_PRIORITYAUTO ":/images/priorityauto.png" -#define IMAGE_SEARCH ":/images/filefind.png" +#define IMAGE_SEARCH ":/icons/svg/magnifying-glass.svg" #define IMAGE_EXPAND ":/images/edit_add24.png" #define IMAGE_COLLAPSE ":/images/edit_remove24.png" #define IMAGE_LIBRARY ":/images/library.png" @@ -84,8 +84,8 @@ #define IMAGE_COLLMODIF ":/images/library_edit.png" #define IMAGE_COLLVIEW ":/images/library_view.png" #define IMAGE_COLLOPEN ":/images/library.png" -#define IMAGE_FRIENDSFILES ":/images/fileshare16.png" -#define IMAGE_MYFILES ":images/my_documents_16.png" +#define IMAGE_FRIENDSFILES ":/icons/svg/folders.svg" +#define IMAGE_MYFILES ":icons/svg/folders1.svg" #define IMAGE_RENAMEFILE ":images/filecomments.png" #define IMAGE_STREAMING ":images/streaming.png" diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index d723f23d1..9f7d6bcdd 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -120,13 +120,19 @@ 0 + + + 20 + 20 + + false - - :/images/down.png:/images/down.png + + :/icons/svg/download.svg:/icons/svg/download.svg Downloads @@ -215,6 +221,12 @@ 0 + + + 20 + 20 + + Qt::ElideNone @@ -232,8 +244,8 @@ - - :/images/uploads.png:/images/uploads.png + + :/icons/svg/upload.svg:/icons/svg/upload.svg Uploads diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index c3bf94d5a..c3b710309 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -65,7 +65,7 @@ #define IMAGE_COLLVIEW ":/images/library_view.png" #define IMAGE_COLLOPEN ":/images/library.png" #define IMAGE_EDITSHARE ":/images/edit_16.png" -#define IMAGE_MYFILES ":images/my_documents_22.png" +#define IMAGE_MYFILES ":/icons/svg/folders1.svg" /*define dirTreeView Column */ #define COLUMN_NAME 0 diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 04eb69fc8..25f9337fa 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -29,7 +29,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -44,7 +53,7 @@ - :/images/fileshare24.png + :/icons/svg/folders.svg true @@ -294,7 +303,16 @@ border-image: url(:/images/closepressed.png) QFrame::Raised - + + 0 + + + 0 + + + 0 + + 0 @@ -346,6 +364,7 @@ border-image: url(:/images/closepressed.png) + diff --git a/retroshare-gui/src/gui/help/licence.html b/retroshare-gui/src/gui/help/licence.html index cf3f6230b..323d90122 100644 --- a/retroshare-gui/src/gui/help/licence.html +++ b/retroshare-gui/src/gui/help/licence.html @@ -50,6 +50,8 @@ href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html
Icons made by Freepik from www.flaticon.com is licensed by CC 3.0 BY
+
Icons made by Eleonor Wang from www.flaticon.com is licensed by CC 3.0 BY
+

GNU GENERAL PUBLIC LICENSE

diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index c0958e29e..df040eb60 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -1,5 +1,10 @@ + icons/svg/download.svg + icons/svg/folders.svg + icons/svg/folders1.svg + icons/svg/magnifying-glass.svg + icons/svg/upload.svg icons/settings/appearance.svg icons/settings/channels.svg icons/settings/chat.svg diff --git a/retroshare-gui/src/gui/icons/svg/download.svg b/retroshare-gui/src/gui/icons/svg/download.svg new file mode 100644 index 000000000..4cd19ee40 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/download.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/svg/folders.svg b/retroshare-gui/src/gui/icons/svg/folders.svg new file mode 100644 index 000000000..5f4d64010 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/folders.svg @@ -0,0 +1,142 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/folders1.svg b/retroshare-gui/src/gui/icons/svg/folders1.svg new file mode 100644 index 000000000..c9fdc44c6 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/folders1.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/svg/magnifying-glass.svg b/retroshare-gui/src/gui/icons/svg/magnifying-glass.svg new file mode 100644 index 000000000..0718ffbb5 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/magnifying-glass.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/svg/upload.svg b/retroshare-gui/src/gui/icons/svg/upload.svg new file mode 100644 index 000000000..6df1fcf99 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/upload.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + From a899c98d88578155ea472872edeb9c77f762b4ee Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 30 Aug 2016 17:21:01 +0200 Subject: [PATCH 18/19] update version string --- libretroshare/src/retroshare/rsversion.h | 3 +-- libretroshare/src/retroshare/rsversion.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/retroshare/rsversion.h b/libretroshare/src/retroshare/rsversion.h index 26cf284a6..105be943f 100644 --- a/libretroshare/src/retroshare/rsversion.h +++ b/libretroshare/src/retroshare/rsversion.h @@ -1,8 +1,7 @@ #define RS_MAJOR_VERSION 0 #define RS_MINOR_VERSION 6 -#define RS_BUILD_NUMBER 0 +#define RS_BUILD_NUMBER 1 #define RS_BUILD_NUMBER_ADD "x" // <-- do we need this? - // The revision number should be the 4 first bytes of the git revision hash, which is obtained using: // git log --pretty="%H" | head -1 | cut -c1-8 // diff --git a/libretroshare/src/retroshare/rsversion.in b/libretroshare/src/retroshare/rsversion.in index 96ab52c89..6c4c3a7bc 100644 --- a/libretroshare/src/retroshare/rsversion.in +++ b/libretroshare/src/retroshare/rsversion.in @@ -1,6 +1,6 @@ #define RS_MAJOR_VERSION 0 #define RS_MINOR_VERSION 6 -#define RS_BUILD_NUMBER 0 +#define RS_BUILD_NUMBER 1 #define RS_BUILD_NUMBER_ADD "" // The revision number should be the 4 first bytes of the git revision hash, which is obtained using: From 53e269838cb03cdff141358c04e72113c0784593 Mon Sep 17 00:00:00 2001 From: cyril soler Date: Wed, 31 Aug 2016 13:24:02 +0200 Subject: [PATCH 19/19] updated ubuntu changelog and version number --- build_scripts/Debian+Ubuntu/changelog | 11 ++++++++++- build_scripts/Debian+Ubuntu/makeSourcePackage.sh | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog index 03878cf56..6230d6c4b 100644 --- a/build_scripts/Debian+Ubuntu/changelog +++ b/build_scripts/Debian+Ubuntu/changelog @@ -1,4 +1,13 @@ -retroshare06 (0.6.0-1.XXXXXX~YYYYYY) YYYYYY; urgency=low +retroshare06 (0.6.1-1.XXXXXX~YYYYYY) YYYYYY; urgency=low + + Release of version 0.6.1. + * See detailed logs: https://github.com/RetroShare/RetroShare/blob/master/build_scripts/Debian%2BUbuntu/changelog + * Release blog post: https://retroshareteam.wordpress.com + * Website: https://github.com/Retroshare/Retroshare/releases + + -- Cyril Soler Wed, 31 Aug 2016 12:00:00 +0100 + +retroshare06 (0.6.0-1.20160818.b9ac4f87) xenial; urgency=low 9780f1f Phenom Mon, 15 Aug 2016 12:00:44 +0200 Add AutoHide to RSImageBlockWidget 368a429 csoler Wed, 17 Aug 2016 09:40:16 +0200 fixed read_125Size and write_125Size according to RFC4880 diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index a85b648ac..71b4dd070 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -1,7 +1,7 @@ #!/bin/sh ###################### PARAMETERS #################### -version="0.6.0" +version="0.6.1" gitpath="https://github.com/RetroShare/RetroShare.git" workdir=retroshare06-${version} #bubba3="Y" # comment out to compile for bubba3 @@ -47,7 +47,7 @@ while [ ${#} -gt 0 ]; do done if test "${dist}" = "" ; then - dist="precise trusty vivid wily xenial" + dist="precise trusty vivid wily xenial wheezy squeeze jessie stretch" fi echo Attempting to get revision number...