diff --git a/0001-fetch-upstream-release-to-3.1.0-33.patch b/0001-fetch-upstream-release-to-3.1.0-33.patch deleted file mode 100644 index 2ab901f..0000000 --- a/0001-fetch-upstream-release-to-3.1.0-33.patch +++ /dev/null @@ -1,2256 +0,0 @@ -From 7a3bdd81d78437a21501966fe84aa67bccc90cd9 Mon Sep 17 00:00:00 2001 -From: dou33 -Date: Thu, 28 Oct 2021 15:37:04 +0800 -Subject: [PATCH] fetch upstream release to 3.1.0-33 - ---- - data/org.china-weather-data.gschema.xml | 4 +- - res.qrc | 70 ++++++++++++++++++++ - res/control_icons/weather-sleet-new.png | Bin 0 -> 630 bytes - res/control_icons/weather-sleet.png | Bin 0 -> 916 bytes - res/forecast-icons/1x/100.png | Bin 0 -> 755 bytes - res/forecast-icons/1x/101.png | Bin 0 -> 620 bytes - res/forecast-icons/1x/102.png | Bin 0 -> 478 bytes - res/forecast-icons/1x/103.png | Bin 0 -> 623 bytes - res/forecast-icons/1x/104.png | Bin 0 -> 769 bytes - res/forecast-icons/1x/200.png | Bin 0 -> 631 bytes - res/forecast-icons/1x/201.png | Bin 0 -> 321 bytes - res/forecast-icons/1x/202.png | Bin 0 -> 480 bytes - res/forecast-icons/1x/203.png | Bin 0 -> 480 bytes - res/forecast-icons/1x/204.png | Bin 0 -> 480 bytes - res/forecast-icons/1x/205.png | Bin 0 -> 624 bytes - res/forecast-icons/1x/206.png | Bin 0 -> 711 bytes - res/forecast-icons/1x/207.png | Bin 0 -> 643 bytes - res/forecast-icons/1x/208.png | Bin 0 -> 711 bytes - res/forecast-icons/1x/209.png | Bin 0 -> 1025 bytes - res/forecast-icons/1x/210.png | Bin 0 -> 1025 bytes - res/forecast-icons/1x/211.png | Bin 0 -> 1025 bytes - res/forecast-icons/1x/212.png | Bin 0 -> 400 bytes - res/forecast-icons/1x/213.png | Bin 0 -> 958 bytes - res/forecast-icons/1x/300.png | Bin 0 -> 824 bytes - res/forecast-icons/1x/301.png | Bin 0 -> 952 bytes - res/forecast-icons/1x/302.png | Bin 0 -> 859 bytes - res/forecast-icons/1x/303.png | Bin 0 -> 877 bytes - res/forecast-icons/1x/304.png | Bin 0 -> 884 bytes - res/forecast-icons/1x/305.png | Bin 0 -> 589 bytes - res/forecast-icons/1x/306.png | Bin 0 -> 670 bytes - res/forecast-icons/1x/307.png | Bin 0 -> 668 bytes - res/forecast-icons/1x/308.png | Bin 0 -> 641 bytes - res/forecast-icons/1x/309.png | Bin 0 -> 634 bytes - res/forecast-icons/1x/310.png | Bin 0 -> 647 bytes - res/forecast-icons/1x/311.png | Bin 0 -> 1093 bytes - res/forecast-icons/1x/312.png | Bin 0 -> 1093 bytes - res/forecast-icons/1x/313.png | Bin 0 -> 618 bytes - res/forecast-icons/1x/314.png | Bin 0 -> 670 bytes - res/forecast-icons/1x/315.png | Bin 0 -> 681 bytes - res/forecast-icons/1x/316.png | Bin 0 -> 647 bytes - res/forecast-icons/1x/317.png | Bin 0 -> 1093 bytes - res/forecast-icons/1x/318.png | Bin 0 -> 1093 bytes - res/forecast-icons/1x/399.png | Bin 0 -> 483 bytes - res/forecast-icons/1x/400.png | Bin 0 -> 580 bytes - res/forecast-icons/1x/401.png | Bin 0 -> 625 bytes - res/forecast-icons/1x/402.png | Bin 0 -> 600 bytes - res/forecast-icons/1x/403.png | Bin 0 -> 864 bytes - res/forecast-icons/1x/404.png | Bin 0 -> 630 bytes - res/forecast-icons/1x/405.png | Bin 0 -> 803 bytes - res/forecast-icons/1x/406.png | Bin 0 -> 790 bytes - res/forecast-icons/1x/407.png | Bin 0 -> 803 bytes - res/forecast-icons/1x/408.png | Bin 0 -> 625 bytes - res/forecast-icons/1x/409.png | Bin 0 -> 600 bytes - res/forecast-icons/1x/410.png | Bin 0 -> 864 bytes - res/forecast-icons/1x/499.png | Bin 0 -> 807 bytes - res/forecast-icons/1x/500.png | Bin 0 -> 497 bytes - res/forecast-icons/1x/501.png | Bin 0 -> 500 bytes - res/forecast-icons/1x/502.png | Bin 0 -> 535 bytes - res/forecast-icons/1x/503.png | Bin 0 -> 602 bytes - res/forecast-icons/1x/504.png | Bin 0 -> 472 bytes - res/forecast-icons/1x/507.png | Bin 0 -> 629 bytes - res/forecast-icons/1x/508.png | Bin 0 -> 1369 bytes - res/forecast-icons/1x/509.png | Bin 0 -> 495 bytes - res/forecast-icons/1x/510.png | Bin 0 -> 202 bytes - res/forecast-icons/1x/511.png | Bin 0 -> 499 bytes - res/forecast-icons/1x/512.png | Bin 0 -> 198 bytes - res/forecast-icons/1x/513.png | Bin 0 -> 272 bytes - res/forecast-icons/1x/514.png | Bin 0 -> 202 bytes - res/forecast-icons/1x/515.png | Bin 0 -> 275 bytes - res/forecast-icons/1x/900.png | Bin 0 -> 1022 bytes - res/forecast-icons/1x/901.png | Bin 0 -> 903 bytes - res/forecast-icons/1x/999.png | Bin 0 -> 890 bytes - src/addcityaction.h | 2 + - src/citycollectionwidget.ui | 2 +- - src/informationwidget.cpp | 83 ++++++++++++++---------- - src/informationwidget.h | 1 + - src/leftupsearchbox.cpp | 27 ++++++++ - src/leftupsearchbox.h | 3 + - src/leftupsearchview.cpp | 65 ++++++++++++------- - src/leftupsearchview.h | 4 +- - src/locationworker.cpp | 1 - - src/mainwindow.cpp | 10 ++- - 82 files changed, 209 insertions(+), 63 deletions(-) - mode change 100755 => 100644 res.qrc - create mode 100644 res/control_icons/weather-sleet-new.png - create mode 100644 res/control_icons/weather-sleet.png - create mode 100644 res/forecast-icons/1x/100.png - create mode 100644 res/forecast-icons/1x/101.png - create mode 100644 res/forecast-icons/1x/102.png - create mode 100644 res/forecast-icons/1x/103.png - create mode 100644 res/forecast-icons/1x/104.png - create mode 100644 res/forecast-icons/1x/200.png - create mode 100644 res/forecast-icons/1x/201.png - create mode 100644 res/forecast-icons/1x/202.png - create mode 100644 res/forecast-icons/1x/203.png - create mode 100644 res/forecast-icons/1x/204.png - create mode 100644 res/forecast-icons/1x/205.png - create mode 100644 res/forecast-icons/1x/206.png - create mode 100644 res/forecast-icons/1x/207.png - create mode 100644 res/forecast-icons/1x/208.png - create mode 100644 res/forecast-icons/1x/209.png - create mode 100644 res/forecast-icons/1x/210.png - create mode 100644 res/forecast-icons/1x/211.png - create mode 100644 res/forecast-icons/1x/212.png - create mode 100644 res/forecast-icons/1x/213.png - create mode 100644 res/forecast-icons/1x/300.png - create mode 100644 res/forecast-icons/1x/301.png - create mode 100644 res/forecast-icons/1x/302.png - create mode 100644 res/forecast-icons/1x/303.png - create mode 100644 res/forecast-icons/1x/304.png - create mode 100644 res/forecast-icons/1x/305.png - create mode 100644 res/forecast-icons/1x/306.png - create mode 100644 res/forecast-icons/1x/307.png - create mode 100644 res/forecast-icons/1x/308.png - create mode 100644 res/forecast-icons/1x/309.png - create mode 100644 res/forecast-icons/1x/310.png - create mode 100644 res/forecast-icons/1x/311.png - create mode 100644 res/forecast-icons/1x/312.png - create mode 100644 res/forecast-icons/1x/313.png - create mode 100644 res/forecast-icons/1x/314.png - create mode 100644 res/forecast-icons/1x/315.png - create mode 100644 res/forecast-icons/1x/316.png - create mode 100644 res/forecast-icons/1x/317.png - create mode 100644 res/forecast-icons/1x/318.png - create mode 100644 res/forecast-icons/1x/399.png - create mode 100644 res/forecast-icons/1x/400.png - create mode 100644 res/forecast-icons/1x/401.png - create mode 100644 res/forecast-icons/1x/402.png - create mode 100644 res/forecast-icons/1x/403.png - create mode 100644 res/forecast-icons/1x/404.png - create mode 100644 res/forecast-icons/1x/405.png - create mode 100644 res/forecast-icons/1x/406.png - create mode 100644 res/forecast-icons/1x/407.png - create mode 100644 res/forecast-icons/1x/408.png - create mode 100644 res/forecast-icons/1x/409.png - create mode 100644 res/forecast-icons/1x/410.png - create mode 100644 res/forecast-icons/1x/499.png - create mode 100644 res/forecast-icons/1x/500.png - create mode 100644 res/forecast-icons/1x/501.png - create mode 100644 res/forecast-icons/1x/502.png - create mode 100644 res/forecast-icons/1x/503.png - create mode 100644 res/forecast-icons/1x/504.png - create mode 100644 res/forecast-icons/1x/507.png - create mode 100644 res/forecast-icons/1x/508.png - create mode 100644 res/forecast-icons/1x/509.png - create mode 100644 res/forecast-icons/1x/510.png - create mode 100644 res/forecast-icons/1x/511.png - create mode 100644 res/forecast-icons/1x/512.png - create mode 100644 res/forecast-icons/1x/513.png - create mode 100644 res/forecast-icons/1x/514.png - create mode 100644 res/forecast-icons/1x/515.png - create mode 100644 res/forecast-icons/1x/900.png - create mode 100644 res/forecast-icons/1x/901.png - create mode 100644 res/forecast-icons/1x/999.png - -diff --git a/data/org.china-weather-data.gschema.xml b/data/org.china-weather-data.gschema.xml -index 6c82ad5..652c5a7 100755 ---- a/data/org.china-weather-data.gschema.xml -+++ b/data/org.china-weather-data.gschema.xml -@@ -6,9 +6,9 @@ - citylist - - -- "1920-08-27 10:17:42,101310204,澄迈,小雨,95%,25℃,北风,1级,海南,305" -+ "1920-08-27 10:17:42,101010100,海淀,小雨,95%,25℃,北风,1级,北京,305" - thisweather -- this city weather now -+ current weather of this city - - - -diff --git a/res.qrc b/res.qrc -old mode 100755 -new mode 100644 -index ba9818e..587661d ---- a/res.qrc -+++ b/res.qrc -@@ -316,6 +316,76 @@ - res/control_icons/logo_24.png - res/control_icons/sleet.png - res/control_icons/snow.png -+ res/control_icons/weather-sleet.png -+ res/control_icons/weather-sleet-new.png -+ res/forecast-icons/1x/100.png -+ res/forecast-icons/1x/101.png -+ res/forecast-icons/1x/102.png -+ res/forecast-icons/1x/103.png -+ res/forecast-icons/1x/104.png -+ res/forecast-icons/1x/200.png -+ res/forecast-icons/1x/201.png -+ res/forecast-icons/1x/202.png -+ res/forecast-icons/1x/203.png -+ res/forecast-icons/1x/204.png -+ res/forecast-icons/1x/205.png -+ res/forecast-icons/1x/206.png -+ res/forecast-icons/1x/207.png -+ res/forecast-icons/1x/208.png -+ res/forecast-icons/1x/209.png -+ res/forecast-icons/1x/210.png -+ res/forecast-icons/1x/211.png -+ res/forecast-icons/1x/212.png -+ res/forecast-icons/1x/213.png -+ res/forecast-icons/1x/300.png -+ res/forecast-icons/1x/301.png -+ res/forecast-icons/1x/302.png -+ res/forecast-icons/1x/303.png -+ res/forecast-icons/1x/304.png -+ res/forecast-icons/1x/305.png -+ res/forecast-icons/1x/306.png -+ res/forecast-icons/1x/307.png -+ res/forecast-icons/1x/308.png -+ res/forecast-icons/1x/309.png -+ res/forecast-icons/1x/310.png -+ res/forecast-icons/1x/311.png -+ res/forecast-icons/1x/312.png -+ res/forecast-icons/1x/313.png -+ res/forecast-icons/1x/314.png -+ res/forecast-icons/1x/315.png -+ res/forecast-icons/1x/316.png -+ res/forecast-icons/1x/317.png -+ res/forecast-icons/1x/318.png -+ res/forecast-icons/1x/399.png -+ res/forecast-icons/1x/400.png -+ res/forecast-icons/1x/401.png -+ res/forecast-icons/1x/402.png -+ res/forecast-icons/1x/403.png -+ res/forecast-icons/1x/404.png -+ res/forecast-icons/1x/405.png -+ res/forecast-icons/1x/406.png -+ res/forecast-icons/1x/407.png -+ res/forecast-icons/1x/408.png -+ res/forecast-icons/1x/409.png -+ res/forecast-icons/1x/410.png -+ res/forecast-icons/1x/499.png -+ res/forecast-icons/1x/500.png -+ res/forecast-icons/1x/501.png -+ res/forecast-icons/1x/502.png -+ res/forecast-icons/1x/503.png -+ res/forecast-icons/1x/504.png -+ res/forecast-icons/1x/507.png -+ res/forecast-icons/1x/508.png -+ res/forecast-icons/1x/509.png -+ res/forecast-icons/1x/510.png -+ res/forecast-icons/1x/511.png -+ res/forecast-icons/1x/512.png -+ res/forecast-icons/1x/513.png -+ res/forecast-icons/1x/514.png -+ res/forecast-icons/1x/515.png -+ res/forecast-icons/1x/900.png -+ res/forecast-icons/1x/901.png -+ res/forecast-icons/1x/999.png - - - data/china-city-list.csv -diff --git a/res/control_icons/weather-sleet-new.png b/res/control_icons/weather-sleet-new.png -new file mode 100644 -index 0000000000000000000000000000000000000000..7cd0243107e84294b9f5ee61db0c0d60ff9e6f1c -GIT binary patch -literal 630 -zcmV-+0*U>JP)93e+AH4>i| -zQ8*Rx0qEsMY* -z_$7b|fKLY>wFHc5&=Z$|2_@}|O}tMd<2k@5FXWnnh|Uxzz6wmh`b6v -z02U-p3EN|I-U3+>c!VD)60yqAR=}iDntGhjvYN>(ZI@72xwrJh>Wcu5T(q1_me7cz_iY*>Oz1=c_&R%PpOZ0i -zO5}vEHrXDSc_QLgMScs-tAD~6%W760>Y||1OW0;r!W#^w#jas3Ajxr`3|`>F=w;W>F1row5Vi_rL59s;nQ8f-b{V1BYY_As!!2CQDHOnDTU1**sW9DOz~Uu -zir&?Qrq*fdQwkdae1?K`glCOiK{KwcYg+h}Vz`OB#vq_;3s)$cp_B|*MY3gU6K8=8Ai$Pnn?q6}sbqkN@Ro7&rlr3U -zxBy%U^o=Wl1}FfS0>BCYN&rC7bl(gB;-D|+IBlNsHhPYD~K-R7C5=rs}Dh#N*&iFaCT#M|{^KDdzd`{aTN9DxbQooC|lTwjph -zvG*Dqf!hnVf+Vo_8YZB9>p=|WR3*JOa$_fHi&V`2r*x4LC?n@szd}k8Q5MOepTXZt -zT71Jy@RTi`o?1wR|;1 -zk9>pWPQUQp=zfpmp$z#kDPv^J(}5^4vVe%@Y7$$zUeu-doe7ZkpDjak91nTFRwUqv -z1ZEO1qAxaboK^_=ePHV7zaK1j90ZjRR7UqikWc|K1QAF*#x2*&+SZH(Yt|Pb1ZIx@?Kw|2IupS0P!srO -ql%qP>B{&|Q?O@>gZH0000RCR*{T%e;DyG@#(#<7#>RFhAt1i{bmb8J8Rx%5`66%H9+4w`*u -zz(0U?4T!uMA}>JXowT(@+a9h&(^F;RVMm;px;R-whjjmRTM0x+%ts -zba-4?yjuSlO+4|739ZRb0lWa16p#l$o5V6CyT+V#sY23zA9y-FVG>28cfonY$9N$- -zp-NyYWP0-8HFMUXhP4vkD#@pfxU~?_hY%&~i)Hf^hMB|`!{ULPCYW1wSq$(EYa7#* -zuLDWrmPNL?vc!HCYF$Nz>^FdK1<#)Wd{P{49|Eh&`356-6QRRf?Xh%fkwN)7AZq(MyIfNK5OqU{CGe@nkpG!g+sGT-K=K(tA+)Zk>8MDwOWg^tz -z!iM@E4%?+*KBJmU)oQ -zv?m6VWl{s2@;iPj()g@@Sx=0(+nP7+Kzm=a(g5s%iS;VwmFT|U*f;)@Z)kJ~_~>nB -l1Yd&gejg9JiQ9pqLhIKhF-a7#WzzML8 -z6JQ%Bz&2hU_BrQu00RJh0PN(_0>Bu+3u9~?=h>MbB{=6j03!f55x2gPNXD3N^88Fw -zh;vRW{;uIX@d)6<)JA3kIOiQo4Z~?&&iT+}LY5I2YOZ{cfvg!V(x`#DEKbVxZt&uE -zyTxj?!g{^NZnrai_EZ-5DC~x$0*11?Xsz^exrFcg*zfnIb|$nyssfKIpf20rt?5LH -z$ZR${j)qJaWB0*1acUs8^F*amL95j|j)rt)S4%8l6xaEGqvbLhjYgcQgWwOQDMTUs -ziep&?rO{tK(74%bB8#0dR!SmZtm-srBZRW)iMpOI`4fnS;U|NmloE9$@!EXT+ -z06s0=VPs&K -z6y0U?;6SW|itvdek&iv7YoJ(E<}@2ltNqZEx+&yq13kE6#bQ8lk+`k6`w%J8&zWrSGJNd{D&y}Q>mn+q3m;;wCI -z4(tOl@j52HV`A4|5K(1#@?c8CM=zPnQ;A?mM~l8m27HqY_$C?fO)}t{xD5cf0gFI7 -USJ=h($ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/103.png b/res/forecast-icons/1x/103.png -new file mode 100644 -index 0000000000000000000000000000000000000000..2b4fa52923f8239ccf138a38e58e7b5f6f3b7be5 -GIT binary patch -literal 623 -zcmV-#0+9WQP)Uve-XJ6O;kDnr6L} -zl70tn;+?ud83^87xM;p??%lgNkS;Z9&ye4VtGBN3bVuG#&%ewE8K{foaciO4BT&6j -zA(*1z{f}OS+>*HIBs5Rf?1-Nuco}s|ViUV}-^$cUAoFrJYj1xgrcibn_?6|&z}#LS -zGlj+xPG(8KD}=hx^N&mfVxO8;MB6Xkfk$A;Rbh+`nOZtQ8f6Ud%T#1y%ouAe(iY|$ -zSw)1gCF+tS8HfW-mz*{p^hZ9`XalOz22`UBs74!5O}-5P_yyW`+keuz^=AM8002ov -JPDHLkV1gV&7~}u| - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/104.png b/res/forecast-icons/1x/104.png -new file mode 100644 -index 0000000000000000000000000000000000000000..170cc31e4b10cf6b93d17f9c51b6c3c641c992a6 -GIT binary patch -literal 769 -zcmV+c1OEJpP)BUoV)Y$ -zyZ6JF#FJ8Dk>xM6`v%|yr~#;34M5#$0P5E1dG60SzW`v9URN_8{{*lH;C&DTdsT5d -zA0;^FTL7K_ST`8H58z=C1V5Z^Rv>Et+VzhBZd%^!5Wq$d1Yb(x)DGwT -zn#0^&SpiVmxR_70P8(2~j8lkG=euFf+vqFR$ZMAxv5CND1?EBB>k)u&6k#jb0Ngem -zD5X3lgjk89Xf2AO^XXR{$LE9)XH@hxQ@1$hZ>j<~w)mu!zA{KAmvklxZaIpgRRYQC -zj!h(N01DG5F|Q07uIDKb6)DYUDiW7X7Rh}QQ_(&Ka2LR(qD2z(IcZTSiWGd`|C1T_ -zOg;RZ0H{~*m=>)N;;f7L)O-aYJkN{ilJq>!sODx;h<4t_{E~`*t!d3V%Srvjal9JG -z@kPei{p058Zv4`wT}mnEIuI7DtGvBsj2$q>uIG)@0T{PSR0xn#3&3t3gbu)F_bdB8 -zF`Z7+Z&g~q(~WaA;8E`D`gkcCjYipJTDqFh0UQfcEVtU|qBPq*q*6M)YJ -z=2vo_o~3Fq7+^A)=$34m0KCveLG5;xJDzAb9HQIp8jqg=pd;-@7NW|0Po&bO)9F~v -z(H1d%?YjZsLjqD&#~F{u|5B#iZlmAtThGt!;S`CZvj}7CB>a)EoxQMVzYD#}Ua$d} -zq5sd?4#RMF9)RaHnpc&rJ=hrogkg99;6bUj%%mcJD-6S5y3y7@Y%#{JP&DpUX!00000NkvXXu0mjfHP~AM - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/200.png b/res/forecast-icons/1x/200.png -new file mode 100644 -index 0000000000000000000000000000000000000000..b507b16fcf070c779a8b6940e5bd4fe70afe1a0d -GIT binary patch -literal 631 -zcmV--0*L*IP)^@RA_0V!alq|%pEFn=M+s*rVX0IWH_zXIQ6Oc0bkfuz8BGkQn#Vh39(2>6}nXQwHOIZBMmWWNCG`of1T5Aq$Jr$ -zJNF(H-GOe2WACZ>xA+Ad&aml-Vr>?T8Hy}_oTep^Qw~jaNR2UxV;x-vo+}QtohyVc -z9sTnnOJpMtJAFs&PXDkGBC=0$*~(<*}4CPwY~D(`K+89WBT%U)(MTW{xW$W -zk6D?*+5=bL(ej*c3hfwdcO(S4q{zP_u;!)WCW2H-HOZWkG(7 -zfji(Dc$vr0r9w9gbY8;}IRzek4O}7gvvSw`up%e_)z_dX57;nTU6A8Dz?N$N^ZixW -zq(pY6NZ3%?_c3ac3jI}e@B7#0feNvsrW*TB>&gS6upu&ORpwE`<|XG6-!+xMs*=cc -z;5cW@SQ45S79B#*Gr}WFWZv1h4jHv4Z~$y8wW<6m5e-@yts5sG^yOg~|z_qD0zUwD% -z9e&8zo(kHtl#k$=hG8^OrEdav03cak3YhH+4oFrFt692 -zuv+^|S<6DrDVw$TyybBAR|pS(@s{HkKgcaA4|-WZs(_Z|Fh1aWu^>gb=vHGi(EALY -Lu6{1-oD!MapdPzWihu{vm-|7zfH^0!TQS#31Ah;=SM?6y{Ae!z -zkDjB_r~ntXE|og}!Om~xr2h#ygWYlc`V;rmR{$E{c@!2#gIGD88xxS5;su;~<0}A< -z0L}uodjR(UzIZ%E((AcwSf?)V!{`fui-`Rl$N;K^$YZDF(#{iOY+NkHQrR=SAo -zfQC<~;(T)L&EKTt0}XHBIpF*%IhiR4pOyHP*l{>bUT+7Q+?asen1I}vfZUWV0KgBt -WNHYs{ZbA(J0000apdPzWihu{vm-|7zfH^0!TQS#31Ah;=SM?6y{Ae!z -zkDjB_r~ntXE|og}!Om~xr2h#ygWYlc`V;rmR{$E{c@!2#gIGD88xxS5;su;~<0}A< -z0L}uodjR(UzIZ%E((AcwSf?)V!{`fui-`Rl$N;K^$YZDF(#{iOY+NkHQrR=SAo -zfQC<~;(T)L&EKTt0}XHBIpF*%IhiR4pOyHP*l{>bUT+7Q+?asen1I}vfZUWV0KgBt -WNHYs{ZbA(J0000apdPzWihu{vm-|7zfH^0!TQS#31Ah;=SM?6y{Ae!z -zkDjB_r~ntXE|og}!Om~xr2h#ygWYlc`V;rmR{$E{c@!2#gIGD88xxS5;su;~<0}A< -z0L}uodjR(UzIZ%E((AcwSf?)V!{`fui-`Rl$N;K^$YZDF(#{iOY+NkHQrR=SAo -zfQC<~;(T)L&EKTt0}XHBIpF*%IhiR4pOyHP*l{>bUT+7Q+?asen1I}vfZUWV0KgBt -WNHYs{ZbA(J0000fQGY2v{^;?JBntnGe_A;a8 -z7vLy`5E(sR2_cTk{7QLO$~P!ub!bcANLQq=%r~eES83TshrUyZ9KaX-|0RR(6hq`f -ze1k>Ti}xJ|@<4g%b`Ru+8y8zy9Y9MP@Uan_4e+sdxZ_G^FMTQQ7z;X-mc6jYGBldH@~rl~!6v9b>(FoX?A -zZ}Z?G7ZuEgaHG;yemi8MBk_=dYoi3NPI^akL6aIYfz+5b0RVqlAf90^TNmvB0000< -KMNUMnLSTX)+!kv9 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/206.png b/res/forecast-icons/1x/206.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ca7b2521f35de4e43a0b8452ac994a5e78230247 -GIT binary patch -literal 711 -zcmV;&0yzDNP)f~M(_an@LdOp(go^| -z{@0nH`N#koL7t$_2J%PyiyZD?A54=HEYYIX)4StY5+M>0fky(qAtDSJ9|o=cXuuU< -zG$1uTMw)*HAOkR$`wBn-U@g}^u>4YKXnwe>|Lz@uM3x!b;(IPND_w7-&)uF5M -zWsUM0t`Sp@OcDb$3Q=@UM7i^YNtD*_v-}=K3IiaMZ;5CXFmS63SbJnLX{~j*^ihHX -z^|xHV0hq>~ppUbVp5P|-;IU{lgmb_6L{=@6YY4q^+j`&V7z0ghrDC9Lkj*@Sud%#D -z5Z5tO-aw_g&5d-NTY`8ZJLtr_WH#{5e5)ik@+^cLz@zl-WM?kK1-b7|z4sMBS?5C5 -z&B=;VR;0;&_HH)wtftoKh>m@OEg~si$&xoIZ)uq`ZsR^M>*zw&(K5$@myU;$6LT#5 -zQTGP}hLR5~)b&Pp48eec$&Oi>dKn)`j|_QcLZq5xyAcn@V@GS*;DSC-AvY -z-&D$Z!!PH!V8*3RqZaTSxs&+Z2Xo&LE}RovQqN$rVri*asFIX%k9ocLDXwKBYh63C -z)P+6+c#z)^{sQsTi`4Y82^GPL30tICc`$Cs~RepMB@Mdl%x=*dtp5sNQPbMRNLa|A1wx2Os1eb7(>)5CDUGfGTot_k1TZ9zSV7%6@C;zX -z`kw7jGW9?}@gI|-5silc?%2FrYlc{iPo5i7Tl?6g(TF|!wl=AYMpfvuvACq%SQ=a8 -z5`iVxh7z%kG-P}s#3F~11-A6`#g9cI)PaP|EK`7!uQ@Y?D^p -zxZ<~vydH;7;~tGY0+{B7P+J@KLg=Cn)D2F>J1=#`0G~oEgDx20Q$BfYEKDEdO01K- -zF3~4_xbjOLLY##HDkff2+G-$E$ao0#Tdw>vQ-u}x0r_s*7KAzV!T3VcIQIXAn#RBV -zv2_OE!l52(054SpRR$!=&j1{o>s1O{+V`W3kSc_F4Je=PJEH^CMjnmcP;;etkM$Ez -z+?yKU8WRB5Y|oi)PPB!E=5+EYPIU#_M59}cIT^IcfS$&j3~c_HQz5M{Ulil%sZS&W -z*18M2PU0jv2dw{Y%0jL^AY&l)zsX2#xXyv6f@Dp`AIetZrs}|@M3t4lh4vSkrm;7m -dX>{8F06$+P8_JG7*|-1z002ovPDHLkV1f^qA@cwL - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/208.png b/res/forecast-icons/1x/208.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ca7b2521f35de4e43a0b8452ac994a5e78230247 -GIT binary patch -literal 711 -zcmV;&0yzDNP)f~M(_an@LdOp(go^| -z{@0nH`N#koL7t$_2J%PyiyZD?A54=HEYYIX)4StY5+M>0fky(qAtDSJ9|o=cXuuU< -zG$1uTMw)*HAOkR$`wBn-U@g}^u>4YKXnwe>|Lz@uM3x!b;(IPND_w7-&)uF5M -zWsUM0t`Sp@OcDb$3Q=@UM7i^YNtD*_v-}=K3IiaMZ;5CXFmS63SbJnLX{~j*^ihHX -z^|xHV0hq>~ppUbVp5P|-;IU{lgmb_6L{=@6YY4q^+j`&V7z0ghrDC9Lkj*@Sud%#D -z5Z5tO-aw_g&5d-NTY`8ZJLtr_WH#{5e5)ik@+^cLz@zl-WM?kK1-b7|z4sMBS?5C5 -z&B=;VR;0;&_HH)wtftoKh>m@OEg~si$&xoIZ)uq`ZsR^M>*zw&(K5$@myU;$6LT#5 -zQTGP}hLR5~)b&Pp48eec$&Oi>dKn)`j|_QcLZq5xyAcn@V@GS*;DSC-AvY -z-&D$Z!!PH!V8*3RqZaTSxs&+Z2Xo&LE}RovQqN$rVri*asFIX%k9ocLDXwKBYh63C -z)P+6+c#z)^{sQsTi`{f@QO>PxpR)D -zT5oc1s8%QgxD8;Q`o99$2CxBOAZ^k8yw^myBa1vS;s`{3yx@3vQx+^#jj#gXZs2(b -z03HC?k+tz1z&WLJIZe2Yi$a|LR6Vk-7nU5xAE@tVguqz|qt6}hYz2bGNCZ~Jbt;|| -zdxdm6LgtpZ(<|z`2w+)cSA9`P<3@1=+TtP>b(Lc9RI|@N1+XjfKz#o#^)Jb1Up?Pq -zRn7R&1fWJ~O(l7jK$+S)WISV&WG2fy@+Z%Gy+}f!DXwC1Jw|`vY3If2A{gN%$+JmL -zL6W8t_ej1(vUMjmdS3ioW0}5xA(Q8p~= -zK0OuPlGo!yW`Q+FGWJapwYYmrjx4t7(CbpaH(MQ+fX!A9l_628{6tb`m*I6|Okds8 -z@I1d2LvUmQ)~G$lY#15kmRx$oZC8rQ;EK8LUl1v7c1>?9M5M-fYHt1FpLMlOFYlNk-4(o -z6Ug(gl)ifW81gy;oU-hP+%c~NIR9yd6sLheFx=*mKvk+Si2F<(0Zy^k{f@QO>PxpR)D -zT5oc1s8%QgxD8;Q`o99$2CxBOAZ^k8yw^myBa1vS;s`{3yx@3vQx+^#jj#gXZs2(b -z03HC?k+tz1z&WLJIZe2Yi$a|LR6Vk-7nU5xAE@tVguqz|qt6}hYz2bGNCZ~Jbt;|| -zdxdm6LgtpZ(<|z`2w+)cSA9`P<3@1=+TtP>b(Lc9RI|@N1+XjfKz#o#^)Jb1Up?Pq -zRn7R&1fWJ~O(l7jK$+S)WISV&WG2fy@+Z%Gy+}f!DXwC1Jw|`vY3If2A{gN%$+JmL -zL6W8t_ej1(vUMjmdS3ioW0}5xA(Q8p~= -zK0OuPlGo!yW`Q+FGWJapwYYmrjx4t7(CbpaH(MQ+fX!A9l_628{6tb`m*I6|Okds8 -z@I1d2LvUmQ)~G$lY#15kmRx$oZC8rQ;EK8LUl1v7c1>?9M5M-fYHt1FpLMlOFYlNk-4(o -z6Ug(gl)ifW81gy;oU-hP+%c~NIR9yd6sLheFx=*mKvk+Si2F<(0Zy^kVG1PZ9EFzH78EE_kW)BP8WvqND_$mhdw2HPoF$%g@_27< -zZ{F_g?9AFT#u!X9PEED-83@z>Gy&AdY)@vSaiIV}N8~L4i$x-kW(Go%`(w0aC?pXm -zi~CqKrj0;kd`aXUfb|L3lnH4FSQO59q##fwxsU{WQHZ0@k?v$n$_C#I1SEeflFhlO&K8foysldNq2Ik~H$#6!S{vLRs)@9^)g- -z0(b=A7l3zpyg2O)ls)ZHc)hCH_r+aWqO+)UW@M)J09+YqjYVNJ=Bk;$XvOHX&2e;% -zG4&YTvN7hqG3K{==Fk{Z_1NLPd^fA~lCI-^LmAR^=u{kSv&NVo<|N{Xd#|K)ns3h0 -zRO?Od4b=)20Jj0m)BUdiwgGGa7)V?6JnuCT?#LofjU)n*A1^pMZ_0v&su5NI-1YQ# -z0N??D9a$US0i07hm$QW1q$tGsPc25a^}>?F_yhI*j1V|0Vf4AU5DxK1@D -z#a(bj{GU+y|G9`pee3maXmqQ5Yx_!)kQGEOOj{P -zoPwlHCGL@YiDc_eZ1lYNxyCYm|3We^*q;)TUGH@wErDpEzIU|Sifu=Y>O=B#$O6AX -z-?!y6pfC+_Nj?QxNIJ&JlFZd5$6=IcnmN+UNx0mQi^FS&2(XK6$$IFj!SXKVECl+h -zMz(k+Ztxkvi-bOQMQ0$R&o07?Hg5kpfng4JqfvXU+CBidCUQmGXI^H)8oo)XL|Ha0 -z>pndd-O|_NLuP?>M>6(J61Ajf14kBHbLe&Her&cnECHLX9x6kkRQZXd&Mw14V@zK? -z(}?N6l|XQ00@kQK$7~oG<(6D}#FLEI>3SHaH)>5BMT`ql9HDdXz#V<_qjaLTgpJ2xsS0nUHCYiSw?c*AWG3Dl$-gSgMs5#SViJ!$VKA^|Qj -vLyz7O#PXXW$>_^8C`#LoF00000NkvXXu0mjf*bdS$ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/212.png b/res/forecast-icons/1x/212.png -new file mode 100644 -index 0000000000000000000000000000000000000000..cb8b3d5ac0725fe0414baec79ea20b1cff506c90 -GIT binary patch -literal 400 -zcmV;B0dM|^P)OH7$09jc{^H=DpEk>Ijd`5aHG3T9vRR>L%^%^(73S;=c1mykQ4X{A5baS1sA -zEh~Ag<6;)lX3zoJwv(8Jn&`q#A{J_*Z9AETvLO2a*8(+Wz^g!=k|pqd$pVQxuuU!C -zFur86#4ofIs1aSuEToND2zUk-5$jgKN9yJhci=5y?L2jJiC<{d@wysjA#Db4p?hF@ -zX3iS;PTZ%F)Dt+@eCV8LQUk1o=0sx_(q^z0x&@wqo0G8v@Cp11^%g|T36xDgI?ew# -u-YPKx$}jy@y+g)Z#Vn+a1<)q%0KgH17N$SpNUXR30000!9{A^xFo6QkfA0} -z(m-6MAW4f5No_>ZMDCL!gQvimm8uE&x`SWN4s>YEQCkWhxsxmiY$XRQcXtpYhxE}V0n7`;+wV8SW4 -zqrS!wPl0s=A&7I>&6An326~ao4*-m1a!ncYnTPaQql_$U7v@w6<}(URwVvjO&bbp; -zj1#u?{W<~j={x5pG3Jy)U}9c0G|EpSl=qk#5_V1WS>Gpt<2ne~QPK<6j{Mj;x2~SA -zvra?$=!Jcuq2$T3mtxsFMu76Lu>OpolCb$6X} -zTh6&}EL*J0Y7ffP?^w-nzgKjN^+Ij)TYH^n>i#3IZvm{R`W4pcHnwk(8@^UZvC@GK)1AceE -zL?Byc83fwo1+vNnKmr#gtT&ZP%tApcl|WmK%0%TQ^G@dc3`Ygoq6Q)1MH`PnAn);J -zH3-PJgJN@`N(4ftQ+oFlsl3ic3rkEO+ofyG+ITE6#1A7~UyE&}PiQwbOF3#u*;2N7 -z>KqF3_T^PJ^?TgZ*G|A=lc&&Cj#9E91MnpJM51IaBnMEB0KDg+R9Q&h4b%5iit?y< -zHtNx1{?rW|c!h946O*;24~He+dYbz3d3>ex$zWS0Xs67lY&v|X97LI;nYj>%g%CYp -z+ZSaIc^CPS?*p$JRZghu{6>}namNp6KFMaIu?PYqt_|^ImA~jTxd!}K%*r1%G;aPY -gv1r^7SSSGe1#)LKQ$#DREC2ui07*qoM6N<$f}3`;ZvX%Q - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/300.png b/res/forecast-icons/1x/300.png -new file mode 100644 -index 0000000000000000000000000000000000000000..25005627018dde980ff84a11cf2cf1ed8e71d422 -GIT binary patch -literal 824 -zcmV-81IPS{P)PbXFRA_&%t4R{t*;xTf^0NoyZK4*>sb#r`t~Fb2>^cQ&p}r385mOj>OKLjZdU -zbGZN?Q1m5H+sH)Rdk<`Gn~IMZ -zQISWCso)D&GEot$b$3rsR`K?W_)0Z-p7%RZ3e5|ry?s!Jc+OjjLT-wQ3>5b?H+D^h -z>0ps2p$UizT= -z>trkZd`^hkCVfQEq!%YSmYE5Y`ITZ}^O(_GmAEZFEJAd)m@{*Pc_ai;J -z9$PkGvT?NA -zD`S-rh$eE=yKa@NG6F88j`7l{!(}(xG?xY%1;8J(HR7MzQq#=<0000)u*qIc-A%GAYr-yT6nS=ZqI9h1}=mFTY -zh!p{7W8?IA{nDDG*l -zt-BH{1CKZvMVJJHRkE{$M>R2qaRI}wGBU;$)>(ZITz^uB2;X$eopcv!XL=z){C-%K -z@AL3n&qQ%Idi#}!d!Op1oy8LWmcJiJqu1~@KUc}l0wn|tA282qCaj~Bfb%%A$Ou@p -zO?{#tSTq3#`hg+~iO2ZbTq)T@v^Y(@FDlA_@#$9++NP$iC<6`ZL;RY_Z`-#LS)7sb -zvEr!+CjegLIl*?g+n~O@T~SR$MEW3aFMtvP&Mp3v;Vyt6k@gWb3S)od$smy%4Y`Mi -z{p>^|NTdbC`BvcoyhxJiv&RP_!XNr{vTMLD3 -z-12wJ86>hlSCebLlA`E$=<7-BXSS)OVmS*45}8W1lKYAbkyP8ylo1AfRwO%)vD^f( -z)kw9mV~5>RJIdo!6YuDF6#JR}rBp0u0YM^HLIvJoB!zcBFp@mwd??Unu{g<4i>1UQ -zS}ZpKEU@q~C)P7uqb#C){4w^2lQlz4aEr7}cAJ#|HU8!+$%}0-_A?`LH3~e@GQkU1 -zpDZZ5>}kbrh1@4G`T0y+$v#;@wzs-pDGPmO5&pj6YwXJf;MX_kIWg5s!cwgS)r9i? -zwvAtdL<;uRt0%P>vqITcLam-vu~7z9D<008Jf;xPrd!q)12vL%9Osp2DVDL19cshxvoR55)Na -z9v=`vzJN^$m0eO{Tp(?Qx1fm>5sR=5NMutWr9gwmz8m&2yF0JNvE(C-9Ibcm+%t1u -zbK^C}7?v3qmRkE2fpY*`1eyT)07d|qU`znKruXcEJF&rNFvdKl29M^Mu00zjQK(Hj -zepO>`1fWOrji75nT>zgol?ToHKqQQya{^7WXK0zCSBtxdgZM3j3{&RyjLJWda2=NG9wC~Wt$4~tHKhcu5I={#YYt*43z*pBr! -zv6hr2GNDbY%Kte54ss`N4I%<|S37(Ltl#{v1X|Xl|9A`hdU%*(Y+pcBmQ2yrYJC75PBsLwGB5s>&TVLm4Heq(M#-XX{Ue) -ziQ0xkxM4O?%F7i%g+MHPI&MkzG_z(B6l7CXxhY5y=max!h#ggSmy!hLr9dX~Xv$4N -z_5@<#k*Fff!FL*&dqtnj%1o{Sf%uB)ja%iJk&xW|J-A`6iqw>wgDim|rFhv&H6{?i -z4a?e*s&aFv=ijWp6YpjlZYbAf)`V&zlTkiSWDn|A9yMJlx%s?ICaXG8&z;x}wL+o} -lRzEdZG*$!_jpZf);4iN^Dy?+bi2(or002ovPDHLkV1kibbb|l@ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/303.png b/res/forecast-icons/1x/303.png -new file mode 100644 -index 0000000000000000000000000000000000000000..6c30d1ec735dece7fa7b543c124a333dc0c2876a -GIT binary patch -literal 877 -zcmV-z1CsoSP)^m_Y^kO2?{VB9pMQGyg-~6 -z0P_G5$rE6gP}wCFCI#ZE_zIdx5snDgfP|d_DFr&TzPb2(-o3ls9b-rGC#`I+cX#HS -zou9qEl`sr(o^jz^YriD00N^4}22cmk1rSPF55NwM#1N%L%FkD5&u -zs*=U88q6I6Sf}|`Fm<6CfPF*dLGwNm2`iZFK$(2nRQV)^WQ?Ba0wx5+wm&o#D1lFF -zmH_mrb?Gx7nn6?33|Jeq!!WGo>7*M28;q9E!xM_LM%Ex*7ZTfg+g>+qv{c5^B{0vE -z-xd|a3Fr_I+2`BL)XT?^YR^P)=f!}?(`~Z+Je3Ef?RvUXwF4rhH7Sr52}kMkl!^d% -zuII!`axIw)ZLli;_XIec+Icp}2=GelzXVoq{Z|4Nw$*>W1Ae^+u0Lj5GL6|ik^T7! -z9K8ZoZvvO^aIM-&cg%)>@cV=3(dU)>oGZ7}9WnyGwV1f_`y@MAln{5{~}8i(>V)$@TW2G(T(lZn&sz`={j -z5!bBUr;~UBltM*dKqQ_PCK3m25@zlrjtjd0?vf6Jtie2Yqn;z;W>fOdE*(p{aDz-m -zOkq#Jb3|~xEilqQBg05YN#KD$@;wpIgT2c5`h)sKKJJhDJ;&rJZ3s6g6_$~KOBw$) -z6of+1vNBm4pif1t@9 -zAn6aNNPhvz2vagL5i%e=H6B0ECT -z8{xS`F0^e__`hes(VXRtK}5jp+s3bf&3pfqK*`wbKi>hr-UGLv8k;hX#qG%cdIobivPbSyq+~*Ue_6S4-=9X(I -zoa_O=Kg>pK8L@z$R11j+bcn4y&OQS__Cmrx03+ -zOWS?=p&g(QNd!)b#Pi%lra>Eqn)~o_VIROllHoM1vzfC|$Kr9bBlu^Z%8~(WFI5m# -z=o4@(9$as8^mH%C7$hV`pyCGp$aC>{SfV2l$5Pp)`LI1+@lNOE+r}o{?hZ@o+sH6v -z7qS+W8nZIn_KM`M4T={($2{@#pk~5#Ca&e}NZNlvx82B}wl@l$e{!poDfPV(Ox1wx -zX`jeVA!C77!u32RghWF2VSA#5ayQ{R6S-o5v_IWac88@L$19H2in)dxSjBKQ%4>oA -z+Mglp=aW)k0jV^TK-~9-r5s0oj#Y^5E9&G{#*xPYy4vr;_U5Wco;oWo7`5DKGmcaO -zO4^SSaAA8%@uHkM!^pCLiuOS%)HiYdpM@*}^4fQ-Djh=AV0&p}lv8IIscE$024zFA -zC`k}#2Nk64Df_h)Onq#-XkYHMjnBEDk9;eE^@r|dV@+VG0PqjN#l<3SPuXDr0000< -KMNUMnLSTZO%bMQ+ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/305.png b/res/forecast-icons/1x/305.png -new file mode 100644 -index 0000000000000000000000000000000000000000..b6c5f2dc4445cf5d802a2dc9d36bf59d7743a47a -GIT binary patch -literal 589 -zcmV-T0TAQh~W%yPqF0@)-;nBke>k1p`OY(6%-Ktz}_Zg6BW&iyX^zsE$+!Yi5G|regnXfjEJn3bQ!_TfOyHTC-Gg}0N_C8I^iy( -z`vJtN5E=fWOe9@_Tmu`gGW%K4u-fS&xkG5I+FQF~O~rtqPz@)OA+)6lbsk2SF|leW -zb!8x-RUjT&c#{)-&_8qrwj|zVryYt#pMi)bONip3Z9p{#4grgQLY0Ag;0Ag#5VH8H -z{lnCbl*jfDQ#0^X+^Gy)UZaK0Nwt}(3}oSHmt};qpi>zTd$SF^4x;d~5 -z#KdQpcuCKxe}jle%g%!>CAD6nA-fX6F!|P^O;_R{X(5Y0xjyG{_mPtmYl^c060}xr -z^Nz7bI1Qn+kY91#FybZlWd<5TDk{T$#TsL6AT4B%sP51m@>suCb7HwzEu(26`=ce5 -z-nTr~_x(AsHrQsMd1})(oh)M6*czyXT=KZL-NK1|nSm=cU`@U#Czj1zN{r2HU~Fas -bqXGaAiYaarTdS<(00000NkvXXu0mjf>@)(8 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/306.png b/res/forecast-icons/1x/306.png -new file mode 100644 -index 0000000000000000000000000000000000000000..32c171e89a19bd97e473fff6cad0ff85a375b868 -GIT binary patch -literal 670 -zcmV;P0%84$P)9GM#u;mAtNvXnV{(eO*Wt` -z(0YQ>4Z;MjY#pf~2l%sqlqc~cI0x@>A3ooTa}G4eY@6RHTqOB*p2N<$t< -zunNQz6IXG;4|+qNfE|)|*=a*zH6|d!WSJv*=n9~6Ae%AyJ5V0D&RoE#2j)z^?%r71 -zk@DQVu`~g9%^fA+<(Pk=fL&{`)ir(p3#_cv2Jgf&5kTN+RI^ntX -zZi{za*M&<6Wy*Yr+B?*BYCJM#uLY|lPMJKded146#_h9eXI;#Ak~01)g=6+6u=RlY -zMX4Q9T|cPgHSM)wEFfjl_02i?SjO#9N6O^zt69I4al3;Yvkxvnna(xiKb2gh+^c&g -zdA;^Fun|xoxjhjYxpE-N%9tF|4%r*S+fJM^S;yb;r&D5@z{^gIHC-)*PKjv(U#)~% -z)14F31il0`U))P#n!uNUCNZg+9~6&vdTKlbObP(_1(P6|vzpqlC;$Ke07*qoM6N<$ -Ef*^V!SpWb4 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/307.png b/res/forecast-icons/1x/307.png -new file mode 100644 -index 0000000000000000000000000000000000000000..e1cab82b60291badeeab85f2da8b525180f6eaf2 -GIT binary patch -literal 668 -zcmV;N0%QG&P)9eM#u<^zzB2$IzihF$OeQ7 -z>Iq6V2otz6Ia5lE@n>VCJPC<72Y!$9ozJ(Sl){?vuxj>q0Rh03fCvC`0H^_g3a%Re -zkDN1H~~O`;-t_`qqzsN -zA}|lXqbCxXp{{_PQ<}?o#$}bwS?VsKTUCCu8EY*97>H;&sVt#A22|~bmoj3}Qj&Qf -z!7LEpnD`h6{GbEo1niN#%}(nJn6fL%1BA;D}V6ghuqHg4(M{#HoLC9HtyBvt#KD{Yph!U0Q>-GoZDB-GRuGf0000oQvJ61fF$s1&^{nVp -z1DhV4XDk7vwl~{GAOY}U`%nd6rH@&`f0i188q3_B;qMGty^paBn}+ZA>uVr!9+m9yM-?Sj3?pw8U<^5%DQH6QpBv+zq;O5 -z3nrIangp<+>n%X%p(}tLCJ%$TWX4s1s)%O+J6}O1K%rjcgGopD`d@~!|-gM~>bCunZm0@pAqa@Dn6iEs|cdM-aaE-zq( -zTy3pBSh_jZBGFvkm*4NTU5a2T5LUk!XS3h>Qs -b3jpv3RPhNZKMHL}00000NkvXXu0mjfelHEw - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/309.png b/res/forecast-icons/1x/309.png -new file mode 100644 -index 0000000000000000000000000000000000000000..19d561e07a2ce5f7cfd19b0edd24f3eb5d6beea2 -GIT binary patch -literal 634 -zcmV-=0)_pFP)hA_7z@ujgOFFu2>F^JK -zhPS&{*w)j+&;>s(qcP0%mP&c(Sf|NGcG~ay_Lge8>_jsz613Pd&UYEwxH~ -zgJQF=V2o`8ZeY3?y@E06Mio+vHBKr$^kMm|5>w@=%EGe5=XIaFT -zZx4pT>vv>H*@#|I0~Q3|J2F1Lk3}4APvP5uaN!yf-v+!speEe^S7L1L21W(I9|uzc -UCff~)wg3PC07*qoM6N<$f?2{El>h($ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/310.png b/res/forecast-icons/1x/310.png -new file mode 100644 -index 0000000000000000000000000000000000000000..4f37c98bf1eb297ad9c606ca4046ad58e34076ad -GIT binary patch -literal 647 -zcmV;20(kw2P)#2^zQbt$$=sU)@lJ(GJ6@&)!Z0p1+0*~ql7 -ze>dRE2a1{0=Vo64BYNP2&&>=n0I$a7ymqjAF5Th^x2cPqo-+#JLV1I;?}B!*Ie-n< -z&u1f>v`AiK2;hT6RNyNh2HrUlJ_3?R0yLK89loxBIh6rAVBW%TtA$}HTRDR`q2L)u -zBwfa@=>;|cBg!_z7%Uwa6lR+XEjvp74AKhd+5d}2%L(TS#7dQQa4`Gy@r`V2Hu@-F -zX*O(GXy3sg{si!BUT|fhE+J#0mjYG}I+l^7u6I&FRJ#>btvB95A^ -z#{!2tW&kngx>8yT_6o`_)5 -hY}^FIM!y9B_y>JM^!#P3{EGkp002ovPDHLkV1no=9H;;Q - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/311.png b/res/forecast-icons/1x/311.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ab66dec1091220f3d40a6e28bbec38d7b0ac6fad -GIT binary patch -literal 1093 -zcmV-L1iJf)P)vwWErNp166@mbA$D`=p0>qU2^|%o(bMVy$dyM%j_ed~ocuXyq9a9UaU6}5NZjiR5 -zH4!yLbWcP}B06tNTEQ&~g&uxc+;JgSZMjph_kD!`$2#ZOevF34>O)-Vr?Zgqs5` -zzE;35(N4|4rP!=VdT>HWvjNA5nH*c@W};Av23lXrUz^Ro@pnusAW9EE-3mRBPOdHK -z0dK}7$bAmFH-`AB+~|i=z?i2s?0%8ZoUb>Wkk>g4-$QbZ@&@1=vCso)wrtDvn_JKIXx&?*Z_2$mohM086;rwYw{eAHS6#BU&%f_>F}p=lx1Di(Uo;B{~L -zQbU?qw3d%I;^v;#ifN(Fa`Zs0BJYhE`sB1$1IerLwF1sWJ4X++VMYs8f@WHb)YvjN -z6NT0WpM#lJ0MbLFjikp5w3l*?;Tppy_<1=C|C -zH!AlP5t{ky_@&m-X|0U;6q7ZY7DBCJp$BeO%a1=9-XqgD3kkr97QPnyYCGB*>2Qb&avDWdO&NMFkTUGIS_`0Y{> -znb$j>)!e3DZrpbZmmXs;H@2yu)0K2M{-^%Xb}Zn~b}ZnaMnwMr;B&X!5rG0Z00000 -LNkvXXu0mjf_hbqf - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/312.png b/res/forecast-icons/1x/312.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ab66dec1091220f3d40a6e28bbec38d7b0ac6fad -GIT binary patch -literal 1093 -zcmV-L1iJf)P)vwWErNp166@mbA$D`=p0>qU2^|%o(bMVy$dyM%j_ed~ocuXyq9a9UaU6}5NZjiR5 -zH4!yLbWcP}B06tNTEQ&~g&uxc+;JgSZMjph_kD!`$2#ZOevF34>O)-Vr?Zgqs5` -zzE;35(N4|4rP!=VdT>HWvjNA5nH*c@W};Av23lXrUz^Ro@pnusAW9EE-3mRBPOdHK -z0dK}7$bAmFH-`AB+~|i=z?i2s?0%8ZoUb>Wkk>g4-$QbZ@&@1=vCso)wrtDvn_JKIXx&?*Z_2$mohM086;rwYw{eAHS6#BU&%f_>F}p=lx1Di(Uo;B{~L -zQbU?qw3d%I;^v;#ifN(Fa`Zs0BJYhE`sB1$1IerLwF1sWJ4X++VMYs8f@WHb)YvjN -z6NT0WpM#lJ0MbLFjikp5w3l*?;Tppy_<1=C|C -zH!AlP5t{ky_@&m-X|0U;6q7ZY7DBCJp$BeO%a1=9-XqgD3kkr97QPnyYCGB*>2Qb&avDWdO&NMFkTUGIS_`0Y{> -znb$j>)!e3DZrpbZmmXs;H@2yu)0K2M{-^%Xb}Zn~b}ZnaMnwMr;B&X!5rG0Z00000 -LNkvXXu0mjf_hbqf - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/313.png b/res/forecast-icons/1x/313.png -new file mode 100644 -index 0000000000000000000000000000000000000000..3b83fedb95db24df47ebbe6fd0dfdaa0cd51bffd -GIT binary patch -literal 618 -zcmV-w0+s!VP)VBO3Ec?rM&2EXm+=8$ -zOy;EMPNSm&#ERe%o>C+t*@LeGN) -z7NbjV6&KQTA+i -zv*qI`T6J2P=V+b!vd~Sd3;{d=_)!o)RajG$>XV_|h3IV!>FY#6JSYifRi85h)YuKZ -zEm?!pqtCL_oN9eibPaGO>k!|j4Z5yR$G|6mFNL?29DROvP@fd%>p*w29GM#u;mAtNvXnV{(eO*Wt` -z(0YQ>4Z;MjY#pf~2l%sqlqc~cI0x@>A3ooTa}G4eY@6RHTqOB*p2N<$t< -zunNQz6IXG;4|+qNfE|)|*=a*zH6|d!WSJv*=n9~6Ae%AyJ5V0D&RoE#2j)z^?%r71 -zk@DQVu`~g9%^fA+<(Pk=fL&{`)ir(p3#_cv2Jgf&5kTN+RI^ntX -zZi{za*M&<6Wy*Yr+B?*BYCJM#uLY|lPMJKded146#_h9eXI;#Ak~01)g=6+6u=RlY -zMX4Q9T|cPgHSM)wEFfjl_02i?SjO#9N6O^zt69I4al3;Yvkxvnna(xiKb2gh+^c&g -zdA;^Fun|xoxjhjYxpE-N%9tF|4%r*S+fJM^S;yb;r&D5@z{^gIHC-)*PKjv(U#)~% -z)14F31il0`U))P#n!uNUCNZg+9~6&vdTKlbObP(_1(P6|vzpqlC;$Ke07*qoM6N<$ -Ef*^V!SpWb4 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/315.png b/res/forecast-icons/1x/315.png -new file mode 100644 -index 0000000000000000000000000000000000000000..013199642741055ed1eb0cec1eca6c1c9275891b -GIT binary patch -literal 681 -zcmV;a0#^NrP);EL41wf91ibpY9zDKIasbG1&Lhq*-&lL6r->GCJ$t{66hE(3Cu$+vbnrCC7#WNsho6%1c%NurvLG5&`LfZ?9_6S>PhCuth-T{EuAg6Hs0f=>ts> -zkc%b;fagKfa_1KS0#&-nfKLE;nwIVrGxf%lLfZ)|U&9mune*ZJsx@*J0h0k!@A9oF -zG-bH1+qD@`+u)f}XsqpmjT~R0nJQ_(RZH!>-1Wor3u;(wh^GY)IU>(RLMxEBK$FFK-c -zy)#nA<4eeUF@W)+fV|@ETpKT&jLf&ZHv=@UsDH;wy@)O#Z^gQZWnL=nz#2^zQbt$$=sU)@lJ(GJ6@&)!Z0p1+0*~ql7 -ze>dRE2a1{0=Vo64BYNP2&&>=n0I$a7ymqjAF5Th^x2cPqo-+#JLV1I;?}B!*Ie-n< -z&u1f>v`AiK2;hT6RNyNh2HrUlJ_3?R0yLK89loxBIh6rAVBW%TtA$}HTRDR`q2L)u -zBwfa@=>;|cBg!_z7%Uwa6lR+XEjvp74AKhd+5d}2%L(TS#7dQQa4`Gy@r`V2Hu@-F -zX*O(GXy3sg{si!BUT|fhE+J#0mjYG}I+l^7u6I&FRJ#>btvB95A^ -z#{!2tW&kngx>8yT_6o`_)5 -hY}^FIM!y9B_y>JM^!#P3{EGkp002ovPDHLkV1no=9H;;Q - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/317.png b/res/forecast-icons/1x/317.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ab66dec1091220f3d40a6e28bbec38d7b0ac6fad -GIT binary patch -literal 1093 -zcmV-L1iJf)P)vwWErNp166@mbA$D`=p0>qU2^|%o(bMVy$dyM%j_ed~ocuXyq9a9UaU6}5NZjiR5 -zH4!yLbWcP}B06tNTEQ&~g&uxc+;JgSZMjph_kD!`$2#ZOevF34>O)-Vr?Zgqs5` -zzE;35(N4|4rP!=VdT>HWvjNA5nH*c@W};Av23lXrUz^Ro@pnusAW9EE-3mRBPOdHK -z0dK}7$bAmFH-`AB+~|i=z?i2s?0%8ZoUb>Wkk>g4-$QbZ@&@1=vCso)wrtDvn_JKIXx&?*Z_2$mohM086;rwYw{eAHS6#BU&%f_>F}p=lx1Di(Uo;B{~L -zQbU?qw3d%I;^v;#ifN(Fa`Zs0BJYhE`sB1$1IerLwF1sWJ4X++VMYs8f@WHb)YvjN -z6NT0WpM#lJ0MbLFjikp5w3l*?;Tppy_<1=C|C -zH!AlP5t{ky_@&m-X|0U;6q7ZY7DBCJp$BeO%a1=9-XqgD3kkr97QPnyYCGB*>2Qb&avDWdO&NMFkTUGIS_`0Y{> -znb$j>)!e3DZrpbZmmXs;H@2yu)0K2M{-^%Xb}Zn~b}ZnaMnwMr;B&X!5rG0Z00000 -LNkvXXu0mjf_hbqf - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/318.png b/res/forecast-icons/1x/318.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ab66dec1091220f3d40a6e28bbec38d7b0ac6fad -GIT binary patch -literal 1093 -zcmV-L1iJf)P)vwWErNp166@mbA$D`=p0>qU2^|%o(bMVy$dyM%j_ed~ocuXyq9a9UaU6}5NZjiR5 -zH4!yLbWcP}B06tNTEQ&~g&uxc+;JgSZMjph_kD!`$2#ZOevF34>O)-Vr?Zgqs5` -zzE;35(N4|4rP!=VdT>HWvjNA5nH*c@W};Av23lXrUz^Ro@pnusAW9EE-3mRBPOdHK -z0dK}7$bAmFH-`AB+~|i=z?i2s?0%8ZoUb>Wkk>g4-$QbZ@&@1=vCso)wrtDvn_JKIXx&?*Z_2$mohM086;rwYw{eAHS6#BU&%f_>F}p=lx1Di(Uo;B{~L -zQbU?qw3d%I;^v;#ifN(Fa`Zs0BJYhE`sB1$1IerLwF1sWJ4X++VMYs8f@WHb)YvjN -z6NT0WpM#lJ0MbLFjikp5w3l*?;Tppy_<1=C|C -zH!AlP5t{ky_@&m-X|0U;6q7ZY7DBCJp$BeO%a1=9-XqgD3kkr97QPnyYCGB*>2Qb&avDWdO&NMFkTUGIS_`0Y{> -znb$j>)!e3DZrpbZmmXs;H@2yu)0K2M{-^%Xb}Zn~b}ZnaMnwMr;B&X!5rG0Z00000 -LNkvXXu0mjf_hbqf - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/399.png b/res/forecast-icons/1x/399.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ebeb836344a8a344ed5f9d1152cc4a63227b474e -GIT binary patch -literal 483 -zcmV<90UZ8`P)~Xy8N#q=b~9cWCWrhHavm1|-T+*7 -zx;_Ei)&;(l>%~xDzQ=i3+g!bvQ~^7yw66nF5`#`5RCQPQvD4xM%+_%USb0Q|(^pKXg?=M*ek=b&;Ph2pB+7+$ -zFb7rvQ)%a+3Zq71G4f2bV;1br?+~M~HM8XGrqlgyhjpneY~}xnQzH{djZ7dlGJ&K3 -Z@D1OKY&|G~2HyYx002ovPDHLkV1ly*$>{(9 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/400.png b/res/forecast-icons/1x/400.png -new file mode 100644 -index 0000000000000000000000000000000000000000..4c0e37d4ded31ffcc751e2f7e83064661955c342 -GIT binary patch -literal 580 -zcmV-K0=xZ*P)%;iDBS=ixXS3#B4R%L1xDhLEJY5+_vX&_`LZG+%$d7cTfYeKfJFck0yqH30Fb0* -z{C#L?zJJ6nWY7X4N=S`_$C=JuHIu;+5#@@;U&(pAu>jq3AmXrC8#uoN5Cix!c!!pN -zfG6FUOw5$LE(+Zj+-r>7^AGw*n}8h~Z*tPQV$~-g!p_@G*`p%A93~sZ2oPpY2r|Ax-FH0z{m>xwmOB7f$4)x3;!5u=hm7 -zOPBE#J-7ath*HhUgDyFjUP6~u32#_Ri#-IKmZ!YCMcii%*C8Yp;Cn3v5NXPz&C8K% -z4_vDl>spRwwX)$_K;B5eN|mD35L}0li22V(--BsAw2n?`Q3Y`TJ@XYcS1lV3!IlT& -zTCQ>$vw~sE17cx5@#kPn0k#%#(el|jwmgv4{{I@a0Jh{pQ?m$|nnl2*0Qd!T6jM7( - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/401.png b/res/forecast-icons/1x/401.png -new file mode 100644 -index 0000000000000000000000000000000000000000..9b0d6ae1dbb4e98fc887ce53b065107a9071b7e9 -GIT binary patch -literal 625 -zcmV-%0*?KOP){1gBhU$&Zjek+ -zIzgKWdfgyQaFrtyq04dHhp!xJ9tjDN!1={KV|ym0geh}3Y3pwS5`arU4gebfr~yD~ -zj+%bY*(Kv94mdI?WhLFH=)Tak&qv73g_Ke_8s8%5{$K&VX|$lQm>i0N9fd^s1o43Re%{BHv8LoA?2MEr~PYnnpJf -zjMaf2ekD&7ra!t0C|S)MWX?Gj$PI)b)jVP -zKtWkxIkMqh4)j7V^a)sz@gZN@Sj>h5*!U}S9ylc~V9*088{eoG -zrq)vK)eBP-a8=yt1bqCBEzTTtA5)!xDm~lJWrVh%(+R*hdy8+AHAgDsv|U@@9#|(L -z;>BeAnSrjqlv3_JCl9^|8olH(rxMBVuSbg|<>lQ7t>y)vu}TXz_)m16IW#;ORlHa< -z3VH#;cQzE_fm6@<5ZEYvlGoOBZk#-r2=PGOnKrw$o9$?(TQqKbThM2 -zE1+?i#HoytM%xhT^58q<4e@|4xL=;B?-s7JP!&!Oux1xqI0ax$%n>NQm500000 -LNkvXXu0mjf1$YcG - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/402.png b/res/forecast-icons/1x/402.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ca2a7f3c8285feca66a0ba7a05bb64ad90ab0b29 -GIT binary patch -literal 600 -zcmV-e0;m0nP)!2uJ{-1Y`hk1b_KExhljff@6P|`f#z1!h4IY&e#B;P^Nd~X4+X*8#>c=B+50{}Y!`1DxANx+&m -z-S})wXy{zjt_wUm%qatr*U%n(1AvNzXs;?7qagKw-sCF~c^kd~;6&oAkfzaN1hO2o -zhhNDPxy?{2U>B6;Fg6rchdxVb2u)S_^=7QO2++84;WQ?M3OZ1iIJ`z<%Y~B7136`Z -z?Zm|Y;!J<&FZu)&MBe938w;x;0T~^Z6v=}rfI9=HgvsB4^FW=rfI$zWOujK6%~x -zRRCMbn%)AE^nm0H=v=&~rqh0)9XQrjvL=fqjZO_80c%Qq6%~LvJ@d7dL3(J6GDD-L -zf%MGRHd+=k2UjCi0c@jXArs2Dqc)blzQp!!A(S)!YTtJ+iLGe3e4*)}bM`ZJ@zlVV -m6^X3~%X?sIECMD40Q>-0!2c3^&}w)9000042*sTm{+d -zfU6*+1Fi$8z>$^D(#XOOV4S;^_LD3xU>HAUzIohz&|1?if+ -z7)r=eDHHn?d47S=5|n5@TEQR(&pQ*F{8#iNyXQlLHZuCHAiwv%716O7`a3)Ne9mAy -zXGfOphrKqS*e)0B{(=*cq(l3?g~_u098{---S?qS*wq#-Hg1izIOaVxTCrp07`4`o -z*1AlXyhV)rOMG)&nYhAScKLxLHZZX9mjgC%J>mz9{ynmY@;i9lr9;CW8qLob|DM@# -zE-TFlL0VjQkR3)ML)6#_pV~Ce3H8nibk4QLJ3e)~rh09uXtV-<7YSoYGBTA4C9LyW -z62>kVD-u>qoIuO;)||xW$oN+_`95MZaU|M63RUh!il5lcLhl|DDx_GhYr=tVfw7B| -zkV(TP$E3i)V*oPYL-!61HSyGiWk~ -zHJ%?g_=zeSLNmk`Fu>?)cv;2DBODWU`3Ymkm2cTaJfpde%oe{CWHm7GaAhx|V^**C -zM59~6Y4U{bIu?zFa$>vN51x$7x6>Bf!^WtxUdhNTCd_618-dluGO|vP4!ejf@r+Eg -zx`w7an|2OmWFaG-P*x#U>s(mLBL(e>!H3kSU`%Cu6^dMAb)f;eS7G9ILLuGf_VE)1 -zt%2nXzT(yd7BljGG4=^pKN63(-k|dhQ#FH$sfI5LbK51MXb`o5y{-0y6=RO#ZVp3? -zL6iVuHn0^&*MGnUzBunbLjQd=)m_N(CnjHle-nRVA}pW)qYzl=3HMTh!EMN3#Keqs -qWbEa2Mn~HHe0000JP)93e+AH4>i| -zQ8*Rx0qEsMY* -z_$7b|fKLY>wFHc5&=Z$|2_@}|O}tMd<2k@5FXWnnh|Uxzz6wmh`b6v -z02U-p3EN|I-U3+>c!VD)60yqAR=}iDntGhjvYN>(ZI@72xwrJh>Wcu5T(q1_me7cz_iY*>Oz1=c_&R%PpOZ0i -zO5}vEHrXDSc_QLgMScs-tAD~6%W760>Y||1OW0;r!W#^w#jas3Ajxr`3|`>F=w;W>F1row5Vi_rL59s;nQ8f-b{V1BYY_As!!2CQDHOnDTU1**sW9DOz~Uu -zir&?Qrq*fdQwkdae1?K`glCOiK{KwcYg+h}Vz`OB#vq_;3GlSH6%IfS0BBRBp&?YXL83QuG?C0;$BtuX_e(pHwceRY^u~TO8E5xO2!Y2ePaZY; -zO8{peJ^^$z&O&^Wc)Z|hlJ%+@TLIXG4O(Pqn!iHm~Y4Yqk)%0mjg06 -zd!~EPa6BR1XXeYVUBdZ40Nw-mZuHhfwP!p(DBpX-d{2I(?ht$BrzkYiLgo0DZpfu3 -z8<_7Z;7t??A#=;=Jla?&R0g0>9ed@cD70bqew0#EMoW#~k)8$7!J7hDtBfuNZwjDS -zfT*jD84t2<4e)Y2)ucs1N!U@1Z>Y9QU9I@l)X4QTe+ytowyAd8KVcn{7|LqzsVwq7 -zNacG%J_pL5RaSnALb{PLim3B!t%O|?z!=0v31CBAXX0>e6!3ERoXEyQ&DPOBEa#cT -zelO$FiuY@@{30Uyru -zRd?Qn&;iT_pSQRt>Zo!Al@tUIwXoiTJ;d$Fqk>?s -z70lU!e}LM*V0#v9dM#CYE1pbysW}Ml#jEKhClBT?h)nZVXJ=>USJK@L?gv7bX7=s- -z&dl5Q=4Ea)8ex{1pK0$)0R`Zi)`ebu6~GPvAAl!(8v^J82+$n#^N^zs;$A%f@XFBE -z9-4!lX*p(!TtKgWgJxEoaUJ31N;L<+vl5Vu0e9y?_jJidCdh*Lt)uh6LIt?Bj%kZ25rf#gG`$-Dwdd0kkj4cCdM9mwdo6VJ&NCVS_PNzbAPNYL%vLt0?Wm3? -z6zmB^0n$MU*#6HRk8(#0Q9xoqg2g+)^;`si3d>dgAIV})R)Mkvb-NAJwt&TzOgvR^ -z0AM@%S|%V~%rWQJJ^@Q>c{?6)!LNe4oL;DS1#>=P?(c>2K=bS4SJa+0v-8UsLjmKA -z*eHzK|1cI%#HP`ZPinK+m5Al4Sribfi*y3aN{j3`6-#fO0DWf8jv=4GOa*i(^A*8) -zpWccwOk!X=XAuXKd8LONoA$a-V*Ctp!zno&$Y!0V{CyyA{!am|5Fc70jub;!s((Q5 -z?0~M7y&nUcQmor5tq|-quj^znhriJ44|G7X{=ZbM1ZstMPY0W89n^J6JAlj$8 -znPR`tya4c&YZay?BvYGGYz43xs-Af`)Qs!XjHk8)9c)S|GjZOO0`jI5kShTG00aB8 -U0Uxu;N&o-=07*qoM6N<$faEW+2;zW_=gHC&{^fV6;3k -zOE->W0ki&nT3K<$^Dw`*)M&Y?Nl4s}w_yXXftTjXd -zPT?6C`3J96-*1syDT@#V6!ZPTccAk^_1*kCC#nzUC$cnbJ_WWuDnBmZ6^US$SkRb| -zi)BI#V)?@8u?zI}bO}hq6$Sb@?FRK)$UJ$50f1x9Ix&a>=2FvkUg{>Ahc^`LF^B>Z -zZ;FBWfAz2^cSIlxh}{sw#tv|=76G8ba>$>E7jsD!C`(X}4uRf2u(4eU(+r#dI0!E% -z35XVRjQs8|U~{)_;vuehD`c0`>m93M;vhet%*2b?%f;)F79;>S&q=B`6xoC>gM -zq&O!24JHNWaOlYu4WG^x=2FH2tCV9IgdM;x4JdU5OZA0`nx7(zl -zu3d=v{JC)MxlAKVL>UW|0du(z0N!$)xJFsPCbzOxiOIr*1$?SvyR=PO{1=pN=uTud -zkq^7v7X7wO3DE6AD{g1u;pzNaiH9i*@Gxot-2#T3+kkT?V}YzYh}k~=jtEa_n>4oi -hxGkp}fOZQ2@DDM(NC}#I;t>D<002ovPDHLkV1hR!X?*|y - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/408.png b/res/forecast-icons/1x/408.png -new file mode 100644 -index 0000000000000000000000000000000000000000..9b0d6ae1dbb4e98fc887ce53b065107a9071b7e9 -GIT binary patch -literal 625 -zcmV-%0*?KOP){1gBhU$&Zjek+ -zIzgKWdfgyQaFrtyq04dHhp!xJ9tjDN!1={KV|ym0geh}3Y3pwS5`arU4gebfr~yD~ -zj+%bY*(Kv94mdI?WhLFH=)Tak&qv73g_Ke_8s8%5{$K&VX|$lQm>i0N9fd^s1o43Re%{BHv8LoA?2MEr~PYnnpJf -zjMaf2ekD&7ra!t0C|S)MWX?Gj$PI)b)jVP -zKtWkxIkMqh4)j7V^a)sz@gZN@Sj>h5*!U}S9ylc~V9*088{eoG -zrq)vK)eBP-a8=yt1bqCBEzTTtA5)!xDm~lJWrVh%(+R*hdy8+AHAgDsv|U@@9#|(L -z;>BeAnSrjqlv3_JCl9^|8olH(rxMBVuSbg|<>lQ7t>y)vu}TXz_)m16IW#;ORlHa< -z3VH#;cQzE_fm6@<5ZEYvlGoOBZk#-r2=PGOnKrw$o9$?(TQqKbThM2 -zE1+?i#HoytM%xhT^58q<4e@|4xL=;B?-s7JP!&!Oux1xqI0ax$%n>NQm500000 -LNkvXXu0mjf1$YcG - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/409.png b/res/forecast-icons/1x/409.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ca2a7f3c8285feca66a0ba7a05bb64ad90ab0b29 -GIT binary patch -literal 600 -zcmV-e0;m0nP)!2uJ{-1Y`hk1b_KExhljff@6P|`f#z1!h4IY&e#B;P^Nd~X4+X*8#>c=B+50{}Y!`1DxANx+&m -z-S})wXy{zjt_wUm%qatr*U%n(1AvNzXs;?7qagKw-sCF~c^kd~;6&oAkfzaN1hO2o -zhhNDPxy?{2U>B6;Fg6rchdxVb2u)S_^=7QO2++84;WQ?M3OZ1iIJ`z<%Y~B7136`Z -z?Zm|Y;!J<&FZu)&MBe938w;x;0T~^Z6v=}rfI9=HgvsB4^FW=rfI$zWOujK6%~x -zRRCMbn%)AE^nm0H=v=&~rqh0)9XQrjvL=fqjZO_80c%Qq6%~LvJ@d7dL3(J6GDD-L -zf%MGRHd+=k2UjCi0c@jXArs2Dqc)blzQp!!A(S)!YTtJ+iLGe3e4*)}bM`ZJ@zlVV -m6^X3~%X?sIECMD40Q>-0!2c3^&}w)9000042*sTm{+d -zfU6*+1Fi$8z>$^D(#XOOV4S;^_LD3xU>HAUzIohz&|1?if+ -z7)r=eDHHn?d47S=5|n5@TEQR(&pQ*F{8#iNyXQlLHZuCHAiwv%716O7`a3)Ne9mAy -zXGfOphrKqS*e)0B{(=*cq(l3?g~_u098{---S?qS*wq#-Hg1izIOaVxTCrp07`4`o -z*1AlXyhV)rOMG)&nYhAScKLxLHZZX9mjgC%J>mz9{ynmY@;i9lr9;CW8qLob|DM@# -zE-TFlL0VjQkR3)ML)6#_pV~Ce3H8nibk4QLJ3e)~rh09uXtV-<7YSoYGBTA4C9LyW -z62>kVD-u>qoIuO;)||xW$oN+_`95MZaU|M63RUh!il5lcLhl|DDx_GhYr=tVfw7B| -zkV(TP$E3i)V*oPYL-!61HSyGiWk~ -zHJ%?g_=zeSLNmk`Fu>?)cv;2DBODWU`3Ymkm2cTaJfpde%oe{CWHm7GaAhx|V^**C -zM59~6Y4U{bIu?zFa$>vN51x$7x6>Bf!^WtxUdhNTCd_618-dluGO|vP4!ejf@r+Eg -zx`w7an|2OmWFaG-P*x#U>s(mLBL(e>!H3kSU`%Cu6^dMAb)f;eS7G9ILLuGf_VE)1 -zt%2nXzT(yd7BljGG4=^pKN63(-k|dhQ#FH$sfI5LbK51MXb`o5y{-0y6=RO#ZVp3? -zL6iVuHn0^&*MGnUzBunbLjQd=)m_N(CnjHle-nRVA}pW)qYzl=3HMTh!EMN3#Keqs -qWbEa2Mn~HHe0000}4U`G0 -z4Z==PWdn5r7DV5*2SPeh3>n9O9&mu|koSGZBXi@Nqie>OtJZ!q;1ggoAcCHVPBjJ8 -zHlQIQQ&T`G1H6($qO!cU2uc|+B^tqNnnH4m888yj9-o(tVCCi7cO%Du!$M(N#fVV( -zX=eX9%P>DmtfU9`7wy76sIR$i-6Bv2hX%Y6b_NS7BniJXMDw>C*=;1-D(?S26zP?!SEM~ -zw}G&`LWh)0p9aPJ3f_-!K(+xMM=*OPqVHhHikE1I%)@~9H^^!sTgS?r+dJn5_aA*^ -z{Q%O|Six^V?NsSP4M>KRb63sN1^7KaZSL{s-y*u{Cv`$6IR##t;CX)@9P!=ZbJ%U> -zBG7;*^E!f8FL*h~JR$0fI;ONs4()M)SqtH;P^TF1Ab9#VJa-rx$daj=ZGcJW;j%ug -z@ZMe+ApbVRygK8cYy)zr3sQkG=8Ot4s`aeG1-ircH?&K&r{|!?jjY1~xD&taU{F_F -zT0;Jns)6wmH6Ra|tL;KpeGY_z5Ad8suY_3}CH$Tt;B`g>Q`2@;5lv8S3vw}U1~;Hg{O`c2U$wN^NSqc -zYh@9egcrKiRB9S+1JB!;H8zMu5tK5Z5em*J&)_x1p4V&tpE$cXQ*m31F)-D*g-LAx -lslPNf11^otfQy2N{s2U1;YwDWTAly^002ovPDHLkV1k_?Z^i%s - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/500.png b/res/forecast-icons/1x/500.png -new file mode 100644 -index 0000000000000000000000000000000000000000..4776253a092973146d297becc104679b39fff530 -GIT binary patch -literal 497 -zcmVTOb1XwLGCz`rb56Az!zj-W6*p1{5bLope%Y%M+@aN0&CK -zluAPp$aobc0hMQO^J~)P#0NR?*48%% -zc7d399unU&a_i5DsI;s+*iv)pC7H7-5e%`k=$mN3H`;}*$5Xq(J>5X>`)8_OzFB+( -n;xg)+XuvnofN!D!uK@S~mi0kZvT(Q100000NkvXXu0mjfkC@u2 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/501.png b/res/forecast-icons/1x/501.png -new file mode 100644 -index 0000000000000000000000000000000000000000..96a5b5cd1699079dbd6554d0323aa7555b949e53 -GIT binary patch -literal 500 -zcmVe$vGF? -z0Z9dM1;HJd3N|BV^B62Z4-`o=`et;&2>rizwR)_G2r+XLwfbZr0FnVF1F#3s03bdRi -zxC-Q+h5zNqf9MZm2DU8TW~Ft-YR*8$lO;s)7#fhxfkVLJuaHIH61aic2!t%Y8$O8b -zNLddb#Ae`Xb0;(K_CH#*Im#AOnSm-i?fo`Fx}lR95PA0EUXwB>-pEN$ZDVs_7l?_+ -zDe*lsr~ZwB(#`w@KvQWf$| -qGT@t3g?y8$kZ+O!-y{QG0q_MbOGr~I4=RxW0000(RA_m5n;$24O)E+AOHp*z_H`` -zZn(*;xw%JVp_VNnq7@NkR87YH5(oD@w6+s041~*MJkEOnD@)-rV!XEimMz8aX&pq9 -zK~qQK_e|Ra(4>^u0yuM+O>zJk&$;3GMaEhgjkb(7W1r002ovPDHLkV1gHQ?ePEr - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/503.png b/res/forecast-icons/1x/503.png -new file mode 100644 -index 0000000000000000000000000000000000000000..af0546e080eb6ec0730136da1567ca99ac2e7216 -GIT binary patch -literal 602 -zcmV-g0;TaAj*ugS696Xw -za{*k24w_IV^e#fXTZ9oK&j`n{Hj`5pkZIv0+d?nLC# -z(H2nU^g3-aPP=venfZg67e>pNIX1p`nK@zRS;=nX!poWbWSsUV<8-F3u6>w!SR(aU -zW819|+p~?)Bnr9ug^9$tPl+g5Wk^JG?c6`c>!EFcCIVdj;twLy*MbYI^pgTwgh|>u -zR%=H}5mAFb>&H(b>O1yRPCqT4iKtU&-)0`@8TZbyUF880aW!u*4-k=x=TB<(OTJJG -zy#i|s*hn7GPJ5~Mwkymrf2@7l&I3)F4yALKuv@g9`Cmwt8+t3A8Lv-lwUPH~RPA{Y -zNp!hklD~H;?3PwQ$M3A7;Myjh>XM#Kz}z!=HS^Y_SD5Xb7gu&;S4c07*qoM6N<$f>)^pf&c&j - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/504.png b/res/forecast-icons/1x/504.png -new file mode 100644 -index 0000000000000000000000000000000000000000..7389cbd01030528c6a77bdb8f6c0ae5adee3f32a -GIT binary patch -literal 472 -zcmV;}0Vn>6P)-!$I%)_SD7XvGx7|6|IZUIKC1^^oT -z+SWq0l>d7hFj^e}-~a&UTF5uDQagkA_tCFB22lL7&p@NqF!sn`_74;T=gH?BdtbAY -zh?Al}z;Y5Bt@gNL-?flFh8I&>iQFVBqg+)i4pQ_gWVHI3uoiL`bz%z~d*Fp(PAlb&EH}kKZtm-9vFo}6*59Xm -zl4iLKr*&0Tw>D(D0;d&=2h?^NKbRVLMVD*kf*Nm>b09axKyJ2e006G-Du-MNo-wun -O0000RA_h!01pXW^nn7IpJ0pQ6poB$XT(Wf~OucAi) -zTiw>`^c#7f>m`Jkc?jS;WAYIDhg|0sX9t*Bt>D}+f2mLa@NU@W%&do(TJ4=&n=-=% -zcnKk9PH*x9U`Rx3ZLA4Eh0e2>5+Z6kKUDDLz!<;=z?z6QmT@)VU(NKQJLy7chdE|e -z3H~NOXGD~Hr-@flTi)WJ)#)ENUZxHly_pO6l#SqM7c0{Nm$)CuRy;5VN(muL4)o56 -zTVA{?v5B?|r6lI$y(zKf7~o1%OWc%KU6Eat`2P*a7RmiUSxPhuGanaNt`9f1W5SrS7paA#-sD>-9O(lk{ -P00000NkvXXu0mjfxhxW% - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/508.png b/res/forecast-icons/1x/508.png -new file mode 100644 -index 0000000000000000000000000000000000000000..98cf4fb0955fcc58eceb4d97bd8e6365e2663601 -GIT binary patch -literal 1369 -zcmV-f1*ZCmP)E`O5fprj1*H%y?TLyaQX^hS=u5niR1uqq7Hg}jR}j+Km)S2Xu01o$7|)FLd*PK~z%J(X&0cSPSF -zV6IZF&E@p#2l~~wzvz-gYe39T0K3Fo9^M6V1qC{RO~BUKsqxNb69Cu@YzXf2@G~$S -z(QiT5fjn)cAv%mo10yzJrCJ+IJU4-MSE{vz92%W6!Iz3MnuTZ|5OZlZ+6|0Kh&;_0 -zN42)Gbf -zm&Zf{902wM&jN2}@Gz+NhMUv!Po@*6Fy03|D#nvAW_|#U0>8;8teq~6oT2-30-^0{ -z?JD3K;4$FU1lq)N1y6ZMfQUGOya6 -z#42?Md0`@PO~SPD4sem4-<@JksmM!Y1G@f{WM1ghd4)R=-0{9P5KA+r)1H9ve&^f+C57;9LL!Vg=VpRA_73(A1^DFdII=(Y&_qGV=C>}x$gQ*Fszl+4yBp?UnF -zG2a8Pn6oRg`5jtrftV-2gmz0CgAi$v=^o&`L=sA3b%P*bLE%T>b6^MXLSoTI^>brp -z0u%DW=$s0vkjQ8-!Ii)*z$IGY4y~|7leK#0VXJ%u_&_1lin=sRD`K@Nmo(nhHDSZ8 -za^g&SGn4i1naTR*RylFl#^h|HEn_jOr -zp|1cQDM6#DJh0xCcRm|;Saf>JgyLq7*XLFHSjK$|*j8}7^?w6c1^lkPb<=3}6Vnjz -za8Q_;IUNQ*1NH)60l(_qW!i0Bpc4)6>{i5WFKa?&zLE9G7aA3GS+HZ2C$*a^g;spz -z>s6_}P9Zf}ZWEjvEjBvHY6h(kpe^HE=o;Yt0{xpp*>7Z9Wbe|YYj?P -zlRFd&4?5?Da{3ObpY`8Wa^Cn_C&V@r(09Q7$`vica{O1KO(nF)d~j0Ha-8_H$A68L -bEdcO0NqnWeQ#w*;00000NkvXXu0mjf10jo} - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/509.png b/res/forecast-icons/1x/509.png -new file mode 100644 -index 0000000000000000000000000000000000000000..60458bb06fd10f8a939811bafad58a2ba68c3fdc -GIT binary patch -literal 495 -zcmV~54n1WII-*cPikB8PqHdScJe+yf6sPjM1-8V$vXNXAOS)NSOC}p*aIL% -zI{zO;$N7Hy)O@PYif8=JVQdGW;_+U%E}=DmAIIRq<33r07cLoC -z@S1iFzE8)Kad3TsivW@KN7oN3X!)IU0Ds)}{A -zH;gSe0nPA%NV&GO%9Y_b<{dr7B<_EcJ*rw>Qs<9j(i{}0JN1I5I#DJGtfV&W_)CXP)p -lacqi-V^ajgCT{@%{sGi@ynsko6(Ils002ovPDHLkV1mFR+TQ>G - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/510.png b/res/forecast-icons/1x/510.png -new file mode 100644 -index 0000000000000000000000000000000000000000..8508802e5b9df0ceedf928b0ff0b69b8782bde8e -GIT binary patch -literal 202 -zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP_V|+ -z#W5tK@$EH3-UbH|mW!QxDZYdlen^T^G@|$}2tj^=;`7 -z%xo8U7Dzf|%Ny*q*9rfoqFp@K|F~s(wOrPJrhjKHg5-+XGu|@<8;@SYIDY#o3RO`yYZSKto<$==T`1>uu#1p=KQWoL~pSqBAHkMVO<8mRS -zvZaJC!{{f^O&w$vs9kR6)i=m%pZFsKYwehb_A{^l+Z3$9_=_x_`8%NG9BS<$h0R^p -zXl*U#d42`perBy-Ns@f48tLwhz5}>4*EEVJ05_^1=o)x&Q30JsA;hi;A)b&BVlN0G -po{$jYHX+1Q5&kRT8ovzy_yv4A+9cw?0Ez$r002ovPDHLkV1jC5+13C6 - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/512.png b/res/forecast-icons/1x/512.png -new file mode 100644 -index 0000000000000000000000000000000000000000..d5cb76a622d95105726ba6b1eb667e3d1e04bd96 -GIT binary patch -literal 198 -zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP_V+& -z#W5tK@$I#ZybT5dEC-n{Dy__3Ad>ZCijr@a2gmg3Wlm2HXtN(TdhU~+{ra}_2WGYl -zJPRZpvgJ4IwGX*EGbMf9=a*8+GUuJ&#vhn(Ig8PRIpZC}Sy`YGmbF+0q+W($E;e4Eb -zjsFzGdy5<@JRpn^w%{DT#vaiLjME8T8-GysixVRu3DF8iH@VoA!3X20wYxS5^;YF9a+wvC~If3}+8$CuKN -RrGdU-@O1TaS?83{1OVqOZ(;xd - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/514.png b/res/forecast-icons/1x/514.png -new file mode 100644 -index 0000000000000000000000000000000000000000..8508802e5b9df0ceedf928b0ff0b69b8782bde8e -GIT binary patch -literal 202 -zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP_V|+ -z#W5tK@$EH3-UbH|mW!QxDZYdlen^T^G@|$}2tj^=;`7 -z%xo8U7Dzf|%Ny*q*9rfoqFp@K|F~s(wOrPJrhjKHg5-+XGu|kpu!q?jh^?+S09Q6B{Q1-vtMw`bQMrkXTh>u#s|D*M|3_; -T2(jt{dWgZ()z4*}Q$iB}XLV|Y - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/900.png b/res/forecast-icons/1x/900.png -new file mode 100644 -index 0000000000000000000000000000000000000000..a71ccae1000b63dffe86487878dd275227fb4c6e -GIT binary patch -literal 1022 -zcmV2;R^kAMs+aHw -z;R~960sH}6svfwc>NQc*FTk9+fTAAT#-^-vfYkqLHy2*MW(+IKX7b+14R{&O6IKdnX`R-xo=2WN6G+0BDkN -zF4R&3ll+h77{hBCaTgp01V}wV*#NI*H$tBmY8zX8Hm6 -zaZ2oCVhwV{7oyAP2LL!yON}!&;0y-7iu^d~AJO|`LrUlhsHH}gV=)X~+olEb%8Dn9 -zuoB`prw5+>VGNSIk>RYiaHe~01MYi07}&N;k*5`CkzQydjy(zD9pH`!v`KAJe1GE}bh@b(_#Kw&{3+2PhVlaGhdK+1UxA@fely8JBpXuS7xU~3VYxKI&U6rx -z$N^u_H8OVlWzm_NHx>@e8w&^KjYtldT{~3EBdlH=Ozi-5rP)q-8KB0-o1$CoQC6Tr -z-RB!Tw@^1?n`GO>7f7BVePNioFJyM@YwBqpet+{8hfaOe4qtxx#AG*GTG9z7RyNLVQD)0G%oqUO|;=CWztyYj;#AQS$)sneMho^E6%=(H8@(LeoAS -ztFL#gzSFV#?T*#2cC3Du#wRw4vGaK( -zQ9HQ4N#ia6G+amA@56)fJTQ;sC3R7NFN}o!9<6EMRpj}5nb0OPQ8bw(=K$aXz#RZ| -zh&*PI3mx90XoeSRqK^^Gbwsc$FD5mBOm(U65mVf`)m)c^>e4;mbzWlHgxb`uO@;rm -ztgnP@Qu|To1$#O1KM*o=X;bv^)h*=21ID<5Rsu9B0OB**J(|w@4Nk1q3~9|}&U12M -z%!#wKc_fj+Z<*!St|P|U3^16CLNogHxdt{NtAW6EgrBqa8B9AdGX05K6zCnJVSmO< -z>jMd(0iPlc*6tWSaePIzD;j%5 -zuk%v~Q_w2rWSppy_@+5YfVPWS+|1ruiZ&CrRmvf59&|OJ>iHo%N(bxJlftvdHZs}z -zzjPFeLi|+vtX4~#Z)|MU)RV6>GER(YpintYOs$!GOw-zrpG!^-IMc$m3U5|+fvyHr -zgz0VBeD|4o@Z3J$G1qY>O1l2&mM=y -daSH$dzX2_x;)2uIeOv$l002ovPDHLkV1n+lq9OnQ - -literal 0 -HcmV?d00001 - -diff --git a/res/forecast-icons/1x/999.png b/res/forecast-icons/1x/999.png -new file mode 100644 -index 0000000000000000000000000000000000000000..ea578f4d1196d14c0ec2037e652dfd8984987d4f -GIT binary patch -literal 890 -zcmV-=1BLvFP)Px&G)Y83RA>e5mraOHQ5eVPWqiFpO5=0kYidfA4I0FB;j -z)w+?-&#s9d2iZ>f8MWsJn3UC(nv)bakQC}2~5c5X6M85=Pb8iF0m8W;V%eOi4>mXa1)vGj_7We4TVOS6Z6L4$2BGd1N|LIKx`cgjKk@ko3R|Cm$s&FZWZfe} -z?N14ORTu{E4>#ghK(@uywvEK~l=LJP*y43QghdTZMl%Td1C`bM7Gm8YC$^@pc;X;7 -z3%B|-F(m!7y@sz -zaXO;H1|&px6l7@w%-dp56dkmjC3T^B26}?aQm1Ev?heQ{d1Q@;*x)Sa$+R?HZHy~$ -zX#LNtU$H%7y!Gg8$HAw-YM3`V6+@M91K|e34TKvAHxO - #include - -+ - #include "data.h" - #include "citycollectionwidget.h" -+ - class AddCityAction : public QAction - { - Q_OBJECT -diff --git a/src/citycollectionwidget.ui b/src/citycollectionwidget.ui -index 6f98797..ad0ec8c 100755 ---- a/src/citycollectionwidget.ui -+++ b/src/citycollectionwidget.ui -@@ -31,7 +31,7 @@ - - 46 - 24 -- 121 -+ 56 - 17 - - -diff --git a/src/informationwidget.cpp b/src/informationwidget.cpp -index 18e34c9..7d4578b 100755 ---- a/src/informationwidget.cpp -+++ b/src/informationwidget.cpp -@@ -257,6 +257,9 @@ void Information::onSetForecastWeather(ForecastWeather forecastweather) - } else { - code = forecastweather.cond_code_n.toInt(); - } -+// ui->lbIcon_1->setScaledContents(true); -+// ui->lbIcon_1->resize(ui->lbIcon_1->size()); -+ - QString picStr = convertCodeToBackgroud(code); - QString pic = "QLabel{background-image:url(" + picStr + ");}"; - -@@ -345,40 +348,50 @@ void Information::onSetLifeStyle(LifeStyle lifestyle) - - QString Information::convertCodeToBackgroud(int code) - { -- if (code == 100 || code == 900) { -- return ":/res/control_icons/weather-clear.png"; -- } -- else if (code <= 103 && code >= 101) { -- return ":/res/control_icons/weather-few-clouds.png"; -- } -- else if (code == 104 || code == 901) { -- return ":/res/control_icons/weather-overcast.png"; -- } -- else if (code <= 204 && code >= 200) { -- return ":/res/control_icons/weather-clear.png"; -- } -- else if (code <= 213 && code >= 205) { -- return ":/res/control_icons/weather-overcast.png"; -- } -- else if (code <= 399 && code >= 300) { -- return ":/res/control_icons/weather-rain.png"; -- } -- else if (code <= 499 && code >= 400) { -- return ":/res/control_icons/weather-snow.png"; -- } -- else if (code <= 502 && code >= 500) { -- return ":/res/control_icons/weather-fog.png"; -- } -- else if (code <= 508 && code >= 503) { -- return ":/res/control_icons/weather-sandstorm.png"; -- } -- else if (code <= 515 && code >= 509) { -- return ":/res/control_icons/weather-fog.png"; -- } -- else if (code <= 999 && code >= 900) { -- return ":/res/control_icons/weather-none.png"; -- } -- else { -- return ":/res/control_icons/weather-clear.png"; -+// code = 999; -+ QFileInfo file(":res/forecast-icons/1x/" + QString::number(code) + ".png"); -+ if(!file.exists()){ -+ return ":res/forecast-icons/1x/999.png"; -+ }else{ -+ return ":res/forecast-icons/1x/" + QString::number(code) + ".png"; - } -+// switch (code){ -+// case 404: return ":/res/control_icons/weather-sleet-new.png"; -+// } -+// if (code == 100 || code == 900) { -+// return ":/res/control_icons/weather-clear.png"; -+// } -+// else if (code <= 103 && code >= 101) { -+// return ":/res/control_icons/weather-few-clouds.png"; -+// } -+// else if (code == 104 || code == 901) { -+// return ":/res/control_icons/weather-overcast.png"; -+// } -+// else if (code <= 204 && code >= 200) { -+// return ":/res/control_icons/weather-clear.png"; -+// } -+// else if (code <= 213 && code >= 205) { -+// return ":/res/control_icons/weather-overcast.png"; -+// } -+// else if (code <= 399 && code >= 300) { -+// return ":/res/control_icons/weather-rain.png"; -+// } -+// else if (code <= 499 && code >= 400) { -+// return ":/res/control_icons/weather-snow.png"; -+// } -+// else if (code <= 502 && code >= 500) { -+// return ":/res/control_icons/weather-fog.png"; -+// } -+// else if (code <= 508 && code >= 503) { -+// return ":/res/control_icons/weather-sandstorm.png"; -+// } -+// else if (code <= 515 && code >= 509) { -+// return ":/res/control_icons/weather-fog.png"; -+// } -+// else if (code <= 999 && code >= 900) { -+// return ":/res/control_icons/weather-none.png"; -+// } -+// else { -+// return ":/res/control_icons/weather-clear.png"; -+// } - } -diff --git a/src/informationwidget.h b/src/informationwidget.h -index ea28ee2..f1b2d4a 100755 ---- a/src/informationwidget.h -+++ b/src/informationwidget.h -@@ -4,6 +4,7 @@ - #include "data.h" - - #include -+#include - - class WeatherWorker; - -diff --git a/src/leftupsearchbox.cpp b/src/leftupsearchbox.cpp -index 53bf9c1..5412056 100755 ---- a/src/leftupsearchbox.cpp -+++ b/src/leftupsearchbox.cpp -@@ -77,3 +77,30 @@ void LeftUpSearchBox::ThemeLeftUpSearchBox(QString str) - this->setStyleSheet("QLineEdit{padding-left:31px;background:rgba(255,255,255,0.2);border-radius:4px;color:rgba(255,255,255,0.5);}"); - } - } -+ -+bool LeftUpSearchBox::event(QEvent *e){ -+ if(e->type() == QEvent::FocusOut){ -+ return QLineEdit::event(e); -+ } -+ if(e->type() == QEvent::KeyPress){ -+ QKeyEvent *k = static_cast(e); -+ switch(k->key()){ -+ case Qt::Key_Up:{ -+ emit lineEditKeyEvent("up"); -+// return true; -+ break; -+ } -+ case Qt::Key_Down:{ -+ emit lineEditKeyEvent("down"); -+ // return true; -+ break; -+ } -+ case Qt::Key_Return:{ -+ emit lineEditKeyEvent("enter"); -+ // return true; -+ break; -+ } -+ } -+ } -+ return QLineEdit::event(e); -+} -diff --git a/src/leftupsearchbox.h b/src/leftupsearchbox.h -index 3207f0e..532dc5b 100755 ---- a/src/leftupsearchbox.h -+++ b/src/leftupsearchbox.h -@@ -11,9 +11,12 @@ class LeftUpSearchBox : public QLineEdit - public: - explicit LeftUpSearchBox(QWidget* parent = 0); - void ThemeLeftUpSearchBox(QString str); -+signals: -+ void lineEditKeyEvent(QString str); - protected: - // set the display style of the searchbox. - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; -+ bool event(QEvent *event) Q_DECL_OVERRIDE; - - private: - QString m_searchText; -diff --git a/src/leftupsearchview.cpp b/src/leftupsearchview.cpp -index 9f18612..1863d92 100755 ---- a/src/leftupsearchview.cpp -+++ b/src/leftupsearchview.cpp -@@ -28,7 +28,6 @@ LeftUpSearchView::LeftUpSearchView(QWidget *parent) - this->setMouseTracking(true); - this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - this->setFocusPolicy(Qt::NoFocus);//设置焦点类型 -- - this->setStyleSheet("QListView{margin:0px;padding:0px;border:none;border-radius:4px;outline:none;background-color:rgba(255,255,255,0.25);}" - "QListView::item:selected:!active{background-color:rgba(255,255,255,0.25);}" - "QListView::item:selected:active{background-color:rgba(255,255,255,0.25);}" -@@ -50,18 +49,20 @@ LeftUpSearchView::~LeftUpSearchView() - - } - --void LeftUpSearchView::mouseReleaseEvent(QMouseEvent *e) -+void LeftUpSearchView::mouseReleaseEvent(QMouseEvent *) - { -- QModelIndexList sourceIndexList = this->selectionModel()->selectedIndexes(); -+ send(); -+} - -+void LeftUpSearchView::send(){ -+ QModelIndexList sourceIndexList = this->selectionModel()->selectedIndexes(); -+ qDebug()<(); -- // qDebug() << "Index : " << sourceIndex.row(); -- // emit requestSetCityName(data.cityName); -- - requestWeatherData(data.cityId); - } -+ qDebug()<<"#####"; - } - - void LeftUpSearchView::requestWeatherData(QString cityId) { -@@ -94,22 +95,42 @@ void LeftUpSearchView::ThemeLeftUpSearchView(QString str) - "QScrollBar::down-arrow:vertical{background-color:transparent;}" \ - "QScrollBar::add-line:vertical{subcontrol-origin:margin;border:none;height:6px;}"); - -+ }else if("ukui-default" == str || "ukui-white" == str || "ukui-light" == str) -+ { -+ this->setStyleSheet("QListView{margin:0px;padding:0px;border:none;border-radius:4px;outline:none;background-color:rgba(255,255,255,0.25);}" -+ "QListView::item:selected:!active{background-color:rgba(255,255,255,0.25);}" -+ "QListView::item:selected:active{background-color:rgba(255,255,255,0.25);}" -+ "QListView::item:hover{background-color:rgba(255,255,255,0.25);}"); -+ this->verticalScrollBar()->setStyleSheet("QScrollBar:vertical{margin:0px 0px 0px 0px;background-color:transparent;border:0px;width:1px;}" \ -+ "QScrollBar::sub-line:vertical{subcontrol-origin:margin;border:none;height:6px;}" \ -+ "QScrollBar::up-arrow:vertical{subcontrol-origin:margin;background-color:transparent;height:6px;}" \ -+ "QScrollBar::sub-page:vertical{background-color:transparent;}" \ -+ "QScrollBar::handle:vertical{background-color:transparent;width:1px;}" \ -+ "QScrollBar::handle:vertical:hover{background-color:transparent;width:1px;}" \ -+ "QScrollBar::handle:vertical:pressed{background-color:transparent;width:1px;}" \ -+ "QScrollBar::add-page:vertical{background-color:transparent;}" \ -+ "QScrollBar::down-arrow:vertical{background-color:transparent;}" \ -+ "QScrollBar::add-line:vertical{subcontrol-origin:margin;border:none;height:6px;}"); - } -- else if("ukui-default" == str || "ukui-white" == str || "ukui-light" == str) -- { -- this->setStyleSheet("QListView{margin:0px;padding:0px;border:none;border-radius:4px;outline:none;background-color:rgba(255,255,255,0.25);}" -- "QListView::item:selected:!active{background-color:rgba(255,255,255,0.25);}" -- "QListView::item:selected:active{background-color:rgba(255,255,255,0.25);}" -- "QListView::item:hover{background-color:rgba(255,255,255,0.25);}"); -- this->verticalScrollBar()->setStyleSheet("QScrollBar:vertical{margin:0px 0px 0px 0px;background-color:transparent;border:0px;width:1px;}" \ -- "QScrollBar::sub-line:vertical{subcontrol-origin:margin;border:none;height:6px;}" \ -- "QScrollBar::up-arrow:vertical{subcontrol-origin:margin;background-color:transparent;height:6px;}" \ -- "QScrollBar::sub-page:vertical{background-color:transparent;}" \ -- "QScrollBar::handle:vertical{background-color:transparent;width:1px;}" \ -- "QScrollBar::handle:vertical:hover{background-color:transparent;width:1px;}" \ -- "QScrollBar::handle:vertical:pressed{background-color:transparent;width:1px;}" \ -- "QScrollBar::add-page:vertical{background-color:transparent;}" \ -- "QScrollBar::down-arrow:vertical{background-color:transparent;}" \ -- "QScrollBar::add-line:vertical{subcontrol-origin:margin;border:none;height:6px;}"); -+} -+void LeftUpSearchView::dealSearchBoxKeyPress(QString str){ -+ if(str == "up"){ -+ if(-1 == this->currentIndex().row()){ -+ -+ setCurrentIndex(model()->index(model()->rowCount() - 1,0)); -+ }else{ -+// this->model()->index(this->model()->rowCount() - 1, 0); -+ this->setCurrentIndex(model()->index(this->currentIndex().row() - 1,0)); -+ } -+ }else if(str == "down"){ -+ if(this->currentIndex().row() == -1){ -+ setCurrentIndex(model()->index(0,0)); -+ }else{ -+ this->setCurrentIndex(model()->index(this->currentIndex().row() + 1,0)); - } -+ }else if(str == "enter"){ -+ send(); -+ } -+ return ; - } -+ -diff --git a/src/leftupsearchview.h b/src/leftupsearchview.h -index 770553d..b825cb3 100755 ---- a/src/leftupsearchview.h -+++ b/src/leftupsearchview.h -@@ -20,7 +20,8 @@ public: - protected: - // handle click event of searchview, send signal when mouse release. - void mouseReleaseEvent(QMouseEvent *e) override; -- -+public slots: -+ void dealSearchBoxKeyPress(QString str); - signals: - void requestSetCityName(QString cityName); //点击选中列表中某一个城市后发出，通知更改左上角城市名 - //void requestGetWeatherData(QString id); //发送出去用于获取数据并在主界面显示 -@@ -28,6 +29,7 @@ signals: - - private: - QString m_cityid; -+ void send(); - }; - - #endif // LEFTUPSEARCHVIEW_H -diff --git a/src/locationworker.cpp b/src/locationworker.cpp -index 5958b90..fed998e 100755 ---- a/src/locationworker.cpp -+++ b/src/locationworker.cpp -@@ -106,7 +106,6 @@ QList LocationWorker::exactMatchCity(const QString &inputText) con - } - else - { -- qDebug()<<"not equal"; - searchedList.append(line); //将数据加入列表 - } - // qDebug()<setText(tr("Add City")); - aboutAction = new QAction(tr("About"),menu); -+ - //actions<addActions(actions); - setBtn->setMenu(menu); - connect(addCityAction, &AddCityAction::requestSetCityName, this, [=] (QString cityName) { -@@ -137,6 +139,7 @@ MainWindow::MainWindow(QWidget *parent) : - // m_searchView->move(100, 49);//2020.12.22 - m_searchView->resize(178,205); - m_searchView->hide(); -+ m_searchView->move(605,49); - - m_hintWidget = new PromptWidget(this); - m_hintWidget->setIconAndText(":/res/control_icons/network_warn.png", tr("Network not connected"));//网络未连接 -@@ -204,7 +207,7 @@ void MainWindow::initControlQss() - titleLayout->addWidget(m_leftupsearchbox);//麒麟天气搜索栏 - titleLayout->addSpacing(4); - // titleLayout->addStretch();//添加伸缩 -- titleLayout->addWidget(setBtn);//设置按钮 -+// titleLayout->addWidget(setBtn);//设置按钮 - titleLayout->addWidget(ui->btnMinimize); - titleLayout->addWidget(ui->btnCancel); - titleLayout->setSpacing(4); -@@ -297,6 +300,7 @@ void MainWindow::initConnections() - } - }); - -+ connect(m_leftupsearchbox,&LeftUpSearchBox::lineEditKeyEvent,m_searchView,&LeftUpSearchView::dealSearchBoxKeyPress); - - //1*****addCityAction替换原来的m_leftupcitybtn***** - connect(m_searchView, SIGNAL(requestSetCityName(QString)), addCityAction, SIGNAL(requestSetCityName(QString)) ); -@@ -305,7 +309,9 @@ void MainWindow::initConnections() - connect(m_searchView, &LeftUpSearchView::requestSetNewCityWeather, this, [=] (QString id) { - m_weatherManager->startGetTheWeatherData(id); - }); -+ - //2*****addCityAction替换原来的m_leftupcitybtn***** -+ - connect(addCityAction,&AddCityAction::sendCurrentCityId, this, [=] (QString id) { - if(this->isHidden()){ - handleIconClickedSub(); //显示在屏幕中央 -@@ -330,6 +336,7 @@ void MainWindow::initConnections() - - //获取传过来的收藏城市的天气数据，并传给显示收藏城市窗口 - //5*****addCityAction替换原来的m_leftupcitybtn***** -+ - connect(m_weatherManager, SIGNAL(requestSetCityWeather(QString)), addCityAction, SIGNAL(requestSetCityWeather(QString))); - // connect(m_weatherManager, SIGNAL(requestSetCityWeather(QString)), m_leftupcitybtn, SIGNAL(requestSetCityWeather(QString))); - -@@ -690,6 +697,7 @@ void MainWindow::onSetObserveWeather(ObserveWeather m_observeweather) - - int code = m_observeweather.cond_code.toInt(); - convertCodeToTrayIcon(m_observeweather.cond_code); -+ qDebug()<<"mainwindows.cpppp"<centralwidget->setStyleSheet(picQss); --- -2.24.3 (Apple Git-128) - diff --git a/0001-fix-city-name-display-issue-when-offline.patch b/0001-fix-city-name-display-issue-when-offline.patch deleted file mode 100644 index 41deef6..0000000 --- a/0001-fix-city-name-display-issue-when-offline.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a853253406dc1c12cc20ee4383d3208dd5611ce2 Mon Sep 17 00:00:00 2001 -From: dou33 -Date: Tue, 26 Oct 2021 17:33:51 +0800 -Subject: [PATCH] fix city name display issue when offline - ---- - src/mainwindow.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index 3064a87..02a5875 100755 ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -557,6 +557,7 @@ void MainWindow::setAbnormalMainWindow() - ui->lbCurrTmpUnit->setText(""); - ui->lbCurrWea->setText(""); - ui->lbCurrHum->setText(""); -+ cityLabel->setText(""); - - ForecastWeather abnormalForecastweather; - for (int i=0; i<7; i++) { --- -2.24.3 (Apple Git-128) - diff --git a/0001-fix-vnc-show-issue.patch b/0001-fix-vnc-show-issue.patch deleted file mode 100644 index c462ce0..0000000 --- a/0001-fix-vnc-show-issue.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 90a2ef1e2e7593bd192c6ddf51e16a8914e8517b Mon Sep 17 00:00:00 2001 -From: dou33 -Date: Tue, 26 Oct 2021 17:32:01 +0800 -Subject: [PATCH] fix vnc show issue - ---- - src/qtsingleapplication/qtsingleapplication.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp -index d0fb15d..dc27559 100755 ---- a/src/qtsingleapplication/qtsingleapplication.cpp -+++ b/src/qtsingleapplication/qtsingleapplication.cpp -@@ -324,7 +324,8 @@ void QtSingleApplication::activateWindow() - { - if (actWin) { - actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized); -- actWin->raise(); -+ actWin->show();//fix vnc display issue -+ actWin->raise(); - actWin->activateWindow(); - } - } --- -2.24.3 (Apple Git-128) - diff --git a/0001-remove-about.patch b/0001-remove-about.patch deleted file mode 100644 index 47e3099..0000000 --- a/0001-remove-about.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b480fa946aa57d43e5dc7ff9776c53f025c2054f Mon Sep 17 00:00:00 2001 -From: lvhan -Date: Tue, 19 Jan 2021 16:39:53 +0800 -Subject: [PATCH] remove about - ---- - src/mainwindow.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index f9e9027..d1ebd40 100644 ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -70,7 +70,8 @@ MainWindow::MainWindow(QWidget *parent) : - addCityAction = new AddCityAction(menu); - addCityAction->setText(tr("Add City")); - aboutAction = new QAction(tr("About"),menu); -- actions<addActions(actions); - setBtn->setMenu(menu); - connect(addCityAction, &AddCityAction::requestSetCityName, this, [=] (QString cityName) { -@@ -214,7 +215,8 @@ void MainWindow::initControlQss() - - setBtn->setFixedSize(30,30); - //menu跟主题走 -- menu->setFixedSize(120,66); -+// menu->setFixedSize(120,66); -+ menu->setFixedSize(120,40); - menu->setStyleSheet("QMenu{border-radius:3px;background-color:white;color:black;}" - "QMenu::item:selected {color:white;background-color: #2dabf9;}" - "QMenu::item {font-size:14px;border-radius:4px;background-color: transparent;}"); --- -2.29.2.windows.2 - diff --git a/indicator-china-weather-3.1.0.tar.gz b/indicator-china-weather-3.1.0.tar.gz index c37c328..1516005 100644 Binary files a/indicator-china-weather-3.1.0.tar.gz and b/indicator-china-weather-3.1.0.tar.gz differ diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec index c95730e..31b63ec 100644 --- a/indicator-china-weather.spec +++ b/indicator-china-weather.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: indicator-china-weather Version: 3.1.0 -Release: 5 +Release: 6 Summary: The weather data are from the heweather API s6 version. License: GPL-3.0+ URL: https://github.com/UbuntuKylin/indicator-china-weather @@ -21,10 +21,6 @@ BuildRequires: GeoIP-devel # Requires: NetworkManager -patch0: 0001-remove-about.patch -patch1: 0001-fix-vnc-show-issue.patch - - %description Indicator that displays China weather information Kylin Weather displays detail weather information for one place, @@ -33,8 +29,6 @@ patch1: 0001-fix-vnc-show-issue.patch %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro @@ -66,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/man/man1/indicator-china-weather.1.gz %changelog +* Tue Dec 7 2021 douyan - 3.1.0-6 +- update to upstream version 3.1.0-34 + * Thu Oct 28 2021 douyan - 3.1.0-5 - fetch upstream release to 3.1.0-33