From 01e9343d8baaef762e53efe2e8eddf5702f121c6 Mon Sep 17 00:00:00 2001
From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Sat, 18 Jan 2020 17:47:17 +0100
Subject: [PATCH] Cleanup/Removal/Adaption/Update to resource files and
crresponding code, esp. regarding svg usage
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---
client.qrc | 43 ---------------
resources.qrc | 6 +++
resources/account.png | Bin 1439 -> 0 bytes
resources/account@2x.png | Bin 2777 -> 0 bytes
resources/activity.png | Bin 1129 -> 0 bytes
resources/activity.svg | 10 ----
resources/activity@2x.png | Bin 1993 -> 0 bytes
resources/add.png | Bin 16561 -> 0 bytes
resources/bell.svg | 4 --
resources/close.svg | 4 --
resources/delete.png | Bin 243 -> 0 bytes
resources/link.svg | 1 -
resources/lock-http.png | Bin 479 -> 0 bytes
resources/lock-http.svg | 5 --
resources/lock-http@2x.png | Bin 583 -> 0 bytes
resources/lock-https.png | Bin 291 -> 0 bytes
resources/lock-https.svg | 4 --
resources/lock-https@2x.png | Bin 375 -> 0 bytes
resources/more.svg | 5 --
resources/network.png | Bin 879 -> 0 bytes
resources/network@2x.png | Bin 2556 -> 0 bytes
resources/public-white.svg | 1 -
resources/settings.png | Bin 1950 -> 0 bytes
resources/state-error.svg | 1 -
resources/state-info.svg | 1 -
resources/state-sync.svg | 1 -
resources/state-warning.svg | 1 -
.../kmessagewidget/kmessagewidget.cpp | 2 +-
src/gui/CMakeLists.txt | 3 +-
src/gui/folderstatusdelegate.cpp | 4 +-
src/gui/folderstatusmodel.cpp | 2 +-
src/gui/main.cpp | 2 +-
src/gui/settingsdialog.cpp | 6 +--
src/gui/sharelinkwidget.cpp | 22 ++++----
src/gui/sharelinkwidget.ui | 24 ++++-----
src/gui/shareusergroupwidget.cpp | 17 ++----
src/gui/shareusergroupwidget.ui | 6 +--
src/gui/shareuserline.ui | 6 +--
src/gui/sslbutton.cpp | 4 +-
src/gui/tray/ActivityListModel.cpp | 6 +--
src/gui/tray/UserLine.qml | 2 +-
src/gui/tray/Window.qml | 4 +-
src/gui/wizard/owncloudadvancedsetuppage.cpp | 4 +-
src/gui/wizard/owncloudsetuppage.cpp | 4 +-
src/gui/wizard/owncloudwizardresultpage.cpp | 3 +-
src/libsync/CMakeLists.txt | 4 +-
src/libsync/theme.cpp | 49 ++++++++++--------
theme.qrc | 16 ++++++
{resources => theme}/account.svg | 0
theme/add.svg | 1 +
{resources => theme}/change.svg | 0
theme/close.svg | 1 +
.../add-color.svg => theme/colored/add.svg | 0
.../colored/delete.svg | 2 +-
{resources => theme/colored}/folder.svg | 0
theme/colored/state-pause-128.png | Bin 3004 -> 0 bytes
theme/colored/state-pause-16.png | Bin 457 -> 0 bytes
theme/colored/state-pause-256.png | Bin 6248 -> 0 bytes
theme/colored/state-pause-32.png | Bin 769 -> 0 bytes
theme/colored/state-pause-64.png | Bin 1598 -> 0 bytes
{resources => theme}/confirm.svg | 0
{resources => theme}/copy.svg | 0
theme/delete.svg | 1 +
{resources => theme}/files.svg | 0
theme/lock-http.svg | 1 +
theme/lock-https.svg | 1 +
theme/more.svg | 1 +
{resources => theme}/network.svg | 0
{resources => theme}/public.svg | 0
{resources => theme}/settings.svg | 2 +-
{resources => theme}/settings@2x.png | Bin
71 files changed, 117 insertions(+), 170 deletions(-)
delete mode 100644 client.qrc
create mode 100644 resources.qrc
delete mode 100644 resources/account.png
delete mode 100644 resources/account@2x.png
delete mode 100644 resources/activity.png
delete mode 100644 resources/activity.svg
delete mode 100644 resources/activity@2x.png
delete mode 100644 resources/add.png
delete mode 100644 resources/bell.svg
delete mode 100644 resources/close.svg
delete mode 100644 resources/delete.png
delete mode 100644 resources/link.svg
delete mode 100644 resources/lock-http.png
delete mode 100644 resources/lock-http.svg
delete mode 100644 resources/lock-http@2x.png
delete mode 100644 resources/lock-https.png
delete mode 100644 resources/lock-https.svg
delete mode 100644 resources/lock-https@2x.png
delete mode 100644 resources/more.svg
delete mode 100644 resources/network.png
delete mode 100644 resources/network@2x.png
delete mode 100644 resources/public-white.svg
delete mode 100644 resources/settings.png
delete mode 100644 resources/state-error.svg
delete mode 100644 resources/state-info.svg
delete mode 100644 resources/state-sync.svg
delete mode 100644 resources/state-warning.svg
rename {resources => theme}/account.svg (100%)
create mode 100644 theme/add.svg
rename {resources => theme}/change.svg (100%)
create mode 100644 theme/close.svg
rename resources/add-color.svg => theme/colored/add.svg (100%)
rename resources/delete-color.svg => theme/colored/delete.svg (83%)
rename {resources => theme/colored}/folder.svg (100%)
delete mode 100644 theme/colored/state-pause-128.png
delete mode 100644 theme/colored/state-pause-16.png
delete mode 100644 theme/colored/state-pause-256.png
delete mode 100644 theme/colored/state-pause-32.png
delete mode 100644 theme/colored/state-pause-64.png
rename {resources => theme}/confirm.svg (100%)
rename {resources => theme}/copy.svg (100%)
create mode 100644 theme/delete.svg
rename {resources => theme}/files.svg (100%)
create mode 100644 theme/lock-http.svg
create mode 100644 theme/lock-https.svg
create mode 100644 theme/more.svg
rename {resources => theme}/network.svg (100%)
rename {resources => theme}/public.svg (100%)
rename {resources => theme}/settings.svg (99%)
rename {resources => theme}/settings@2x.png (100%)
diff --git a/client.qrc b/client.qrc
deleted file mode 100644
index bb284644a..000000000
--- a/client.qrc
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- resources/settings.png
- resources/settings@2x.png
- resources/activity.svg
- resources/activity.png
- resources/activity@2x.png
- resources/network.png
- resources/network@2x.png
- resources/lock-http.png
- resources/lock-http@2x.png
- resources/lock-https.png
- resources/lock-https@2x.png
- resources/account.png
- resources/account.svg
- resources/more.svg
- resources/delete.png
- resources/close.svg
- resources/bell.svg
- resources/link.svg
- resources/files.svg
- resources/state-error.svg
- resources/state-warning.svg
- resources/folder.svg
- resources/network.svg
- resources/settings.svg
- resources/public-white.svg
- resources/public.svg
- resources/confirm.svg
- resources/copy.svg
- resources/state-sync.svg
- resources/add.png
- resources/add-color.svg
- resources/state-info.svg
- resources/change.svg
- resources/delete-color.svg
-
-
-
- src/gui/tray/Window.qml
- src/gui/tray/UserLine.qml
-
-
diff --git a/resources.qrc b/resources.qrc
new file mode 100644
index 000000000..60e0f0a6e
--- /dev/null
+++ b/resources.qrc
@@ -0,0 +1,6 @@
+
+
+ src/gui/tray/Window.qml
+ src/gui/tray/UserLine.qml
+
+
diff --git a/resources/account.png b/resources/account.png
deleted file mode 100644
index e2eede81db25c64e702b6a29f782675bb5f67105..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1439
zcmV;Q1z`G#P)aUp{jejy!QslPogOL
zLRBMY8eJOTdERRzkEY>J)$fflZ>b}p&L%I(Ik$+d!uS2dB!|+b{%x+k`F#Gc
zb-mUJeg6m<`=;v&s`>ZtS~tLY2B>O7#MuJV`sT>G0U|OF!20_d07%Z;=5(UjLlr*gsBPWUY(;
z{_N7y()BE~W!4-e`Fqk>5m|7lWjiu!j*|Q*X>1lf!A*a)ng=|0#HmZ>yB7d)ya0deQ|kt
zIdzdVl>wupqva@yUIZ|aR!FxXxenk<-}leW&CS(&=IOdUIS;}3otsH&c=R;wR(bDAWv0i{xDTtr?cd3VneGk~gI
zj-u$Dr1gVD>wrq75_q2X%5Hyn03i98@B438DwVxS;uEa|+wJxH)>+3H8
zI2{+5bR~FyIz2mr(Ii2MGC)LJzuT>YWTJD4Ni(4D3;=LXlAxp+FqBTqjv!a5RDzkA
zne{sb#TpQXVSZp>pkPl|c8H>A4}g_B#l#MQLZQ%)=??%1f*^Jn#AZMgMMZ}P9-P7$
z6FU*c8sK?eKaPI@faiJXGk|0bFqtXmE@VYphOj+N~IFy
za=9ZUp965vhB`;+0JyBGlhf1FKPI`M>!Rqy#6(F|pH
zVzDS9!%-9si^wp5VE{w8b#O8u8K`OiVDnOvZB=anXsK$8WQ%0e7*iLKx-sUOG3Htj
t1lKNIy7Z^bZwNE_bapqRKeu@n@h_j=f
diff --git a/resources/account@2x.png b/resources/account@2x.png
deleted file mode 100644
index c227f8d776cc3ca292afe2f5d886605fc212ddc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2777
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
diff --git a/resources/activity.png b/resources/activity.png
deleted file mode 100644
index a05e841c85f02c6e14def6bde8bb4e20edee4248..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1129
zcmV-v1eW`WP)qr!a&wnIYPDBtfB#?xFUAWoO&)|K4r}ynULSu3q9+se
zUt&Z6$8k;pG#tnId;%;^{Dhf_KBEJC-|rDoornm4aRJ;ai*0RfHHoMTfQal6plS!4
z5fPRjk|Z%MKxGc7)oLBrbvw(ezreTvl{f$ZT-QBYJ??p)aRDlEKoA675oxX-kK@?5
z0Hr$sK%Izs0O;i(Gyf2gA7$5nkJ1GQg5Z>h8mq@`*a3)2o&sSQHUONgEPP8oz5qnj
zW9Isr?>@EwySuwhX6~;0K21|A1SoS2_$BnbD$Hz!0Hru!Z*Q*ypz~H6TLjSV002mm
z!de3ODfCYJ-4xkp6x#q&K=45BC+6dhz^0a~qAlbO3F-z@?l
zM6_|}QIY2oo{5Oj&_hK1(P$Lu7)aZ1fg-fqZ9hqpzcMzT&StYe?(gq&?fa`#`gC|5
zA`)(pq|bGoJds5LWLZ!}WRfIF?$D#cmiGk1ERC4CQ0P&PsdKQrxUQQ;favb-u2ASv
z*48~>9$VO)Ui?d@0g7m;W<9BL0eDvVEo*=!bip0|3ql+dHXxB!mh{Nex+
z8C+jqmlAqZ7#G0vyf97EME+TzVStHIRyYrgCHn1
z^r$fI03r&RnV9+f;^Lyz(4)e*1L$WAo;*H2mL7Uk7fJuxyz%>5>tAiZ+S4m1F00000NkvXXu0mjfTBq|V
diff --git a/resources/activity.svg b/resources/activity.svg
deleted file mode 100644
index 496b7cad8..000000000
--- a/resources/activity.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/resources/activity@2x.png b/resources/activity@2x.png
deleted file mode 100644
index 8d4ae9f70eef2d52e0bab0d7a21ee096bb8f9eaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1993
zcmXX{2~<7z`v)lmw7Oq(;hJe8sZ4pES%@@NYd_)ET31H+Yt0htt
zLHJ)Q(*i7r3||o|ijay5{R|;RK?0FU1VovFLZjG!WB*(0zI)GE`<#8we)ryY*4<5D
zY-DZ(0LH?d{Jm(#b;E#&-i=(p7Bnr1b`kC~K+j2oKpC=#nljOX~ZFB4OF~t=(
z4Ba{l40d}|xR>ozw=JJBke(h7>zTIEm{ebR8g@6w&q^#gllqIROOVIZLBGMk2>#z^A`?qel1~u?M4RckHv|`
zccV^#{fL=*qT^gO0YCv_&w1;Z;TOR4UqPLR0VnlQ<++Q5f%xaqd=k}z$eY*Omn>TY
zA9AGQAE12P7Y{wz-%r5T0Z_kj0yjF-;0(8zl?1>P;Q_>*nSl)I%=>PCNFjBEe0c)I
z!P>;U(cfXr7dN^&R-G=hUsTLX>7ZWb?p&ml5Mgm>UQm=l!Y7xO|9oxC^TkH0)T^G^
zSh^@2&}y~OU{KP&SU>!sgi-L4C|Q^ujG42wCcu`jG?GIm)KZ=MD8ixBLw=whT
zZQ?X1f&r6ZA3U3Z_q}mP*jH2heCy?>_l5=o|DitF>a`*vHw?3_apYC^1QzX~ZszT(
zAmOsM{nsD4GEC@DdKo)d(S>+N~zq#}W
zO!ejjWAZGQG&`<97A0!`oNc`?k=d9)xYhgSvNFXPtwRY+>+rC!)-*230qFZJ!~p>T
zm1B)e!UewytZ=Na*Y9Yh5j+1%gAlCGLtU`_oo@CR@ZSQu^3v`%yKBP6VIbd$pK)mnxm?z&&PeVJ33(~FLF#UVR
zqV;Q6bJ8=2JpStw_uj8eTEL({8PW{j`4wY#)#0BhQ?}p6IU%ZkQfgtTkl(O9)@i=C
zb)d6kPebJ_Jf`EavNY~j+hq$)Wn}*+-|&9zHJ0{QZPNO*559dHTlXrN7KD!I_HQ!MDo$Q7*SDSvJ#@&LDePdEUbk?mu_5el_8nVn|UkirK9pTX?3f
z-}ldNtnDlzk}4}JiDl%nr%*q&drr7Uq1kUGW#6I~^iO#wl%%&YhXzMRg35=VsYv!#
z>7Qwf(@yq#FGmQPI5F`a85Dt2`hX|1&u8-)CWnX@#x6S4-M{a(O3Kb6%P+F_*l53V
zH%CS|CX@B{_9D(Em!X!H-B*!j*Dx!mQ*}4DNjLH1=LX%6pr(Izrfhns?i+ZBp)sa#8c+?J!b{t)!t=u&nd%6AQAPaLC3Fh9nEQ4g&x~$FeW({ZfZ*U-iEqVX0Vg@Nky5P)jF_A|~
zrRvnN#x=y|^?q=)P?s{`_uaqEjE`U2qC?sH4d&}nlw~@|rT>&-L>7y+Uw570hCh*T
zkMy`~bbiy8DzNf2)E&Sxwb~fO&nKYBM)-f%!tBWIruoJA!{Nu~1}Ox&i?MhtKCecX
z9W-R19$2lD(|+DieDe5l|5zQSxHXLzE7Qr9b%02#i`P8Xq5=ru_$v%ErZyypVHbRj
z>VucDIb81fm39JKf4I{PMKv`wD&6;hzHOi{5D03{>Qb17!;iwuCmXbp>bH~SPp*oGPi0ga-RsbKr6hxveZ4xr0XOAOMU~HZ%9~bhvUx^z&PQ%!$D}aKm6WVVnux
z0ad;e$huvft?cpo&SG`06UvgDtA=$#Pw5E$GXMZQ+0h~vIKYCsCrvoOQ#LGOfdee4
zd(wmhJY~Zo7C69yx+hIIz*9CXVu1rJsC&|^QWLB@-m)5_yBc2I05Bg2fB*=900@A<
lkOYo4y9rORCI1UB
-
diff --git a/resources/close.svg b/resources/close.svg
deleted file mode 100644
index c58fe6379..000000000
--- a/resources/close.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/resources/delete.png b/resources/delete.png
deleted file mode 100644
index e891b370cca7b3d83e937863dbbc9578c5b8b1bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR480)$nmJ+{x8;_1^tiDKYXUH;WVQ}+PBRg>=XEc7$zjP
hYcO;CJy$d(-{^YY!e<{gssrt2@O1TaS?83{1OOQCReJyc
diff --git a/resources/link.svg b/resources/link.svg
deleted file mode 100644
index 08127c001..000000000
--- a/resources/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/lock-http.png b/resources/lock-http.png
deleted file mode 100644
index dbdbefb1e684646f23de91f9af9d8535f6256433..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 479
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy^8k?>14BbY!;^K=-QC?2
zCQRrDgS%@bfb_(P6M^LY^^*72OKqDQ4rD_V++Qm-VL~5}4ODP{tt5m2kyD*R562b@pU-eN*yKl%0VbeQbu(~Pj3(ulw
z?P-hx8>SqbBs}?%|C2cteY)Iy=9|6*b0ozb5N%F&TK8x2pMPFnKQwJr-UJow6M3!8|p^WsjNb|5l)n7(8A5T-G@yGywoiQR3_X
diff --git a/resources/lock-http.svg b/resources/lock-http.svg
deleted file mode 100644
index a2e25cfae..000000000
--- a/resources/lock-http.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/resources/lock-http@2x.png b/resources/lock-http@2x.png
deleted file mode 100644
index 94b1690068e78ebe79981092b7425a8fa24246a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 583
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!+5>z-T>pbXLqo&-`Sb73SC~9`
za$jHH!?oi5{rz{>iBFg?VdBJz7grbpNg%ktUIHk7f2|Zy90-8y2kW40Aa~BxY9M)k
zog_#OtPx0_UTz5&nKZFy_LPPdGjq4k58W|8Wbqf_x)2mZ_F-Gp~BLi?NFlE
zwV9n`(yICMu9u|N`7<00V%a$FvG>WCeN0Wg95uGT&Hp{&6_9Z;xb)eW`|^EOl^3Nu
zQWLGWi0mmid&kefvgmAKlB&l~zbxe$pZJ&Ua1dv)(rVO;Fmz|#wcu3;cTm`p2@c{e
zRzcFwn^><3ipT71wba`&MdwA|h6l&iE?J?F&iE!nkE6^)%*9%Ydy%X!>%+bR$6)tj
y#|?{jD%`jjBLJ3G5hzX5eZjhSf%qR?Tlq6R?=82!YA^>z1B0ilpUXO@geCy)=?{hg
diff --git a/resources/lock-https.png b/resources/lock-https.png
deleted file mode 100644
index a59c4e3afdafe461a91dd299bfa0ed1def65e13a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy-T^)#uK)l44_y@+yT~nNnP1Fe
z_r%5S@eAA&7kVWw@JL($A`?Jt&-g_ii3>dwfD9nH&=bU71Y$rCM9{=c`99ECiIO0{
zUHUfcj@Vy_rIq_Yt00z$@g?|45_&Fw(BIHLx8}64{ws=
zfB%oyV(C1yqtoKWO3&AOeI|q-4tRPn*5BRi*p+vz>aAB7Oa4;fnJoA0goIVbpU^*S
zR(EB6@~(5vkxE*@zg{uSneFLA)s!p&fv4;FlytXj+W5Ql-~)L(tB%I+0^Cj;6kod?
SRtpAN&EV
-
diff --git a/resources/lock-https@2x.png b/resources/lock-https@2x.png
deleted file mode 100644
index 733e5ffd981ccb5abd2b6ccfb8a1546ed2147465..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!yaRkfT>t<7&+wn2p`jsRzC+Sn
z*SLi~@e4fT7kI=i^hjLbmAJq&VWC(2A}=7B02Ep1k+9G+aUoC;jDWI>VC;pS!c%kZ
z1C5m^3GxeOU}WNulD75>Oe|?=?pn0($gvv_UwruVZ_?$S$v`!SJzX3_Dj45Rx|`Rg
zz~iu7;ROGph8y4OFR7~LO{@q!t2eF2cDnjoMS*?)%+IWF^4Ypf;>wSt*c(jtBHHub
zotM;m^7G=a2YfFq?tDn7Zg)S^MX1SJ>BlqT$UmleBy_?w|uq
zoBZ}?Ma|y4;G-)L|@b=Pz_b9GjlsG`8F-(RboWjPu
-
diff --git a/resources/network.png b/resources/network.png
deleted file mode 100644
index bed57f7de1edbaa73350d306fcfb0c94a147d165..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 879
zcmV-#1CacQP)mxk&e^c2=X~IF;Yk-fSFQzu%fMn@vIpd^1etU_>+_qKV2e%f?nV
zkZn(h$WMO8>2wNIja?>646to`634Nh{vOA%Z`<};m_SA6fTU1AY{#
z>dm}_t~-AZ?IB#XK*hxafS+80
zHhv87JWsp!Sr8H5Zns)YV1QZ01Aq|1_dHLF3Djz}s@DDyrJErAVW{11|1EOD&1Unb
z$nmOC`cm{Ak$x#kL}gq@Wz+`99#9+bVMrUm*k@(-^(|nW0i8~#&~wImy_R~;_$;4u
zU|b96Zn4?`*#l|=J`8CCR;yL1pXPKwXDHhtqKdi&G-I3rbqmxjpcmr|(A@%GZ$RN~
za?j{?yGFluFFgR@9Ky5hbh;5j@FWXQ2=OYflGS5o(b*1
zm&@hPw@q3n!Q{kMns8M-pxJPG9abj
z?`zqFl~p`YaR9(MgtC@MA;iPt0RsX6fWcs(JOm*GpU>w{_ZArOC_JCf10jU6IpNjf
z0YeN(84ibqx9SiP55w@~T_r{skP?PrKt#DskS!iC%z%{PaF}OxkS-oD%z%_I3aa_1~
zz|cA1mf37}wK^2l{*t#aAZ0urPXJ&#ohsWs`c?sy!9S!9PRC+iQcwT@002ovPDHLk
FV1kC{e2D-6
diff --git a/resources/network@2x.png b/resources/network@2x.png
deleted file mode 100644
index 5190c9a82e9d2058cbcdd803813e424eb22bc413..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2556
zcmai0dpK0<8vkZlv_e=ZmsDh;W0TP%8Qo?GlWR6kDchI|2@&I#$}CY)Zfzy$V)iZ(
zU2KOaw@Ib8OQdq?Ce1NI)P&5|m^t67efH@*=Z~|VnP;u<{l4G(d*9#teeYUn9`39;
z$_tbM0CSu++Is>(fsYh`DZ$%MQN=;$JQ=@z!YTX&SI;rt%9LmLRyumHYrNvv3+1a)
z_D$1d-@=jGAZj{vOdYhcfWZn1aS!Dm^=uZx-z~dAwVgmHH0aI}2T8tC?OXXV$I^-Uc){
z1B4CzDvn46%W-0P*c#a!oIgL4(DqT^HzF>0W3lmBEqL^pE5&g(;_U_=SqLQ7_C&~R
zfr-*W`4P;+h(h05R97H!yWIwOX|J
z5V#jD?9-rxoLCRMvLJu4?XaF8fyl{{qt=w5oX?6Lze}iwwP>DOGw@ysqv2=`As+oC
z>F>5XkB_IfRPyu-Pd=-P=v%0y>vv3>=_1UM{9)R7_wEK7#j#2PDprvW
zl#i=1OG#YQ%^t`_Z_6aP9DjSLEof}g$NP;0f78+?6f1P_VB=l@P1DpmdiQND`R}imnVp
z5{i{9(nj@@ixmwB3(`-625%fboWnHm`KUm$i;A@FSEx>yEJ^Nbbv7w&FJRQnUTXD1
zMIagJh45PX~V_=IW}!#Bd69_Lf=e#{*EFgfkZbC^B!hU
zED{|Jk@?d?EIvB=pU>Nip=9d%>*=bS-*!XE&e(OwJYca{5G*lml$^=Mo?d)e9eG!B
z=5T{rYeczxWsgs0W~S`?7t7Y6yGPaKtuwm8-DdKAd--YzNSh6o8iVYfJ}!@_cQ)bj
z(BNF{uckb}+yUop5W5|0kp1WA7KQoU2x3JTmbMQXzj+cVf$v7pZywcPsYvnPEI#Ab
zKom1BYU2&cRJjRq*$jirJF-4souIy{mHtuH=1=+7V8C3i0$-aa+cS>9b_3>Wf{m`Q
z_pq1=;=#UEv~MHWiC%(t_X~J0YX9s@Ul+FG*=*96%3m;RK*DZ{6h4l@ULheDy`;?&-26T>CM_KNZ#MHCp}qtqOAy!o
zDKV>>;yu`P%{PnM=tiuNu8?6gV)&|Dao=o<3VAxi4wNiKRNp@pvoL0*J&|lUBDv
ziCBV(vDbAYEq3E)pnEnLy2b-_=w<6K5JqSu>3Tz*DI7P{*z0R8=>4zj_Sc)O{2BJ*
zftJ(H(qVjrCcFN?P?Z9;I1&aZFtO+ORAxd7dNQVZQ3UG&1~rlrL-ctmR0H4YxDOX-
zDx=q@#jJQr+2Kj`^3#IP`8rU&G9$canyT??J>HpwqPZ3@HKtM&JZ-N2THEfC
z1<-kzprOk~jzi6W1s}zIo{~8xEvF;L^+?kpMMusFa<2r~t1n&~EYnMdueb5Rc5NsV
z4LD9n{}{i_bEuvmGoprCA-YYF)slmS@8+1V!fGyA&1)jX2UG4Nzifho;L_5#}kS
zbV6LP0Tg!u+(M>8M?C9TS&K)dfxp1A4LvDp;!$XzWNKpQ$@xTwVCf4@kYBb3P3Ku7
zOiS})@P+6Of}6KO=nNg{yab^$vJ6{cUk>QF8iO`Urk24Tr}tOClq;;}`#KJMp0R;n
PYQV|C-Tt~A=g_|ZM150c
diff --git a/resources/public-white.svg b/resources/public-white.svg
deleted file mode 100644
index d85defb6a..000000000
--- a/resources/public-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/resources/settings.png b/resources/settings.png
deleted file mode 100644
index b7c6b11ddc4ca97c4d9ec8b6b85ddb0948a97de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1950
zcmV;P2VwY$P)+BtC2!NeU^AVofm7^&pX<
zWpLRIGcY|cJxpja^rGqAAYpdB>47k0VHP9wfG%Cwh#}0PR~kc7Lc}1NMI)3$sKg{C
zrYhbui@Y?ZQpvmTRn3bt-5E3lR)8_)a**=?psG1z%;h+20%BYNs+tjT<6BiT|7CN2
zL~H~A07)mgI8$>&1aQlvgsN79WQ{S-1cZ=F0@&0B7>gVO(&=MB<~U
z^F&1=k@zT;O5I2%ljG@hIxx2Eg-8UX)9IY5j*|QUK$|gUxTU4#YCTz!Or=s6MC6RK
zQ6gtjsniATu@qWbTCN&nh5@vZ{6JMlqmsa|t0$dK=SYsKYHRIpsyeZ;v2hy!NVcX@
zsUebA0C-W115i}eJC#ahQdP^qmh&Y4P%B8Xtg6@Eym_+_MnNb7(&=m~t%UZia@{@h!%GTOYBsde`;{1DpP$W1JuqRuV23&4oZ;s7R&p|`NZ7yJn#EzwfdQ=UJ7elNcnIp!1KJ;
zYPEWUq*H}wtz8z8v8AP@>9B?Yz|o^e2d%XuBGTa^uc{l#Wb$`GM8Atro1x9k%^_Fk
z0W1R;iRwH6_+v->xdK75Wpi_LD2xtg0=R`MB;j%a7%P=ZufiBp5B?luu6lhNou5%>
z0=l}o21$C3&QCS+&)34AYs!%TudAzT&~@%zLD2KOZdJWp+m|!OoN4*fU%q><-Xo9;@x0YuTB%g-NAxiel}hD4NsVeBfL&dqT`Rz~
zbzKjty0}-7(+sSvtSlcteteN+Z?ooX>WdK(dD+bQ;?Pkq1~f8XDOjXolp3^g2bxMi
zTrV`5NkFq7fzD>mR}aP*r?S`;O$~wojx{paRY!w1?!c~@8c2Z`RCQN%RSQ-9
z*z>&an_Ufhp4WQl(4kLUmOsfKRCT`Q_A3#&w@cPFa`*Q3UI6eH7g>^1&z?Q|o72RO
z$Y!%&glLfb_4)JX4_pMDqsijp;xvGw<8yW?o6S1!$b#U{b;(h8(YMtJ&IG8cipU)i
zfy+g5B%94Pe9|ME&1OiBxat*=J7LZXgvuxD>+6#wH(X>%c8JJWE|-hE5^}lRpool-
zbjmCwH`dqJC&TCn-4#B0^5o|ve-&nos!pw~tpzqkx8ZqSYg=2}XCy;4MOF3g)2C1W
z9%f9GuJB6OQk3MSOeT{*b?VfuR4R4<(W6IocZ}!Go$IJnDi<@EOr*BBs;-0`6KVyV
zK7IPv*4jUYRkA}NsQ?y9zEstcf3H(jj{)duB+vVEO+0z>r1>vK`uh5=sOq00TNWck
zWMY1PzIm_4`uh5Y0Q|X8!(ztx9V!q1NYV{kJg2*`t=JWZSwRTiQ
z-s^Kh*4na&Tq_g`PPps&`fOW`JBM=Ya^7
zU_PJEk*s@Mj^xDb?Cfn{u2n>a09;YkNCzcJ76II`)=m}*g)#v2_xE2_)q00C%BmX5
zc_0D-z!nL{nA+2#KRUld0m*zmKS=UZ0D=7kA3vz-KMIAybiL=ezrTOSNfnaiw{PEu
zb{>e>6fG1A3&xmhBwvtR12A6Cd0;Du&dtp|08rbY*bnn_b8`>&3Sz#lagu8!Ul?N|
zIS({&Tz-0bdV%Ed`Sa%!4<9}ZJdM@NMkWBv&dz=}FfcGVGc(iBaruV67w{DaI=>Cq
zO_ZxYF2n~Rwl7BfCW(`5oL`K@_R$nc=hGr#WE(|n1SFHmdjJ+3dU^}KY%GYB2LGS%
klmBw`X95n|fP=<=05=lpm;-A+`~Uy|07*qoM6N<$f<57q2LJ#7
diff --git a/resources/state-error.svg b/resources/state-error.svg
deleted file mode 100644
index 224ce8626..000000000
--- a/resources/state-error.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/resources/state-info.svg b/resources/state-info.svg
deleted file mode 100644
index 14b52e326..000000000
--- a/resources/state-info.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/state-sync.svg b/resources/state-sync.svg
deleted file mode 100644
index 658d1b40e..000000000
--- a/resources/state-sync.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/resources/state-warning.svg b/resources/state-warning.svg
deleted file mode 100644
index a738cdbc8..000000000
--- a/resources/state-warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.cpp b/src/3rdparty/kmessagewidget/kmessagewidget.cpp
index cd3563a1d..c0166f622 100644
--- a/src/3rdparty/kmessagewidget/kmessagewidget.cpp
+++ b/src/3rdparty/kmessagewidget/kmessagewidget.cpp
@@ -94,7 +94,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
QAction *closeAction = new QAction(q);
closeAction->setText(KMessageWidget::tr("&Close"));
closeAction->setToolTip(KMessageWidget::tr("Close message"));
- closeAction->setIcon(QIcon(":/client/resources/close.svg")); // ivan: NC customization
+ closeAction->setIcon(QIcon(":/client/theme/close.svg")); // ivan: NC customization
QObject::connect(closeAction, &QAction::triggered, q, &KMessageWidget::animatedHide);
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4ccf3abaa..3cc80a1df 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -5,8 +5,7 @@ set(CMAKE_AUTOUIC TRUE)
set(CMAKE_AUTORCC TRUE)
add_subdirectory(updater)
-#TODO Move resources files
-set(MIRALL_RC_SRC ../../client.qrc)
+set(MIRALL_RC_SRC ../../resources.qrc)
if (EXISTS "${OEM_THEME_DIR}/theme.qrc")
list(APPEND MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)
set(theme_dir ${OEM_THEME_DIR}/theme)
diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 4b8899a05..d7ba865a4 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -217,7 +217,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
warnRect.setWidth(16);
warnRect.setHeight(16);
- QIcon warnIcon(":/client/resources/warning");
+ QIcon warnIcon(":/client/theme/warning");
QPixmap pm = warnIcon.pixmap(16, 16, syncEnabled ? QIcon::Normal : QIcon::Disabled);
warnRect = QStyle::visualRect(option.direction, option.rect, warnRect);
painter->drawPixmap(QPoint(warnRect.left(), warnRect.top()), pm);
@@ -440,7 +440,7 @@ void FolderStatusDelegate::slotStyleChanged()
void FolderStatusDelegate::customizeStyle()
{
- _iconMore = Theme::createColorAwareIcon(QLatin1String(":/client/resources/more.svg"));
+ _iconMore = Theme::createColorAwareIcon(QLatin1String(":/client/theme/more.svg"));
}
} // namespace OCC
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 319436cd2..3f0d20adf 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -159,7 +159,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
return x._checked;
case Qt::DecorationRole:
if (_accountState->account()->e2e()->isFolderEncrypted(x._path)) {
- return QIcon(QLatin1String(":/client/resources/lock-https.png"));
+ return QIcon(QLatin1String(":/client/theme/lock-https.svg"));
}
return QFileIconProvider().icon(x._isExternal ? QFileIconProvider::Network : QFileIconProvider::Folder);
case Qt::ForegroundRole:
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index c29720d69..1224869b8 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -46,7 +46,7 @@ void warnSystray()
int main(int argc, char **argv)
{
- Q_INIT_RESOURCE(client);
+ Q_INIT_RESOURCE(resources);
// OpenSSL 1.1.0: No explicit initialisation or de-initialisation is necessary.
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 53ff923b8..206e4d444 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -97,7 +97,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
_toolBar->addWidget(spacer);
- QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General"));
+ QAction *generalAction = createColorAwareAction(QLatin1String(":/client/theme/settings.svg"), tr("General"));
_actionGroup->addAction(generalAction);
_toolBar->addAction(generalAction);
GeneralSettings *generalSettings = new GeneralSettings;
@@ -106,7 +106,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
// Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
connect(this, &SettingsDialog::styleChanged, generalSettings, &GeneralSettings::slotStyleChanged);
- QAction *networkAction = createColorAwareAction(QLatin1String(":/client/resources/network.png"), tr("Network"));
+ QAction *networkAction = createColorAwareAction(QLatin1String(":/client/theme/network.svg"), tr("Network"));
_actionGroup->addAction(networkAction);
_toolBar->addAction(networkAction);
NetworkSettings *networkSettings = new NetworkSettings;
@@ -206,7 +206,7 @@ void SettingsDialog::accountAdded(AccountState *s)
QImage avatar = s->account()->avatar();
const QString actionText = brandingSingleAccount ? tr("Account") : s->account()->displayName();
if (avatar.isNull()) {
- accountAction = createColorAwareAction(QLatin1String(":/client/resources/account.png"),
+ accountAction = createColorAwareAction(QLatin1String(":/client/theme/account.svg"),
actionText);
} else {
QIcon icon(QPixmap::fromImage(AvatarJob::makeCircularAvatar(avatar)));
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 62ed18da8..e531ae2ab 100644
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -232,15 +232,15 @@ void ShareLinkWidget::setupUiOptions()
}
// Adds action to unshare widget (check box)
- _unshareLinkAction = _linkContextMenu->addAction(QIcon(":/client/resources/delete.png"),
+ _unshareLinkAction = _linkContextMenu->addAction(QIcon(":/client/theme/delete.svg"),
tr("Unshare"));
_linkContextMenu->addSeparator();
- _addAnotherLinkAction = _linkContextMenu->addAction(QIcon(":/client/resources/add.png"),
+ _addAnotherLinkAction = _linkContextMenu->addAction(QIcon(":/client/theme/add.svg"),
tr("Add another link"));
- _ui->enableShareLink->setIcon(QIcon(":/client/resources/copy.svg"));
+ _ui->enableShareLink->setIcon(QIcon(":/client/theme/copy.svg"));
disconnect(_ui->enableShareLink, &QPushButton::clicked, this, &ShareLinkWidget::slotCreateShareLink);
connect(_ui->enableShareLink, &QPushButton::clicked, this, &ShareLinkWidget::slotCopyLinkShare);
@@ -560,19 +560,19 @@ void ShareLinkWidget::slotStyleChanged()
void ShareLinkWidget::customizeStyle()
{
- _unshareLinkAction->setIcon(Theme::createColorAwareIcon(":/client/resources/delete.png"));
+ _unshareLinkAction->setIcon(Theme::createColorAwareIcon(":/client/theme/delete.svg"));
- _addAnotherLinkAction->setIcon(Theme::createColorAwareIcon(":/client/resources/add.png"));
+ _addAnotherLinkAction->setIcon(Theme::createColorAwareIcon(":/client/theme/add.svg"));
- _ui->enableShareLink->setIcon(Theme::createColorAwareIcon(":/client/resources/copy.svg"));
+ _ui->enableShareLink->setIcon(Theme::createColorAwareIcon(":/client/theme/copy.svg"));
- _ui->shareLinkIconLabel->setPixmap(Theme::createColorAwarePixmap(":/client/resources/public.svg"));
+ _ui->shareLinkIconLabel->setPixmap(Theme::createColorAwarePixmap(":/client/theme/public.svg"));
- _ui->shareLinkToolButton->setIcon(Theme::createColorAwareIcon(":/client/resources/more.svg"));
+ _ui->shareLinkToolButton->setIcon(Theme::createColorAwareIcon(":/client/theme/more.svg"));
- _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
- _ui->confirmPassword->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
- _ui->confirmExpirationDate->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
+ _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg"));
+ _ui->confirmPassword->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg"));
+ _ui->confirmExpirationDate->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg"));
_ui->progressIndicator->setColor(QGuiApplication::palette().color(QPalette::Text));
}
diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui
index 90cd61067..ec520fd7d 100644
--- a/src/gui/sharelinkwidget.ui
+++ b/src/gui/sharelinkwidget.ui
@@ -25,7 +25,7 @@
- :/client/resources/public.svg
+ :/client/theme/public.svg
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -74,8 +74,8 @@
-
- :/client/resources/add.png:/client/resources/add.png
+
+ :/client/theme/add.svg:/client/theme/add.svg
false
@@ -97,8 +97,8 @@
-
- :/client/resources/more.svg:/client/resources/more.svg
+
+ :/client/theme/more.svg:/client/theme/more.svg
QToolButton::InstantPopup
@@ -162,8 +162,8 @@
-
-
- :/client/resources/confirm.svg:/client/resources/confirm.svg
+
+ :/client/theme/confirm.svg:/client/theme/confirm.svg
true
@@ -215,8 +215,8 @@
-
-
- :/client/resources/confirm.svg:/client/resources/confirm.svg
+
+ :/client/theme/confirm.svg:/client/theme/confirm.svg
true
@@ -265,8 +265,8 @@
-
-
- :/client/resources/confirm.svg:/client/resources/confirm.svg
+
+ :/client/theme/confirm.svg:/client/theme/confirm.svg
true
@@ -337,7 +337,7 @@
-
+
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 0a58d61a5..0a2bea6ab 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -266,7 +266,7 @@ void ShareUserGroupWidget::slotPrivateLinkShare()
menu->setAttribute(Qt::WA_DeleteOnClose);
// this icon is not handled by slotStyleChanged() -> customizeStyle but we can live with that
- menu->addAction(Theme::createColorAwareIcon(":/client/resources/copy.svg"),
+ menu->addAction(Theme::createColorAwareIcon(":/client/theme/copy.svg"),
tr("Copy link"),
this, SLOT(slotPrivateLinkCopy()));
@@ -379,7 +379,7 @@ void ShareUserGroupWidget::slotStyleChanged()
void ShareUserGroupWidget::customizeStyle()
{
- _ui->confirmShare->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
+ _ui->confirmShare->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg"));
_pi_sharee.setColor(QGuiApplication::palette().color(QPalette::Text));
@@ -421,7 +421,7 @@ ShareUserLine::ShareUserLine(QSharedPointer share,
menu->addSeparator();
// Adds action to delete share widget
- QIcon deleteicon = QIcon::fromTheme(QLatin1String("user-trash"),QIcon(QLatin1String(":/client/resources/delete.png")));
+ QIcon deleteicon = QIcon::fromTheme(QLatin1String("user-trash"),QIcon(QLatin1String(":/client/theme/delete.svg")));
_deleteShareButton= new QAction(deleteicon,tr("Unshare"), this);
menu->addAction(_deleteShareButton);
@@ -453,10 +453,6 @@ ShareUserLine::ShareUserLine(QSharedPointer share,
_ui->permissionToolButton->setMenu(menu);
_ui->permissionToolButton->setPopupMode(QToolButton::InstantPopup);
- // icon now set in: customizeStyle
- /*QIcon icon(QLatin1String(":/client/resources/more.svg"));
- _ui->permissionToolButton->setIcon(icon);*/
-
// Set the permissions checkboxes
displayPermissions();
@@ -474,9 +470,6 @@ ShareUserLine::ShareUserLine(QSharedPointer share,
connect(share.data(), &Share::permissionsSet, this, &ShareUserLine::slotPermissionsSet);
connect(share.data(), &Share::shareDeleted, this, &ShareUserLine::slotShareDeleted);
- // _ui->deleteShareButton->setIcon(QIcon::fromTheme(QLatin1String("user-trash"),
- // QIcon(QLatin1String(":/client/resources/delete.png"))));
-
if (!share->account()->capabilities().shareResharing()) {
_permissionReshare->setVisible(false);
}
@@ -686,9 +679,9 @@ void ShareUserLine::slotStyleChanged()
void ShareUserLine::customizeStyle()
{
- _ui->permissionToolButton->setIcon(Theme::createColorAwareIcon(":/client/resources/more.svg"));
+ _ui->permissionToolButton->setIcon(Theme::createColorAwareIcon(":/client/theme/more.svg"));
- QIcon deleteicon = QIcon::fromTheme(QLatin1String("user-trash"),Theme::createColorAwareIcon(QLatin1String(":/client/resources/delete.png")));
+ QIcon deleteicon = QIcon::fromTheme(QLatin1String("user-trash"),Theme::createColorAwareIcon(QLatin1String(":/client/theme/delete.svg")));
_deleteShareButton->setIcon(deleteicon);
}
diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index ab4c91797..e5b194699 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -63,8 +63,8 @@
-
-
- :/client/resources/confirm.svg:/client/resources/confirm.svg
+
+ :/client/theme/confirm.svg:/client/theme/confirm.svg
true
@@ -133,7 +133,7 @@
-
+
diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui
index 8049607a6..b947aed3c 100644
--- a/src/gui/shareuserline.ui
+++ b/src/gui/shareuserline.ui
@@ -93,8 +93,8 @@
-
-
- :/client/resources/more.svg:/client/resources/more.svg
+
+ :/client/theme/more.svg:/client/theme/more.svg
true
@@ -111,7 +111,7 @@
-
+
diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index 0efdc6f7c..8b4bd6e40 100644
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -169,11 +169,11 @@ void SslButton::updateAccountState(AccountState *accountState)
AccountPtr account = _accountState->account();
if (account->url().scheme() == QLatin1String("https")) {
- setIcon(QIcon(QLatin1String(":/client/resources/lock-https.png")));
+ setIcon(QIcon(QLatin1String(":/client/theme/lock-https.svg")));
QSslCipher cipher = account->_sessionCipher;
setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name()));
} else {
- setIcon(QIcon(QLatin1String(":/client/resources/lock-http.png")));
+ setIcon(QIcon(QLatin1String(":/client/theme/lock-http.svg")));
setToolTip(tr("This connection is NOT secure as it is not encrypted.\n"));
}
}
diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index a9b2efc64..d1d06c765 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -137,11 +137,11 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
} else {
// File sync successful
if (a._fileAction == "file_created") {
- return "qrc:///client/resources/add-color.svg";
+ return "qrc:///client/theme/colored/add.svg";
} else if (a._fileAction == "file_deleted") {
- return "qrc:///client/resources/delete-color.svg";
+ return "qrc:///client/theme/colored/delete.svg";
} else {
- return "qrc:///client/resources/change.svg";
+ return "qrc:///client/theme/change.svg";
}
}
} else {
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 357be6005..10fb36122 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -104,7 +104,7 @@ MenuItem {
Layout.preferredHeight: userLineLayout.height
flat: true
- icon.source: "qrc:///client/resources/more.svg"
+ icon.source: "qrc:///client/theme/more.svg"
icon.color: "transparent"
MouseArea {
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 5a040c970..865e9e130 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -563,7 +563,7 @@ Window {
hoverEnabled: false
visible: (path === "") ? false : true
display: AbstractButton.IconOnly
- icon.source: "qrc:///client/resources/files.svg"
+ icon.source: "qrc:///client/theme/files.svg"
icon.color: "transparent"
onClicked: {
@@ -579,7 +579,7 @@ Window {
hoverEnabled: false
visible: (link === "") ? false : true
display: AbstractButton.IconOnly
- icon.source: "qrc:///client/resources/public.svg"
+ icon.source: "qrc:///client/theme/public.svg"
icon.color: "transparent"
onClicked: {
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 03cfb0661..f83e1f43f 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -68,7 +68,9 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
_ui.lServerIcon->setText(QString());
_ui.lServerIcon->setPixmap(appIcon.pixmap(48));
_ui.lLocalIcon->setText(QString());
- _ui.lLocalIcon->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/folder-sync.png")));
+
+ // TO DO: File doesn't exist anymore - unneccessary or replacement needed?
+ _ui.lLocalIcon->setPixmap(QPixmap(Theme::hidpiFileName(":/client/theme/folder-sync.png")));
if (theme->wizardHideExternalStorageConfirmationCheckbox()) {
_ui.confCheckBoxExternal->hide();
diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 84f160aaf..48f5edba8 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -178,11 +178,11 @@ void OwncloudSetupPage::slotUrlChanged(const QString &url)
}
if (!url.startsWith(QLatin1String("https://"))) {
- _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png")));
+ _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/theme/lock-http.png")));
_ui.urlLabel->setToolTip(tr("This url is NOT secure as it is not encrypted.\n"
"It is not advisable to use it."));
} else {
- _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/lock-https.png")));
+ _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/theme/lock-https.png")));
_ui.urlLabel->setToolTip(tr("This url is secure. You can use it."));
}
}
diff --git a/src/gui/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp
index 6d884e396..79446de37 100644
--- a/src/gui/wizard/owncloudwizardresultpage.cpp
+++ b/src/gui/wizard/owncloudwizardresultpage.cpp
@@ -38,7 +38,8 @@ OwncloudWizardResultPage::OwncloudWizardResultPage()
setSubTitle(QLatin1String(" "));
_ui.pbOpenLocal->setText(tr("Open Local Folder"));
- _ui.pbOpenLocal->setIcon(QIcon(QLatin1String(":/client/resources/folder-sync.png")));
+ // TODO: File doesn't exist anymore - unneccessary or replacement needed?
+ _ui.pbOpenLocal->setIcon(QIcon(QLatin1String(":/client/theme/folder-sync.png")));
_ui.pbOpenLocal->setIconSize(QSize(48, 48));
_ui.pbOpenLocal->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
connect(_ui.pbOpenLocal, &QAbstractButton::clicked, this, &OwncloudWizardResultPage::slotOpenLocal);
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index b83061282..663bc1ac8 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -102,8 +102,8 @@ target_link_libraries(${synclib_NAME}
)
if (NOT TOKEN_AUTH_ONLY)
- find_package(Qt5 REQUIRED COMPONENTS Widgets)
- target_link_libraries(${synclib_NAME} Qt5::Widgets ${QTKEYCHAIN_LIBRARY})
+ find_package(Qt5 REQUIRED COMPONENTS Widgets Svg)
+ target_link_libraries(${synclib_NAME} Qt5::Widgets Qt5::Svg ${QTKEYCHAIN_LIBRARY})
target_include_directories(${synclib_NAME} PRIVATE ${QTKEYCHAIN_INCLUDE_DIR})
endif()
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 08bf11521..8f6dbd83f 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -24,6 +24,7 @@
#include
#endif
#include
+#include
#include "nextcloudtheme.h"
@@ -141,28 +142,23 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray) const
}
QList sizes;
- sizes << 16 << 22 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
+ sizes << 16 << 32 << 64 << 128 << 256;
foreach (int size, sizes) {
- QString pixmapName = QString::fromLatin1(":/client/theme/%1/%2-%3.png").arg(flavor).arg(name).arg(size);
- if (QFile::exists(pixmapName)) {
- QPixmap px(pixmapName);
- // HACK, get rid of it by supporting FDO icon themes, this is really just emulating ubuntu-mono
- if (qgetenv("DESKTOP_SESSION") == "ubuntu") {
- QBitmap mask = px.createMaskFromColor(Qt::white, Qt::MaskOutColor);
- QPainter p(&px);
- p.setPen(QColor("#dfdbd2"));
- p.drawPixmap(px.rect(), mask, mask.rect());
- }
- cached.addPixmap(px);
- }
- }
- if (cached.isNull()) {
- foreach (int size, sizes) {
- QString pixmapName = QString::fromLatin1(":/client/resources/%1-%2.png").arg(name).arg(size);
- if (QFile::exists(pixmapName)) {
- cached.addFile(pixmapName);
- }
+ QString svgName = QString::fromLatin1(":/client/theme/%1/%2.svg").arg(flavor).arg(name);
+ QSvgRenderer renderer(svgName);
+ QImage img(size, size, QImage::Format_ARGB32);
+ img.fill(Qt::GlobalColor::transparent);
+ QPainter imgPainter(&img);
+ renderer.render(&imgPainter);
+ auto px = QPixmap::fromImage(img);
+ // HACK, get rid of it by supporting FDO icon themes, this is really just emulating ubuntu-mono
+ if (qgetenv("DESKTOP_SESSION") == "ubuntu") {
+ QBitmap mask = px.createMaskFromColor(Qt::white, Qt::MaskOutColor);
+ QPainter p(&px);
+ p.setPen(QColor("#dfdbd2"));
+ p.drawPixmap(px.rect(), mask, mask.rect());
}
+ cached.addPixmap(px);
}
}
@@ -592,8 +588,17 @@ void Theme::replaceLinkColorString(QString &linkString, const QColor &newColor)
QIcon Theme::createColorAwareIcon(const QString &name, const QPalette &palette)
{
- QImage img(name);
- QImage inverted(img);
+ QSvgRenderer renderer(name);
+ QImage img(64, 64, QImage::Format_ARGB32);
+ img.fill(Qt::GlobalColor::transparent);
+ QPainter imgPainter(&img);
+ QImage inverted(64, 64, QImage::Format_ARGB32);
+ inverted.fill(Qt::GlobalColor::transparent);
+ QPainter invPainter(&inverted);
+
+ renderer.render(&imgPainter);
+ renderer.render(&invPainter);
+
inverted.invertPixels(QImage::InvertRgb);
QIcon icon;
diff --git a/theme.qrc b/theme.qrc
index 2a2881e96..678842632 100644
--- a/theme.qrc
+++ b/theme.qrc
@@ -143,5 +143,21 @@
theme/black/activity.svg
theme/black/bell.svg
theme/black/state-info.svg
+ theme/close.svg
+ theme/files.svg
+ theme/public.svg
+ theme/settings.svg
+ theme/confirm.svg
+ theme/copy.svg
+ theme/more.svg
+ theme/change.svg
+ theme/lock-http.svg
+ theme/lock-https.svg
+ theme/network.svg
+ theme/account.svg
+ theme/colored/add.svg
+ theme/colored/delete.svg
+ theme/colored/Nextcloud-icon.svg
+ theme/colored/Nextcloud-sidebar.svg
diff --git a/resources/account.svg b/theme/account.svg
similarity index 100%
rename from resources/account.svg
rename to theme/account.svg
diff --git a/theme/add.svg b/theme/add.svg
new file mode 100644
index 000000000..4b2d21330
--- /dev/null
+++ b/theme/add.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/resources/change.svg b/theme/change.svg
similarity index 100%
rename from resources/change.svg
rename to theme/change.svg
diff --git a/theme/close.svg b/theme/close.svg
new file mode 100644
index 000000000..30de70b7c
--- /dev/null
+++ b/theme/close.svg
@@ -0,0 +1 @@
+
diff --git a/resources/add-color.svg b/theme/colored/add.svg
similarity index 100%
rename from resources/add-color.svg
rename to theme/colored/add.svg
diff --git a/resources/delete-color.svg b/theme/colored/delete.svg
similarity index 83%
rename from resources/delete-color.svg
rename to theme/colored/delete.svg
index 72aed6b93..f92bad593 100644
--- a/resources/delete-color.svg
+++ b/theme/colored/delete.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/resources/folder.svg b/theme/colored/folder.svg
similarity index 100%
rename from resources/folder.svg
rename to theme/colored/folder.svg
diff --git a/theme/colored/state-pause-128.png b/theme/colored/state-pause-128.png
deleted file mode 100644
index a423df502339dd4a3f37304b100c0f4bd4cbfa9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3004
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
diff --git a/theme/colored/state-pause-256.png b/theme/colored/state-pause-256.png
deleted file mode 100644
index cc52d94f317488dc38b2b97c1fcfeb94923a8f42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6248
zcmaiZXH-*7)b1pq2~r}wp%;S!Vkm+X4N5VJ1rd}e9i)g-q$YHTl^_ZtDj)<9MIk6v
zs+6cyMT&HSfC8d~UZle}_}%;W-m_NLIVah(XJ(h#`*{*+VroFsTKEDmp}qY5o>%<*
zFZ(zHe}8}FYuDX;9WQ%1D|`C5Bu(jv0U$hjilA>6kUaT4^r6rwjdNx?*Tv=OB^zN?
z4t;&X{@FYCE}9AX?npZjpB(!QS9T%a;J(=-{8w-8`2wrXI$EO5Y^!=BZDd1P4(l+m
z=YV{PnBa%2%41dw1~Q!bdXZe2`&HGM8}D^{&hGx<>@xNzEGVcdRZ%hP-pY|d87m4#u9rCHcsPJ-~5o>pn{L)mBS`qG2`f5DDNxh33pOkrX$qofI-SXr5)JS(fvj
z*>L0Ge{lGZ^6PGDiOF(Um#lFMtQs%l8i+2E@X(?Rq5_PGc3u)=cg|-mRItkNN@MBz
z_6Wj5R{7blU%yVzhi)05%eWYRK+t`R{_P7$G3zX%m%qx*own#Et+_{}`#T^A6jr(M
zg$wP6A_+fb>4yawf#5_>vvUs&NMgIWAqbo)1W_SXQ}Gqtl!ZdWDU02JzC}-jv+3~^`Hi;62puf;OHxu&b+y-zkCnx!T2USuneX4f
zPyb=D-WwBg>Nj(LWCnR=j&DQ{_s2ClrQ}P>MVkW-C7W`;fGo3eOQI*331bF2{MrZX
z_Q!u2B-!|>jt7pO1qc5Yj`I4^&@`0-t)1!no
zrQHlIhGBRy1I3!8h#UNaOYvkszc(e4uWa+d-86HY@m#2`EH;(nVIJ-EhZP{TprcZc
z&6MIvJ}kq=CXhm(M3?qkpWGlBV3;J{l+Ny+d$I6Mz3Gd(WsimXush3+oTP1e87SG4%S
zZ5K+`Xx5Vfb8cn5f`FZs2$<7)6eSp0qrMWdDM$49UCk!`cZlcCM{Quo=~Xs~bLwn)
z_Uzfw&dhEOu>t@`?ZwV{%v6Q;O`oG5){XzNQA2*1r(uS8W1f%Azx?Sgl48|rUvF%f
zLGRNbjdw&B7i+eV6Y>r=ooWr&8Vm)>`LsLO$+1Q!pDCr1{yBN3{>N4Ub`uRBrJuV!+tJItRgacSjQHJ$t{-Lb2WcsUpD=;
z;uD`W&xuog&BsWucQBF@)m=`XJJ&K?G7ywKsdIxmY6!YX7qZO8SsN<#@s6!+`B9C3`WJaqLwTm=wJ$HG@3ji5meH_HBCLw9uJ5M{|S+JFshF}Aj8H|kS1SzKtA
zJw*mEWb2XUyeaEKXnIgNb^YD@_rdQbah-IytzvhJZ%Z4TjOmqqLCv!|o_AQ~q{WX3
z<%$$ZJh`8DGdVt;RbZw_ikTGX%uJF-{l|TWjJ9yXbGDf#tGji*sXTJzh?_g7=>76i
zu7s8`-F?`>W3-WsyJM(?q_0;l_3`-}jMaS(W26^5w}*l*E)*dC@E}&oz$ob=Ka`F1
zLo93+Om|cNC{;xgki+#c^|yBjdi8tPKQAj21tyA5^4z+W-FpkznZ+Kr#yZDj$A5-}
z7|LQMw5>MXt>fj}fF4pPar_n!{o?`zXX#as~X!h%W~@CA3d33D_H=
z>R0TWlMf}RUPeA@e4(4EkZ9zvzC5eF)bIO4o3Hr#cka%sRh^1c^;(42S{fR}prD|z
zYxsue1RqWl1tDdQ84;|tNvD{Gt58nG-0Az$c1)WWa37y;@gJoQ4A>rPY@)8sb~bRT
zswaItdL7^J0ecDVr1<6eEEn{P;B~_osRwR3WgJRMN+*6z4pfRS4FszU1hJH4=Ux9>
z8de{1MkhXPbRzfi`J^>`=X!iPW0Uv5;gz_?J-?c1ZWAMb^7JXDiH7$#v6@J$-B{lF
zjBDsRb2lF*ONsp4q?AwZ{iKAP4Y}7@d-U;z`z?}(eD<7(mWW(rO>RmYnW}f`=~Z`W
zw%+>vBBsh7-#}@Y0Eh8-+1`gm+Osu+2RtmjbgdFJJ;daU@|GkXmrC0S5JvW!uC91F
zaqAJP*oH)yhm6XXe@3C~9P93j-pKXV_SUVUybDMvX(Ce*u?mz;t5DtR_=r<)-@Z-I
z3G^9a8Kvlm!j~JlzIjj`PV^sD;4{Q4`
zrt*-HJ(i{BxMq}n(Z)@oUuSVyW{U5MIBGVQ4GvajXS3ppF(v1r6QhwPdHI^A9hu{k
zXP)AAc%C7F{p=5oWqX_0kL{;0J*zj^fY$9IDO1|2_11fpV`xi+nc|abPF38SMe2A57kb6o
zJnGKB<$^q!`$g1o8a*uR&$kT2u;hZ>&xQ2V64xJ7@AEn;rHhD^cn(&Xgvkm9KxeRK
zg2U74N`5w4GxO>*?Az6Vd#EF=d-uJ>_D78)hBs~ZEZ_B(uw9WCL!x)A*J|Iu=()Iz
zMFOPff%Jq`^HzQV-gf|&q7cGF+c1IjvTFwA&l4RNpQ&J(
z1SewwY1DmTMvl$v$MTp#v+1LZIIJeyWweHOd|#z&@D6r98C#=;k0=nzE@?I!gHJ$3|`ZN}XE*c%SbxsJ0K4e9F5c2){%k6ZPM`+j8
z;IN13Pp77)BIP(l_feeG8ml)V4Mx_gVtt!C3;_n1QVAnCL0_Z)7>RPf1loo&UH!NL
z!|a$Z^{UtXit8fx=CCPIXK~*q=R)xjH@2#(^GH98YH~;LIfaxNPOu5d(pK3HHaXXu2(iLHWjB}%1P6u_O3Hk)$TxhuaTXiEL
zFbD`vH>e#UQ;7CY|$
zW<_OPqJ)EcG*W}*rr1XKC=GmTcp$hN3QtS}22!SA?=JQWX)hJnxI>4;X&17vy#vj-b*DoIl)T
ze_|PtP|C$cd>gpmfI#eZa-haS18->@fL<{qK1lX`MFuJf3C9SxhP9)&-O4u(2}ML-1a?rm(She=i19{nPsiKRo9{F$ey>|!$WYBp0-iKDzB5O
zaf4w>xGjyMBKKh3&Ni!C0{W_*+!(qIzfx7*H=^@`UDdrOuO3Wj9EziEx=+vi_>`)8
zsP!sh!H#qJPGchBT`E|$9iU=JP
zDc0}b%g0PUq4rb4?05o>n!br_=)RRKeHF1&T+@9o#YR6zU&t{R_VdzgWqN7st>J@n
z{{>7cnd53R4l<@iLc2q5^HqS==^X)kev_yUzkaxDiZ53lydeyr
zjBZ3epQ&}`xa8$Gf~OH9K4qOl^TmR45P>_b~0
zt>ZFnsST?T(RwDh-L(Wf7+hxNxX0z3Q)Vh5gZ`h^nbKTk0N9UrWDO!_-sg4iy;mB)
znj3dVaRGVN&21j|{i|AsqT@(5-Ta~7^Mu(b?wap+F@`m}XB
z6c!ydB?LqdhkWSz*~JZ8z$4l8!GfZ&*45RI@1F|(vefK)=N+=UT%KlJZSUso#@?DM
z$w+#t&gL*ZFk>4l@_z+-pPbIHPC~rF=qblDm9d9lIiFi)vfc8
z)ykD@PM2U#3WUwMbg}m?oY%jXYrHEe_F%#e0tNfX-2pmrjclu>xgYXuVM?q*jKMF{
zDxZ4WV`FtO-}+14GtFof`wWPQEYSIzX%Z}Uu)Y#{)27%rVd3-s+@U9zY3PC8cKr@
zgyqil-kW@S?#e4URwaDmTGw~FZ`M5!&%aKq6h2VDv5d@X@lIx8aONiYl1_R~(0$+j
zEJV?tU2C!##yvT0p6|dO6de5Es|3ANI&~j*&Py(?tezZw>v#?z5Fq?p1h$2=
z+Q*a3633Of(G#2e-a=?L&vLVbMPY*nJYgOX#=`L?iWpK&p%VW?5
z;Xg@j$Q?4`z4`IL&_Mysu_{1M_Bo(z$!qv|BhFHSpd=aa>GG)vLAyZ+O
zD$w~$1HE#!<6Kx8A9Tgx!-u=@(Z1{se}fVCGD2Yh#Wp&P|NPTUf+6tG_;sp4Y#=ZQ
zzb@7$lSOUv^z_V4T8o!m(HQ!%u&_{ZF!=8TH^l-@DrrRYY`juvS44XuMuKi@ZEv5i
zd1Fyn2eb#tm~;fz$3-)VP4<9TAKA$Xc`OUzGNnBfJjZosz(
zYnf$slxOHD(<1Z7+hjH8&x?xzb0|_dN+i#r_Fm0hUh$`>($8d!s}6nj10
z7Q~RKzP`Q+(-$XfUeGVv()AvkA%?34E&MK941vR|P$I3>g3BBf7R0}Iz3j@YQ!Y)*
z>za(=DF_b_4_o-2OYcf8I6eD{Zl@IgrMu?G2&Y2NoD=?1)l<4T_2ctfL<@B(2GKS8N_3s3!Uo3^=TlFhJo
zb0Vm6!Sfui`|MM;UUdS$a)YBEA)%1k(jpkEf)eq-^H|J2rS>PoAQ|5+C8yyB)#jV)
z{KxP&TSPJ~6wKTRPPUag?^P6d?En}m&uQ=P52>UNAf`BeUXP)Mcz=Gp&;MOfQDE_>
zo;swq9%O_9TIQ>eL)>t%fG$a5tniOtP~oJE=?A3tZHN2-($@7MHb@pxJ+K9;agF_+
z_>&z6`%Azr7^hW9MsnwfomLC~h7u&*^V=
z#U_buUVmF65mCR{mW{34ixk_3Oc*B%%2@gp+R^wOp7or6olsAYxa
zYL|qr<*Gs2m(h!}HPVMSrMn)&DAA;}ELAi75+-#H5D_!S&=$Lv2LD9dVYfGjjduw(
zgqslpF1U|HM)HEHwvLX4$>UL&N=SPp=K-V{4%4z2y2bH-7{76&9gLXcBiVoa$|IQT
z_Ibcy2r{pVPoAODco|0E>{Hp}L}`i?Sc+=kS5ItGX5RQ2%`Q-YpDJ~9hvBk|ArC@;
z-Z!5;Ohq8YnTKR774}ZBp3WZ>!cdMwtS8#r-K}Lq+~Q!=BOr-$;bbu?fIyJi6>A93
zZSi81h9XAq_Q?E-IwIsGK^f_V{yE=MpafC`Vm0WiS0QuSNS5h~VHdc(P4>v|iWH>>
z-Jqu^VO>yH^Jy#va@IHxb}pH|sTg}w=R@k?31ObJ=6|eF;D80z=P5NghaQJ8`ndVs
z0Q*uTv}dbiRSt+F)}_VqBT;SaT%(uqnY9sGcC!BSm}}
zsd5u4k&dfdZYaC6QH14|+@>v`Ts5z!+7s8lLWKA)dZ
z)k&ZyCGR&8d18!tu^-4k0fHdt1)c+gDTCwsBq9@@=Y2geK($)EEh5vvng0ym)s~1n
z@H}rWHNe!=)Gbwg1DrZ!_^y75$hhZu@8U)-A-u<0`&L9w$G!gkenv+}0jSsOslAa>WQi$9@QEaJK@eSLknu1m34Oyxy%HkZpiQ`J4Ez6T%-
z!-v37Qg@+HKxDgDL?{#rsl1r31wn8>5nyNf$xfX|B@uZVJ%tuP7=}Z@<>LkbdV?Ui
z(gt9ybu$PDKtx(uPGoa9D*#}m4FKrQDqTb_CIOt!3P4p`!$tv8eZ7uIzuN#rWFxC|
zRc&QCNt?&5=&(_M#S8%!+5mu=3;|kMEr4>l{8?4MWRSmVj9F;|0B{_qoB=>-PiAys
zjF|yGBy}~LO;oqvR8^(fY^L&}Qq{#$sr0HNfQYEI_7U(S-rQ(3sMTt$t*ue3)o3&t
zsl13bbGh8(_-5iSSr~@H*4jBBpE%0F_0w8=)A#-5xZxyK8)M#EYi|IXhfP-1IxwCT
z-Vp%6_x)vS?R8-35cvzLI#?=|7CIHAx)}vQa2Kco11W=7thHs|_h0WcaMunsIbjx%eFSv|;ePqzL5HD>;|U&C5M00000NkvXXu0mjfV>(UZ
diff --git a/theme/colored/state-pause-64.png b/theme/colored/state-pause-64.png
deleted file mode 100644
index 76d6192d87213a7291830bb9e208603aea75b0e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1598
zcmV-E2EqA>P)k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11-nT^K~#90?VDX}6jc<*|7T`r+ftxd8qpvzg|wm#PbLcCOT~}W
zO?=R#CSu|X+E{t8rOEDeCApC{+h$9H3rLJ_f{Ee9CsS&Zs<9H|i)j>4S?Hnx!5Cs;
zYr8Yf9v@m1cV>5Ic4uZw?eFp2d(Qpee>)%d&Rt-MC6=fZLI_C+AyrZXc|Cv-qFPau
zEkv{xz(W9%h0Ivb4a-(JeG60TAk|ZLL$W*z-$~K^{ukR%y8UnDU+*%H~%FLb7
zX!N6Uij-`?(9lrL%*;%Ji1w5tzy*$Ln${tNNSBgak^u(}9B7mz=@TM)u#|icI7>t!
zRaH|?6CE4S-{0So&1O#lxX)>>$NVZuQfnj*>v>iX(Vkc=_Cm3K1q~P&
z7+Ar~2OW(JpsA?|vMih8vMi&ismb-cd@%E2A;ii;eF_?27={3_*6G02)%n*xUbGe9
z-m0pqw+eO0Yd~LL-x>g~moh3*{(GwzZG~XwH{$X5-TB({8bCx{_;Qj5_zw|%nHw`1(A?boEr36KQRFYzGntI(yP?T|wzf6{z^A@Q@|O`IL^d~=??vcC
zkHz>7Gat8#TN_3B{&zj><2U#{u8K5ErqX+V2>yG}&!daKD-jtC+CvT7*wUEmOa
zvJW9G0B&fSb|hb8UIQYL$P_al@Q`|5NB$G+k^YXyV+)?bPt@&GY4r60u$z8j4
ztpc#w?#Q#Vvq-1YSigQfBx%lL!!R&1GJ;ep<$9hKL^Rmb)AL@jezs1CXqpxd27_Aw
zJZe|K#KZ(rsT4MB*Z=^yaNz=`ri$NFOU=6-B061PUmvyA*KX0l!NCSy*Taro7*E@sJm7FoP*v57M6`8*?ipMpqQ~~{
z-#_Uj$?>MBs;a3#Ah3goPCL!@3T7S$uvt}A$B&AlPXQ}NM@Of(Z{PlbBuPv}JK)1F
zPx8P34mUJ3?C$LBENL&ZY~it3>`7)m3ZS{%T27e13_Da+9V@Gj8)6cPL{&PS-Upx?
z-k&4B4j`^++K>=JE4P@d|GGkmmBC=J1HfLCaJ;SvmjNVXSw0pHhh5vc_vG3=dGe%u
z{`~nT=8xJu1K^$#OI;
\ No newline at end of file
diff --git a/resources/files.svg b/theme/files.svg
similarity index 100%
rename from resources/files.svg
rename to theme/files.svg
diff --git a/theme/lock-http.svg b/theme/lock-http.svg
new file mode 100644
index 000000000..a77e45536
--- /dev/null
+++ b/theme/lock-http.svg
@@ -0,0 +1 @@
+
diff --git a/theme/lock-https.svg b/theme/lock-https.svg
new file mode 100644
index 000000000..cf013708d
--- /dev/null
+++ b/theme/lock-https.svg
@@ -0,0 +1 @@
+
diff --git a/theme/more.svg b/theme/more.svg
new file mode 100644
index 000000000..8bbdaca10
--- /dev/null
+++ b/theme/more.svg
@@ -0,0 +1 @@
+
diff --git a/resources/network.svg b/theme/network.svg
similarity index 100%
rename from resources/network.svg
rename to theme/network.svg
diff --git a/resources/public.svg b/theme/public.svg
similarity index 100%
rename from resources/public.svg
rename to theme/public.svg
diff --git a/resources/settings.svg b/theme/settings.svg
similarity index 99%
rename from resources/settings.svg
rename to theme/settings.svg
index 8cc9790be..8dfc7a8b9 100644
--- a/resources/settings.svg
+++ b/theme/settings.svg
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/resources/settings@2x.png b/theme/settings@2x.png
similarity index 100%
rename from resources/settings@2x.png
rename to theme/settings@2x.png