From b2af40c95bf50bc7b1abd7d1390fb03fae5cc5cc Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 22 Aug 2009 15:01:53 +0000 Subject: [PATCH] - Updated some icons to oxygen theme - Prepared actions for rss grouping --- src/Icons/add_file.png | Bin 1005 -> 0 bytes src/Icons/add_folder.png | Bin 1359 -> 0 bytes src/Icons/oxygen/document-new.png | Bin 0 -> 873 bytes src/Icons/oxygen/folder-new.png | Bin 0 -> 923 bytes src/Icons/oxygen/remove.png | Bin 0 -> 1270 bytes src/createtorrent.ui | 8 +++--- src/icons.qrc | 5 ++-- src/rss.ui | 39 ++++++++++++++++++++++++------ src/rss_imp.cpp | 34 ++++++++++++++------------ 9 files changed, 57 insertions(+), 29 deletions(-) delete mode 100644 src/Icons/add_file.png delete mode 100644 src/Icons/add_folder.png create mode 100644 src/Icons/oxygen/document-new.png create mode 100644 src/Icons/oxygen/folder-new.png create mode 100755 src/Icons/oxygen/remove.png diff --git a/src/Icons/add_file.png b/src/Icons/add_file.png deleted file mode 100644 index a5f69ca61e8b1c05bea5637c4a3d466eaffb2c6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1005 zcmVkK-MGsql+Nj8{(42zeI=nnq42MjC>Ugt1gbIu>qdJzN> z77XN^5K)+r+lmWL2xN_dh|!tFHakChy6fdI+S;qg5>icdy>9A#`qj5yy;dTE=Xt{a z*s9g4(l-xZma3fm4M7jOJ!p5K6F@iYk9WI?ZXrs6vY^+4=_2r#2S5zA6=(%mU@Q=H~K^di~(Z=F@li@F@hjO#-LExwuPfL zYlnRw>oKj=b=MZSS{QJJ0oRangeQ*hL>tmBwEk)EM|~fQUhJzsc0)uUiVPysk6Z*1 zP)gD5_Gq;`L`MD#SQ6unZHytC%`!SVnwW2W4AdBdF(v^w#>BRW;QM~!qlt(wE-u*K z-sbG=j4%w*T2m+#D3wa&a=94t;VMo~PdPd|Vt#)9VesDG9&10W!6y(z0j}*r4Tgt@ znVp?YM0gW*uh%1$N-;JzhSvIFaI@LOAM$zi{VVdRJdJjPm*2gl(P$)qccCIeHk&1# zPRH`x(>RJELwHk(aGoE}eS%1dP|)mO!} zUCvwQ@q~rx1zvppqMvqR*xcCU{QMltx>a#-a4@lP06K^Q-gVx^;79XW3_%oNjA4C! z{n5GFwOvm9lRJe+9;g{Awq4uBaU1}amX>f`7t6A690$+ySYBTKqFSw@TfevbTCq*-L|x)K*G(kK%ylWxfBE%8&IP1AR4O}6P0MhOJbsl zmsb-Kp9~KMsXHdO=jAT&)EuEw$V2wmrLh&hFVWGd@%h6%G2$+sx#b z|9ms^{Z0OlLh(rb!iUx^U;px!k+EW^SS+Nh^12%34UJsfBK{jNW>(BtcEj~I-LrAw z%9h(pW<~sq{hxHzR+c-*k9M6s`{}cfq5Uxc>#Bf;MP$--vlpy+?2+bMR^KzBuCA`9 zzeteD(zu{0`Tc44)QHz#k6|T{R{&eF+HkDCVV(+noW2vswD0=iDf8>+ENflA>bA8T z8s^Qo=DedtZ{HX(WpF`Naipgt&iCe}rK=Mn6tB|KJ$DH#LJ?zf)15c8tb6G3H8);& z^H8p!-rT$@XqfTvQ^lgzwr!fHF8Jh~0@ZeiUbmc| zQ-V=<{DKVA5K*(Nax{o)BRqAwa*mI?SCL#cYs3AmPp+FEn_Ol?NrMI^B}}6-VVOS< z6p0DVgz|Fw@?nPZ0;NFfar?Bd5hXK(3`ay{W)iRgjKCc$21QRQ#(@{5fr78FwIUiV zBkdZLg7Jk*V5QMc2^AQI5Rr%o&rV{76986n)dROqsV<)gFq}@){#iR01_p790fP=y zR@5-<`qgMP5%oJ%Y0y$bR-#;qlwexnkR6#dD+t$4SNYzQRa0A=oHIF=(7>@HNBH3V zZHQ^$OCQ^``SmdPkvgi9Eq{PZ8l6`tPZE?gT4@%{)y6eb>Zb14K6jy$?>%IExA(Po zzdJjc5ZQ4iM3vIX+4!P0HI5dEu2+{>r)C2(}qLS9;98cag%9^IK z(9Gnb76>Jbq2nFj?mhTTM@$kkoQaqvWi5_ zwXAK5(mW?eG$bi_g6_T?JNI`DeD(S6w<)CutQBil><(&!_@~FVBDJJ(aU)LA!IwUT zpg`l|Mt=PIFj?mZgb>6tahhhea(B}jWMGiaNcMO3`ETv|q_g|`cQ)(%*@J*%Mdw80 zt@pNK2m=7yv>9@TEj9dc$o0L}g(#I?Kym#;y|CQI@?>zbSj?LN~ukug1W1BYpPXA>eL;npZ zE=yP2wE3vxr_s}|f4RjucW@i}k1GEJc2BuZXQnf*wMHsQ^}K50Gvg?&Foc0~#$oux zFs5N5guooMgKs-_y-JXK5y<}2=>*UMQ~@TibkPHgHb$GHlw^sJ8NzLMnXTrNDpX`T z4($2dOLy-9^)Zn8H`^@Wz~vLBVQx&jX}rKAVnv76QN?u+qIAf(Or=hnYelaWZgZV7z6aNJY@EiOcX0^WF Ryg!0D0`BB1}#^JwdP| z$k{z-`I?*M-ti$M*I)LrHPp%DQCo;e;9gq@Nlw9S0>OM2p43Ulq$?`{x#RQ7) zg#Qo9WO2*Q0B-tT=CNZv~B2(Y?SX0&*zn%C?Pb z0fHNY7<&!chBP7@pzRmL2LzH+cQx1w=^|9Skfdsj>nl)g<#9dsd2h5AyznOs+D`Cy zf+7&Hvm1VQf)xO~Jdom*?P@aDTM>)Kh_*$c3N!OCR{}+*2yec@+#=xT6HDB2-sAa& zh3Bg6iuo^UUHNjJp7%W@<`Yl?-w$~mDqFzv0Gr7$&k=E67`nQtAug$!+grBt_V8P7 z?!C#Ou0sU&Z)D599aug-)5-uLc1bCK)A;w|qHNswcDTg#>Bi&noD@Qg(15pQcehro zCU;X8*JX8S)5dl?EX$I!skknMrj3imBI$IRrKKgx<+39;3?m23f}3vphr+%|EH5t$ z`vzf}rl?dZPO8spHzGY*#20P^)O{}RjkxQ}tM2>WF@|8I_c;iAm{(iLSj@=?R_F8PY;KhsaQh$H!bUglU zj3(%;5qqcP^TzC@OP7zYCSCu39;Ag3Db~PW-k42K!5=_z00000NkvXXu0mjfKDd*j literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/folder-new.png b/src/Icons/oxygen/folder-new.png new file mode 100644 index 0000000000000000000000000000000000000000..bd34174a33ca1b0809041b89853a593be6f6a2ee GIT binary patch literal 923 zcmV;M17!S(P){7@b+0x69x5zf zOFuQv?|XLN)T?e*$tkpCluG{TM_od0zCn%TaxNqU^6^s_y(x2wHvU{?= zQ2($UK6)~Hxvr|PYqxW$OF zngiwx-}fJ6kqnbfa3=%_pqYdSNc3*vrR?eQb<;|C&i5N4#)hFoSUnt&;_%`a7sKOZ zlcy>5PU4%8MAXZ3l_Tt$f0ub(mcY$7yfE;q0w(4xYx{+kJ*{KxDIVirJV98pf%7X~ zEbz-h)EoFh6e*oBMiA7-16T06Lbqs)Bx8ZlYzdw4tRRBKL;v)K!;%|%&Ei62Rqxk>;002ovPDHLkV1lSPvy%V- literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/remove.png b/src/Icons/oxygen/remove.png new file mode 100755 index 0000000000000000000000000000000000000000..e3a4422e7d905ad9e63b9849f626bacab2aa786b GIT binary patch literal 1270 zcmVrqyLa#2nN%uuK~WU{&fRSowul;walZ%+(QVXM z2dS=-P@HwFQjwcCu2U!!jJbb8~Y8jg5^{p-|{Y5nya=>})g|<<_lRoH})i zQqkb0efw!`X~i^6L>$Uxi_(r3e0CeQc!qFDBp3`535n}tgNiCu&{t_+nNUxMNtQ^ zEDOUhP*oL4l8D7(D2hUJb2Fh(h;TTJBuT8VuTv_Ouq><6NZo@01^#EbuFK=X5}Czi z!jWo{G|(8?`IJr&gn|ciU02^KFl>VlZ=OTdMe3`PT)p!vQas2&&sW5K@vU;*Yk(+< zOIvR*O_8Tu%QcC z^wAXEP0$ylr{PUjtW{5I+ct`#OnYgnsybaM=3nMC`AnXZttYu54b#2j2(skkbm#lz zgd89Leu4Rg%Y63CCu}2tWm$-#IPFE&+uN&~=0@z>W z{c%d=61HP=Df=A&rfFt-dwc(_8GvP3X@Dz*-!NSZNsxGupQLPi?MIbWj<*~KpyU`& z*m-GgdbkffSMRF>peOkTZ*6~@Y<8pAC9BBD%ysrRyvj#aACNP3uspjbVXo`m0s0OE z_HixR!E5ouoV)fO`qB!rZgcR39)9@yd%m3fnsP|yLi2gBz;T>A6^554kgANMcN^bf zB0tHrHpNP5nN@umZ9Tu~6%NE+VVBZ~>$_eF$WLRp2o&2doPJ{ZIr!kN_130wEy0x&462#)B?w go<+a_*4<6WKbYACWl@6bOaK4?07*qoM6N<$f{#i=GXMYp literal 0 HcmV?d00001 diff --git a/src/createtorrent.ui b/src/createtorrent.ui index 15fd310c2..8be9532a3 100644 --- a/src/createtorrent.ui +++ b/src/createtorrent.ui @@ -62,22 +62,22 @@ - Add a file + Add file - :/Icons/add_file.png:/Icons/add_file.png + :/Icons/oxygen/document-new.png:/Icons/oxygen/document-new.png - Add a folder + Add folder - :/Icons/add_folder.png:/Icons/add_folder.png + :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png diff --git a/src/icons.qrc b/src/icons.qrc index 358f61c1e..1459dab54 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -6,10 +6,8 @@ Icons/sphere2.png Icons/downarrow.png Icons/url.png - Icons/add_folder.png Icons/locale.png Icons/loading.png - Icons/add_file.png Icons/magnet.png Icons/sphere.png Icons/uparrow.png @@ -76,6 +74,7 @@ Icons/oxygen/view-refresh.png Icons/oxygen/file.png Icons/oxygen/time.png + Icons/oxygen/folder-new.png Icons/oxygen/edit-paste.png Icons/oxygen/proxy.png Icons/oxygen/log.png @@ -88,11 +87,13 @@ Icons/oxygen/edit_clear.png Icons/oxygen/download.png Icons/oxygen/gear.png + Icons/oxygen/remove.png Icons/oxygen/browse.png Icons/oxygen/unsubscribe16.png Icons/oxygen/subscribe.png Icons/oxygen/edit-copy.png Icons/oxygen/bt_settings.png + Icons/oxygen/document-new.png Icons/oxygen/webui.png Icons/oxygen/list-remove.png Icons/oxygen/connection.png diff --git a/src/rss.ui b/src/rss.ui index a970117a8..f7528abd2 100644 --- a/src/rss.ui +++ b/src/rss.ui @@ -159,31 +159,40 @@ p, li { white-space: pre-wrap; } - + - :/Icons/oxygen/unsubscribe16.png:/Icons/oxygen/unsubscribe16.png + :/Icons/oxygen/remove.png:/Icons/oxygen/remove.png - Delete feed + Delete + + + Delete - + :/Icons/oxygen/edit_clear.png:/Icons/oxygen/edit_clear.png - Rename feed + Rename + + + Rename - + :/Icons/oxygen/view-refresh.png:/Icons/oxygen/view-refresh.png - Update feed + Update + + + Update @@ -255,7 +264,23 @@ p, li { white-space: pre-wrap; } RSS feed downloader + + + + :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png + + + New folder + + + + + QWebView + QWidget +
QtWebKit/QWebView
+ + diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp index b29ca18cd..235668db9 100644 --- a/src/rss_imp.cpp +++ b/src/rss_imp.cpp @@ -46,28 +46,30 @@ void RSSImp::displayRSSListMenu(const QPoint& pos){ // No item under the mouse, clear selection listStreams->clearSelection(); } - QMenu myFinishedListMenu(this); + QMenu myRSSListMenu(this); QList selectedItems = listStreams->selectedItems(); if(selectedItems.size() > 0) { - myFinishedListMenu.addAction(actionUpdate_feed); - myFinishedListMenu.addAction(actionMark_items_read); - myFinishedListMenu.addSeparator(); + myRSSListMenu.addAction(actionUpdate); + myRSSListMenu.addAction(actionMark_items_read); + myRSSListMenu.addSeparator(); if(selectedItems.size() == 1) { - myFinishedListMenu.addAction(actionRename_feed); + myRSSListMenu.addAction(actionRename); } - myFinishedListMenu.addAction(actionDelete_feed); - myFinishedListMenu.addSeparator(); - myFinishedListMenu.addAction(actionCopy_feed_URL); + myRSSListMenu.addAction(actionDelete); + myRSSListMenu.addSeparator(); + myRSSListMenu.addAction(actionCopy_feed_URL); if(selectedItems.size() == 1) { - myFinishedListMenu.addSeparator(); - myFinishedListMenu.addAction(actionRSS_feed_downloader); + myRSSListMenu.addSeparator(); + myRSSListMenu.addAction(actionRSS_feed_downloader); } }else{ - myFinishedListMenu.addAction(actionNew_subscription); - myFinishedListMenu.addAction(actionUpdate_all_feeds); + myRSSListMenu.addAction(actionNew_subscription); + myRSSListMenu.addAction(actionNew_folder); + myRSSListMenu.addSeparator(); + myRSSListMenu.addAction(actionUpdate_all_feeds); } - myFinishedListMenu.exec(QCursor::pos()); + myRSSListMenu.exec(QCursor::pos()); } void RSSImp::displayItemsListMenu(const QPoint&){ @@ -389,9 +391,9 @@ RSSImp::RSSImp(bittorrent *BTSession) : QWidget(), BTSession(BTSession){ connect(listNews, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayItemsListMenu(const QPoint&))); // Feeds list actions - connect(actionDelete_feed, SIGNAL(triggered()), this, SLOT(deleteSelectedItems())); - connect(actionRename_feed, SIGNAL(triggered()), this, SLOT(renameFiles())); - connect(actionUpdate_feed, SIGNAL(triggered()), this, SLOT(refreshSelectedStreams())); + connect(actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedItems())); + connect(actionRename, SIGNAL(triggered()), this, SLOT(renameFiles())); + connect(actionUpdate, SIGNAL(triggered()), this, SLOT(refreshSelectedStreams())); connect(actionNew_subscription, SIGNAL(triggered()), this, SLOT(on_newFeedButton_clicked())); connect(actionUpdate_all_feeds, SIGNAL(triggered()), this, SLOT(on_updateAllButton_clicked())); connect(actionCopy_feed_URL, SIGNAL(triggered()), this, SLOT(copySelectedFeedsURL()));