From b9ce7d037ff606ac6b12c30cabe58a8500a8df13 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 22 Nov 2011 18:31:44 +0100 Subject: [PATCH] - renamed icons to mirall instead of ownCloud - install of desktop file icon added --- mirall.qrc | 10 +++++----- resources/{ownCloud-128.png => mirall-128.png} | Bin resources/{ownCloud-22.png => mirall-22.png} | Bin resources/{ownCloud-24.png => mirall-24.png} | Bin resources/{ownCloud-32.png => mirall-32.png} | Bin resources/{ownCloud-48.png => mirall-48.png} | Bin resources/{ownCloud-64.png => mirall-64.png} | Bin src/CMakeLists.txt | 3 ++- src/mirall.png | Bin 0 -> 1408 bytes src/mirall/createanowncloudpage.ui | 2 +- src/mirall/folder.cpp | 2 +- src/mirall/folderwizardtargetpage.ui | 2 +- src/mirall/statusdialog.ui | 2 +- 13 files changed, 11 insertions(+), 10 deletions(-) rename resources/{ownCloud-128.png => mirall-128.png} (100%) rename resources/{ownCloud-22.png => mirall-22.png} (100%) rename resources/{ownCloud-24.png => mirall-24.png} (100%) rename resources/{ownCloud-32.png => mirall-32.png} (100%) rename resources/{ownCloud-48.png => mirall-48.png} (100%) rename resources/{ownCloud-64.png => mirall-64.png} (100%) create mode 100644 src/mirall.png diff --git a/mirall.qrc b/mirall.qrc index 0472e06e2..05db6b7c1 100644 --- a/mirall.qrc +++ b/mirall.qrc @@ -1,14 +1,14 @@ - resources/ownCloud-32.png - resources/ownCloud-64.png - resources/ownCloud-128.png + resources/mirall-32.png + resources/mirall-64.png + resources/mirall-128.png resources/folder-grey-32.png resources/folder-remote-32.png resources/folder-grey-22.png resources/folder-remote-22.png - resources/ownCloud-22.png - resources/ownCloud-48.png + resources/mirall-22.png + resources/mirall-48.png resources/folder-grey-48.png resources/folder-remote-48.png diff --git a/resources/ownCloud-128.png b/resources/mirall-128.png similarity index 100% rename from resources/ownCloud-128.png rename to resources/mirall-128.png diff --git a/resources/ownCloud-22.png b/resources/mirall-22.png similarity index 100% rename from resources/ownCloud-22.png rename to resources/mirall-22.png diff --git a/resources/ownCloud-24.png b/resources/mirall-24.png similarity index 100% rename from resources/ownCloud-24.png rename to resources/mirall-24.png diff --git a/resources/ownCloud-32.png b/resources/mirall-32.png similarity index 100% rename from resources/ownCloud-32.png rename to resources/mirall-32.png diff --git a/resources/ownCloud-48.png b/resources/mirall-48.png similarity index 100% rename from resources/ownCloud-48.png rename to resources/mirall-48.png diff --git a/resources/ownCloud-64.png b/resources/mirall-64.png similarity index 100% rename from resources/ownCloud-64.png rename to resources/mirall-64.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7e86e5524..56d7b6ab8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,6 +78,7 @@ endif(CSYNC_FOUND) install(TARGETS mirall RUNTIME DESTINATION bin LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib ) +install(FILES mirall.png DESTINATION share/icons/hicolor/48x48/apps ) diff --git a/src/mirall.png b/src/mirall.png new file mode 100644 index 0000000000000000000000000000000000000000..8731afb9e3df94696dd32640ab94d1ea97551243 GIT binary patch literal 1408 zcmV-`1%LX9P)w<^U6t{Fs30RcEB9@hoNz=&$WrO&|QW#sM(v7wdg$?$_ImYyZ9~K8=!U`HtCai0{ zvQ<$UNOd4&jXjA?nC9xmb8%iK?!7dLM$hDob=}~85cJ-?clZCj_xu0e{~dq|6)IGy zP@zIa*3dld2d=NLo6#RCe(BL@G{XOa01Dhb>JK}{=9U;QzXCc!3zlLXoP0TtEiE|M zf{1wjvji6Yl$_UYKeW38qU`-PD+6yE^-YLG?=vTWW*W=Go{&i>5-s^~_<`NaN79aq zlQ{9TSK|3y>wEF%5t#dm0x1AM8lgYZ0hxlw=ot0GF+J%(|DJzl1Ry**05hLZ$?IGT z40%F|hKkY}+zW^{Gzo3-CKjy*yH^6w?PB(=uy~V6Y1CODAWDi~<_?PBy>P+dsjhbT zT3bhiyLTU==i2_g6~MB=K+?gp59Bd)5s>X_p>?UjqXfsRfUzcuAh0a{F+~jx1BgV{ z3BDTw927NxxOy4*aRMY>0(}*c(t*|y@Scf8+08keyw2vv0#87z)4{7ZZuAm`g-!cH0P7S5Kd?FYB#CAQ+{7BJ@*l&PSD6Ybjdpk| z_$K%}I+ATASFZ|%b#(>%BB7<}C8u2Q7&*QOXboQ|4ju#dC67~Jv07vKptD#Yudd}vXn+1=&EQk+y_4wg1$$_tH5@NL1K9!F?s2$@a*=;me!xGl1SDKiB>m9>J0b7e)q z%-G;!S=kc;TY-s`Toa(+balGbNRg1Vu;83-Y_vzbUPS@mB=-1RS$lYlxcPf|0(eDc zKcnDHQ;qaBy1(ObAP5 zzpx@@I4+28)amzg83`Vz0J@e2#?Amm7wwrq4xwOjqKnqY_a2W( zg5-=Jm{JK~*THrszlx{?xcyCR6-WaKzWT$^82SUwOmQ%=%Iukdfg}}prIwoMnXyh@ znY4#~35{$f5hIYvs<5&>KmoNee0R> z%<@5H`}|Z5MEt2%OEM(4jR5}qkylYseYCqrLd?4BpsGL|k(j^3jQ_ZEQrU>#)`7P;62^>LZsK4J94TX}? z$)V+^c#lczlNG7b)zaFA>?9PM0wuxyJ8Q3}nxC$}sYk9R35 zr#F41;x;=~oTPbcdzueiLb`e;UOXlelgs8{qe6uW6)IGyP>}`x5nup?Q#FEkn#be- O0000 - :/new/mirall/resources/ownCloud-32.png + :/new/mirall/resources/mirall-32.png diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index e25baab71..62b3051a2 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -232,7 +232,7 @@ QIcon Folder::icon( int size ) const { QString name; - if( _backend == "sitecopy") name = QString( "ownCloud-%1.png" ).arg(size); + if( _backend == "sitecopy") name = QString( "mirall-%1.png" ).arg(size); if( _backend == "unison" ) name = QString( "folder-%1.png" ).arg(size); if( _backend == "csync" ) name = QString("folder-remote-%1.png").arg(size); diff --git a/src/mirall/folderwizardtargetpage.ui b/src/mirall/folderwizardtargetpage.ui index fefdf19d5..2d4297d4f 100644 --- a/src/mirall/folderwizardtargetpage.ui +++ b/src/mirall/folderwizardtargetpage.ui @@ -105,7 +105,7 @@ - :/new/mirall/resources/ownCloud-48.png + :/new/mirall/resources/mirall-48.png diff --git a/src/mirall/statusdialog.ui b/src/mirall/statusdialog.ui index dd630c6ec..fe25a1385 100644 --- a/src/mirall/statusdialog.ui +++ b/src/mirall/statusdialog.ui @@ -71,7 +71,7 @@ - :/new/mirall/resources/ownCloud-128.png:/new/mirall/resources/ownCloud-128.png + :/new/mirall/resources/mirall-128.png:/new/mirall/resources/mirall-128.png