From 25ead318da11b04e7cf0bdccb5f921a24e0c5000 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Tue, 14 Dec 2010 19:13:02 +0000 Subject: [PATCH] Better icon theme integration --- src/Icons/oxygen/insert-link.png | Bin 0 -> 1881 bytes src/Icons/skin/open.png | Bin 2730 -> 0 bytes src/Icons/skin/url.png | Bin 2509 -> 0 bytes src/icons.qrc | 3 +-- src/mainwindow.cpp | 6 +++--- src/mainwindow.ui | 1 - src/webui/html/index.html | 8 ++++---- 7 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 src/Icons/oxygen/insert-link.png delete mode 100644 src/Icons/skin/open.png delete mode 100644 src/Icons/skin/url.png diff --git a/src/Icons/oxygen/insert-link.png b/src/Icons/oxygen/insert-link.png new file mode 100644 index 0000000000000000000000000000000000000000..1347a931a79c5cbc558341f26598a9ffdd38d597 GIT binary patch literal 1881 zcmV-f2d4OmP)pfDxp=Td*Yi_wN@73=HH?N=lNWg8DxyD(VY!bMrO!_V$PR`uey% zJw4wcu@y!kPVHGR0Evl-^yK7Z+kN}?#iypGW~Ha6XQ!m3BzSv!N7~rfC>kp zAmBl3YwPLc3j+XE%EraTg_oC?m!ZXj{r&w@sCKHlx_T%$IJgTlAH(O|?c28>F*7q$ zqxLKqfY8uT>Bz{);Op0~H$HpzYywH^)6&uohJ}UY@7c4bv$3)9Er-LIMBD$^x^?RY zYR`fJfRV^z&LNOf)2mmnCJGA+OXK6?t?_I&F)?9PRaL!!&c`s0NklnDqKkb?76gEk zlM@2~B9Od|$Ky@0SS)r#M1+N}uP=S=+O^hsd3l_R7cV{mmKdhK9+yy1JAa?1Sz0sl3FDz zE9-Up_U$K^FJJD!Wg;9*j)tXX0E8B`MpILB1+?w}#uwti89jCCR0GzzqZ`uywtX2w zA+**b)BL;^&-KdJJa!lB^jtf@FDWVM2*ddkEq#eumJJOJjiSn4RBMUK#h?y5KR>?$ zTr7FHxw-Y0mX<#73B`|QzRcjX61SzVg>d?siOcVsd2azo0~_ova;&H4L6*43eTTE7sP)4_kU|$fgEY>Zzi064lyfJCv#Q- z?rTOM;W?1-Z=CN07mdF#?-H~<6FR^7@ZrO896Al?gb&3J>=8i7A?S$zx}cKHAXVK} z?_yK2%G>~e#R|Ag#K6a&wYRtPGBPrHG3QB`%UihHTYNqYgSn`!t?jO-r>FSd%*9j- zRg(oX1$p!|F~Uft6V1#ug#ECbush0$X@Mp&0SK!yO~R}+8OeW;cw|O$Fqq-*?{5b7 z_d@?qaMB%EzkYo*4wyLn&DGJ-`CdguB@tn#uC6YQaebikRfkq_b8hC4V|R~{qnxAU zcnhK}mlU< zlPXbUNfNm{2C=`O$$kH&LB!3?O}(L^!4=H*$A!`ugp;0T^<0DRTfQjTH?$Gq5Md$` zB0>~nG5JB6XK_v?cKWClz+GLwwYAj(Z!Pxld|i-G z3d!G9IG+#?6ei~9H3+lXkSM1}%_Je1P206=7acDQ>p?CPbU_&x50UvNr#j~^rX0o~ z#y_i&-PgV%@+tJ003bDC+}l+jKYpx*s%4Q}5VM{C`@$pZm9Jk1%C8BRd81yqh8Ubw zBlKjUnMMSYk%rFYK|oQsnE)zZptmJw$TCnsGU3Z~iFol*(G=kk!L$_#AFuld{V)@K T9Z5M(00000NkvXXu0mjfRey+A literal 0 HcmV?d00001 diff --git a/src/Icons/skin/open.png b/src/Icons/skin/open.png deleted file mode 100644 index f7fdb5d3cb5c9817f9dad2773fe9fcd03b1117cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2730 zcmV;b3RU%qP)g;)LAn+;2^nlmaQV4PBMX5&xbr9)SBFeP*}IrQR&ct^*L|CQ+2=S0X(j6E?ia)^RL2HZya^HjP&eLx1V% zNA5fIe*rjn^r==wao-~;>fM4U2Lw?ezY-iWQDguFe2l>1=GZpC05BkyLEnwAmDB&2 z%W2O&d-Q>+FARWoy+=_!hXj|pUldgck_?yPLQQ2ks>_Q}>GQ%@UKS+W8vZj+|auh zotqj^U**g1S}5#%!zI6r!#~W$Qka^LA#^DMP$X=Vg9sXW=CP+9KKSZq0^mD$7d;`8 zbHU|Ccya_kx@|vn+M%p^;3+PH;`Wk%;ZxJ*6aeJE*f>8E#pu)`GMP2N&?zcfFsG#t zZ;XU^Sb3uJWN&U`Rm>we|+53JyL&Rs0$3hMk7sB7v%|G*%=v}qISYW&<%sRZ8XdyjTD z0bgYe0*&o(HZ%hJ$0K3quZ@8#s5UgrhNBd2o9@{A70WtDZyxz51+3LnZ^_?9*&6@> z5D9J9raI_LA#`8ej!R-zkm{c3OVIi8xk~^CdRlZy7z$7dzk-A|s20xfVG#bU&*cgU~hf!T!jazQHh2L9V zCh}RE!W{?NP+2M?nbL4>Xb_WQXW_1F17(B?&MMS}#oLsKYF^s)jhlZ)t=BBd3eP=7 z5303-+6oa`HVJoeH4hye6FaxH;>$ZWqc0f3p+ko_kYmS=p{%S7tE;P=l2&7vuxncl zc61h_dy5aLwG_@xr{Svz@Z#j1Kx?s72)3CO^HZ(B?KETp&7C;*#u(-nm*6W_VC!M3 z+5{4bD8)nIKV~6kMYwO@J{&%L7)3=z^gMytg#>{+Pk1$AKpj4hfl@COWGYD>$Q7F* zoW%0}96@Xm`A8M;5yh&sm|WS3*?DqkQ{h+{T2Mzxk&0}ZdRg+KA>hSB4;{hy_&9I7 zo}M1~d_IK3Vbs(#BXnVs!keO?Wf6{LDT=-VZ991YWE_Ve_~lQd)Uv8t42+(^bz4el z_>>c1_L>T}A`zAd?)ctUFgG7TU*CW5;)^e$t*s4#KmbciOUSit!^qPixqSrh&zrr|CBts+|;~af4D& z!kN=%dSTrc+pO(Oi%dpgV|y^NpqJdfIOhLdTPc3zCg*n28lLC^7-bG#uYO-Q*xRT43k?d-3+Dg>-5WdUgtWW`=AIiO4Ww^8-l6 z=gBT1xk}enx*uP_gST}cIJ`tdCrQ!BQdjx7GRm)SbH{nzXw8`9TYCT0@s-z4544ir z>t?xUTp&uUPbHe)DnMAuN8!y*osdH&Yo>@e~%;#m2?8lEk|G2Drf9_Dv3$lk~0Tqvur)N>1F-1^v)J00A@yXU!bgdtaSlPno53W4(QB}&_YjIoN?~Ye0>C02q z9=S{rG3iVPj;kHf-p?wO6#*+wStWoXlNUCn#D(IrDhjC|{)S)BtXM-latZ%>>loJF zJddWT9JV%OalEaCx{NVTdW2Y58Op% z`BZs+Vxzq1IaL3NN^j$ke{jETY1RJ3WdY`GTK^xR01%h204WC20# z6QcAo05o8PgTMU!O_HoW;y~QSdO;+a&F{9Z-F&A6aKzEH{aFU*nZ`mvfJBjlDuV+ zV6vRf3!D#_iL%5`N_h=vkyDGD=XjkMv||<#i@L()qT123@6Ak%{Q2Zde|nQ%PZmsL z!4vqzVC(`Ek(H8N!RAq8`__)FJHNWGGSIk-j%P)DN>CakrW<6Y9p%dba1aIu!FruI zo&f0SSa`PYgZ|U6&4xzU=wzaSh6)m7G*pn?7y$-?MjtB4D%P(ZUDsb<*V@rl?yqlA z+#Zi0tRGH4J|KM*P$y64hL+7PN9LyIr^e5YpFMMio-C8aHe6Sja~^?D)PT4lA|(Yt zHDrzC|GKK$#;(%xs``@B@=_WwZq-}Nk?7eqTT7+1RAMEOT#3#tEzF)J{{!@BmTa-$ kFja7BIC*i%|NbYy05LF;JTFWqSpWb407*qoM6N<$f)QB^wEzGB diff --git a/src/Icons/skin/url.png b/src/Icons/skin/url.png deleted file mode 100644 index 3995aab8ae1d88ec7ddefc35ddf0337a3134debc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2509 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 X6F@qbbMf9M00000NkvXXu0mjfL|?;5 diff --git a/src/icons.qrc b/src/icons.qrc index 3cf7f1b17..008bb082e 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -17,7 +17,6 @@ Icons/skin/tabs.gif Icons/skin/qbittorrent16.png Icons/skin/connected.png - Icons/skin/url.png Icons/skin/qbittorrent22.png Icons/skin/disconnected.png Icons/skin/mascot.png @@ -29,7 +28,6 @@ Icons/skin/handle-icon-horizontal.gif Icons/skin/qbittorrent32.png Icons/skin/knob.gif - Icons/skin/open.png Icons/skin/filterall.png Icons/skin/uploading.png Icons/skin/queued.png @@ -295,6 +293,7 @@ Icons/oxygen/edit-clear-history.png Icons/oxygen/edit-copy.png Icons/oxygen/folder-documents.png + Icons/oxygen/insert-link.png Icons/oxygen/network-wired.png Icons/oxygen/mail-mark-read.png Icons/oxygen/go-up.png diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dc233afa1..4c939b409 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -101,8 +101,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo connect(static_cast(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession())); // Setting icons this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); - actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); // FIXME - actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png"))); // FIXME + actionOpen->setIcon(misc::getIcon("list-add")); + actionDownload_from_URL->setIcon(misc::getIcon("insert-link")); actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png"))); actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); @@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo actionPause_All->setIcon(misc::getIcon("media-playback-pause")); actionStart->setIcon(misc::getIcon("media-playback-start")); actionStart_All->setIcon(misc::getIcon("media-playback-start")); - action_Import_Torrent->setIcon(misc::getIcon("list-add")); + action_Import_Torrent->setIcon(misc::getIcon("document-import")); actionShow_console->setIcon(misc::getIcon("view-calendar-journal")); QMenu *startAllMenu = new QMenu(this); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 2c806b272..9b5b77ae7 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -123,7 +123,6 @@ false - diff --git a/src/webui/html/index.html b/src/webui/html/index.html index 134771b7f..7de33792d 100644 --- a/src/webui/html/index.html +++ b/src/webui/html/index.html @@ -35,8 +35,8 @@
  • _(File)
    • @@ -70,8 +70,8 @@
    - - + +