From d089762e12709e7e7b34ce4d5029418c974b0fa3 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 5 Oct 2019 21:13:15 +0200 Subject: [PATCH 1/8] Changes for thumbnail display & subcribe buttons * Changes for Thumbnail display & subscribe buttons * Display Poster thumbnails without wasted empty space *Display the thumbnail as Poster, 1:1 or 16:9 format *Moved the Subscribe buttons to the left --- .../src/gui/feeds/GxsChannelGroupItem.ui | 41 +++++++++--------- .../src/gui/feeds/GxsChannelPostItem.cpp | 14 ++++++- .../src/gui/feeds/GxsChannelPostItem.ui | 8 +++- .../src/gui/feeds/GxsForumGroupItem.ui | 41 +++++++++--------- .../src/gui/feeds/PostedGroupItem.ui | 42 +++++++++---------- 5 files changed, 81 insertions(+), 65 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui index bc61fe8b3..bb7688ffa 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Channel + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Channel - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index 9b70ca191..bbf9e1823 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -392,9 +392,21 @@ void GxsChannelPostItem::fill() if(mPost.mThumbnail.mData != NULL) { - QPixmap thumbnail; + QPixmap thumbnail; + GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL); // Wiping data - as its been passed to thumbnail. + if( thumbnail.width() < 90 ){ + ui->logoLabel->setMaximumSize(82,108); + } + else if( thumbnail.width() < 109 ){ + ui->logoLabel->setMinimumSize(108,108); + ui->logoLabel->setMaximumSize(108,108); + } + else{ + ui->logoLabel->setMinimumSize(156,108); + ui->logoLabel->setMaximumSize(156,108); + } ui->logoLabel->setPixmap(thumbnail); } diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index cd6594674..53e7f5348 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -51,9 +51,15 @@ + + + 0 + 0 + + - 158 + 82 108 diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui index 60f306113..ccdb0a591 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Forum + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Forum - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui index dd2b199bd..e792fadca 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Posted + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Posted - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - @@ -330,6 +329,7 @@ + From 98f35cf8af3fa74065f808239c032613d75b4155 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 6 Oct 2019 21:23:19 +0200 Subject: [PATCH 2/8] Changed the Channed feeds icons Changed the Channed feeds icons --- .../src/gui/feeds/GxsChannelGroupItem.cpp | 4 +-- .../src/gui/feeds/GxsChannelPostItem.cpp | 4 +-- .../src/gui/feeds/GxsChannelPostItem.ui | 34 ++++++++++-------- retroshare-gui/src/gui/feeds/SubFileItem.cpp | 1 + retroshare-gui/src/gui/feeds/SubFileItem.ui | 17 ++++----- retroshare-gui/src/gui/icons.qrc | 10 +++++- retroshare-gui/src/gui/icons/png/cancel.png | Bin 0 -> 5971 bytes retroshare-gui/src/gui/icons/png/comment.png | Bin 0 -> 1161 bytes retroshare-gui/src/gui/icons/png/copy.png | Bin 0 -> 2368 bytes retroshare-gui/src/gui/icons/png/correct.png | Bin 0 -> 2044 bytes .../src/gui/icons/png/down-arrow.png | Bin 0 -> 1446 bytes retroshare-gui/src/gui/icons/png/download.png | Bin 0 -> 2269 bytes retroshare-gui/src/gui/icons/png/play.png | Bin 0 -> 3885 bytes retroshare-gui/src/gui/icons/png/up-arrow.png | Bin 0 -> 1326 bytes 14 files changed, 42 insertions(+), 28 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/cancel.png create mode 100644 retroshare-gui/src/gui/icons/png/comment.png create mode 100644 retroshare-gui/src/gui/icons/png/copy.png create mode 100644 retroshare-gui/src/gui/icons/png/correct.png create mode 100644 retroshare-gui/src/gui/icons/png/down-arrow.png create mode 100644 retroshare-gui/src/gui/icons/png/download.png create mode 100644 retroshare-gui/src/gui/icons/png/play.png create mode 100644 retroshare-gui/src/gui/icons/png/up-arrow.png diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp index edc83c586..af3e575dd 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp @@ -176,13 +176,13 @@ void GxsChannelGroupItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index bbf9e1823..c049dff59 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -699,7 +699,7 @@ void GxsChannelPostItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); readToggled(false); @@ -707,7 +707,7 @@ void GxsChannelPostItem::doExpand(bool open) else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index 53e7f5348..e81b4ed78 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -309,8 +309,8 @@ Download - - :/images/download16.png:/images/download16.png + + :/icons/png/download.png:/icons/png/download.png false @@ -326,8 +326,8 @@ Play - - :/images/player_play.png:/images/player_play.png + + :/icons/png/play.png:/icons/png/play.png @@ -336,6 +336,10 @@ Comments + + + :/icons/png/comment.png:/icons/png/comment.png + @@ -373,8 +377,8 @@ Copy RetroShare Link - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -392,9 +396,8 @@ Unsubscribe From Channel - - - :/images/mail_delete.png:/images/mail_delete.png + + Unsubscribe @@ -413,8 +416,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -433,8 +436,8 @@ Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -453,8 +456,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -564,6 +567,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp index 0f542db21..ba81ab9bf 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp +++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp @@ -718,6 +718,7 @@ void SubFileItem::mediatype() /* check if the file is not a media file and change text */ playButton->setText(tr("Open")); playButton->setToolTip(tr("Open File")); + playButton->setIcon(QIcon()); } void SubFileItem::copyLink() diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.ui b/retroshare-gui/src/gui/feeds/SubFileItem.ui index d5c6b7181..6717836b5 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.ui +++ b/retroshare-gui/src/gui/feeds/SubFileItem.ui @@ -83,8 +83,8 @@ Cancel Download - - :/images/delete.png:/images/delete.png + + :/icons/png/cancel.png:/icons/png/cancel.png @@ -112,8 +112,8 @@ Download - - :/images/download.png:/images/download.png + + :/icons/png/download.png:/icons/png/download.png @@ -141,8 +141,8 @@ Play - - :/images/player_play.png:/images/player_play.png + + :/icons/png/play.png:/icons/png/play.png @@ -167,8 +167,8 @@ Copy RetroShare Link - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -242,6 +242,7 @@ + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index d510544a8..3986bfad7 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -71,7 +71,7 @@ icons/png/add.png icons/png/attach-image.png icons/png/attach.png - icons/png/cert.png + icons/png/cert.png icons/png/channels-notify.png icons/png/channels.png icons/png/chat-bubble-notify.png @@ -261,5 +261,13 @@ icons/png/flame.png icons/png/new.png icons/png/top.png + icons/png/copy.png + icons/png/down-arrow.png + icons/png/download.png + icons/png/up-arrow.png + icons/png/play.png + icons/png/cancel.png + icons/png/correct.png + icons/png/comment.png diff --git a/retroshare-gui/src/gui/icons/png/cancel.png b/retroshare-gui/src/gui/icons/png/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..4755b642b67765062bbca0a186f927caa2ed9737 GIT binary patch literal 5971 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 BJdywa literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/comment.png b/retroshare-gui/src/gui/icons/png/comment.png new file mode 100644 index 0000000000000000000000000000000000000000..28d18c2b7222fb1950e0a8d9bec208ac22a6d1f7 GIT binary patch literal 1161 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zFmDB6My|T7XrQ2EiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb2>)JY5_^ zD(1YsYrjG!ROI-_`#U%L_a^uVe`>$c!S7fo%&g?d;U*wxm?12n<8y+|WuuRB(j}FZ ze}h$|n#1@Z>sGj!t?~S7u8J{qwuUez-{p-(zKPmNRPVH#y+kc<+ z!A-U3MP(}=MV#5Sf}yERd}BvC+m&U{3%=c+y2&+=(c{A2v)`R{Z#Nx0^*6QqkshO# zwN!q4l)1yU%{jhLeCOV~U1EI2?rf>|O{sfVm;0Q0e_NuVnCE~c+XETqf<8uz;|z0> z8O|9pJO>IhU-l2L)s#PBzO4F1gU)dYxA=9Yybet?ZU~>O6RqVQf zhCX&bXfeH4eQSK)1isn>uO|C42Rv{*eO^6|=?=t_oP4H6eTF}Id)oCXm>gdIe;mzr z`#m$qy?OGob(uTc^-dhS?9XV**)SdK9&FC^na?72VDinMC(VE^YPw~^%CbhDRXg4; zw--szoVVgmF7A#`7rm6z(r74We6#u9aiyF8v>84<&N2COu82Q0(fG2q z#^jGqnJu$NJJ*+#!jg(zryO|{7`fJTzqtJQ;yYo1m0zsCT(g&O{Q8&o=yQ%AJ8smx zJpAaw!ae6ab(nW3xfVt^?MU6x{%_)<8J>l*-(z<6&2s*4KbgVh$)}oW@&{H|d&!4h zD%x7df8b%c_iDz1A9pWDG04=JZxv!_zaQ((-*EW-wxw)9$@`a>9(?$ns0mc^cjE^J zi$8Ud89;^qb#xf`_RkjsDUa`E1}a$_2ok=^*KpY1c`Z;~NeGDPy%fm&;=+F5;c`tq phETryTg&zCXYOTHf`Y7P_WO?M`0_W2Z2%S<44$rjF6*2UngDH&`wjpA literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/copy.png b/retroshare-gui/src/gui/icons/png/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..b225ff4aa0861066a3eeac57ae06d81b37efb96a GIT binary patch literal 2368 zcmd5;`8$*g8-Cx{(AY_XQHo=iW$a62kI~F148n;iB*s$6h?Bu*Um{}2GH8fO#HrCC zG#Hg#l9YrjBfA)DpY!|o2YkV5L*q;bsllOXGoF+Ps*YHd(*!3fUBiSA>!A zvD`*-Z6JY{HTUuPX7M`PT24CktMT&K*5dB?R${v zd^qbkTmJ^sk`3*;Fn~VC1Rj-;Kc`-B{nY2<9^4`JJoVee%*Ho{fE`E?3(Hj`On3{u zSYQnb5b1lE{{1N>)4t%M4=e<*UY>DO2B*0y_-i2B#A;TDMlDF8N^qiWAK#*%I%rh+ zqax92e=-hl9G7=wSUVR&`C5HIPV#_Q*C7w@nqX_8{VPi3auqRPPPlP0cT_ip2JkJV z8d`9g!VX?{i7gjlvt4+o@!g=lWLSnRnQ|&;`;FLs#$6iV8=%kCnFltBgyry%Tf0gl zC$8S%VmbgowefnP?5m^gc91?Yte8@7%Ckx-iCJ|&Qk%7u6+e9Cc}@EjIpIK9?O=%D z%mc?=@0JbCc5WdD`^Ff&#F_#uP*;*cwRrV(l}D&H~VG<|n~f>X#N zNbNG}Wy=@W6}!2UBhu0@f9Yb2|EUk59I7kn3HiD}Q*Mj|1mMQq6n-z;af8!5$h)R;I5X=ZkVT+cWq(AQ=1MQm?lYl=NjHJee&_H|7-a zqs)yu*3=rZq?S8g0-7E~nf`sVggSCWH%T7%lEVXX3>Vai*&d)WT)BSLk$q)I>i*A)M0QKW1%pCR;GETkl6U*y3Vpbx!H4xgRO7ow2|x~kAE+8 z9^PM{)FwiAH;J?4=!Z5I1Y^GTEk9ql8}c4#~KI=_IV%{*|WU;Umt1*<)w zK>nc*sxY}d4RFBw8<0zeNbAi);Q#bRPBB-kH`IL+0y!R|-6Jt-H^PRBab(-cn$8h% zQX^4vRjWd^2tXwC(~q})NaIYK#rw~UbneH(e^AcYO6Hpgf9C}j&}Sr7YF52j>! z|F}$W@e2)Lw7LLLx;R4f<2Ei^_EtU2_bFN_uBRpdPGZ9*I1*?hG9L5~*NWSv>=1eY zn|e`o;Jh?5U-&Bcu=6ZqQ28x8tIy~yb+-!wwvbLG1%|gLJt;SO6YBs6=8!swGS0f$ z+=bBFO?CVp`aE-zs7|Jx`;|7^AAwc+azX3rfoMOvK)ku)2kg#;>C~+qTYS~epC#%G zsdnIA#E`V*h9xEIUGH+$&aBKYO}ruGS-dLVc~Y(x8IT`M>UO&L@Miq51nECy`5}$& zxslNgg{Bh|aETxY$lPvIL;ck=RjUN_#nxHZ8ItcArKBV4!{X`B_gBi4&$?CSxLCF8 zLF}B_lNh~6n+>bm&8QU>U@czIrV~ZBYGc-=e0xls(Ylzp@>;AvcUw%{Lr^*uyJu~7 z%Tf|rX+%E!to0Ab;xSBrj>B!C{(4z&D|>MF%k;P3|T!8 zMR904)45H>$Q@?CFc9CKu~q1pm)mU=OXc_7Ru}*fjW_P(-`k4IjL+*R^IDVFxoly?EgY1im#wBd7HfpPN%q$||3K0o`74)hO`p&aLs5ey^c;Y9K0Q&dyx z3djgP6$R=^Q+_h*!mL2a4NS?s+x%2%vWKJVvW4|fR#HgBWQ$1VK9h literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/correct.png b/retroshare-gui/src/gui/icons/png/correct.png new file mode 100644 index 0000000000000000000000000000000000000000..948c13987796c786328ff39154a33c642cb6e100 GIT binary patch literal 2044 zcmV*;BOxJHu49o!NR_In1S)Of-Kqx!NWH8=oW(Q=LR?Uw zD2gbBgsf-g*MoPOUE=k6#xwKY%=|vLWIgjn`hNY!9@}pKA%qY@2qAkld&j6$qe9{MrXItL5rF1h_?ft_pjXWEPi*-)nOhj1#rpC z(k?TG`S{_7_-}sDeSVnJffT?MiG?2;t^`s57bG5jXyXz{0c=Yx{LtVMNC9k0J^ax6 zC6EHxl3Dnn{w0tC*f6uS%T&3=z@6C+e0>R|09msZerRn8jU^foYgo+GR*teziXYQrg%)hQbM7 z@Gt0DQ>>i8;BHsAu~V{au_~9fAtPb{!
sb1e(!HdXe?F$+zM>209P(zdg^i_`*ltI^bS)|^LYv% zz{h^Dycg3`7yJEjqym^DXC7t3Z$b1kFmGP@ZwB}j2lVIQW<86iCzeMU!x{C{JB(2+ z2JW_fC=m<{ABbCk+0QoV?l-T2=$SzeBj&RntEVwN`Dv_iTv5>Qfj9-2>1@%J;4KjU zc&NuSUsBrN*FEr1JMvgAC~){d)B-dXZ_uc`1w}uNv>oF=%J9DKi+fH*+RnBdhCk>9 zU;oDsD{lCqyp^E2w9O!BG3Y+qhcc|F;rF%~#;D}(jEfrjiRIr+bW$B> zBP9(V==WJbR^bBx;Z`61$?B2LMCxO$r{1oWHGJTQ1;{e|kj)a*+cl$6+VFe(3)u*N zwX9DEVfaM%XEI&_k`5mTXMkg!s;0_uYvBXEnSi_#)#lQVQXi|aIBqokJx}2S=y*Z* zmq~^XtQ0_h?Y|770n3qQg|_<4Coy|2yz3=C%M>`KBw$FOIW~efkr|=1U z-UmIIR`>v*KU;hPync4{SLidH?Q+iVPcidtX$~+FLQMx(7e;zvSZ~)% z#XBL-{QlgU`un1-K7v-P63AP<4Jl$=$YP+;&{moCiV@6emfbhaCVg*=6ijHdn7 z6hQB0HP}cP+cmliL%l_;w`;oU&oOBD!dRB&w7;5Cgrfi=-)h7PLQQ+ibC~^j{quQq zX`3-v0FeF#rQ~G(%nzyMgOg_nd^GEU>BFEn7+?9i`Z&J3d`WLME#zq0C-6BBYOjrHf9-Ls zHq+UntHE)AAF*^i(GguB4*o08{CKYaMo=DSf*f(>nIE$Im9Ua=EquW0mqN?M#qa@Z zUkfi6SHlOa{4k_kTn-<|`ln$f<9hf&mOlK%504qyz)yDSROA z5;0POzVa46Fv=oPQi3(|7(OuSGI3G@0Qn6cNMfD9l9wRQ;RDGn6j{m=K$+dz@ zR)Qjg4XtD%EkV)42eQ0pP|iwFhVX%`ZyJ@85|kx;z{Xv}94|qc!Ut^K zHqOx!lr4O~=6wSlD?u5<2W;Os^3C>*`g?VJ==%?)$C=;iWzFsyLC@{^&gZL7A>j9H z9Rh*R*;tvw6>i)**3#*qtkeE#ZWI8>yaW<{k2?hbGAn_Ee~nuO08%f3guj-11prbj zLDq{f=7F0901_{Ogx{aL1ppE&frP(4w+jG_TmlJyF!u`p#4dq^zp)&w77k!~>ay>d zUjr0jF-!i)*7B=)l8*uaz@dq6{VSXHgXs+bJn*rEcl?{ie_qzhyHVuh6z~I;=9z~B z#z9i_7&DIpP#}B>sP_nJ)_dszYo9HMtQ|Y1(O9h5J`5p*5JCtcgb+dqA%qY@2qA=U a%l`nCIT8`a%j-G-0000#{0svr4 zIqnsxQ|@;{w&`L&A$C+J;7m^n4Wa`Za;8w1L(`6jXXD%c zOjc}0JiubHa7ihQ%(&RJcwA~mLe;9f1ppY>QoKmCtm+lHevN|)4;?%Soua4mETsG_#@F8qMG>F=NQv1Y@HiL;U%_`E0Na{ zB%;g8&3|)-Ik>!ar>4J_JH{7>_DQEhxo>Xtn}z-4q7`;?MokzdE!&>NOco#TIo8@) zkXy)_>88>$96^iY8CtlkrI--7cJ_Oe$s~c_AqWZVv zWiQFg4YG8zheDZ9Nk6K*eaCDIR;YL(jZ{lXLjc3K8#)AIo?^bU5L(o{>}NSQn~m=pZ5ttG~c% zzm;~*`rA=TR`xitxtE!fwb6<8O&*Ko#8VpJvwf|t7|xeRjr1|yFbe!^-tM7WD^N9U zCtr@Q#EE*&yb~Ae4I{$j8%BnT_Nra;(toyrb)`}1vsH<-If`eO9DR=H%v= zhF>_Buz0fVYmjKL3HYf@ew6$J8{`-a)23!y9;k}wqvsC&W25X*O1Ktt!{3rx=M2EH92@%y%0 z8UkBo!dNBW!GQb4=ea~JZPfF~MJFa|=IJ2e7x>k49lpkvY%C!80q9{#=1MZgfXk)A z{4}sYkQEm$FeL~=0Cg8wdCA1u3~IpmZE`WfFyjl07(!;0Zr{-Wr2w! z0yv8y?NgGm23$iQn7;-V1QPP#1Ez$55CGE-Ub|%CXa-O*q-rI(#el2l154GwGC@Kv zd;m#k(aPE|z7<&AP7I~#u0}3mcq0h|J^D=SH1o~ViIa?#yHS3w>ZF|hX{jB%H`duO zt$*Zw=Gcp!i8N5iSalv2J#$u>4(Km-T*xUF)jSUP fJmK|Y$kvGUkzJ{z-l_Atp9)aC{k-mb#_;|J9C4IK literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/download.png b/retroshare-gui/src/gui/icons/png/download.png new file mode 100644 index 0000000000000000000000000000000000000000..38414dfc99aa314b6e555f2137b5e4b74958e6ae GIT binary patch literal 2269 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/up-arrow.png b/retroshare-gui/src/gui/icons/png/up-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..34de4aba361c55ae86fa6480fe86e7caa156864b GIT binary patch literal 1326 zcmZ{kiBnTo6vl5LLWIT!SxiCgCZ6XBFHjzp_s)GBB)433P=$a&PFt(BUa??r(H*mS->|4rm>DEN{u7N zu@cK7@>z!}`%cBZXo`NC5a0JEx0!pl==`MW--Q8I-BCM&!)LTF_p7&fY}U)g2E~QZ za13u!r_b(OM%*rEZp1n+*o65#>>D-y)iiZu3m;u*=k_pSv8n&PbJ&cPpSo(mYB5A& zo3S`!%bb_Sp3u6!(u6e(?v=#Os9gA)-Y)L=UT{Oj_gUac6PvwQ!7=1LVdiF{_BkS}g3{Uv`k|^yYNoQ!L6Q}NniZBS3 zJGfPL)e5&&)0l+)6HCa=i@Axb!MRt!F;yNoDkI&j?tlneBnM5Lcn?s~`=L9KGdaGu z1thw0C#a!Hz$S4gDAM98%QIJelV}`lYq-_$t#VVqdHk z=HTbnbDoAr=qKgV-uh^azyfy>^*WTtyIk~)Pc%B|gRP$<8C|PG$3cMRus_t22`J;` z{SMP4V0!PJj1{lY!3LbOel0rQ5(dq40cGbZ4UGWM$48O|&%Kg?3}WTTtmQ$GfuEez z_F=5uv-dur3bXP2l-9VM*PTw@O+)Ul8`Snvb9q-dw&itWtH)fxAHd`mD=tVi=pNkt z=aK(U!(Z=~6kRa~E>{LYf?mMzaYXA) z;;vBa)Q-Z)J4Xe_bJZMb&`SN9B}B7hbYkfm|NqP>F1H>#cFOh-9R8?v z%z>X?t{IO1(U?V3^=vy8M4o);VIQ|~MSCURVl%xQuQT$C?b??}k}JDZJ+L*=Q#NL{ z{vm&x;1({RfMI}Ih7euBBkM0*Fs5>yyTkOhkp4ME^|FJ&B7a+2J&rK6Ulw(K7@iB> zPqCeco2|9J(8WmvenH=&p+oU44E~T?KKohWcwp z^`6YAq{OzR3On9?J7S>SSvjhA{cee{P$B=E?)|LAm~X=7OXupx(7z3^m{Cx37*F;; DLN!(E literal 0 HcmV?d00001 From 2df4a1a3e88d6bd2be59f5f7679c710012c148a1 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 9 Oct 2019 18:06:30 +0200 Subject: [PATCH 3/8] changed icons on othe feeds too * changed the icons on other feeds too * Show on Forum Message Feed the Avatars --- retroshare-gui/src/gui/ChatLobbyWidget.ui | 2 +- .../src/gui/FileTransfer/TransfersDialog.ui | 2 +- retroshare-gui/src/gui/FriendsDialog.ui | 2 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 2 +- retroshare-gui/src/gui/NewsFeed.ui | 2 +- .../src/gui/Posted/PostedDialog.cpp | 4 +- retroshare-gui/src/gui/Posted/PostedItem.ui | 12 +- retroshare-gui/src/gui/feeds/ChatMsgItem.ui | 81 +-- .../src/gui/feeds/GxsChannelGroupItem.ui | 24 +- .../src/gui/feeds/GxsChannelPostItem.cpp | 12 +- .../src/gui/feeds/GxsForumGroupItem.cpp | 8 +- .../src/gui/feeds/GxsForumGroupItem.ui | 24 +- .../src/gui/feeds/GxsForumMsgItem.cpp | 31 +- .../src/gui/feeds/GxsForumMsgItem.ui | 467 +++++++++--------- retroshare-gui/src/gui/feeds/MsgItem.cpp | 4 +- retroshare-gui/src/gui/feeds/MsgItem.ui | 90 +--- retroshare-gui/src/gui/feeds/PeerItem.cpp | 4 +- retroshare-gui/src/gui/feeds/PeerItem.ui | 11 +- .../src/gui/feeds/PostedGroupItem.cpp | 4 +- .../src/gui/feeds/PostedGroupItem.ui | 19 +- .../src/gui/feeds/SecurityIpItem.cpp | 4 +- .../src/gui/feeds/SecurityIpItem.ui | 33 +- retroshare-gui/src/gui/feeds/SecurityItem.cpp | 4 +- retroshare-gui/src/gui/feeds/SecurityItem.ui | 35 +- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 315 ++++++------ .../src/gui/gxschannels/GxsChannelDialog.h | 2 +- .../gui/gxschannels/GxsChannelGroupDialog.cpp | 6 +- .../gui/gxschannels/GxsChannelUserNotify.cpp | 4 +- .../src/gui/gxsforums/GxsForumsDialog.cpp | 2 +- retroshare-gui/src/gui/icons.qrc | 8 + .../src/gui/icons/png/channels-notify.png | Bin 3332 -> 7686 bytes retroshare-gui/src/gui/icons/png/channels.png | Bin 3614 -> 2232 bytes retroshare-gui/src/gui/icons/png/chats.png | Bin 0 -> 4404 bytes retroshare-gui/src/gui/icons/png/correct.png | Bin 2044 -> 1793 bytes .../src/gui/icons/png/fileshare.png | Bin 0 -> 2616 bytes retroshare-gui/src/gui/icons/png/forum.png | Bin 0 -> 2545 bytes retroshare-gui/src/gui/icons/png/message.png | Bin 0 -> 2795 bytes retroshare-gui/src/gui/icons/png/network2.png | Bin 0 -> 3967 bytes .../src/gui/icons/png/newsfeed2.png | Bin 0 -> 1358 bytes .../src/gui/icons/png/people-notify.png | Bin 4915 -> 6046 bytes retroshare-gui/src/gui/icons/png/people.png | Bin 5574 -> 6416 bytes retroshare-gui/src/gui/icons/png/people2.png | Bin 0 -> 4646 bytes .../src/gui/icons/png/postedlinks.png | Bin 0 -> 10174 bytes .../src/gui/icons/svg/channels-notify.svg | 78 ++- retroshare-gui/src/gui/icons/svg/chats.svg | 64 +++ .../src/gui/icons/svg/fileshare.svg | 105 ++++ retroshare-gui/src/gui/icons/svg/forum.svg | 54 ++ retroshare-gui/src/gui/icons/svg/message.svg | 69 +++ .../src/gui/icons/svg/newsfeed2.svg | 69 +++ retroshare-gui/src/gui/icons/svg/people.svg | 72 +-- retroshare-gui/src/gui/icons/svg/people2.svg | 56 +++ .../src/gui/icons/svg/postedlinks.svg | 74 +++ retroshare-gui/src/gui/msgs/MessagesDialog.ui | 2 +- 53 files changed, 1120 insertions(+), 741 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/chats.png create mode 100644 retroshare-gui/src/gui/icons/png/fileshare.png create mode 100644 retroshare-gui/src/gui/icons/png/forum.png create mode 100644 retroshare-gui/src/gui/icons/png/message.png create mode 100644 retroshare-gui/src/gui/icons/png/network2.png create mode 100644 retroshare-gui/src/gui/icons/png/newsfeed2.png create mode 100644 retroshare-gui/src/gui/icons/png/people2.png create mode 100644 retroshare-gui/src/gui/icons/png/postedlinks.png create mode 100644 retroshare-gui/src/gui/icons/svg/chats.svg create mode 100644 retroshare-gui/src/gui/icons/svg/fileshare.svg create mode 100644 retroshare-gui/src/gui/icons/svg/forum.svg create mode 100644 retroshare-gui/src/gui/icons/svg/message.svg create mode 100644 retroshare-gui/src/gui/icons/svg/newsfeed2.svg create mode 100644 retroshare-gui/src/gui/icons/svg/people2.svg create mode 100644 retroshare-gui/src/gui/icons/svg/postedlinks.svg diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index bc8da9d6b..134b50b9a 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -62,7 +62,7 @@ - :/icons/png/chat-lobbies.png + :/icons/png/chats.png true diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index f1685a5d5..d2e7a9ab6 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -62,7 +62,7 @@ - :/icons/png/filesharing.png + :/icons/png/fileshare.png true diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 1ac4095cc..2ecd9772e 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -62,7 +62,7 @@ - :/icons/png/network.png + :/icons/png/network2.png true diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index d49782bd4..4aa73e097 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -80,7 +80,7 @@ - :/icons/png/people.png + :/icons/png/people2.png true diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui index 43908f81a..ed40bdccb 100644 --- a/retroshare-gui/src/gui/NewsFeed.ui +++ b/retroshare-gui/src/gui/NewsFeed.ui @@ -59,7 +59,7 @@ - :/icons/png/newsfeed.png + :/icons/png/newsfeed2.png true diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp index c312bd8e8..edf09ff20 100644 --- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp @@ -99,7 +99,7 @@ QString PostedDialog::icon(IconType type) { switch (type) { case ICON_NAME: - return ":/icons/png/posted.png"; + return ":/icons/png/postedlinks.png"; case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: @@ -109,7 +109,7 @@ QString PostedDialog::icon(IconType type) case ICON_POPULAR_GROUP: return ""; case ICON_OTHER_GROUP: - return ":/icons/png/feed-other.png"; + return ""; case ICON_SEARCH: return ":/images/find.png"; case ICON_DEFAULT: diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index 250f43007..dc4368992 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -407,6 +407,9 @@ 0 + + 6 + 3 @@ -539,8 +542,8 @@ Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -559,8 +562,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -685,6 +688,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui index 924028ef3..3b52ca54b 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui @@ -7,7 +7,7 @@ 0 0 543 - 201 + 208 @@ -31,70 +31,6 @@ 0 - - - - - - - 254 - 246 - 222 - - - - - - - 254 - 246 - 222 - - - - - - - - - 254 - 246 - 222 - - - - - - - 254 - 246 - 222 - - - - - - - - - 240 - 240 - 240 - - - - - - - 254 - 246 - 222 - - - - - - true @@ -201,8 +137,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -406,20 +342,21 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+ AvatarWidget QLabel
gui/common/AvatarWidget.h
1 - - StyledLabel - QLabel -
gui/common/StyledLabel.h
- + diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui index bb7688ffa..e94938020 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui @@ -125,7 +125,10 @@ - :/images/channels.png + :/icons/png/channel.png + + + true @@ -153,6 +156,12 @@ + + + 75 + true + + name @@ -219,8 +228,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +248,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +268,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -328,6 +337,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index c049dff59..fbf9f0f33 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -389,6 +389,8 @@ void GxsChannelPostItem::fill() mInFill = true; QString title; + + float f = QFontMetricsF(font()).height()/14.0 ; if(mPost.mThumbnail.mData != NULL) { @@ -397,15 +399,15 @@ void GxsChannelPostItem::fill() GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL); // Wiping data - as its been passed to thumbnail. if( thumbnail.width() < 90 ){ - ui->logoLabel->setMaximumSize(82,108); + ui->logoLabel->setMaximumSize(82,108*f); } else if( thumbnail.width() < 109 ){ - ui->logoLabel->setMinimumSize(108,108); - ui->logoLabel->setMaximumSize(108,108); + ui->logoLabel->setMinimumSize(108,108*f); + ui->logoLabel->setMaximumSize(108,108*f); } else{ - ui->logoLabel->setMinimumSize(156,108); - ui->logoLabel->setMaximumSize(156,108); + ui->logoLabel->setMinimumSize(156,108*f); + ui->logoLabel->setMaximumSize(156,108*f); } ui->logoLabel->setPixmap(thumbnail); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp index e73f08ca6..1e430638a 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp @@ -132,9 +132,9 @@ void GxsForumGroupItem::fill() ui->descLabel->setText(QString::fromUtf8(mGroup.mDescription.c_str())); if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { - ui->forumlogo_label->setPixmap(QPixmap(":/images/konv_message64.png")); + ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums.png")); } else { - ui->forumlogo_label->setPixmap(QPixmap(":/images/konversation64.png")); + ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums-default.png")); } if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) { @@ -174,13 +174,13 @@ void GxsForumGroupItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui index ccdb0a591..066ea2121 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui @@ -125,7 +125,10 @@ - :/images/konversation64.png + :/icons/png/forums-default.png + + + true @@ -153,6 +156,12 @@ + + + 75 + true + + name @@ -219,8 +228,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +248,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +268,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -329,6 +338,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp index d6081bbd8..8e1dba4ea 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp @@ -28,9 +28,12 @@ #include "FeedHolder.h" #include "gui/RetroShareLink.h" +#include "gui/gxs/GxsIdDetails.h" #include "util/HandleRichText.h" #include "util/DateTime.h" +#include + #include /**** @@ -279,9 +282,9 @@ void GxsForumMsgItem::fill() } if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { - ui->iconLabel->setPixmap(QPixmap(":/images/konv_message64.png")); + ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums.png")); } else { - ui->iconLabel->setPixmap(QPixmap(":/images/konversation64.png")); + ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums-default.png")); } if (!mIsHome) { @@ -289,6 +292,16 @@ void GxsForumMsgItem::fill() mCloseOnRead = true; } } + + RsIdentityDetails idDetails ; + rsIdentity->getIdDetails(mMessage.mMeta.mAuthorId,idDetails); + + QPixmap pixmap ; + + if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(mMessage.mMeta.mAuthorId,GxsIdDetails::SMALL); + + ui->avatar->setPixmap(pixmap); ui->nameLabel->setId(mMessage.mMeta.mAuthorId); @@ -322,6 +335,16 @@ void GxsForumMsgItem::fill() ui->parentMsgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mParentMessage.mMsg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); ui->parentNameLabel->setId(mParentMessage.mMeta.mAuthorId); + + RsIdentityDetails idDetails ; + rsIdentity->getIdDetails(mParentMessage.mMeta.mAuthorId,idDetails); + + QPixmap pixmap ; + + if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(mParentMessage.mMeta.mAuthorId,GxsIdDetails::SMALL); + + ui->parentAvatar->setPixmap(pixmap); // if (rsPeers->getPeerName(msgParent.srcId) !="") // { @@ -369,7 +392,7 @@ void GxsForumMsgItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); if (!mParentMessage.mMeta.mMsgId.isNull()) { @@ -382,7 +405,7 @@ void GxsForumMsgItem::doExpand(bool open) { ui->expandFrame->hide(); ui->parentFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui index 938d44947..47b1457b2 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui @@ -77,9 +77,95 @@ QFrame::Sunken - - - + + + + + + 70 + 70 + + + + + 70 + 70 + + + + :/icons/png/forums-default.png + + + true + + + Qt::AlignCenter + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Forum Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 358 + 20 + + + + + + + + + 75 + true + + + + Timestamp + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + @@ -110,16 +196,13 @@ - + Qt::Horizontal - - QSizePolicy::Expanding - - 10 + 168 20 @@ -139,9 +222,8 @@ Unsubscribe To Forum - - - :/images/mail_delete.png:/images/mail_delete.png + + Unsubscribe @@ -160,8 +242,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -180,8 +262,8 @@ Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -200,238 +282,13 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg - - - - - - - 70 - 70 - - - - - 70 - 70 - - - - :/images/konversation64.png - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Forum Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - - - Qt::Horizontal - - - - 358 - 20 - - - - - - - - - 75 - true - - - - Timestamp - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Horizontal - - - - 518 - 20 - - - - - - - - - - QFrame::Box - - - QFrame::Sunken - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - - - - - 75 - true - - - - Name - - - true - - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Subject: - - - - - - - - 0 - 0 - - - - Message is about ??? - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - Qt::Vertical - - - - 20 - 27 - - - - - - - - - - - 0 - 0 - - - - Current Message.. - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - @@ -589,6 +446,131 @@ + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + + + + + 75 + true + + + + Name + + + true + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Subject: + + + + + + + + 0 + 0 + + + + Message is about ??? + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + Qt::Vertical + + + + 20 + 27 + + + + + + + + + + + 0 + 0 + + + + Current Message.. + + + true + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + @@ -609,6 +591,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp index 3e4ae3bb6..c0dd8768e 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp @@ -236,7 +236,7 @@ void MsgItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); mCloseOnRead = false; @@ -246,7 +246,7 @@ void MsgItem::doExpand(bool open) else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui index d273f935d..6e47331d9 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.ui +++ b/retroshare-gui/src/gui/feeds/MsgItem.ui @@ -31,70 +31,6 @@ 0 - - - - - - - 52 - 177 - 255 - - - - - - - 51 - 174 - 255 - - - - - - - - - 52 - 177 - 255 - - - - - - - 51 - 174 - 255 - - - - - - - - - 240 - 240 - 240 - - - - - - - 51 - 174 - 255 - - - - - - true @@ -215,7 +151,7 @@ - + Qt::NoFocus @@ -229,12 +165,6 @@ :/images/mail_reply.png:/images/mail_reply.png - - Qt::ToolButtonTextBesideIcon - - - false - @@ -265,8 +195,8 @@ Delete Message - - :/images/mail_delete.png:/images/mail_delete.png + + :/icons/png/cancel.png:/icons/png/cancel.png @@ -285,8 +215,8 @@ Play Media - - :/images/startall.png:/images/startall.png + + :/icons/png/play.png:/icons/png/play.png @@ -305,8 +235,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -325,8 +255,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -493,7 +423,7 @@ - + diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp index 0c0c1d057..c1ccd788e 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.cpp +++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp @@ -236,13 +236,13 @@ void PeerItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index dc37abc28..b7a18df71 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -7,7 +7,7 @@ 0 0 476 - 250 + 262 @@ -294,8 +294,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -314,8 +314,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -581,6 +581,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp index f0453e4df..1a9ebeb9e 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp @@ -189,13 +189,13 @@ void PostedGroupItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui index e792fadca..3b3a3dbb4 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui @@ -153,6 +153,12 @@ + + + 75 + true + + name @@ -219,8 +225,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +245,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +265,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -330,6 +336,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp index 969440a8c..a6a5d2d50 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp @@ -203,13 +203,13 @@ void SecurityIpItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(":/images/edit_remove24.png")); + ui->expandButton->setIcon(QIcon(":/icons/png/up-arrow.png")); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(":/images/edit_add24.png")); + ui->expandButton->setIcon(QIcon(":/icons/png/down-arrow.png")); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui index a0ee5a55f..defbd39f1 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui @@ -11,7 +11,16 @@ - + + 1 + + + 1 + + + 1 + + 1 @@ -105,10 +114,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -215,8 +233,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -235,8 +253,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -475,6 +493,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp index 6a3f169ec..722296ae5 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp @@ -294,13 +294,13 @@ void SecurityItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui index 0b3c2be41..6b62a5aff 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.ui +++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui @@ -7,11 +7,20 @@ 0 0 763 - 241 + 246 - + + 1 + + + 1 + + + 1 + + 1 @@ -102,10 +111,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -362,8 +380,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -382,8 +400,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -625,6 +643,7 @@ + diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 9c6a9b662..6a0da2fc2 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,7 +7,7 @@ 0 0 600 - 633 + 563 @@ -51,6 +51,9 @@ 0 + + 3 + @@ -64,7 +67,7 @@ 4 - 4 + 0 4 @@ -213,159 +216,6 @@ - - - - - 0 - 0 - - - - Message Distribution - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages 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 - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. </p></body></html> - - - Restricted to Circle - - - - :/icons/png/circles.png:/icons/png/circles.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.</p></body></html> - - - Restricted node group - - - - :/icons/png/network.png:/icons/png/network.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 68 - 20 - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - @@ -601,6 +451,161 @@ + + + + + + + + + + + + + + + 0 + 0 + + + + Message Distribution + + + + 6 + + + 6 + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages 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 + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. </p></body></html> + + + Restricted to Circle + + + + :/icons/png/circles.png:/icons/png/circles.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.</p></body></html> + + + Restricted node group + + + + :/icons/png/network.png:/icons/png/network.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 17 + + + + + + + + Qt::Horizontal + + + + 1 + 25 + + + + + + + diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h index 3f45a9df4..eedde4833 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h @@ -23,7 +23,7 @@ #include "gui/gxs/GxsGroupFrameDialog.h" -#define IMAGE_GXSCHANNELS ":/icons/png/channels.png" +#define IMAGE_GXSCHANNELS ":/icons/png/channel.png" class GxsChannelDialog : public GxsGroupFrameDialog { diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp index 369d28778..5732a706a 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp @@ -99,11 +99,11 @@ QPixmap GxsChannelGroupDialog::serviceImage() switch (mode()) { case MODE_CREATE: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); case MODE_SHOW: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); case MODE_EDIT: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); } return QPixmap(); diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp index 63dde30f4..aa82953ed 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp @@ -36,12 +36,12 @@ bool GxsChannelUserNotify::hasSetting(QString *name, QString *group) QIcon GxsChannelUserNotify::getIcon() { - return QIcon(":/icons/png/channels.png"); + return QIcon(":/icons/png/channel.png"); } QIcon GxsChannelUserNotify::getMainIcon(bool hasNew) { - return hasNew ? QIcon(":/icons/png/channels-notify.png") : QIcon(":/icons/png/channels.png"); + return hasNew ? QIcon(":/icons/png/channels-notify.png") : QIcon(":/icons/png/channel.png"); } void GxsChannelUserNotify::iconClicked() diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index 84e903335..34c2818f1 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -114,7 +114,7 @@ QString GxsForumsDialog::icon(IconType type) { switch (type) { case ICON_NAME: - return ":/icons/png/forums.png"; + return ":/icons/png/forum.png"; case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 3986bfad7..3445b1a41 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -105,6 +105,7 @@ icons/png/netgraph.png icons/png/network-notify.png icons/png/network.png + icons/png/network2.png icons/png/network-puplic.png icons/png/newsfeed-notify.png icons/png/newsfeed.png @@ -269,5 +270,12 @@ icons/png/cancel.png icons/png/correct.png icons/png/comment.png + icons/png/chats.png + icons/png/fileshare.png + icons/png/forum.png + icons/png/message.png + icons/png/newsfeed2.png + icons/png/postedlinks.png + icons/png/people2.png diff --git a/retroshare-gui/src/gui/icons/png/channels-notify.png b/retroshare-gui/src/gui/icons/png/channels-notify.png index df46c8857561d9cbf8f156bb0a84553eb4ee396b..a916eebbb6d5ddb38221f65f0705980af824007b 100644 GIT binary patch delta 7678 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 Yf6!-@>uorKy8r+H07*qoM6N<$f-ou~lK=n! diff --git a/retroshare-gui/src/gui/icons/png/channels.png b/retroshare-gui/src/gui/icons/png/channels.png index f4460cce92fdf3f524792f530fbc6d55d17cb78e..5fdefc95d8846292d940e777e327ef654f13d5d6 100644 GIT binary patch delta 2161 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 diff --git a/retroshare-gui/src/gui/icons/png/fileshare.png b/retroshare-gui/src/gui/icons/png/fileshare.png new file mode 100644 index 0000000000000000000000000000000000000000..3caa28411234f7e92a2b2109707c4e4f6a18e565 GIT binary patch literal 2616 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 Hu0mjfD8R{5 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/message.png b/retroshare-gui/src/gui/icons/png/message.png new file mode 100644 index 0000000000000000000000000000000000000000..ae9da7e016fbf697ab63b9b6a068b3a3ae9aab52 GIT binary patch literal 2795 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 XvrVE==gh$2U<#ODzG_@`5sUvH2H8qo literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/network2.png b/retroshare-gui/src/gui/icons/png/network2.png new file mode 100644 index 0000000000000000000000000000000000000000..eafc2c0955c3cef6ab319fd4e644c8b328767398 GIT binary patch literal 3967 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 Z`G2E>bQLLg)_DK`002ovPDHLkV1gIzrkVf% literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/newsfeed2.png b/retroshare-gui/src/gui/icons/png/newsfeed2.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1c4f59f3e0afcb67d2e7ac621403d0644b1dee GIT binary patch literal 1358 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zh|dRMM(;VsAYGCrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0S!9s>Eakt zG3V`F?~IsK3AP8{f1mf!(+%Uk)f(C|En%`JcU0_-AeSjSF7-+?FEkSmFfX0@$jybt zRiJcX<{qU*Ap)+Bg09U9U5-b$a0=xHx~w*IyPb7wX7RuCtt(TErmI~3f5!9E-t&3q z&eS}Q-80kvzvWH_7gVt2qQ}vR>dT`)zb!0hi_B>Cdepyo{|EPu$emrvZ%;0jtFt*$ z;N|}0;%tWXEi;}v@htq>&1%qxgw_>F@8A)v<+#_oRIu&e;sZwoYPU*0k1A!na@xh{ z##cwF#EgTN@8|Uw6$bkqRXt!KhCn+)-!o}cGl>+ntL0}s*;}}}rgh)Bo5lT+4W%Be z?2NWIPE;4GzU^%Me$MupP=X9M3W~Xr`{0F3I?MN>3p1sso=QHMa6LQnI7d{&p2KPH zH<~{=)9dBBJ#{YQ1EB;tB%LuAVjVP(#XR{?bpohOW7+0&3@!Wk47U9K&9X!Jg^!o$ zbcV+fsHiEAIofSmnfkf?l0|9GEQdYo7ykO%F|l**#NzknmVv4l*(d*dH+@r|;1-5i z-O&&4_DwLBE^&Oj+=O4@bI+=x#A}iadW_FDG8}`Wo4=o4nD)Z|h{cpr9(I|Jk?jpf zncis6@n~4MCV7o$3{y`sBMREQowp`!lXBOW&ufwyB>dR8X2$n#2xsV2R=72*l!x`! zrgIDhoCf_!v2yO7p2B@Q?R{T7t{EOtf4oO_PU~)~w4?-!*Am&Rm|lF7%j~}Irs&R$ zRh;Rw{Moo>&nlSr`H(+qH~@p?(7%lt&+Cdh)9RM%vdj8s+1{Ks|KeuPUy`nmuACQi zxbd3dHDbmL?}kDhR5X=!!jtvC-cQiYY+cBzS8lcS=Bx8l z=B|3g`g`{?hB+%O_Brf{le80^DtV_+$U(FB;-i4Dbz1Wo7A>*}%We?gY1taHWkv_n z55wMzOC^fC<-`BVIk?)dHFa1}U3A_zR@_P=^oK?3OxFiFksGsWgkRXLG+qOJD_tqfJVxQW-Q%BvVywTsY_`t*o z#-Rq=zC?WWZ>Z*4&L|U?cJFQApYsuUUtaVEOlA0)VJKMo>K$vq=VQ-arN7!O+Mc!7 z?EjmKtM??yXzvdDpv@A0=y5s6v-9f8p*utmq%uDHGwH`q?P+?9rTdE(Upy(!_?Ek% z=+q3R@4p)l9ro_O{`Zxi*GEPM`z6!5W<8x@zxC-d-$mEAsy_IVp_;|L4u$ zr{dLhz5CVHS1IBm(V{y%8qV^bUvi8iZNZF|M~72_Pv3s=)?#LlI|~<|000-C0ZW`SQjta{e-|4`L_t(|ob8=?m=x8uz<=jf_bkl9 zun(v#?t*|yToDyT1(%3P)Tl|+C?M){i@qdk64YlBHD=Mz=zvCJj8Wc;aThmmLl#9v zL`6XcM22l(W_n=vR1Bj_@U}e9F}7l_F^7 ze=GlxY#Wd+dSCu-IL>I4(IAHc2LeStsS5#1P< zWhT_TEK>+)+n_{rY6sB!i}%6k#V8j7{jzOOlB@@P0%5vLu3egKW7?uqI)IiH9gXsH zgj4CHHYSBI7mwSS5_+z)4I(?uA6FG&M$tr6ehqq1w(ao;eIJ!um=b!Xvp7Phe{cYu zUOWNSTY*v8wk1QnhsaGbx#p#88fgTh1IBe}WU`%FQ)4 zg<5q0ol(#aPhJ2y#HQRXVl2YbQ)FuG23rEHIe^|*G8p5&0_<%|W*4pU1)g(~Osy)n zAA#J>fPj~BP3-9&}kU96hDf}iRl>7MOus{x9D-5iIb{; z)O&#bg?E9TmGb>v*kU4Eihi5w%_$86wXFC&(0`_?vr{OxgjW3p+9o zq+7E0cHt|PL?Q>v<#k^rb5l|dpbwEpW6?rjcv7ZyRDQ|+cmpS(f4vVv^ZG!yQi#+c z^&6n}Ys}i$F<-w54OM=qPaEwyJZgWh5oliTsQuxsNZopU{5hNte}0RE%6+hh+hua-7ahO6gKUrFc{!PT63Xm3oXF_EpuI*Uf3p|C zeExR=@BRi{>uV$(Li>D&$kBJB-BU9VBA5lcd%H-NNI&yJ`8dJ*# zbc4`Gz+P#Y)(mg=6Nwx%9dgo3d2#@W3Pb{x)qy^zxO#r#yysH;{#}~5kyXT0nN``;*h)l#Zl)? zv+)76-{C|~c^-0mSge^B{>-d}J+dzZB70ICS8H(N6% zuQ%?{sn*1`iV5N#)ZsUvq|k!haQE{$Ml+C)JHlo!0EoGzy|3Hu0cI3U1P--jhd1an z2o@y1Fl{}jLa@-j+#zRzvGXKsSI?f`2a{t{`-}GhPPVE%gOfA>nqO*HV1W+}(yl(sfA&W?L(96in9OVG)}ohSJ72)DI;crZ zqQPcv3EFEo-tH&j?R7TZ?kA!>heJ;5wWnmm0-VKnf*0|@*p{fVKTiS(ct73wWZaB~ zmJtMgVqJBewJ`R?G;AU8&b2Mi=k>(h^X%wyZNDQxT8X0aBA5;HkX0|>eEGjk%g$Z| zf9HeSk@fS5jQzVWZyC*zZD|Mlw#84ijA_l+2;zGHEgBD4?|-Cj1E?>lZSmA^COGR1 zWZm4RbAf!^;aAi6y?1dB`yaG)bnA@|U;=ohV{i}uUG(~4m&J`;%-S~y&N>4cttRKR zKYcL2ekTs|+1Z1%Yde~MdA@U?T1EuX|rY0(hEr@w|f>L$qPo}9eg z9=M0zLin_o(84`pr=@Z+f!RN{IA`Ay*|^9z*`Vh%KZ-ekK13eyUBA?t)i3%b8i2sU z8{__PS~{BWX)mX?R^JTmF^uqOub_RK-lEL9xzTleKk&lQs3E@)ChAOLgR-U`f1siG zIDD+YX;wW8K2=6D6>ngcJrXM~x-Sy0`rf zc`Ko+AU4s^IJa(fUt;n8LTKqc_* zO_s+tiu2(e7Ui|2#>5u*nvDU(fA_gs=l$Dkhd*J;pGK-aiygZouaEmrwTYJOhdcbL z*s)YD!F*-!(PmaXk8F6?n!I+1wY7omCD)+?5t->BHDBT^YIkueX`IgE1eb9)uX3p3ki(F#9J+op0~|EfI4R#2kR5GN%~=^RB~u zk$z&4ta+8Dfu&?@#nBshO4EUQ$k%C<_G{Qe;MMbxO&_FhSTd-LhS(TDtgZWZ2(OXA z+^cXF-k8?=w5ePi`>eeVe?$xHE&{cMcHal>-c$!8)%SMU@(ID`PQp~YY0I=Elyew> z(PjK7pehnz_u@Tq)!)hOc97620&h-6KfE1p(5ZL>e@}@fitHQ}Q@;tb zaS^8cY0RqUAQE3lGm~NA0NSldpR9X_;8UaV_Bsb|x3N*@*eP&S>Ng=@&%u24B4*7i zzDF;2fbKk4GB7|y59ka<&`vUU&WWdVi`ufHl zO4Tx)MYlxXa!d|df6yOtN}#bOI=IVzgSW)2I-$659; z)K^-tG7&Pw00aG0p}h|xJmGmF;e=)1tvm2es`cz*t9WSGR6Q8feiF+=G8f z&)}sb}pgltBiiZ{jOczyxs*y_xW-FQNSo_eF*FJg`aK`UMc)>WiKhG;E1q zdF*NVB`R2ee>>t@!V~AltwLHyw2vXWm8xBGdk{YPDcoU~w;g<80k5=KxVu}AS(}-? z7R;Jg;=;qc{$_~_BkYeUcT9qu%9@e z|D(xz#2uUWcePIugWFZ4%O3xvqww_E=EYOXa0@CKcRxA!@TFSLy2^@)x(wj-5G2+X_A z4^0H-e_n}He;zyIj=0*_Y~dC-xkSd?XEAqBa_ywM1oCkYyUmKIRB%UJ9T)p&mj4Uq zqd!^I;e7CW%*y}7jjZ8wrGApy3xCC1A)0$;w-+a>0GcdS|TO`f7!yVnsnfQS;|e&1`7@#c*A_o`|kkS zeednnJDR#j^Z6qLXH7&leVCF=+4vs87f+23U~%$@obYJJO4|8FZV$Y@Y&>qI!2oH^ zo@l?rt<8j`MYtBWu0?lR6p{@K2|jlsfj1^28x|%G;#3z|KcB#yiwHhHp@s8keqRW! ze{QiFnQ7d;tfX*k6)h`T0vwp|(zXm4^{co*$xI_#*Wi43XY~2pfkx51KIk4Np~XYc z{Qi*F6Y49Y;bk>nMkjeX65|o)EX>6i}plwdq$s`e>>Lb!?j4|5`-l!Zi&?~@WRnDul1Xd(3dTB zgljR&9>%Pgi96yN++kBQn*xvE^*eHVzD3G1HU)sRTqt9cKFyFVO9{-rpk=95F?gj% z;|)3;?LQ_iY%4t!sr~{}@fN218D!l%#Fo$_+i>2$4YT42BF8_Hb|z9%R+a1zf9W`Y zQW*eNC%mvN@_O1&z({~u{XBuUE{k9IF*$hq{wP|7tk93eO+mZwi`#u)-2E>`LMw5W z`~|c8iCCV4R4*s^{K-U)nU1%6X7`V0?Vi?+b8rv-1(7j-ZJHSJe~GmMD4wM|HlA*Jhf?*oic^x9)i1<8dxO7gdrKAH(fq!6do&eX z^}9$`QYbNFnjFBGPGh0eu10E`_CNH7oS8*yQpX!SG4@%imL<+_%oyIR9iN&UpuXmH zpgIfIv_LA}YC15%f9$O|ris^oOtXn9MJnFTsy*AOqUYAwA2{X!awQE2N$)-D2U7V_ z?6a2apK|hO*2(P=SFlPpb&8q6C*|y>D6pMM#mdZ#o6`!?usQZQTl4(3h^r)0o7A?x zK4G4SJBs_RqUI$a`|m4tP0vcrv!A(^QJRIQNyC;b8UnyNf2f|*{6w4s$TT7dN#s}g zlUE-1hYDn^c!?F_mdqoTlUI{=D0y(_-9%e1r5SmE4z{dRe?josvC)m3*Uz(8PrrFF zN#kE~X-1G{rDD{zBXa#b0&^}R@K#dM*orGHCL>zxfGC&LEZ6BpFQS~X^LMQpQ@I4E zatY2ye~fN;f7JgNyaC6d1CHw)(Zb&lq;fH4oE5b!Al1tWJ~cX8VWgqT*G(tlP-(M3bDQy0a%t#kgoXZC)DDd`)+>s48X|Sk zDdD;ef0=81c$X9GVIhUQi;NS(3n$zGHlYK^B{j=|KU*=Wi_D=+lc{xIC%UX-LG@ch(}3k^ zn$$(+Sc-)1>Bxm0asauOI*d*sqeX?gND&Xif7G4l{M(|#X*Dvbb~dV=Fub*ko%nrQ zlRmAHTwYaU?azV539suSJ1FxZG%cB1l5&7()R3M}nq_5@(z$Wb_6VU}?dhYKHLpf1 zj%0>SIFYkD+V$@sr7R1bUUVkPzf-+GC7pS_(E-Qe4H%2=c3fPE*v^D({W`iJw(Mb~ zfBK6|sa1rDGC7p=&YUSXpq3T=0Z90s=@(kE|Mq3)W6)kBvg#00vjVgF1k~q1W)}=fZ*3YxzmtdZg+zWb-G; zhK0z61x>q_WCeMgikkCf8Y%5zn^qUDe`N&G!eLMxLBa$~(F5g(2ju0z@I4vvc4ZIEPXG2~W30Z;hM$4qFe`#-& zWTn1}ObKnmbH)Q18}@#S`2xo|!A9eQB?kbIsa55KIWjsK(S=XEho?u&B~{jT$g)~t zNv;T0;^v)*>Pt4|c0qK&*AP5Grq)`0+rx%Pv&7(kOcX!_P*@Vgka%qjP zA$b{@%hwtCyW<7^1st6TeY-ruLR{w@nOarux2lYk*_26jYp4i~1-Thgo3i|tprCi7 zp`$a=_>hH~YdXE~SXAx>hGklJCua$U%aaM_utCNP?aJiZH>e05gvixEe}?yb?~Ld+ zkelfd`c9@BAF^C^Q6KC!fQa*Z;K$jtBWoznA%V+f%9b=UKU1eul-<<(3r+y@8-y{5 zul@$0%*W9i6D4hAf==N8JJ9=F*p9GyuHo4X&2@y4T! z2ZmSTUx=t0SOUC@>f1Ov z*H&Ogw%Fwzpf&WqlEFCM0pJZmWpH%-pnZW}+kd(dEswKfyYUbZ0k#2^(H~h4`W5I( j)T|_6KD8N$(OLL^)`i*f40rS%00000NkvXXu0mjfua?D= delta 4865 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 delta 5530 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 c9i9IN5(g=Covuk{00000NkvXX1g=70fb%7 diff --git a/retroshare-gui/src/gui/icons/png/people2.png b/retroshare-gui/src/gui/icons/png/people2.png new file mode 100644 index 0000000000000000000000000000000000000000..6934b9ee33ef126dab629b3d6b76f9c9646ff8a8 GIT binary patch literal 4646 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/svg/channels-notify.svg b/retroshare-gui/src/gui/icons/svg/channels-notify.svg index 1219e4988..d0a4e0dee 100644 --- a/retroshare-gui/src/gui/icons/svg/channels-notify.svg +++ b/retroshare-gui/src/gui/icons/svg/channels-notify.svg @@ -2,7 +2,6 @@ image/svg+xml \ No newline at end of file + style="fill:#ffffff;stroke-width:0.79999691" + d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0" + id="path24" /> \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/chats.svg b/retroshare-gui/src/gui/icons/svg/chats.svg new file mode 100644 index 000000000..fd8763804 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/chats.svg @@ -0,0 +1,64 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/fileshare.svg b/retroshare-gui/src/gui/icons/svg/fileshare.svg new file mode 100644 index 000000000..bc10e769d --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/fileshare.svg @@ -0,0 +1,105 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/forum.svg b/retroshare-gui/src/gui/icons/svg/forum.svg new file mode 100644 index 000000000..38b647f4f --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/forum.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/message.svg b/retroshare-gui/src/gui/icons/svg/message.svg new file mode 100644 index 000000000..81fcd8254 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/message.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/newsfeed2.svg b/retroshare-gui/src/gui/icons/svg/newsfeed2.svg new file mode 100644 index 000000000..dc0bc96ea --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/newsfeed2.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/people.svg b/retroshare-gui/src/gui/icons/svg/people.svg index 3ea6a2e19..5afff47a8 100644 --- a/retroshare-gui/src/gui/icons/svg/people.svg +++ b/retroshare-gui/src/gui/icons/svg/people.svg @@ -11,7 +11,7 @@ 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" @@ -19,7 +19,7 @@ sodipodi:docname="people.svg">image/svg+xml \ No newline at end of file + d="m 48.355,17.922 c 3.705,2.323 6.303,6.254 6.776,10.817 1.511,0.706 3.188,1.112 4.966,1.112 6.491,0 11.752,-5.261 11.752,-11.751 0,-6.491 -5.261,-11.752 -11.752,-11.752 -6.429,0.002 -11.644,5.169 -11.742,11.574 z m -7.699,24.062 c 6.491,0 11.752,-5.262 11.752,-11.752 0,-6.49 -5.262,-11.751 -11.752,-11.751 -6.49,0 -11.754,5.262 -11.754,11.752 0,6.49 5.264,11.751 11.754,11.751 z m 4.985,0.801 h -9.972 c -8.297,0 -15.047,6.751 -15.047,15.048 v 12.195 l 0.031,0.191 0.84,0.263 c 7.918,2.474 14.797,3.299 20.459,3.299 11.059,0 17.469,-3.153 17.864,-3.354 l 0.785,-0.397 h 0.084 V 57.833 C 60.688,49.536 53.938,42.785 45.641,42.785 Z M 65.084,30.653 h -9.895 c -0.107,3.959 -1.797,7.524 -4.47,10.088 7.375,2.193 12.771,9.032 12.771,17.11 v 3.758 c 9.77,-0.358 15.4,-3.127 15.771,-3.313 l 0.785,-0.398 H 80.13 V 45.699 c 0,-8.296 -6.75,-15.046 -15.046,-15.046 z m -45.049,-0.8 c 2.299,0 4.438,-0.671 6.25,-1.814 0.576,-3.757 2.59,-7.04 5.467,-9.276 0.012,-0.22 0.033,-0.438 0.033,-0.66 0,-6.491 -5.262,-11.752 -11.75,-11.752 -6.492,0 -11.752,5.261 -11.752,11.752 0,6.488 5.26,11.75 11.752,11.75 z M 30.589,40.741 C 27.929,38.19 26.245,34.644 26.122,30.709 25.755,30.682 25.392,30.653 25.018,30.653 H 15.047 C 6.75,30.653 0,37.403 0,45.699 v 12.197 l 0.031,0.188 0.84,0.265 c 6.352,1.983 12.021,2.897 16.945,3.185 v -3.683 c 0.002,-8.078 5.396,-14.915 12.773,-17.11 z" + id="path2" + style="fill:#f9f9f9" /> \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/people2.svg b/retroshare-gui/src/gui/icons/svg/people2.svg new file mode 100644 index 000000000..06badb8a1 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/people2.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/postedlinks.svg b/retroshare-gui/src/gui/icons/svg/postedlinks.svg new file mode 100644 index 000000000..e509c7e32 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/postedlinks.svg @@ -0,0 +1,74 @@ + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui index 134621e7e..8c830e042 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui @@ -324,7 +324,7 @@ - :/icons/png/messages.png + :/icons/png/message.png true From fe3eec64e948df0a877a99de0753dda2e88b31f3 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 10 Oct 2019 19:56:07 +0200 Subject: [PATCH 4/8] Added to display avatar icons & fixes for context menu & format send/receive time Added to display avatar icons for global router & gxs transport Fixed to work context menu call for details View Updated Person details windows Display the receive/send time with date format --- .../src/gui/Identity/IdDetailsDialog.cpp | 12 +- .../src/gui/Identity/IdDetailsDialog.ui | 493 +++++++++--------- .../gui/statistics/GlobalRouterStatistics.cpp | 27 +- .../gui/statistics/GlobalRouterStatistics.ui | 4 +- .../gui/statistics/GxsTransportStatistics.cpp | 28 +- .../gui/statistics/GxsTransportStatistics.ui | 8 + 6 files changed, 312 insertions(+), 260 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp b/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp index e5aae3b49..ad0c261c9 100644 --- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp @@ -17,6 +17,7 @@ * along with this program. If not, see . * * * *******************************************************************************/ +#include #include "IdDetailsDialog.h" #include "ui_IdDetailsDialog.h" @@ -53,6 +54,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) : mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgId); mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgName); mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Type); + mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Created); mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_LastUsed); mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->ownOpinion_CB); mStateHelper->addWidget(IDDETAILSDIALOG_IDDETAILS, ui->overallOpinion_TF); @@ -63,6 +65,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) : mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_KeyId); mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgId); mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Type); + mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Created); mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_LastUsed); mStateHelper->addLoadPlaceholder(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgName); @@ -70,6 +73,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) : mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_KeyId); mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgId); mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Type); + mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_Created); mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_LastUsed); mStateHelper->addClear(IDDETAILSDIALOG_IDDETAILS, ui->lineEdit_GpgName); @@ -80,7 +84,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) : Settings->loadWidgetInformation(this); - ui->headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_64.png")); + ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png")); ui->headerFrame->setHeaderText(tr("Person Details")); //connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(changeGroup())); @@ -178,8 +182,10 @@ void IdDetailsDialog::insertIdDetails(uint32_t token) 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)) ; + ui->lineEdit_Created->setText(QDateTime::fromMSecsSinceEpoch(qint64(1000)*data.mMeta.mPublishTs).toString(Qt::SystemLocaleShortDate)); + + time_t now = time(NULL) ; + ui->lineEdit_LastUsed->setText(getHumanReadableDuration(now - data.mLastUsageTS)) ; QPixmap pixmap; diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui b/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui index 73e1006f0..3faad4076 100644 --- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui @@ -17,7 +17,7 @@ :/images/logo/logo_32.png:/images/logo/logo_32.png - + 0 @@ -30,6 +30,9 @@ 0 + + 0 + @@ -41,7 +44,7 @@ - + 9 @@ -52,235 +55,99 @@ 9 - 0 + 9 Identity Info - - - - - 6 + + + + + Qt::Vertical - - 6 + + + 20 + 40 + - - 6 - - - 6 - - - - - - 75 - true - - - - Overall: - - - - - - - Friends votes: - - - - - - - Your opinion: - - - - - - - - 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:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:9pt;">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.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:9pt;">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). </span></p></body></html> - - - 0 - - - - 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 - - - - - - - - <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 - - - - - - - <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 - - - - - - - Owner node ID : - - - - - - - Type: - - - - - - - Owner node name : - - - - - - - Identity name : - - - - - - - Identity ID : - - - - - - - Last used: - - - - - - - Ban-option: - - - - - - - Auto-Ban all identities signed by the same node - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - - - - true - - - true - - - - - - - true - - - true - - - - + - + + + + Ban-option: + + + + + + + <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 + + + + + + + Auto-Ban all identities signed by the same node + + + + + + + + 75 + true + + + + Overall: + + + + + + + Type: + + + + + + + Identity ID : + + + + + + + + + + Owner node ID : + + + + + + + true + + + true + + + + QLayout::SetDefaultConstraint @@ -426,25 +293,172 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical + + + + Owner node name : - - - 20 - 40 - + + + + + + true - + + true + + + + + + + Last used: + + + + + + + true + + + true + + + + + + + Identity name : + + + + + + + true + + + true + + + + + + + true + + + true + + + + + + + Friends votes: + + + + + + + + 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:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:9pt;">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.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:9pt;">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). </span></p></body></html> + + + 0 + + + + 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: + + + + + + + <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 + + + + + + + true + + + + + + + Created : + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - + 9 @@ -483,19 +497,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp index 85adb8293..eb11ab19a 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp @@ -18,6 +18,7 @@ * * *******************************************************************************/ +#include #include #include #include @@ -39,6 +40,8 @@ #include "gui/Identity/IdDetailsDialog.h" #include "gui/settings/rsharesettings.h" +#include "gui/gxs/GxsIdDetails.h" +#include "util/DateTime.h" #include "util/QtVersion.h" #include "util/misc.h" @@ -49,8 +52,8 @@ #define COL_TUNNELSTATUS 4 #define COL_DATASIZE 5 #define COL_DATAHASH 6 -#define COL_RECEIVED 7 -#define COL_SEND 8 +#define COL_RECEIVED 7 +#define COL_SEND 8 #define COL_DUPLICATION_FACTOR 9 static const int PARTIAL_VIEW_SIZE = 9 ; @@ -65,7 +68,7 @@ static QColor colorScale(float f) } GlobalRouterStatistics::GlobalRouterStatistics(QWidget *parent) - : RsAutoUpdatePage(2000,parent) + : RsAutoUpdatePage(4000,parent) { setupUi(this) ; @@ -177,6 +180,18 @@ void GlobalRouterStatistics::updateContent() if(nicknames.isEmpty()) nicknames = tr("Unknown"); + + QDateTime routingtime; + routingtime.setTime_t(cache_infos[i].routing_time); + QDateTime senttime; + senttime.setTime_t(cache_infos[i].last_sent_time); + + QPixmap pixmap ; + + if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(cache_infos[i].destination,GxsIdDetails::SMALL); + + item ->setIcon(COL_NICKNAME, QIcon(pixmap)); item -> setData(COL_ID, Qt::DisplayRole, QString::number(cache_infos[i].mid,16).rightJustified(16,'0')); item -> setData(COL_NICKNAME, Qt::DisplayRole, nicknames ) ; @@ -185,9 +200,9 @@ void GlobalRouterStatistics::updateContent() item -> setData(COL_TUNNELSTATUS, Qt::DisplayRole, tunnel_status_string[cache_infos[i].tunnel_status % 3]); item -> setData(COL_DATASIZE, Qt::DisplayRole, misc::friendlyUnit(cache_infos[i].data_size)); item -> setData(COL_DATAHASH, Qt::DisplayRole, QString::fromStdString(cache_infos[i].item_hash.toStdString())); - item -> setData(COL_RECEIVED, Qt::DisplayRole, QString::number(now - cache_infos[i].routing_time)); - item -> setData(COL_SEND, Qt::DisplayRole, QString::number(now - cache_infos[i].last_sent_time)); - item -> setData(COL_DUPLICATION_FACTOR, Qt::DisplayRole, QString::number(cache_infos[i].duplication_factor)); + item -> setData(COL_RECEIVED, Qt::DisplayRole, DateTime::formatDateTime(routingtime)); + item -> setData(COL_SEND, Qt::DisplayRole, DateTime::formatDateTime(senttime)); + item -> setData(COL_DUPLICATION_FACTOR, Qt::DisplayRole, QString::number(cache_infos[i].duplication_factor)); } } diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui index 1a5133251..5a4da3859 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui @@ -93,12 +93,12 @@ - Receive time (secs ago) + Receive time - Sending time (secs ago) + Sending time diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp index 87b59cb16..2eeba44f6 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp @@ -33,7 +33,6 @@ #include #include - #include #include #include @@ -47,6 +46,7 @@ #include "gui/common/UIStateHelper.h" #include "util/misc.h" #include "gui/gxs/GxsIdLabel.h" +#include "gui/gxs/GxsIdDetails.h" #define COL_PENDING_ID 0 #define COL_PENDING_DESTINATION 1 @@ -55,6 +55,7 @@ #define COL_PENDING_DATAHASH 4 #define COL_PENDING_SEND 5 #define COL_PENDING_GROUP_ID 6 +#define COL_PENDING_DESTINATION_ID 7 #define COL_GROUP_GRP_ID 0 #define COL_GROUP_NUM_MSGS 1 @@ -89,9 +90,11 @@ GxsTransportStatistics::GxsTransportStatistics(QWidget *parent) /* Set header resize modes and initial section sizes Uploads TreeView*/ QHeaderView_setSectionResizeMode(treeWidget->header(), QHeaderView::ResizeToContents); + QHeaderView_setSectionResizeMode(groupTreeWidget->header(), QHeaderView::ResizeToContents); connect(treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CustomPopupMenu(QPoint))); - + + treeWidget->setColumnHidden(COL_PENDING_DESTINATION_ID,true); // load settings processSettings(true); @@ -217,6 +220,13 @@ void GxsTransportStatistics::updateContent() RsIdentityDetails details ; rsIdentity->getIdDetails(rec.recipient,details); QString nickname = QString::fromUtf8(details.mNickname.c_str()); + + QPixmap pixmap ; + + if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(rec.recipient,GxsIdDetails::SMALL); + + item ->setIcon(COL_PENDING_DESTINATION, QIcon(pixmap)); if(nickname.isEmpty()) nickname = tr("Unknown"); @@ -227,6 +237,8 @@ void GxsTransportStatistics::updateContent() item -> setData(COL_PENDING_DATAHASH, Qt::DisplayRole, QString::fromStdString(rec.data_hash.toStdString())); item -> setData(COL_PENDING_SEND, Qt::DisplayRole, QDateTime::fromTime_t(rec.send_TS).toString()); item -> setData(COL_PENDING_GROUP_ID, Qt::DisplayRole, QString::fromStdString(rec.group_id.toStdString())); + item -> setData(COL_PENDING_DESTINATION_ID, Qt::DisplayRole, QString::fromStdString(rec.recipient.toStdString())); + GxsIdLabel *label = new GxsIdLabel() ; label->setId(rec.recipient) ; @@ -293,6 +305,16 @@ void GxsTransportStatistics::updateContent() GxsIdLabel *label = new GxsIdLabel(); label->setId(meta.mAuthorId) ; groupTreeWidget->setItemWidget(sitem,COL_GROUP_GRP_ID,label) ; + + RsIdentityDetails idDetails ; + rsIdentity->getIdDetails(meta.mAuthorId,idDetails); + + QPixmap pixmap ; + + if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(meta.mAuthorId,GxsIdDetails::SMALL); + + sitem->setIcon(COL_GROUP_GRP_ID, QIcon(pixmap)); sitem->setData(COL_GROUP_UNIQUE_ID, Qt::DisplayRole,QString::fromStdString(meta.mMsgId.toStdString())); sitem->setData(COL_GROUP_NUM_MSGS,Qt::DisplayRole, QDateTime::fromTime_t(meta.mPublishTs).toString()); @@ -303,7 +325,7 @@ void GxsTransportStatistics::updateContent() void GxsTransportStatistics::personDetails() { QTreeWidgetItem *item = treeWidget->currentItem(); - std::string id = item->text(COL_PENDING_DESTINATION).toStdString(); + std::string id = item->text(COL_PENDING_DESTINATION_ID).toStdString(); if (id.empty()) { return; diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui index 07b726275..ee76d42ac 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui @@ -78,6 +78,11 @@ Group ID + + + Destination ID + + @@ -95,6 +100,9 @@ Qt::Vertical + + Qt::CustomContextMenu + Group ID / Author From ef5c6c3f652dbda24aea47f55347e65b2a404c97 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 10 Oct 2019 23:00:56 +0200 Subject: [PATCH 5/8] Added back the routing & last sent time in (secs ago) --- .../src/gui/statistics/GlobalRouterStatistics.cpp | 8 ++++++-- .../src/gui/statistics/GlobalRouterStatistics.ui | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp index eb11ab19a..f80188f63 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp @@ -55,6 +55,8 @@ #define COL_RECEIVED 7 #define COL_SEND 8 #define COL_DUPLICATION_FACTOR 9 +#define COL_RECEIVEDTIME 10 +#define COL_SENDTIME 11 static const int PARTIAL_VIEW_SIZE = 9 ; //static const int MAX_TUNNEL_REQUESTS_DISPLAY = 10 ; @@ -200,9 +202,11 @@ void GlobalRouterStatistics::updateContent() item -> setData(COL_TUNNELSTATUS, Qt::DisplayRole, tunnel_status_string[cache_infos[i].tunnel_status % 3]); item -> setData(COL_DATASIZE, Qt::DisplayRole, misc::friendlyUnit(cache_infos[i].data_size)); item -> setData(COL_DATAHASH, Qt::DisplayRole, QString::fromStdString(cache_infos[i].item_hash.toStdString())); - item -> setData(COL_RECEIVED, Qt::DisplayRole, DateTime::formatDateTime(routingtime)); - item -> setData(COL_SEND, Qt::DisplayRole, DateTime::formatDateTime(senttime)); + item -> setData(COL_RECEIVED, Qt::DisplayRole, DateTime::formatDateTime(routingtime)); + item -> setData(COL_SEND, Qt::DisplayRole, DateTime::formatDateTime(senttime)); item -> setData(COL_DUPLICATION_FACTOR, Qt::DisplayRole, QString::number(cache_infos[i].duplication_factor)); + item -> setData(COL_RECEIVEDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].routing_time)); + item -> setData(COL_SENDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].last_sent_time)); } } diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui index 5a4da3859..83de70e5b 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui @@ -106,6 +106,16 @@ Branching factor + + + Receive time (secs ago) + + + + + Sending time (secs ago) + + From 7f8d0fb23fdca4ff534698fdff758f9c8aeb0867 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 11 Oct 2019 22:36:34 +0200 Subject: [PATCH 6/8] Fixed to use GxsIdRSTreeWidgetItem on Pending packets & pending data items Fixed to use GxsIdRSTreeWidgetItem on Pending packets & pending data items Added to display on Pending data items the time in seconds Set text alingment for some items --- .../gui/statistics/GlobalRouterStatistics.cpp | 12 ++++------ .../gui/statistics/GxsTransportStatistics.cpp | 24 +++++++++---------- .../gui/statistics/GxsTransportStatistics.ui | 7 +++++- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp index f80188f63..0a992353b 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp @@ -41,6 +41,7 @@ #include "gui/Identity/IdDetailsDialog.h" #include "gui/settings/rsharesettings.h" #include "gui/gxs/GxsIdDetails.h" +#include "gui/gxs/GxsIdTreeWidgetItem.h" #include "util/DateTime.h" #include "util/QtVersion.h" #include "util/misc.h" @@ -173,7 +174,8 @@ void GlobalRouterStatistics::updateContent() for(uint32_t i=0;iaddTopLevelItem(item); RsIdentityDetails details ; @@ -188,13 +190,7 @@ void GlobalRouterStatistics::updateContent() QDateTime senttime; senttime.setTime_t(cache_infos[i].last_sent_time); - QPixmap pixmap ; - - if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) - pixmap = GxsIdDetails::makeDefaultIcon(cache_infos[i].destination,GxsIdDetails::SMALL); - - item ->setIcon(COL_NICKNAME, QIcon(pixmap)); - + item -> setId(cache_infos[i].destination,COL_NICKNAME, false) ; item -> setData(COL_ID, Qt::DisplayRole, QString::number(cache_infos[i].mid,16).rightJustified(16,'0')); item -> setData(COL_NICKNAME, Qt::DisplayRole, nicknames ) ; item -> setData(COL_DESTINATION, Qt::DisplayRole, QString::fromStdString(cache_infos[i].destination.toStdString())); diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp index 2eeba44f6..b5a42264e 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp @@ -47,6 +47,7 @@ #include "util/misc.h" #include "gui/gxs/GxsIdLabel.h" #include "gui/gxs/GxsIdDetails.h" +#include "gui/gxs/GxsIdTreeWidgetItem.h" #define COL_PENDING_ID 0 #define COL_PENDING_DESTINATION 1 @@ -55,7 +56,8 @@ #define COL_PENDING_DATAHASH 4 #define COL_PENDING_SEND 5 #define COL_PENDING_GROUP_ID 6 -#define COL_PENDING_DESTINATION_ID 7 +#define COL_PENDING_SENDTIME 7 +#define COL_PENDING_DESTINATION_ID 8 #define COL_GROUP_GRP_ID 0 #define COL_GROUP_NUM_MSGS 1 @@ -207,6 +209,8 @@ void GxsTransportStatistics::updateContent() //time_t now = time(NULL) ; // 1 - fill the table for pending packets + + time_t now = time(NULL) ; groupBox->setTitle(tr("Pending data items")+": " + QString::number(transinfo.outgoing_records.size()) ); @@ -214,23 +218,18 @@ void GxsTransportStatistics::updateContent() { const RsGxsTransOutgoingRecord& rec(transinfo.outgoing_records[i]) ; - QTreeWidgetItem *item = new QTreeWidgetItem(); + //QTreeWidgetItem *item = new QTreeWidgetItem(); + GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR) ; treeWidget->addTopLevelItem(item); RsIdentityDetails details ; rsIdentity->getIdDetails(rec.recipient,details); QString nickname = QString::fromUtf8(details.mNickname.c_str()); - - QPixmap pixmap ; - - if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) - pixmap = GxsIdDetails::makeDefaultIcon(rec.recipient,GxsIdDetails::SMALL); - - item ->setIcon(COL_PENDING_DESTINATION, QIcon(pixmap)); if(nickname.isEmpty()) nickname = tr("Unknown"); + item -> setId(rec.recipient,COL_PENDING_DESTINATION, false) ; item -> setData(COL_PENDING_ID, Qt::DisplayRole, QString::number(rec.trans_id,16).rightJustified(8,'0')); item -> setData(COL_PENDING_DATASTATUS, Qt::DisplayRole, getStatusString(rec.status)); item -> setData(COL_PENDING_DATASIZE, Qt::DisplayRole, misc::friendlyUnit(rec.data_size)); @@ -238,12 +237,11 @@ void GxsTransportStatistics::updateContent() item -> setData(COL_PENDING_SEND, Qt::DisplayRole, QDateTime::fromTime_t(rec.send_TS).toString()); item -> setData(COL_PENDING_GROUP_ID, Qt::DisplayRole, QString::fromStdString(rec.group_id.toStdString())); item -> setData(COL_PENDING_DESTINATION_ID, Qt::DisplayRole, QString::fromStdString(rec.recipient.toStdString())); + item -> setData(COL_PENDING_SENDTIME, Qt::DisplayRole, QString::number(now - rec.send_TS)); + item->setTextAlignment(COL_PENDING_DATASIZE, Qt::AlignRight ); + item->setTextAlignment(COL_PENDING_SEND, Qt::AlignRight ); - GxsIdLabel *label = new GxsIdLabel() ; - label->setId(rec.recipient) ; - - treeWidget -> setItemWidget(item,COL_PENDING_DESTINATION, label) ; } // 2 - fill the table for pending group data diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui index ee76d42ac..e2c7449c0 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui @@ -70,7 +70,7 @@ - Sending time (secs ago) + Sending time @@ -78,6 +78,11 @@ Group ID + + + Sending time (secs ago) + + Destination ID From 32718c673f4dd53ccbe1f6df966ccd9b3d2084a6 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Oct 2019 22:32:14 +0200 Subject: [PATCH 7/8] Changed the toolbar icons & hide hashing groupbox by default * Changed the toolbar icons * Hide the hashing group box when there is no file attached * Show the warning text color in red when the size is too big --- .../src/gui/gxsforums/CreateGxsForumMsg.cpp | 11 +++++++++-- .../src/gui/gxsforums/CreateGxsForumMsg.ui | 15 +++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp index f10332a30..22db0d97d 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp @@ -117,6 +117,8 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage mForumCircleLoaded = false; newMsg(); + + ui.hashGroupBox->hide(); #ifndef ENABLE_GENERATE ui.generateCheckBox->hide(); @@ -348,10 +350,13 @@ void CreateGxsForumMsg::checkLength() RsHtml::optimizeHtml(ui.forumMessage, text); std::wstring msg = text.toStdWString(); int charRemains = MAX_ALLOWED_GXS_MESSAGE_SIZE - msg.length(); - if(charRemains >= 0) + if(charRemains >= 0) { text = tr("It remains %1 characters after HTML conversion.").arg(charRemains); - else + ui.infoLabel->setStyleSheet("QLabel#infoLabel { }"); + }else{ text = tr("Warning: This message is too big of %1 characters after HTML conversion.").arg((0-charRemains)); + ui.infoLabel->setStyleSheet("QLabel#infoLabel {color: red; font: bold; }"); + } ui.buttonBox->button(QDialogButtonBox::Ok)->setToolTip(text); ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(charRemains>=0); ui.infoLabel->setText(text); @@ -506,6 +511,7 @@ void CreateGxsForumMsg::addFile() QStringList files; if (misc::getOpenFileNames(this, RshareSettings::LASTDIR_EXTRAFILE, tr("Add Extra File"), "", files)) { ui.hashBox->addAttachments(files,RS_FILE_REQ_ANONYMOUS_ROUTING); + ui.hashGroupBox->show(); } } @@ -542,6 +548,7 @@ void CreateGxsForumMsg::fileHashingFinished(QList hashedFiles) } ui.forumMessage->setFocus( Qt::OtherFocusReason ); + ui.hashGroupBox->hide(); } void CreateGxsForumMsg::loadForumInfo(const uint32_t &token) diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui index 4c6838558..1e3b45abf 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui @@ -139,14 +139,17 @@ QFrame::Sunken + + 0 + - 1 + 6 1 - 1 + 6 1 @@ -163,8 +166,8 @@ - - :/images/add-share24.png:/images/add-share24.png + + :/icons/png/attach.png:/icons/png/attach.png @@ -186,8 +189,8 @@ - - :/emojione/1F603.png:/emojione/1F603.png + + :/icons/png/smiley.png:/icons/png/smiley.png From b62dbb6461fabd905a57578a21478a0fef7691b5 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Oct 2019 23:41:18 +0200 Subject: [PATCH 8/8] fixed the font metrics --- retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index fbf9f0f33..4807fb175 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -399,15 +399,15 @@ void GxsChannelPostItem::fill() GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL); // Wiping data - as its been passed to thumbnail. if( thumbnail.width() < 90 ){ - ui->logoLabel->setMaximumSize(82,108*f); + ui->logoLabel->setMaximumSize(82*f,108*f); } else if( thumbnail.width() < 109 ){ - ui->logoLabel->setMinimumSize(108,108*f); - ui->logoLabel->setMaximumSize(108,108*f); + ui->logoLabel->setMinimumSize(108*f,108*f); + ui->logoLabel->setMaximumSize(108*f,108*f); } else{ - ui->logoLabel->setMinimumSize(156,108*f); - ui->logoLabel->setMaximumSize(156,108*f); + ui->logoLabel->setMinimumSize(156*f,108*f); + ui->logoLabel->setMaximumSize(156*f,108*f); } ui->logoLabel->setPixmap(thumbnail); }