From decae01cafe48255bfe328aa996addeb422af392 Mon Sep 17 00:00:00 2001 From: legatvs Date: Tue, 16 Jun 2009 03:56:48 +0300 Subject: [PATCH] UI (e.g. ->link list widget) and icon changes. --- rc/NOTES | 2 +- rc/abby.qrc | 6 +- rc/document-save.png | Bin 1971 -> 911 bytes rc/edit-find.png | Bin 1636 -> 617 bytes rc/feed-icon-28x28.png | Bin 1737 -> 0 bytes rc/mainwnd.ui | 367 +++++++++++++++++++++++++++++++------------------ 6 files changed, 235 insertions(+), 140 deletions(-) rewrite rc/document-save.png (99%) rewrite rc/edit-find.png (99%) delete mode 100644 rc/feed-icon-28x28.png diff --git a/rc/NOTES b/rc/NOTES index a2f6bd5..e591dd0 100644 --- a/rc/NOTES +++ b/rc/NOTES @@ -9,4 +9,4 @@ http://tango.freedesktop.org/Tango_Icon_Library (public domain) * document-open.png http://www.feedicons.com/ (license?) - * feed-icon-28x28.png + * feed-icon-14x14.png diff --git a/rc/abby.qrc b/rc/abby.qrc index 1cf21a2..7432793 100644 --- a/rc/abby.qrc +++ b/rc/abby.qrc @@ -3,13 +3,15 @@ process-stop.png folder-saved-search.png go-next.png + list-add.png + list-remove.png edit-paste.png edit-find.png document-save.png document-open.png address-book-new.png - feed-icon-28x28.png + feed-icon-14x14.png ../i18n/abby_fi.qm - ../rc/abby.png + abby.png diff --git a/rc/document-save.png b/rc/document-save.png dissimilarity index 99% index db5c52b769e74c5ff883ed02dd4f96e604f2982d..22ff49571020a2b520d34f622673bea031cbbf2d 100644 GIT binary patch literal 911 zcwXxa@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~Ds(|LD2km4-xh%9Dc z;1&j9Muu5)B!GhKC7!;n>{q$Dc+L6eY2DZl6zVB)jVN)>&&^HED`D_W%`4R{&a6sJ zQOHcr&*QR%11>I&WK9Jl0|R3Puf*)qBn9=X%-r0>WOaq$lGMz+)FK@Pu8fkB0xNxe zh=g8lX>n$9Mq*BmUUC%|S8`EmVhPaL^30M9g_4X^1$R&103Dc?^73-M^vv7>z5Jr| z^seLX3=B*yo-U3d7N_S<^7RNw6lt5k^X|uI=b!jI*lKuo;-PM5A_t}{cj+LpYyGyB}%pMKnlIh)M( z&i;Jxq0OA{w($>6+4 z+q-s6f9Ukt&8xFdS*=oT&CWfq{#W<#>wC{%9ljp;XrlS)UDoe;{)xcU<7=|y;*^N<_pZHVc#|2|_(@dBh+RNXX`+E> zs-d22#PPGc`8$rUy1=nOP$4k>?Aq%7jN37X`<8tb5fy*R%%F4nkcscA#ak^s9V;mes5MAug&gFj10H870R@~eEG6c@ioKWzkheEn|=L* z4S($Q;`jEVoi3k@KiKq_Se-p_f@7u+o1mkM0Z;S7g^ErK1J*@NYfX*(86Myj7!%`S zAaSNvh~avvpeeVoX|>(c-#^6;Jv3Olbg9eYK!!~>bsY5GR>aCI75TW!YD$n!r(5wf j=9PUhX^>bP0l+XkKb|!># literal 1971 zcwPas2Tb^hP)PyKrkN=j13{7l$sh8kRr(E5NL&1 z>!1#!rDOlGGqnS){h%GE){$|>KiZj6XZnZJPIa)3EiIJ}(L#$lXqBKHAfN#Qq>Cn- z&Ayl2_ujp?e}sKa0!SU{^vs-j_v_vB+jGu6cOU$pMOFv+#AIiFq4h=gm^qo0he(dDAnKv}nMC^z~ z(Np9LKIv4PWTLG6z5b!=v%P7w7n6c*34cds7n=9Ua))@1PNF=hvvaAV^ z!+xC6Yi?xu;&uiG^8{)v7s{fNXJ34oFH|1G7!$5nN-5v>pLbpN-aUKv6ek1N<2zbg zr=<@5p|$?mrcIlcc6N3mr3^PT#*lZ5+_vRuqy#U}Xl)o7^{GjxkanD%J9lD?8L!qe z&pdNycX#(2z!M(}Q1tcb`Ar{;h(R%b#flaD;gue~`Q%F%xy`mELI^xxp|wF9Lo8z9 z6g*~cd}_klFMY9@hq_kN-QE2Fumdm?_8Q;G?0e*2(Q7t*b=mE=r!C8(V|ESSzkd-= zzu3dlg`cIoEQ%!swj~jO=WDbvXl*b8wryFBlmcVm^~3LTZs0uM`0`v*sT6H(ZOuZ6 zrMq_R+ILxi3v&OeRjbJ7^Z35c%8o`dgD$%d{*&8oX(N*z#VrIF491Lw#VrQB@YfT# z#enwa8UnAtk)wV5{98-WD!_3ZmM>qKJC_@qt9kXUV@$0oM;SvlUu57Thxg77bLM=WY`#cSZHh7*{{H4M9(!;x=~Nsk zC8MLGG&eU>QBkpe-MV!(mjw_)Jg{-&M&Y_{sgKqgr4$d}-NCd}j91?}K{{DRcBDwo z^-y{&q_x!*%)G9WeFxv++jqA!^SVlmF$f_r#^C!t%a$#RMk0~Tmjqa{WQi?=xUapv zoqRrzZQB@QP)ZR50V?qM!RGly@j2OdhMQ(jBN`biq?L&%H?`F8^1*lLTrh)PE z!qX$A#C2UdIywNhY~Q|JUIdU%r`If6w5T=`iBKpMkWvx^0iNekEEXvii)a<_=mR&C z%MNpP;3MYGo<_VZ!mV@bdF}09>Z@biaqEn5z2|uZL4a-Bc%DZxnPkqKIWrF*KD^>0 z03pQJR<2x0E|&u!2m*{T;U>lywAMr{!;dz%bNu9K2D3TV-ZGQk_s@~b4)b7VGoI(+ z`#!$!69fTLN|aJ)t#MtK#fukXS=N>b0PEJRtF5lCUe(ahfa5qQrO4;=0F;-Phs8)K zg;I*ja>)I7TwnnTagQ*8Z8 z8&j(iM59sS@i@t3l4LT8=Xp4egOm~}C6P!3r4$PnF0{4Q_rrxcAcVNPy}cdRb*Zhb zC7aDMGBSb?f*=UOwq;o)lSyFg{NJ2T^ShrkP*H9pr9^9u)_N>ov<}~qQj$ugsIIQ2 zzrUZ3jt=(j-Fpx4<5D5|Ofs2dWMqW1XV0RwM#{1Duq-PysI?CBq12Dr;QRgr&&6Uf zg!s=rXN)1A&*L}_T5G0EnS$2(hR_2*%=0{K+YVnGe*u-AC8*2IkDn{)__!Lx;nJhw6?b5c^)k-Effj`nwy((9EYZ+ zCUUtPsZ^?T)QKKi3?iBCBB+Ir34qW0OT(K@o!k3U4Q?i+IRo}002ovPDHLk FV1jL*$BzI2 diff --git a/rc/edit-find.png b/rc/edit-find.png dissimilarity index 99% index 5594785d10896bc17095baf387437d01bcb1fcf5..d072d3cbe2dadb1494f77e950952123813613677 100644 GIT binary patch literal 617 zcwPZ%0+#)WP)4+SOttuFuo0rp8m zK~y-)osvy!6Hyq2pF7DUO`2wgN>U06wOwc$MHIn>xD*Oicj6|$z;CJaABeUjK|~aE zS$9RDeGK5zq#vnP18H_P9en3BbiKg914X(U4?fX zv=3%78D?M10+5(X0MN8+cL(3TuaZiqIeKc0ZN-aeE4XBZ)ck8EZr_Z=qW7OQ{wVDZ zG+iT=PIKtw7@rGX1_uI+90*bpKD5zs{F**C6zm9u?EJ zQ5_2JmL<2Flg761XDbP7v)0}Ku5Shi%_G^x}q%2kVgpPOH0wIvBfN{N(qOE7M? z3xuFtwW!u4n_D&9s)POg9;6U0U2p=nX__rgY-58pql(|7qW8J5Es5XbtmWcc6+03YVxryf3dbXat2*wyQorvicCWHaaM z^${Ko^E;cZ_ht1ff`3FT9+eG|{}KR{SUhS0lnsNw28{O8e>3MU00000NkvXXu0mjf D_c;L2 literal 1636 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 0 520 - 321 + 338 @@ -30,24 +30,21 @@ Qt::Vertical - + - - - - + - + - Parse video page links from RSS feeds + Add video page link - &RSS... + - :/feed-icon-28x28.png:/feed-icon-28x28.png + :/list-add.png:/list-add.png @@ -63,7 +60,7 @@ Paste video page links from clipboard - &Paste + @@ -77,17 +74,67 @@ + + + + Remove selected video page links + + + + + + + :/list-remove.png:/list-remove.png + + + + 16 + 16 + + + + - + + + Video page links to download videos from + + + QAbstractItemView::ExtendedSelection + + + + + + + + + Add video links from RSS feeds + + + + + + + :/feed-icon-14x14.png:/feed-icon-14x14.png + + + + 16 + 16 + + + + - Scan for video page links + Add video links from scanned web pages - &Scan... + @@ -104,10 +151,10 @@ - Download videos from specified links + Download videos from the listed page links - &Download + @@ -262,6 +309,9 @@ 0 + + Current video progress + 0 @@ -275,6 +325,9 @@ 0 + + Batch progress + 0 @@ -292,7 +345,7 @@ - Stop process. + Abort download &Abort @@ -323,6 +376,12 @@ true + + false + + + Log containing the output generated by (c)clive process + true @@ -334,81 +393,126 @@ - tabWidget_2 - splitter &Options - + - - - - - - 0 - 0 - - - - &Download format: - - - formatCombo - - - - - - - - 0 - 0 - - - - Download format of the video. Note that different format + + + General + + + false + + + + + + + + + 0 + 0 + + + + Downloaded video format + + + &Download format: + + + formatCombo + + + + + + + + 0 + 0 + + + + Download format of the video. Note that different format typically means different video resolution. Also note that some formats may not always be available. - - - - flv - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + flv + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Use video page title for naming downloaded files. +See also the Preferences for the character-class +used to clean up the video page titles. + +Note that cclive must be built WITH_PERL=yes for +this to work. + + + &Use video page title for output filename + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + - + @@ -466,7 +570,7 @@ video data for the command to process. - + @@ -494,7 +598,7 @@ download finishes. - + Qt::Vertical @@ -507,38 +611,6 @@ download finishes. - - - - - - Use video page title for naming downloaded files. -See also the Preferences for the character-class -used to clean up the video page titles. - -Note that cclive must be built WITH_PERL=yes for -this to work. - - - &Use video page title for output filename - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -558,10 +630,6 @@ this to work. &File - - - - @@ -571,8 +639,15 @@ this to work. + + + Help + + + + @@ -730,22 +805,6 @@ this to work. - formatCombo - currentIndexChanged(int) - MainWindow - onFormatStateChanged(int) - - - 521 - 129 - - - 253 - 139 - - - - pasteButton clicked() MainWindow @@ -793,6 +852,38 @@ this to work. + + addButton + clicked() + MainWindow + onAdd() + + + 36 + 82 + + + 259 + 168 + + + + + removeButton + clicked() + MainWindow + onRemove() + + + 36 + 146 + + + 259 + 168 + + + onStart() @@ -808,5 +899,7 @@ this to work. onURLReturnPressed() onRSS() onScan() + onAdd() + onRemove() -- 2.11.4.GIT