From 440968cb982ba0b3df8beb38ba2e82435d372fc0 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 25 Sep 2013 15:58:01 +0000 Subject: [PATCH] Added a icon label to RSImageBlockWidget changed some icons for encrypted messages git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6762 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessagesDialog.cpp | 5 +- retroshare-gui/src/gui/ShareManager.ui | 55 ++++++++++-------- .../src/gui/common/RSImageBlockWidget.ui | 16 ++++- retroshare-gui/src/gui/images.qrc | 3 + .../src/gui/images/decrypt-mail.png | Bin 0 -> 877 bytes .../src/gui/images/imageblocked_24.png | Bin 0 -> 4088 bytes .../src/gui/images/mail-encrypted-full.png | Bin 0 -> 1070 bytes 7 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 retroshare-gui/src/gui/images/decrypt-mail.png create mode 100644 retroshare-gui/src/gui/images/imageblocked_24.png create mode 100644 retroshare-gui/src/gui/images/mail-encrypted-full.png diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 0181a7f8c..6b1719295 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -49,6 +49,7 @@ #define IMAGE_STAR_ON ":/images/star-on-16.png" #define IMAGE_STAR_OFF ":/images/star-off-16.png" #define IMAGE_SYSTEM ":/images/user/user_request16.png" +#define IMAGE_DECRYPTMESSAGE ":/images/decrypt-mail.png" #define COLUMN_STAR 0 #define COLUMN_ATTACHEMENTS 1 @@ -608,7 +609,7 @@ void MessagesDialog::messageslistWidgetCustomPopupMenu( QPoint /*point*/ ) } if(nCount==1 && (msgInfo.msgflags & RS_MSG_ENCRYPTED)) - action = contextMnu.addAction(QIcon(IMAGE_SYSTEM), tr("Decrypt Message"), this, SLOT(decryptSelectedMsg())); + action = contextMnu.addAction(QIcon(IMAGE_DECRYPTMESSAGE), tr("Decrypt Message"), this, SLOT(decryptSelectedMsg())); int listrow = ui.listWidget->currentRow(); if (listrow == ROW_TRASHBOX) { @@ -1137,6 +1138,7 @@ void MessagesDialog::insertMessages() // Subject if(it->msgflags & RS_MSG_ENCRYPTED) text = tr("Encrypted message. Right-click to decrypt it.") ; + else text = QString::fromStdWString(it->title); @@ -1218,6 +1220,7 @@ void MessagesDialog::insertMessages() { item[COLUMN_SIGNATURE]->setIcon(QIcon(":/images/blue_lock.png")) ; item[COLUMN_SIGNATURE]->setToolTip(tr("This message is encrypted. Right click to decrypt it.")) ; + item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/mail-encrypted-full.png")) ; } else if(it->msgflags & RS_MSG_SIGNED) diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui index 2d693dbdc..1e0f9f625 100644 --- a/retroshare-gui/src/gui/ShareManager.ui +++ b/retroshare-gui/src/gui/ShareManager.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 350 + 741 + 334 @@ -49,7 +49,7 @@ 6 - + Shared Folder Manager @@ -58,22 +58,7 @@ 2 - - - - <!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:8.25pt; 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-size:8pt;">This is a list of shared folders. You can add and remove folders using the buttons at the bottom.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">When you add a new folder, intially all files in that folder are shared.</span></p> -<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:8pt;">You can separately setup share flags for each shared directory:</span><span style=" font-size:8pt;"> </span></p> -<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:8pt; font-weight:600;">Browsable</span><span style=" font-family:'Sans'; font-size:8pt;">: files are browsable from your direct friends.</span></p> -<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:8pt; font-weight:600;">Network Wide</span><span style=" font-family:'Sans'; font-size:8pt;">: files can be downloaded by anybody through anonymous tunnels.</span></p></body></html> - - - - + Qt::CustomContextMenu @@ -136,7 +121,7 @@ p, li { white-space: pre-wrap; } - + @@ -164,7 +149,7 @@ p, li { white-space: pre-wrap; } - + @@ -192,7 +177,7 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal @@ -205,14 +190,14 @@ p, li { white-space: pre-wrap; } - + Apply and close - + Edit selected Shared Directory @@ -222,6 +207,28 @@ p, li { white-space: pre-wrap; } + + + + + Tahoma + 11 + + + + border: 1px solid #DCDC41; + border-radius: 6px; + background: #FFFFD7; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); + + + This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory. + + + true + + + diff --git a/retroshare-gui/src/gui/common/RSImageBlockWidget.ui b/retroshare-gui/src/gui/common/RSImageBlockWidget.ui index ed8dd2430..37f1c54b8 100644 --- a/retroshare-gui/src/gui/common/RSImageBlockWidget.ui +++ b/retroshare-gui/src/gui/common/RSImageBlockWidget.ui @@ -7,7 +7,7 @@ 0 0 476 - 34 + 38 @@ -96,6 +96,16 @@ 6 + + + + + + + :/images/imageblocked_24.png + + + @@ -128,6 +138,8 @@ - + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 836079a1c..7c7e88d48 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -1,6 +1,8 @@ images/add_chat24.png + images/mail-encrypted-full.png + images/decrypt-mail.png images/inbox_22.png images/blue_lock.png images/d-chat64.png @@ -271,6 +273,7 @@ images/hot_4.png images/hot_5.png images/image16.png + images/imageblocked_24.png images/info16.png images/im-user.png images/im-user-offline.png diff --git a/retroshare-gui/src/gui/images/decrypt-mail.png b/retroshare-gui/src/gui/images/decrypt-mail.png new file mode 100644 index 0000000000000000000000000000000000000000..e24cefd714a52c31de761f2e772d95ec11aa2211 GIT binary patch literal 877 zcmV-z1CsoSP)Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00PBH zL_t(IPmPo7OOtUF#~-1fSN#D(6uqp7%9m*&(Tk!tVM*Q!%FIe#4b$m1nGV5B(}lM= zl}$x$%zSD?g-v1_scbqgE7)3IAeUR4yQsUlJ>Q<^u|yQa1BY|?opV0tcYcRoTyJL^ z@y%u<01$gcEPfp)6c+CbFsVznMWUxqNf0#PlAw&I;tPw(!)mFZSe1S+^#a?FDc;!J zKqwqSnAPwBx*cco83+p~;TMqxg8{){5Rpg(fk1%ucU#71G!of@)9HlKXarNo0`fV} z$Y?YQtJMmR$HPLHF8^&T7K7jC!~FalOf%CM80e>CVQ{#4+khueACsX_203CS_nsug60WIl0*^z(;psWOjBI6h*PV-|vUyT^)K< za>(S(sI9L?bDIR6y)q~i9iRc3MAm~08W4or?M5iL31%FV$;7H=Py?Bw36h2yXf&U& zM&~G%y{K=jfxKIWuI|qJL`GKHKY$Bs9v>E$S9T^C*6J`arh`ya#-0U&Vb*dB3n+nz z2Z698n@CN&Lk8&^tgbp>HjuE4)#1lv2drPE&?`%!?JI};O%BMWJWObnh|%LMEiKXz zj=qS;Jw~M5y}bi)Sk>?>f24c3Ky6v!wY`UbK?Ubr3#F{Qj-SRMOifQy%og}U-u4zU zv(jY7DI@01W*A3W;Ig#SZ)gP-{sOnT5nhV|j;XikDoYBDsudyoZ#%up4-i+123de^ zNPQyt+STWmuO#Nx7AEyOW~%5dj8n0I3agWRxMn1004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ0#b(FyTAa_ zdy`&8VVD_UC<6{NG_fI~0ue<-nj%P0#DLLIBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^ z_ww@lRz|vC zuzLs)$;-`!o*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!&C1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2h zoGcOF60t^#FqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTX za!E_i;d2ub1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqK zG_|(0G&D0Z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY z_n(^h55xYX#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^b zXThc7C4-yrInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qj zZ=)yBuQ3=54Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK% z>{;v(b^`kbN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<) z0>40zCTJ7v2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01) zS~6}jY?%U?gEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j z*2tcg9i<^OEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfKTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761 zjmyXF)a;mc^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQq zHZJR2&bcD49Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^ zTY0bZ?)4%01p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK z8LKk71XR(_RKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS z<&CX#T35dwS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@ zqL5!WvekBL-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW z%ue3U;av{94wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#oSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%o zZ=0JGnu?n~9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8N zo_-(u{qS+0<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-U zsyQuty7Ua;Ou?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimk zUAw*F_TX^n@STz9kDQ z$NC=!KfXWC8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgU zAAWQEt$#LRcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6 z?<+s(e(3(_^YOu_)K8!O1p}D#{JO;G(*OVf32;bRa{vGf5&!@T5&_cPe*6Fc02*{f zSaefwW^{L9a%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000F8NklC zB@kw6h{~dl;W$!m{Q5377(+8U&G=tu<~Q$q?)RMMIrGhT-y=!?UoYE%>gwtnuM07xDEB#3C3+`5M1oRR$v#>AgIS-V?FjlZy(x#eb~>8 z4{u~b#4k8TUP5beL(dEM378ml1$lN0%d=XLXEn1zusrL!=znA7->CY)?CXMN@mn(i zIoAmg_ww8p0`qR7$iGQ&VJp+N-sm4Nb(;`~MU^nHpiOYAmmtwAROH_xs8B^4!9}gC zDr_gXSoF#^)|9lfdUprwO7G&b<97c5*R;E=-+PBO$_|26RR~v?-Vunpr=7KXZnLIL zXo{~B6S|vRpN&*{%LOaR^$j5|axWoYbP%?$let-){R2F5Iti=lBvcSqDQe|C!i6|o zRcm0gAa=`sPR#S>eq0pY$^xjYfT{|*OA6_XjihGY0uqvI@Ktv84_H$22U`z6WXqw4 z#2)G*_Q(U`L?3q+qVrCXAdlyYj~90jsLINjde1?I$0RB1k$RY9plWsiV+)20zSn;`SN^SLOaxI!$AzX8_4zIV40B zkn&*w_5Mp~lYh*e)q$LIbLH}hult^&h@+5M*Ue|&KO^JJ6S6Kt>Y)~r{d_2Ke3wge z+^BP(MY*#RRki0Sy9UKgu=gf>w?3REvEDGtnG3?a$$cir7kKpzNT_{E(fP*|3zV1W zp&}`o#D&YKv9@5JjTL*WESWQ99`5q(l#2DLj%S?qSjq)E8_o(%+0;p7yyw8dG3Fe! zGN(K}y}kF3mUHGl$6MgcZK(Sb_Gf2vAoUYsTxU>eq|YuxJ(6tR#Kd3(V*H>cNEtGi z+F=HqGSDX9d;~GG=MrFHL7J`>Wri|}6oL1812T_YB{_dTiuerdra1MOsBqC#CrzeJ zluV282^QEo*f4Um1<^)E91+IH2C9)`Vu0INa{}giqp-6kLZ(UXKuxk2c;D|07&qDt z6PYb;&WmssM2ByqIKPTblU>-Vr^6yGH4!%c%%nWiO!^cx{zI&e#9<%hde`F)@ewDSq;b6 zauAu?5+ynkW%>g+yv-lKbxy>@e?Y*p8Tea`WUbhu9fI7A8}GgtcB(D06pVO|?nsGY zrV?hx5@|+y6lh7L41Fg4!Xve5on1Po}{)W~2CZdrI$!?`UnKIzFC48%qx84dCb?ZAya_FOKQU zJ~-t?MXl*$EuS#Om0PgO_xTVs8GG#W^%mF43K zrSewKxPH}Zu_V2{!%(lW!PJ;*V@zqA?7#yzCmy=HaA(>?nyt;aFlq?N`m&#vNRsud z`u5R%BuT^8X=`mS8)ed7?`TikY!`tm7abia9ckRUR!cL{SCWSOC-Z+kKS^@)mL%hUGyV(2C8XPei55!$0000Px#32;bRa{vGdga7~ugaNAJV|f4o00(qQO+^RU2@@9<47wgMP5=M^24YJ`L;(K) z{{a7>y{D4^00XW`L_t(|+NG0CXk1kk$A9;|`)+0?&BsjAd||%Rny84VNfljmp>!d( zg)F2Hs;h1aLfncAH*T{kxKPB6E?hKPD58*xD3ORsqpoyJ(^!&}W+vowGMV?@_0AC| z384eU^Z0Yld3Wab{`YXNZmK7d+hhQ+{Ew(lac^^%4M0LW=!^Teys4d?n5tnP-qzLm z1ZSgjz&8~z5bwt+Hiow#EKn_!a`HTk4=w?Ul5eQ_NgeyN2Jk%}!fjNv4ydEftaU&o z@;pV2vV1zY*oOjCc%vxU(wR2@w7+6BuJ)G?CljWfgzXA(c9O@>dFco9UUxt9xJP>oH~7q zI4-hQ?6wacti1K*E)Z z>0$o%JTISpjk@eB>eAT2>ih4#(>^gVaeaJz{5b(rlVoyol9r4nlW77hVHmQzyGsxR zB$G+B@3XPFNq>Jo3kwVE?CdZyGVIoTg7{ay`24%KpLwe1lgpRieAa;;E7R<`h(%-*FQFI3A{1+S;ex8}Zme$-Bd&N;h zeLbyhZQOCSgUQz2pBNe%0<4S(`IwwnDO0J`Ua?q|S|ec@cH1&)8$cj3S8M6(>#Lk= zPk8|BM~38yW*L)2QZU;=G989-Aho=4R>Vz6`4%aeuUr@>SC_%k>xALk4_{?$*m7_F z1HQhw$6Bs{ZyN0P*Pi(0Wcz2d*+1;fkKXuEz{H`r@#N}C1}EtyOOFqjL@o81ERVJS zg$7#EkV@uN%0Rjm>Uy45(GM{KMh?G1ofku0Z<1|WcxuwlmGw#07*qoM6N<$g53k~5C8xG literal 0 HcmV?d00001