From 05f08003fc76a65f1a23c771f565afd2c7fb28a4 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 15 Sep 2020 19:22:20 +0200 Subject: [PATCH] removed more icons --- .../src/gui/FileTransfer/SearchDialog.cpp | 9 +++++---- retroshare-gui/src/gui/MainWindow.cpp | 4 ++-- retroshare-gui/src/gui/images.qrc | 8 -------- retroshare-gui/src/gui/images/rate-1.png | Bin 1072 -> 0 bytes retroshare-gui/src/gui/images/rate-2.png | Bin 1077 -> 0 bytes retroshare-gui/src/gui/images/rate-3.png | Bin 1074 -> 0 bytes retroshare-gui/src/gui/images/rate-4.png | Bin 1115 -> 0 bytes retroshare-gui/src/gui/images/rate-5.png | Bin 1077 -> 0 bytes retroshare-gui/src/gui/images/rating.png | Bin 742 -> 0 bytes .../src/gui/images/window_fullscreen.png | Bin 623 -> 0 bytes .../src/gui/images/window_nofullscreen.png | Bin 647 -> 0 bytes .../src/gui/unfinished/PhotoDialog.cpp | 1 - 12 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 retroshare-gui/src/gui/images/rate-1.png delete mode 100644 retroshare-gui/src/gui/images/rate-2.png delete mode 100644 retroshare-gui/src/gui/images/rate-3.png delete mode 100644 retroshare-gui/src/gui/images/rate-4.png delete mode 100644 retroshare-gui/src/gui/images/rate-5.png delete mode 100644 retroshare-gui/src/gui/images/rating.png delete mode 100644 retroshare-gui/src/gui/images/window_fullscreen.png delete mode 100644 retroshare-gui/src/gui/images/window_nofullscreen.png diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp index 6f39e8347..89795da64 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp @@ -43,8 +43,9 @@ #include /* Images for context menu icons */ -#define IMAGE_START ":/icons/png/download.png" -#define IMAGE_REMOVE ":/images/delete.png" +#define IMAGE_START ":/icons/png/download.png" +#define IMAGE_SEARCHAGAIN ":/images/update.png" +#define IMAGE_REMOVE ":/images/delete.png" #define IMAGE_REMOVEALL ":/images/deleteall.png" #define IMAGE_DIRECTORY ":/images/folder16.png" #define IMAGE_OPENFOLDER ":/images/folderopen.png" @@ -670,12 +671,12 @@ void SearchDialog::searchSummaryWidgetCustomPopupMenu( QPoint /*point*/ ) QMenu contextMnu(this); QTreeWidgetItem* ci = ui.searchSummaryWidget->currentItem(); - QAction* action = contextMnu.addAction(tr("Search again"), this, SLOT(searchAgain())); + QAction* action = contextMnu.addAction(QIcon(IMAGE_SEARCHAGAIN),tr("Search again"), this, SLOT(searchAgain())); if (!ci || ci->data(SS_DATA_COL, ROLE_KEYWORDS).toString().isEmpty()) { action->setDisabled(true); } contextMnu.addAction(QIcon(IMAGE_REMOVE), tr("Remove"), this, SLOT(searchRemove())); - contextMnu.addAction(QIcon(IMAGE_REMOVE), tr("Remove All"), this, SLOT(searchRemoveAll())); + contextMnu.addAction(QIcon(IMAGE_REMOVEALL), tr("Remove All"), this, SLOT(searchRemoveAll())); contextMnu.addSeparator(); action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copySearchLink())); if (!ci || ci->data(SS_DATA_COL, ROLE_KEYWORDS).toString().isEmpty()) { diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 17e2b2a27..b58114416 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -146,8 +146,8 @@ #define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png" #define IMAGE_OPTIONS ":/images/settings.png" #define IMAGE_UNFINISHED ":/images/underconstruction.png" -#define IMAGE_MINIMIZE ":/images/window_nofullscreen.png" -#define IMAGE_MAXIMIZE ":/images/window_fullscreen.png" +#define IMAGE_MINIMIZE ":/icons/fullscreen.png" +#define IMAGE_MAXIMIZE ":/icons/fullscreen-exit.png" #define IMAGE_PLUGINS ":/images/extension_32.png" diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 88b52b554..248c5e1fd 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -264,12 +264,6 @@ images/greenled.png images/grayled.png images/yellowled.png - images/rate-1.png - images/rate-2.png - images/rate-3.png - images/rate-4.png - images/rate-5.png - images/rating.png images/records.png images/replymail-pressed.png images/replymail24.png @@ -364,8 +358,6 @@ images/view_calendar_month.png images/view_calendar_list.png images/view_split_top_bottom.png - images/window_fullscreen.png - images/window_nofullscreen.png qss/chat/standard/private/info.xml qss/chat/standard/private/incoming.htm qss/chat/standard/private/outgoing.htm diff --git a/retroshare-gui/src/gui/images/rate-1.png b/retroshare-gui/src/gui/images/rate-1.png deleted file mode 100644 index b24fcc30996dc546dbba358b2971392e802547d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uGBwbBK{D2f=age(c!@6@aFM%AEbVpxD28NCO z+2$o-vSyZS>hT|5}cn_ zQl40p$`Fv4nOCCc=Nh6=W~^tbXJXfTrVOa4*3-o?L?Ybv$Vss#1qRj&&vTaE^qAN- zMZ}Yex&ADeqxL2&c)m3*6Yt7TYS5FBlQ)~+B`24Z{t8O*RZoMCr7!@hKeb$LEJDnbuLF&v3w zIFZC~B8}lp8pF9vhSTK?7qS>G7BXBfWVlwsaJ`!0RxQK*N`?#70+(x4uheTks$)3O zU~r>V?|!fG^G1eeEeuaO8Qym?eC%WRK9S+eB!+)87@keDcst+b|0agZvjgtWkH5L9 z;PZ0FpX=TJZS(qn%K!h}kY|S`JU_SL+nWdf|NjSiXB3Qv02M>P%yx1#&^XBw*NBqf z{Irtt#G+J&fW*wa5hJySgsyWTTpKt)ZSE{-7*;jZUiGc_78uw7U$EvhwL z((Q^#w(G75d;fR;JbF%8#zcFu<0m7bBZvQ{cL;vjZ$lISce*Tpu?&ys&nRM%8TKsu_FI}^3mztD6Oletj*dRt|lI4cW j|5djp&gJ3emiVmyHAGmHM|ARGPzZRs`njxgN@xNA3rV~V diff --git a/retroshare-gui/src/gui/images/rate-3.png b/retroshare-gui/src/gui/images/rate-3.png deleted file mode 100644 index 759f1e41513f6ee98991ebfa2fa6bf69f3673867..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uGBwbBK{D2f=age(c!@6@aFM%AEbVpxD28NCO z+<+X%j=s7KYAU z4BdMe+EyF)Z?>4W%cfzj!^HIt^Y_Qk-jpzZOTnZg4D${;E<5SA_Pp1YYyP|MhO9YM zux5Y5rlSql?jN}M=)nK~|AD?31*0KAix4P^+0O|ySF*%4q9iy!t)x7$D3u`~F*C13 z&(AePq0Cs%RL{h&_e>d3QN5>&V~9k!>yeXUO$rRG7uq*Za}8AKa$Ax5^ume%^-;Mt zcaFMl-)gmlU)$B@ZhCM}#+4}1qn_EeZXE1O^^V!}d+{nZ#ht48{_k1PH^x6<92?EA z|6j|${^6Xpaq`D1A0J#RX)RrR+aPRrftS~G&rQpwOyl#|HY1hgNrGU=hE?(m9|aaw S$t8lE!r=$X1(;%A#_;tahwJDw8vZv$&)0^3sbtd5cioA<3qSVTxOs5|#BS(k4WWC=$_XM7JSEgIG1tS|oMiau1Sw zkc=oo4Q;)j7k^Op7H%$)Ake_D9W|zM& zuTm66+y1})2?rL768h;!w~DzT;*&|y;xtim6a=CRiDFg&m#|A^vz%E@?zg*B>7y4s zFAiZH%vEa)4Gk`9PJ!^%}S9)sDC7+;7#n-l=!HU*&P7#`{X6|NgFs6HNhkngj1QhurN5 zz0ntar`hXqi{H~W{}-*H54(cj^hJD}6#K0&`{ay@b8~7hPfmU~GyCb(#9#A@UM{V_ zzo_Eviu#XR=H6c0_H|Rw&ux?b?4I%e_JwzMF1~;J{M)xLzyJUL5A@e47!3i+LxAVX z-yEPRk|nMYCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dM0+gXUc$znmk<`LnOjokGP99 z88EOO@Sm7xF11le(UDb?Nv!C9@yoX9kvyk5gOn;X8UMU9d{I-8J8RiV&7b$H3ZxbJ z_WqG+&4{rueg3dou;^Sidzt9*+i~~w3uA6>;5v3~@$>Sd5s3%SXzul@yd5xWwtPx#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE;K%k%ys|(0zXMa zK~y+Tjgw1gQ$ZAl=UUu|xNzr2aN(-pt{bIvp~V&=M69&+QH+htmVjWzx^bnTMZutg zfd;FTG)>whO{4*(ZNQk2ijt-f(Ud05>n6ELZr;z|nTriwba4kh&Y3gk@z20;`q>@0 z-5Ju;bCQg!&z#^mu0Rf10Jy{A_Z8UfUQ}y!Tva+i1_#Y}@q7n@P=>`y8>CVwmP%3)dno2J*cDhqhr=tKHRuq9 z!UEFYzkp{?|3VaNu-dkfOlLZBnQXRaG+V8X8m6FDZ%{=h5VhKY2M>S2z81#H$~O3n z03nx`3Yca4{TRDDBa_Y126bGzXaM2)5;U51Xr?ys$?y{?Au9{kps(*E2z}He9#0g* zqf3~2@)?%(KeAYLhj8J%9?}P+O^)ewKcG^5KzH|J*-TEFI}JGYT_cf5m(SQh3-_My z`JBT!0!RT%{F}8zsZ=_(ZF^m7jSyn$FRk_DE`-4Eb}`~{%H{G~Q)^_qeaX#Dmt^uT zLP(^PlR&LCzCWPTxg?QD(rLHRuL~qzx`2>ozu(9A1ESFwO7&;5#$pQ$20jaS65zff z0F?4Dl~RO47LiEguZs6Pk6uq<20?)SSmVRd5%<^Dc(A!ibZL4|d#x6qPfqxHcE-c) zZG3-#1V}j!%}Rw@p@4Au}Dx@3-t@Th~E}bTu&y#W-&U3k$0_V9LDaRq3 z&oh@!Bc(LW@#CuN;(H$LdVQwA{e66;NM_z-rb6H(ovAnfKa%BZ87Mm*2zrH3Ej{^{0T;w~VC5pv2r?zdcj|XWy_rp^Izwd_- z0wDxSDXP`#d%^#1<2a)b!UDo0w?=M`5CXslegb_!0ZMB<_yq;@x!5lJ)w2Kq002ov JPDHLkV1oQd5vl+H diff --git a/retroshare-gui/src/gui/images/window_nofullscreen.png b/retroshare-gui/src/gui/images/window_nofullscreen.png deleted file mode 100644 index bfd4fa597e44f06d6d09802a500628373412aeb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 647 zcmV;20(kw2P)OmLP(^P!9`;Xp6AkNtddNoXw>VN>FXq~6agWX<2ZPpPb?NkYv-?C*ESY0xibdW<) zNis3W{QdJd%`ap!X>z$Np64R_RSO4>GIQe$H_siy_uPP2Up`^#bb+p;*|uX>sJJ14 zkU!gA%T^p8ouW; zIGkep*m%IlcJCt+8)EtMN8GONbD+WwsxKaM{Olbjr=KIO-{mRnKf=YkRqTNXUq8JM zxNX}?%+5ZV%jfeGy+-Qw{jb#k;rS3kAcR0`O{G$KBlzEG?7b+2uz|>W+Uu#-E%<;3 hbO8s@fHuasKLKxpy~^JCfM5Us002ovPDHLkV1idd9sB?Q diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index f266a738c..42fd5acee 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -181,7 +181,6 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point ) connect(rateUnratedAct, SIGNAL(triggered()), this, SLOT(rateUnrated())); QMenu *ratingMenu = new QMenu(tr("Rating"), this); - ratingMenu->setIcon(QIcon(":/images/rating.png")); ratingMenu->addAction(rateExcellenAct); ratingMenu->addAction(rateGoodAct); ratingMenu->addAction(rateAverageAct);