From 6750e6140f94568ec1e47448e3abfa5f6f40f8ba Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Jan 2019 15:46:47 +0100 Subject: [PATCH] Added for Channel Message composer a Image Attach button Added for Channel Message composer a Image Attach button Added a Combobox for Sort in Posted links easyer with new icons Messengerwindow changed the button icons & display on status the status icon too. --- retroshare-gui/src/gui/MessengerWindow.cpp | 11 +- retroshare-gui/src/gui/MessengerWindow.ui | 43 +++- .../src/gui/Posted/PostedListWidget.cpp | 42 ++-- .../src/gui/Posted/PostedListWidget.h | 2 +- .../src/gui/Posted/PostedListWidget.ui | 216 ++++++++---------- retroshare-gui/src/gui/common/FriendList.ui | 2 +- .../gui/gxschannels/CreateGxsChannelMsg.cpp | 19 +- .../src/gui/gxschannels/CreateGxsChannelMsg.h | 1 + .../gui/gxschannels/CreateGxsChannelMsg.ui | 47 +++- retroshare-gui/src/gui/icons.qrc | 3 + retroshare-gui/src/gui/icons/png/flame.png | Bin 0 -> 3537 bytes retroshare-gui/src/gui/icons/png/new.png | Bin 0 -> 5875 bytes retroshare-gui/src/gui/icons/png/top.png | Bin 0 -> 2469 bytes retroshare-gui/src/gui/icons/svg/flame.svg | 103 +++++++++ retroshare-gui/src/gui/icons/svg/new.svg | 103 +++++++++ retroshare-gui/src/gui/icons/svg/top.svg | 81 +++++++ .../src/gui/statusbar/peerstatus.cpp | 6 +- 17 files changed, 503 insertions(+), 176 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/flame.png create mode 100644 retroshare-gui/src/gui/icons/png/new.png create mode 100644 retroshare-gui/src/gui/icons/png/top.png create mode 100644 retroshare-gui/src/gui/icons/svg/flame.svg create mode 100644 retroshare-gui/src/gui/icons/svg/new.svg create mode 100644 retroshare-gui/src/gui/icons/svg/top.svg diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index 1119d849c..b5ad24eab 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -108,20 +108,22 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags) } expandedGroups.clear(); - ui.messagelineEdit->setMinimumWidth(20); + ui.messagelineEdit->setMinimumWidth(24); /* Initialize friend list */ QToolButton *button = new QToolButton(this); - button->setIcon(QIcon(":/images/user/add_user24.png")); + button->setIcon(QIcon(":/icons/png/invite.png")); button->setToolTip(tr("Add a Friend")); connect(button, SIGNAL(clicked()), this, SLOT(addFriend())); ui.friendList->addToolButton(button); + button->setIconSize(QSize(27, 27)); button = new QToolButton(this); - button->setIcon(QIcon(":/images/friendsfolder24.png")); + button->setIcon(QIcon(":/icons/png/filesharing.png")); button->setToolTip(tr("Share files for your friends")); connect(button, SIGNAL(clicked()), this, SLOT(openShareManager())); - ui.friendList->addToolButton(button); + ui.friendList->addToolButton(button); + button->setIconSize(QSize(27, 27)); // load settings RsAutoUpdatePage::lockAllEvents(); @@ -221,6 +223,7 @@ void MessengerWindow::updateOwnStatus(const QString &peer_id, int status) // my status has changed ui.statusButton->setText(m_nickName + " (" + StatusDefs::name(status) + ")"); + ui.statusButton->setIcon(QIcon(StatusDefs::imageIM(status))); return; } diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui index 92d4f3a7c..7e952e86b 100644 --- a/retroshare-gui/src/gui/MessengerWindow.ui +++ b/retroshare-gui/src/gui/MessengerWindow.ui @@ -19,7 +19,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -34,7 +43,16 @@ - + + 6 + + + 6 + + + 6 + + 6 @@ -70,11 +88,17 @@ 0 + + + 27 + 27 + + QToolButton::InstantPopup - Qt::ToolButtonTextOnly + Qt::ToolButtonTextBesideIcon true @@ -118,7 +142,16 @@ - + + 3 + + + 3 + + + 3 + + 3 @@ -142,7 +175,7 @@ 0 0 258 - 20 + 21 diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp index e51bc51b8..2bd005566 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp @@ -41,23 +41,19 @@ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent ui->setupUi(this); /* Setup UI helper */ - mStateHelper->addWidget(mTokenTypeAllPosts, ui->hotSortButton); - mStateHelper->addWidget(mTokenTypeAllPosts, ui->newSortButton); - mStateHelper->addWidget(mTokenTypeAllPosts, ui->topSortButton); + mStateHelper->addWidget(mTokenTypeAllPosts, ui->comboBox); - mStateHelper->addWidget(mTokenTypePosts, ui->hotSortButton); - mStateHelper->addWidget(mTokenTypePosts, ui->newSortButton); - mStateHelper->addWidget(mTokenTypePosts, ui->topSortButton); + mStateHelper->addWidget(mTokenTypePosts, ui->comboBox); mStateHelper->addWidget(mTokenTypeGroupData, ui->submitPostButton); mStateHelper->addWidget(mTokenTypeGroupData, ui->subscribeToolButton); - connect(ui->hotSortButton, SIGNAL(clicked()), this, SLOT(getRankings())); - connect(ui->newSortButton, SIGNAL(clicked()), this, SLOT(getRankings())); - connect(ui->topSortButton, SIGNAL(clicked()), this, SLOT(getRankings())); connect(ui->nextButton, SIGNAL(clicked()), this, SLOT(showNext())); connect(ui->prevButton, SIGNAL(clicked()), this, SLOT(showPrev())); connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool))); + + connect(ui->comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(getRankings(int))); + // default sort method. mSortMethod = RsPosted::HotRankType; @@ -67,8 +63,6 @@ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent mTokenTypeVote = nextTokenType(); - ui->hotSortButton->setChecked(true); - /* fill in the available OwnIds for signing */ ui->idChooser->loadIds(IDCHOOSER_ID_REQUIRED, RsGxsId()); @@ -183,7 +177,7 @@ void PostedListWidget::updateShowText() ui->showLabel->setText(showText); } -void PostedListWidget::getRankings() +void PostedListWidget::getRankings(int i) { if (groupId().isNull()) return; @@ -192,23 +186,19 @@ void PostedListWidget::getRankings() std::cerr << std::endl; int oldSortMethod = mSortMethod; - - QObject* button = sender(); - if(button == ui->hotSortButton) + + switch(i) { + default: + case 0: mSortMethod = RsPosted::HotRankType; - } - else if(button == ui->topSortButton) - { - mSortMethod = RsPosted::TopRankType; - } - else if(button == ui->newSortButton) - { + break; + case 1: mSortMethod = RsPosted::NewRankType; - } - else - { - return; + break; + case 2: + mSortMethod = RsPosted::TopRankType; + break; } if (oldSortMethod != mSortMethod) diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.h b/retroshare-gui/src/gui/Posted/PostedListWidget.h index 426c4f742..9d472c7a5 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.h +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.h @@ -71,7 +71,7 @@ private slots: void submitVote(const RsGxsGrpMsgIdPair& msgId, bool up); - void getRankings(); + void getRankings(int); void subscribeGroup(bool subscribe); diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui index 934d4dafc..8fd987927 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui @@ -14,7 +14,16 @@ Form - + + 0 + + + 0 + + + 0 + + 0 @@ -53,6 +62,12 @@ 0 + + + 50 + false + + Subscribe @@ -64,12 +79,18 @@ - Submit a new Post + Create Post :/images/posted_24.png:/images/posted_24.png + + + 24 + 24 + + Qt::ToolButtonTextBesideIcon @@ -78,6 +99,62 @@ + + + + + 10 + 75 + true + + + + SORT + + + + + + + font: bold; +font-size: 15px; +color: #0099cc; + + + + 27 + 27 + + + + + Hot + + + + :/icons/png/flame.png:/icons/png/flame.png + + + + + New + + + + :/icons/png/new.png:/icons/png/new.png + + + + + Top + + + + :/icons/png/top.png:/icons/png/top.png + + + + @@ -91,116 +168,6 @@ - - - - Hot - - - - - - - :/images/hot_24.png:/images/hot_24.png - - - - 24 - 24 - - - - true - - - true - - - - - - - New - - - - - - - :/images/new_24.png:/images/new_24.png - - - - 24 - 24 - - - - true - - - true - - - - - - - Top - - - - - - - :/images/vote_up.png:/images/vote_up.png - - - - 24 - 24 - - - - true - - - false - - - true - - - - - - - - Today - - - - - Yesterday - - - - - This Week - - - - - This Month - - - - - This Year - - - - @@ -236,19 +203,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -279,7 +233,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -302,6 +265,7 @@ + diff --git a/retroshare-gui/src/gui/common/FriendList.ui b/retroshare-gui/src/gui/common/FriendList.ui index 49a875088..03c417e05 100644 --- a/retroshare-gui/src/gui/common/FriendList.ui +++ b/retroshare-gui/src/gui/common/FriendList.ui @@ -81,7 +81,7 @@ - Trusted nodes + Friends AlignCenter diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 6ca6a4613..62ac84274 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -24,9 +24,11 @@ #include #include #include +#include #include "CreateGxsChannelMsg.h" #include "gui/feeds/SubFileItem.h" +#include "gui/settings/rsharesettings.h" #include "gui/RetroShareLink.h" #include "util/HandleRichText.h" #include "util/misc.h" @@ -66,7 +68,8 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId connect(buttonBox, SIGNAL(rejected()), this, SLOT(cancelMsg())); connect(addFileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); - connect(addfilepushButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); + connect(addfilepushButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); + connect(imageButton, SIGNAL(clicked()), this, SLOT(addImage())); connect(addThumbnailButton, SIGNAL(clicked() ), this , SLOT(addThumbnail())); connect(thumbNailCb, SIGNAL(toggled(bool)), this, SLOT(allowAutoMediaThumbNail(bool))); connect(tabWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); @@ -821,3 +824,17 @@ void CreateGxsChannelMsg::loadRequest(const TokenQueue *queue, const TokenReques } } } + +void CreateGxsChannelMsg::addImage() +{ + QString file; + if (misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Choose Image"), tr("Image Files supported (*.png *.jpeg *.jpg *.gif *.webp)"), file)) { + QString encodedImage; + if (RsHtml::makeEmbeddedImage(file, encodedImage, 640*480)) { + QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage); + msgEdit->append("\n\n\n\n\n"); + msgEdit->textCursor().insertFragment(fragment); + } + } +} + diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h index bb8f15518..0a5afda7e 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h @@ -70,6 +70,7 @@ private slots: void addThumbnail(); void allowAutoMediaThumbNail(bool); + void addImage(); private: void loadChannelInfo(const uint32_t &token); diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 3f4cd7d4b..79dbaf424 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -96,7 +96,7 @@ - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -118,9 +118,15 @@ p, li { white-space: pre-wrap; } :/images/add-share24.png:/images/add-share24.png + + + 24 + 24 + + - + Add Channel Thumbnail @@ -129,6 +135,29 @@ p, li { white-space: pre-wrap; } :/images/add_image24.png:/images/add_image24.png + + + 24 + 24 + + + + + + + + Attach Picture + + + + :/images/add_image24.png:/images/add_image24.png + + + + 24 + 24 + + @@ -302,8 +331,8 @@ p, li { white-space: pre-wrap; } 0 0 - 767 - 42 + 63 + 24 @@ -390,17 +419,17 @@ p, li { white-space: pre-wrap; } + + MimeTextEdit + QTextEdit +
gui/common/MimeTextEdit.h
+ HeaderFrame QFrame
gui/common/HeaderFrame.h
1 - - MimeTextEdit - QTextEdit -
gui/common/MimeTextEdit.h
- diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 45b7c920b..a1bdb46a5 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -257,5 +257,8 @@ icons/png/circles-green.png icons/png/forums-default.png icons/png/forums-signed.png + icons/png/flame.png + icons/png/new.png + icons/png/top.png diff --git a/retroshare-gui/src/gui/icons/png/flame.png b/retroshare-gui/src/gui/icons/png/flame.png new file mode 100644 index 0000000000000000000000000000000000000000..5b92fb27aa4dfecfee0c3a0b440eb0b57c3b5000 GIT binary patch literal 3537 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 LNkvXXu0mjfJ0?Y= literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/new.png b/retroshare-gui/src/gui/icons/png/new.png new file mode 100644 index 0000000000000000000000000000000000000000..6838d543125ac238bb6990322c358801940d4744 GIT binary patch literal 5875 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 JPDHLkV1fZ!n_U0^ literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/top.png b/retroshare-gui/src/gui/icons/png/top.png new file mode 100644 index 0000000000000000000000000000000000000000..f25741faef2df37808779eb6ee7e3009d6c5499a GIT binary patch literal 2469 zcmai0c{J4R7yp`J#=c}}8hg^13XLs=X~>c_OCjrw^%XJkPHJLLm zXRZ2qDrS>h632YUl7zLUpR^82NIh+C{kFZ~G#b%1lUwgSxJz7W_a?RyyaXv)*XLw= zrGyH9%9SV9onML0_;uK6X~!JxQ_;5I@21Lq==J@a9?h-G3I|jbi(f&*druD(S3bOG zn_vTe`R(e!dQZk{D0S_?S7bODxz5o$-?m||Xu(ILE=$jV`VM3*%{-@j$Ri3}Jczkj zS`eat4$w3n;6PFHX&BF&tzIzX?T*ku7^Z+B9|%b3-w(X!7O$*9*T|ePzAJb5dd%Y& z;FtBdPv`E+f&0*ML=L-K(GZVOw^UuN(qtJ70<88Lnur~x#P&b$x_!$6I(VO_&mXTH z)%W02D5Pc*J=a5B#j9#b12Jx0sUmsdO8phBf^q0#zN|z5rI_y3_5%6^uR5aCj0eE?26xCe_~}5_xU;$iIL} zcU(#E1}e+%oOgy1-Ilv{6IF~eD&pOkM2KjRR~nx zPn+mi=9drI<@^2wSC$~gF_Refa$mgQG;{d6R!$(WDpRUv7D!H>46(-%E5?_f zmU>CVz{OfKDj8`Qvp)z~IU)VSwYEH_ZzdSkrURjn#v92jS+eWCI8tT1zrLMu?wO?3 zrOBTxBMHbu6kKzRrz0UIR{{J6fgRuSokitdYW6Zl?ww9a`rVMVNOE-Kj9X7{e~S&P zpUl+!%RR0J#D!*e3i*B@DRQoU;aUq(2>q2H5mR|)nmf@^d2(cq9mYZy@@Ng7w&+IZ zd+9Z+VcB3j7`1L^(3wtX=0{Mn!JE0NA9p!q#v@FAPJx^ z5IEJt_DBNy{{dpN+C5*?xKJ3J~UQF;wRHW|w7P-ei3p&qYuHw*Ye7hSGK* zq3}%N!yDZ^rrX*v?(h$-@hb<#ErPeH4+H>4=Aq~__32&p;H@!?!N7Xwp9iWjL5ja` zrVR3RC>2uXzC6@T!UHMYrHZiOB2FYUG2Rg1*9f%a;9>l zbGP+SS^^-iS?gZmG(6@nc@fOn{$%k5Id!EMh%q|FP{LI#zXv#lf|}z>i&ViK@b3Ri z&sY?bb5*=OS#Ke47ByDvb_$S%aCV#fo5{GJoEA`)XKq+$N*0@gWF9?8K_iM5bVPFY zv_n%dhl>FIBP9Zaa8&yR#)tZe8(x;8h2qYBnR3iIAMpkb$gA$CmHbrJvkRLRhoko2 zhyieI67XsGGWY{%Sf@5qYX+nuH$y8K?a`Vc4?<^IV|rDoofn;cnO4u%1IGOLg5wnp zAcQ+ByJT6=`oDXePJD_lg8IsZ$P!vd-b(6TKc~lBsEXqyPs0|R$`Aq zO_NaHvIf^Ma5B_al}?UUc}SId)nek6yT_)f7A4(f+A26C9Y_5X)bdlEI$9^&->)^A z)w8A%4TP69Bh|M}Q?8MZM;g-RawvBfA+tmC5HqJpN#RSbE(V|r&;sT`Yev(S5pVYB z8ykMY#P-{;8H5fjKP;2f=0xQHisOexl>LHgVT&!}fJZmUvaW`);6UNw1OU1C{5xY? zP0qXoDP87n1k!%qrv8+{yz&~mbo;)i!Aa~-=;b6KWVcE~GIm2&w_|C=H05_rc+l6s z+5X3;Fp{b9a3&S)n8VG7I{JBHa||1I?%LPgf}JXl{%S1SZ<{&-|45HIWwm|q?iE~H zuyU7T94(v^Kzkf07!zqo8Ym3jY{puSJbtNt62cmS>ZTP6-ijy6L_r*4I!r$=n`2=Q z&jfE$)I%us%FG?>aLBVmM2C#;G%Cs}qALGIq^TLPl}pU&5pbBPKb=qF3S;nGL;F;pJZ78=;AY5B19Hz<}d^UqsV4J_5cgcEUZ+)%fTDHK)31 tgz1TL5|&Xa+8|FJV9ljlrl)Y5Ou71OSf2&-ENce=j14UGse0Hu{{U9nYaIXp literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/svg/flame.svg b/retroshare-gui/src/gui/icons/svg/flame.svg new file mode 100644 index 000000000..6f5d79a40 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/flame.svg @@ -0,0 +1,103 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/new.svg b/retroshare-gui/src/gui/icons/svg/new.svg new file mode 100644 index 000000000..05b7b3249 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/new.svg @@ -0,0 +1,103 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/top.svg b/retroshare-gui/src/gui/icons/svg/top.svg new file mode 100644 index 000000000..2493a1394 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/top.svg @@ -0,0 +1,81 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.cpp b/retroshare-gui/src/gui/statusbar/peerstatus.cpp index eaaf00a3b..322109b05 100644 --- a/retroshare-gui/src/gui/statusbar/peerstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/peerstatus.cpp @@ -36,7 +36,7 @@ PeerStatus::PeerStatus(QWidget *parent) iconLabel->setPixmap(QPixmap(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation)); hbox->addWidget(iconLabel); - statusPeers = new QLabel( tr("Trusted nodes: 0/0"), this ); + statusPeers = new QLabel( tr("Friends: 0/0"), this ); hbox->addWidget(statusPeers); _compactMode = false; @@ -50,10 +50,10 @@ void PeerStatus::getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCo /* set users/friends/network */ if (statusPeers){ - statusPeers->setToolTip(tr("Online Trusted nodes/Total trusted nodes") ); + statusPeers->setToolTip(tr("Online Friends/Total Friends") ); QString text; if (_compactMode) text = QString("%1/%2").arg(nOnlineCount).arg(nFriendCount); - else text = QString("%1: %2/%3 ").arg(tr("Trusted nodes")).arg(nOnlineCount).arg(nFriendCount); + else text = QString("%1: %2/%3 ").arg(tr("Friends")).arg(nOnlineCount).arg(nFriendCount); statusPeers -> setText(text); } int S = QFontMetricsF(iconLabel->font()).height();