Improved Create comment dialog for channel/posted comments replies

*Improved Create comment dialog for channel/posted comment replies
*Update forum icons use the new flat one green/black
*Changed the context menu icon for Pin post
*Fixed for "new thread" dialog the title icon
*Added new circle icons for later to use
This commit is contained in:
defnax 2019-01-10 00:12:38 +01:00
parent 59d48b1191
commit 2d096e3179
22 changed files with 564 additions and 53 deletions

View File

@ -43,6 +43,8 @@
#define PCITEM_COLUMN_OWNVOTE 6
#define PCITEM_COLUMN_MSGID 7
#define PCITEM_COLUMN_PARENTID 8
#define PCITEM_COLUMN_AUTHORID 9
#define GXSCOMMENTS_LOADTHREAD 1
@ -170,6 +172,9 @@ void GxsCommentTreeWidget::setCurrentCommentMsgId(QTreeWidgetItem *current, QTre
{
mCurrentCommentMsgId = RsGxsMessageId(current->text(PCITEM_COLUMN_MSGID).toStdString());
mCurrentCommentText = current->text(PCITEM_COLUMN_COMMENT);
mCurrentCommentAuthor = current->text(PCITEM_COLUMN_AUTHOR);
mCurrentCommentAuthorId = RsGxsId(current->text(PCITEM_COLUMN_AUTHORID).toStdString());
}
}
@ -307,6 +312,8 @@ void GxsCommentTreeWidget::replyToComment()
msgId.first = mGroupId;
msgId.second = mCurrentCommentMsgId;
GxsCreateCommentDialog pcc(mTokenQueue, mCommentService, msgId, mLatestMsgId, this);
pcc.loadComment(mCurrentCommentText, mCurrentCommentAuthor, mCurrentCommentAuthorId);
pcc.exec();
}
@ -520,7 +527,7 @@ void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
std::cerr << "GxsCommentTreeWidget::service_loadThread() Got Comment: " << comment.mMeta.mMsgId;
std::cerr << std::endl;
GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_ALL) ;
GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR) ;
QString text;
{
@ -557,6 +564,9 @@ void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
text = QString::fromUtf8(comment.mMeta.mParentId.toStdString().c_str());
item->setText(PCITEM_COLUMN_PARENTID, text);
text = QString::fromUtf8(comment.mMeta.mAuthorId.toStdString().c_str());
item->setText(PCITEM_COLUMN_AUTHORID, text);
addItem(comment.mMeta.mMsgId, comment.mMeta.mParentId, item);
@ -580,6 +590,8 @@ QTreeWidgetItem *GxsCommentTreeWidget::service_createMissingItem(const RsGxsMess
item->setText(PCITEM_COLUMN_AUTHOR, text);
item->setText(PCITEM_COLUMN_MSGID, text);
item->setText(PCITEM_COLUMN_AUTHORID, text);
text = QString::fromUtf8(parent.toStdString().c_str());

View File

@ -89,6 +89,9 @@ protected:
RsGxsMessageId mLatestMsgId;
RsGxsMessageId mCurrentCommentMsgId;
QString mCurrentCommentText;
QString mCurrentCommentAuthor;
RsGxsId mCurrentCommentAuthorId;
RsGxsId mVoterId;
std::map<RsGxsMessageId, QTreeWidgetItem *> mLoadingMap;

View File

@ -20,9 +20,9 @@
#include "GxsCreateCommentDialog.h"
#include "ui_GxsCreateCommentDialog.h"
#include "util/HandleRichText.h"
#include <QPushButton>
#include <QMessageBox>
#include <iostream>
@ -35,8 +35,27 @@ GxsCreateCommentDialog::GxsCreateCommentDialog(TokenQueue *tokQ, RsGxsCommentSer
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(createComment()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(close()));
/* fill in the available OwnIds for signing */
ui->idChooser->loadIds(IDCHOOSER_ID_REQUIRED, RsGxsId());
}
void GxsCreateCommentDialog::loadComment(const QString &msgText, const QString &msgAuthor, const RsGxsId &msgAuthorId)
{
ui->titleLabel->setId(msgAuthorId);
ui->commentLabel->setText(msgText);
ui->avatarLabel->setGxsId(msgAuthorId);
ui->avatarLabel->setFrameType(AvatarWidget::NO_FRAME);
ui->replaytolabel->setId(msgAuthorId);
ui->replaytolabel->setText( tr("Replying to") + " @" + msgAuthor);
ui->commentTextEdit->setPlaceholderText( tr("Type your reply"));
ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Reply");
}
void GxsCreateCommentDialog::createComment()

View File

@ -22,6 +22,8 @@
#define _MRK_GXS_CREATE_COMMENT_DIALOG_H
#include <QDialog>
#include <retroshare/rsidentity.h>
#include "retroshare/rsgxscommon.h"
#include "util/TokenQueue.h"
@ -38,9 +40,11 @@ public:
const RsGxsGrpMsgIdPair& parentId, const RsGxsMessageId& threadId, QWidget *parent = 0);
~GxsCreateCommentDialog();
void loadComment(const QString &msgText, const QString &msgAuthor, const RsGxsId &msgAuthorId);
private slots:
void createComment();
private:
Ui::GxsCreateCommentDialog *ui;
TokenQueue *mTokenQueue;

View File

@ -6,60 +6,125 @@
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
<height>336</height>
<width>459</width>
<height>324</height>
</rect>
</property>
<property name="windowTitle">
<string>Make Comment</string>
</property>
<layout class="QVBoxLayout" name="GxsCreateCommentDialogVLayout">
<item>
<widget class="QLabel" name="titleLabel">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1" colspan="2">
<widget class="GxsIdLabel" name="titleLabel">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Compose new Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<item row="0" column="0" rowspan="2">
<widget class="AvatarWidget" name="avatarLabel">
<property name="minimumSize">
<size>
<width>52</width>
<height>52</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>52</width>
<height>52</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<layout class="QVBoxLayout" name="mainVLayout">
<item>
<widget class="GxsIdLabel" name="replaytolabel">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="MimeTextEdit" name="commentTextEdit">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="placeholderText">
<string>Type your comment</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="signedHLayout">
<item>
<spacer name="signedHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="signedLabel">
<property name="text">
<string>Signed by</string>
<string>Post as:</string>
</property>
</widget>
</item>
<item>
<widget class="GxsIdChooser" name="idChooser"/>
<widget class="GxsIdChooser" name="idChooser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="MimeTextEdit" name="commentTextEdit"/>
</item>
</layout>
</item>
<item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1" rowspan="2" colspan="2">
<widget class="QLabel" name="commentLabel">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -73,16 +138,30 @@ p, li { white-space: pre-wrap; }
</widget>
<customwidgets>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
<class>GxsIdLabel</class>
<extends>QLabel</extends>
<header>gui/gxs/GxsIdLabel.h</header>
</customwidget>
<customwidget>
<class>GxsIdChooser</class>
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget>
<class>AvatarWidget</class>
<extends>QLabel</extends>
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../icons.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

View File

@ -86,7 +86,7 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
QString text = mOId.isNull()?(pId.isNull() ? tr("Start New Thread") : tr("Post Forum Message")):tr("Edit Message");
setWindowTitle(text);
ui.headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png"));
ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png"));
ui.headerFrame->setHeaderText(text);
ui.generateSpinBox->setEnabled(false);

View File

@ -71,6 +71,7 @@
#define IMAGE_WARNING_RED ":/icons/warning_red_128.png"
#define IMAGE_WARNING_UNKNOWN ":/icons/bullet_grey_128.png"
#define IMAGE_VOID ":/icons/void_128.png"
#define IMAGE_PINPOST ":/images/pin32.png"
#define IMAGE_POSITIVE_OPINION ":/icons/png/thumbs-up.png"
#define IMAGE_NEUTRAL_OPINION ":/icons/png/thumbs-neutral.png"
#define IMAGE_NEGATIVE_OPINION ":/icons/png/thumbs-down.png"
@ -758,7 +759,7 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/)
connect(editAct, SIGNAL(triggered()), this, SLOT(editforummessage()));
bool is_pinned = mForumGroup.mPinnedPosts.ids.find(mThreadId) != mForumGroup.mPinnedPosts.ids.end();
QAction *pinUpPostAct = new QAction(QIcon(IMAGE_MESSAGE), (is_pinned?tr("Un-pin this post"):tr("Pin this post up")), &contextMnu);
QAction *pinUpPostAct = new QAction(QIcon(IMAGE_PINPOST), (is_pinned?tr("Un-pin this post"):tr("Pin this post up")), &contextMnu);
connect(pinUpPostAct , SIGNAL(triggered()), this, SLOT(togglePinUpPost()));
QAction *replyAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply"), &contextMnu);

View File

@ -126,7 +126,7 @@ QString GxsForumsDialog::icon(IconType type)
case ICON_OTHER_GROUP:
return ":/icons/png/feed-other.png";
case ICON_DEFAULT:
return ":/images/konversation.png";
return ":/icons/png/forums-default.png";
}
return "";
@ -191,6 +191,6 @@ void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo,
//if (IS_GROUP_ADMIN(groupInfo.mSubscribeFlags))
// groupItemInfo.icon = QIcon(":images/konv_message2.png");
if ((IS_GROUP_PGP_AUTHED(groupInfo.mSignFlags)) || (IS_GROUP_MESSAGE_TRACKING(groupInfo.mSignFlags)) )
groupItemInfo.icon = QIcon(":images/konv_message3.png");
groupItemInfo.icon = QIcon(":icons/png/forums-signed.png");
}

View File

@ -82,7 +82,7 @@
<file>icons/png/exit.png</file>
<file>icons/png/feedreader-notify.png</file>
<file>icons/png/feedreader.png</file>
<file>icons/png/feed-other.png</file>
<file>icons/png/feed-other.png</file>
<file>icons/png/feed-popular.png</file>
<file>icons/png/feed-subscribed.png</file>
<file>icons/png/filesharing-notify.png</file>
@ -90,8 +90,6 @@
<file>icons/png/font.png</file>
<file>icons/png/forums-notify.png</file>
<file>icons/png/forums.png</file>
<file>icons/png/forums-newpost.png</file>
<file>icons/png/forums-nopost.png</file>
<file>icons/png/fullscreen_arrows.png</file>
<file>icons/png/highlight.png</file>
<file>icons/png/home.png</file>
@ -252,5 +250,12 @@
<file>icons/png/channel-other.png</file>
<file>icons/png/channel-popular.png</file>
<file>icons/png/channel-subscribed.png</file>
<file>icons/png/circles-black.png</file>
<file>icons/png/circles-gray.png</file>
<file>icons/png/circles-notify.png</file>
<file>icons/png/circles-red.png</file>
<file>icons/png/circles-green.png</file>
<file>icons/png/forums-default.png</file>
<file>icons/png/forums-signed.png</file>
</qresource>
</RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circle-nopost.svg"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="3.6195028"
inkscape:cx="36.923359"
inkscape:cy="69.292647"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g4163" /><g
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,0 51.2,0 22.9232,0 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
transform="matrix(0.38197934,0,0,-0.38197934,-230.43126,-30.25739)"
id="g3-7"><g
id="circles"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6-4" /><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"
style="fill:#ffffff"><path
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6"
style="fill:#ffffff" /><path
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8-6"
style="fill:#ffffff" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circle-gray.svg"
inkscape:export-filename="C:\Users\Mustermann\Downloads\flaticons-20181108T132958Z-001\flaticons\circle-gray.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="3.6195028"
inkscape:cx="-25.609348"
inkscape:cy="60.03256"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g4163" /><g
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,1.3797308e-8 51.2,1.3797308e-8 22.9232,1.3797308e-8 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
transform="matrix(0.38197934,0,0,-0.38197934,-230.43126,-30.25739)"
id="g3-7"><g
id="circles"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6-4" /><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"
style="fill:#ffffff"><path
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6"
style="fill:#ffffff" /><path
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8-6"
style="fill:#ffffff" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circle-newpost.svg"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="3.6195028"
inkscape:cx="37.576976"
inkscape:cy="61.227944"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g4163" /><g
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#00b400;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,0 51.2,0 22.9232,0 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
transform="matrix(0.38197934,0,0,-0.38197934,-230.43126,-30.25739)"
id="g3-7"><g
id="circles"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6-4" /><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"
style="fill:#ffffff"><path
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6"
style="fill:#ffffff" /><path
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8-6"
style="fill:#ffffff" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circles-notify.svg"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="3.6195028"
inkscape:cx="9.0011778"
inkscape:cy="70.383092"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g4163" /><g
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#ff990d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,0 51.2,0 22.9232,0 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
transform="matrix(0.38197934,0,0,-0.38197934,-230.43126,-30.25739)"
id="g3-7"><g
id="circles"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6-4" /><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"
style="fill:#ffffff"><path
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6"
style="fill:#ffffff" /><path
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8-6"
style="fill:#ffffff" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circle-red.svg"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="3.6195028"
inkscape:cx="34.758059"
inkscape:cy="56.65037"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g4163" /><g
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,1.3797308e-8 51.2,1.3797308e-8 22.9232,1.3797308e-8 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
transform="matrix(0.38197934,0,0,-0.38197934,-230.43126,-30.25739)"
id="g3-7"><g
id="circles"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6-4" /><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"
style="fill:#ffffff"><path
inkscape:connector-curvature="0"
d="m 374.85,357 c -20.399,58.65 -76.5,102 -145.35,102 -84.15,0 -153,-68.85 -153,-153 0,-66.3 43.35,-122.4 102,-145.35 0,-2.55 0,-5.1 0,-7.65 0,-25.5 5.1,-51 12.75,-73.95 C 84.15,96.9 0,191.25 0,306 0,433.5 102,535.5 229.5,535.5 344.25,535.5 438.6,451.35 456.45,344.25 433.5,351.9 408,357 382.5,357 c -2.55,0 -5.1,0 -7.65,0 z"
id="path6"
style="fill:#ffffff" /><path
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8-6"
style="fill:#ffffff" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -11,15 +11,15 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg4155"
version="1.1"
inkscape:version="0.91 r13725"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
xml:space="preserve"
width="80"
height="80"
viewBox="0 0 80 80"
width="128"
height="128"
viewBox="0 0 128 128"
sodipodi:docname="circles.svg"><metadata
id="metadata4161"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs4159" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@ -29,13 +29,13 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="706"
inkscape:window-width="1024"
inkscape:window-height="705"
id="namedview4157"
showgrid="false"
inkscape:zoom="5.11875"
inkscape:cx="12.911357"
inkscape:cy="29.970313"
inkscape:cx="55.968954"
inkscape:cy="92.485576"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@ -43,11 +43,11 @@
id="g4163"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,80)"><path
transform="matrix(1.25,0,0,-1.25,0,128)"><path
inkscape:connector-curvature="0"
id="path4167"
style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32"
style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
d="M 102.4,51.2 C 102.4,22.9232 79.4768,0 51.2,0 22.9232,0 0,22.9232 0,51.2 c 0,28.2768 22.9232,51.2 51.2,51.2 28.2768,0 51.2,-22.9232 51.2,-51.2"
inkscape:export-filename="C:\Qt\RetroShare\RetroShare\retroshare-gui\src\gui\icons\png\circles.png"
inkscape:export-xdpi="144"
inkscape:export-ydpi="144" /><g
@ -62,7 +62,7 @@
inkscape:connector-curvature="0"
d="m 382.5,0 c -84.15,0 -153,68.85 -153,153 0,84.15 68.85,153 153,153 84.15,0 153,-68.85 153,-153 0,-84.15 -68.85,-153 -153,-153 z m 0,229.5 c -43.35,0 -76.5,-33.15 -76.5,-76.5 0,-43.35 33.15,-76.5 76.5,-76.5 43.35,0 76.5,33.15 76.5,76.5 0,43.35 -33.15,76.5 -76.5,76.5 z"
id="path8" /></g></g><g
transform="matrix(0.08545504,0,0,-0.08545504,8.3770531,55.388524)"
transform="matrix(0.13672806,0,0,-0.13672806,13.403285,88.621638)"
id="g3"
style="fill:#ffffff"><g
id="circles-4"

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB