From c9ef2a77b570ea678379f7e34eec3d5212c6f08f Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 29 May 2014 15:50:46 +0000 Subject: [PATCH] Added a Header Frame for Collection Editor git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7391 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/common/RsCollectionDialog.cpp | 4 + .../src/gui/common/RsCollectionDialog.ui | 806 +++++++++--------- retroshare-gui/src/gui/images.qrc | 1 + retroshare-gui/src/gui/images/library64.png | Bin 0 -> 5378 bytes 4 files changed, 429 insertions(+), 382 deletions(-) create mode 100644 retroshare-gui/src/gui/images/library64.png diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp index 9f45ab925..0d8fc057d 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp @@ -134,6 +134,10 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint); setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName())); + + + ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png")); + ui.headerFrame->setHeaderText(tr("Collection Editor")); // 1 - add all elements to the list. diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui index b5bf4e88b..9aaaacfc4 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui @@ -3,394 +3,436 @@ RsCollectionDialog - - 0 - 0 - 693 - 331 - - - + + 0 + 0 + 693 + 525 + + + Collection :/images/mimetypes/rscollection-16.png:/images/mimetypes/rscollection-16.png - - true - - - - - - Qt::Vertical - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 0 - - - 0 - - - - - QLayout::SetDefaultConstraint - - - - - - - File name : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Total size : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Selected files : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - TextLabel - - - - - - - - 21 - 14 - - - - <html><head/><body><p>Change the file were collection will be saved.</p><p>If you select an existing file, you could merge it.</p></body></html> - - - ... - - - - - - - - - TextLabel - - - - - - - TextLabel - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - - 0 - - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::ExtendedSelection - - - true - - - - - - - - - - 21 - 21 - - - - - 17 - 21 - - - - <html><head/><body><p>Add selected item to collection one by one.</p><p>Select parent dir to add this too.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Enter&gt;</span></p></body></html> - - - > - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Add selected item to collection.</p><p>If a directory is selected, all of his children will be added.</p><p><span style=" text-decoration: underline; vertical-align:sub;">&lt;Shift + Enter&gt;</span></p></body></html> - - - >> - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Del&gt;</span></p></body></html> - - - < - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;+&gt;</span></p></body></html> - - - + - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::ExtendedSelection - - - false + + true + + + + 0 + + + 0 + + + + + QFrame::StyledPanel - - true - - - - 1 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Save - - - - - - - Download! - - - - - - - - - - true - - - - - - - - - HashBox - QScrollArea -
gui/common/HashBox.h
- 1 - - - - - + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Qt::Vertical + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + + 0 + + + 0 + + + + + QLayout::SetDefaultConstraint + + + + + + + File name : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Total size : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Selected files : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + TextLabel + + + + + + + + 21 + 14 + + + + <html><head/><body><p>Change the file were collection will be saved.</p><p>If you select an existing file, you could merge it.</p></body></html> + + + ... + + + + + + + + + TextLabel + + + + + + + TextLabel + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + + 0 + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::ExtendedSelection + + + true + + + + + + + + + + 21 + 21 + + + + + 17 + 21 + + + + <html><head/><body><p>Add selected item to collection one by one.</p><p>Select parent dir to add this too.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Enter&gt;</span></p></body></html> + + + > + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Add selected item to collection.</p><p>If a directory is selected, all of his children will be added.</p><p><span style=" text-decoration: underline; vertical-align:sub;">&lt;Shift + Enter&gt;</span></p></body></html> + + + >> + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Del&gt;</span></p></body></html> + + + < + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;+&gt;</span></p></body></html> + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::ExtendedSelection + + + false + + + true + + + + 1 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Save + + + + + + + Download! + + + + + + + + + + true + + + + + + + + _mainSplitter + _listSplitter + + _mainSplitter + + + + frame + headerFrame + + + + HashBox + QScrollArea +
gui/common/HashBox.h
+ 1 + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index eb7de4ef4..54f873ae3 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -686,5 +686,6 @@ images/library_edit.png images/library_view.png images/library_add.png + images/library64.png diff --git a/retroshare-gui/src/gui/images/library64.png b/retroshare-gui/src/gui/images/library64.png new file mode 100644 index 0000000000000000000000000000000000000000..8aec71cf2ffdfa39cd627b415d5d31decc6b0bec GIT binary patch literal 5378 zcmV+d75(aoP)81_w6^2A)`~j6DAVda< zNWlIPLU=PIph?5PMsxsO!?mW-(die%FZKTTTpNAX090;X{=IN6{xIaraI!556Z7Ms zss<1>3@g%$@ow9A38=Z|+q_x+GxRDX-`Ry=P=I+^sP+t86nW#+p>u8cSplHly!>G$ zLcYhgKUmoa6W2DujE(M#f3_~RQaoDbNZ54W8$_*v7BSacV3Wy_m?9J3MynHov>-$#u{V2 z>yUZAIN1;JZ~O(KiQ%BgP%+?<=#IYco@>MF0#N!w=RMK3^xZI30OYl^^foGRBrTgE zkXGVwRpD_)sZN3Bt7cf}Y6X(7zR3Ylb)bnDjFigT4uJN2i9kWcOPt3D z&jU)?PY0QdEs8~l;~HoZ-cOK8)Ys?0`*}oSyb_(rq?%Baa_7Mb<1+!!zO;BmE>v26 zFBqw?#*Wj*6p*eKYhSpCvR+Z=I%jPgZ20%FEo5A=cM@PU@ATGroV`JWZO1Btazv1b zDAi%PswN|c=w$xJhQmn7dH|@aS|v$|XwppK?9-!dh|@C)#^s$T4;<_&l|Z{*hU%;i z`I8tvcRY=u5C&H$1AU3t4?^P|-{jhnO@nr56r@zd1=+UP5C9WFW#C!c40D3wT-3Dh zr}hoqUl)Mt70uyLMXtcetPj#4yD3kBRtKov5+n4VF30fK&F0Gnf#MniD&q#sA^_(< z`4LJ)#1hZ?I2Xo_LE`osczd}F=sS;q99Ou32K6$9Mp6ve7 zzpo2Gu8)Ye=j*|3Xju!Cy7XLqcKhR0A7Dpk|KA|i7-qC#m#hvKvfE1rEB0SF^t zGMp(1Rb~bt`}Ny+o7j$4FhClauo~PXNM06l?R#<`Qj@-T3Jp*^uwL-mS zA(28MgN)9)9u4xo6=U|@5_XFHqpSuf3RkwBAJgO` zq$z%e5Fn1oc#jc=1gGEW310oll9%R=r-W_6NaM2eK1Y;8d64)vI$nao$pGh*pj*I6XMR?A zY5)+93k=ZkSJgnTXdumN1F`}=jD?dKItbtk(Tky1jbZ7n!sl`nuAUzj(w$fM+-zWl zz^Oq#7_)x}MB((zuH=r7ud53{;mVeqVyl)t2Z*>)(tzTFfmL+aL8=?>1YRFOxwsZIHlU7P|})%4U%{$N+i_y|sHE zkceUd5W{RDg5Y}BYp}4kK@s-_3B}|D5h>y9+9+;5H%v zKxzRnFR=`#{&PW~`Pk#6)DX~TcLPjK1Bo%?5sZ++wZx{F9|VyV>{uO;%%TmOP&?*B zQKksMF+C7~*;_7tAhjgB9tZIO@h=)9c$bKV2Qb9Xl$tQIKwzCuCNU1Hpyf;6ECE*K z8Bp|?H37T8PKh=M_N~@61evDw4MF0a10I__JNd74J(yh5cqd0Q0Dypzp9ct$<_;ht zC?caI_wm#x5{`%(-df+o1j8qS!nSUBk6XZ$G#TRm_HumyW)XnYlBPRr7~r9_aN1`>0fh=5pWyn*LQp=jw*MxvbUE6RL z_p;0j8&b!3@g67k?bHUm4QdEphgxqMMy)|&tQ$rhCe(sdRAR^gO^W_ecsU&THAoW?!IO5sD3w0SX6z3E=ds&p6>)Tjjxb%wbi40iMnaAb1L! zI$(%GNQ2o>$m9@!k`#OG{W=Wz$~E_;834@t=@jP0Jh-K*b*XFvfFMmyVdrdWQ`h63 znPT4%*=B*qV}=(HPg*m)M*8)Fe%5vF^>Ym^pi~fm-|npkz_s_Mm*h5>l^|1k210($ zTi>(ektp9EpX4JhXXHh}lip~ZO0P!T1P_7_1i!JYZ~kl$7#e!bxw&i`0#KArp@{_dI12|B^K4{hG9b#07@y#8f2%4NMP2NuD0JYZBwKW0 ze$NQ$!coj4A|Y{1)#X?aYFXJNA!V#A0_6eH<-rBR=R6$!d$O% z7BJ)4v4%!~;ZY0`WJjsY&zm4OD4;iF@eX`s?WQA1O1+-Zg@~1qn!7L)T1F9Hb%zpjm-|+30drXI?XAYj3XEk#AXV}!X!v4D}-V|DkWrC)ub~u@Tc)@bH0zw z^X2nGJwWjqvAU$zlc{Trzq|#XQKFaacI=51+$hDvAkEBy{JS2=d_2O#Rb&a?kZ)ZG zN)Z9rciaWwx~o@{SMU8NB8`nG)nmQg$)RH#O`0<=cXR;cTA?s>7{b@DhENQ_kYd<4 zt_`HLj!e{Y$ZdTM4~0Ff%C}np>_6#cKig z3k0xqz+p`-2Hew3fAV02mcsO=t&lyCx9Skig8aNi2tZzn9~|%kP}uovi5%~f)v?L$ z^ogGDn{l4P5NK&JsZ{vmrI2Xv-~cEY6KN9w=6wz0U&Wun0I|Fe!dSu_EK--UHr*Zi z+a9(IC)V0LuDQ$rfl)O82tYGtqS2>*`Vn+&-($WOcQj!BVo(YQz|kQu0JASWBT0RI zvNksH!_453O*{k`12_PswOtVF=)~A(05tLuA)`GrSVQ5fvU&iEq6((Q>a-OKW!C_w zf7Tme=er^{?H%TfVr$bl%>vM3fXxC?(7dkqV!#}L&piFFd!YS=z3e+Su0gC2TCfCU zWI&>K)C<7$i@ze$+q)!nbgVn8PHi^RU=~wd=MwV)rOz*eSSO~!FdmZ=ypuXJd>rFv z5DlI%sRvaAp^C?i5(mfxz~>}!O$8&&S^=4*B)G;XmfqN)*y&INwC4K?YBA7&{zpE5 z_FwG*Stvyc^A~|!n3Iwx#=QVcz4$zl-gs52j*NCU$6+%>g_@6%yfqD=GeCtg%Ceh`C?5 zmvR73J-QcK{`&(Cfc3a?dnZVk2GgHT_yE}P8VL^%MAhEDA7*-X^C_`Vm``|MPA`7z z3W&Ed51>~=Y3>;&fc86r>KF$=D_R*r;h-SZHT#$Z;Hd$KWw;YE zws;b*MWJRdD@<4O6ny+A`=M#u2Ov>!znE#Ak0D!>vi(!Rqrt&-Ywu|>T<_My(D+Lp0yY4oWgbujp!xK4FaW34Uf11G9^YaDVAC6!P}sZ% z5>35GzjiAO@S$445+>C`od~Kgc#&G36+17+ufO6Gt3%sxA}FT6D3UBQLahi!)(N>I zTYI757ay2;$9|HOYeSM2rIx|jU;vJP@tW?%b0b^K+TDIAj{FK6FU1fzfe&cqsgD&y ztOjrlvpQ{l_@uh5FzGK+!57mYtif04I3Vb}P4imWYdrWslvwtdXQtOfKRpiVU+m=o zSWSkTTRu!`DNyxex8Zm;)3#36|wIih0=7DIG$3<^*FIV2m8ap7SW z5i1RP=eev^5lXY?L;v5t2n&WvrU=WJr#%eQ$5bt2&~-{4&(J|Md}!xtHXd*E4!BroZ4cJ>M;L9v54s$ zMesjwf^_aE&&f>jnYy!5Sd3R^cBcsW@#T=e<#}kJiW}PI6;ya1YQJaTDrx>D_8)=V zxSMZ^LC13|QNa)LTEsTVlQFC{`#McZ!QqF~kb3?o$mR#bd{HuuP%amx&ha_`^j^BW zyYthdTg)Ox34@MWz@ksz{+EzxKFp%XQf^s@bH4|QFgw}>gSWl}Sxun5Z@$!D1Ug0w z(}=e86iCnM@i~O_P>R7lQ#f zdcl(Jd84Pdm;+SHZ5lQndiF-VdA|#Q*-O1P4$V%KV0LUJ^xyglq;=VqC`Z_-;4F1+1qw#1gbp zt;!eWE5QI9TC||Md1z=0pWw9`#J`D`*Fj@;A5tsqcFUjc9B-6iX8Z~`cGK(7r2F_G zmIs38oj3482sqc_Zjk}7eK8I*4uB%L^R3Pt3b^AWHb)zdq+$QoHi$lR6vVudjz;O2 zrpv2KYA^u%+H?Pym>BBwcn^&$C!M@lS$b1^a4wVWr*`lYI_ zh&Fow_(3$ZtQd)HkO)!iZn6I+_1*1VH)XS*q>)>a8=Qu>dP85Ctie*aP`r@#{CGq= zx-Y-y_-W&?oA!nO?BFScgl6mzvG%XNBy?T+{M5qL>m#ALnSS$2I@567WtGDKg98wW z$JHG_Y53^CvqJ|dNKPUw8Ai{e26+C{mVZDAx5pxK$!b(-kfGX6lm{RA-0xaaJzWOq z#4T;Xt!adEh82?K3f0Pu*~Zl8!F=Cc+iABo4u`Il=ib>n`yUrCPV_zT+?@Vd&p6X^*X<4D_)vc3 zqJ`<331P!f8gP|YP$(sp-S1C6(b*FJblY!=^i1u4CID>N{Ouf>m{w(3CYE;BMF2&J z(o$K6L`>GVK0QOvrv0;7zJ7CDR`B_fVn0_cB76Tn$gYybcN07*qoM6N<$f*H3xbN~PV literal 0 HcmV?d00001