From 32a09777a9528280b0784454903965f65615da8e Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Thu, 19 Jul 2018 17:19:09 +0200 Subject: [PATCH] graphical improvements --- graphics/TreffpunktFannyLogo.png | Bin 0 -> 8941 bytes qml/AppToolBar.qml | 7 +--- qml/FoodPlanForm.qml | 1 + qml/HomeForm.qml | 1 + qml/MainPage.qml | 65 +++++++++++++++++++++++++++---- qml/WebsitePage.qml | 1 + shared.qrc | 2 + 7 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 graphics/TreffpunktFannyLogo.png diff --git a/graphics/TreffpunktFannyLogo.png b/graphics/TreffpunktFannyLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..23872c783b606d69d856860855d857d52fb58b43 GIT binary patch literal 8941 zcma)i1%OdH??em?J>W^v_5TqGO;zu!2iK z&cvC6lJx`t*Z?{(RYb(%QE_Au4YqagQ+1a|qT5TLD>ZE%W#H#xKZI>*K?m2se~(-ib=Cd)_$m4#Sok@Oi8lLx|1Yq4&RO&f@RjPBHZ!FL_KShg%49WX z*GlH&l4T|tYAi{-K%nU~u|NF+Gd7NWstyMpzc)UsdMtjRNHHhis-9U zTDaz-|DRFH-==BjQ;U+J3z4R+$iFlU>e7f~F%=WoERIMLq|(K9>+yOR0PN1>fvy#$4{5$m1yk%&>yc_~ z*Q>x0w?O$qjRH-D>s0e|wB;8ul2WNlS$uRpM$?h3E@enqB@Qv2IEp+_#~U!kvwek^ zrHzYa-I}*{bXm?k_`6xPN({`B7yW3&oS+Rd6Ok|b4$xP3<;?h4KEzB1WJ;sW*4zgD zz9qc`_pRb#@A(cDSCykb*7?)jD$!`TI_9chPf%7=r+qQN(s!&GsMrDar2M?BK96lA zcuJgZi(|}WF0zaWl6eM!#{eZ6*j+LH1kT`Am7y07WPQH$b=R_B&+CHmo5u(a_p)lx z9D7g((8-3ovAk>k8@zvyG54B5_1tvbc6nwCkFMuar2RnnnQVXy+Sr!t&*RM_1%wE> zthT~FK(wz>k)vW4$6~$eVR_^n43W26_cJwGp$AU@HgOQ8n%i!WC85b@3ljjm*F-W* zgC(khPCx>n8KxJ5Sf0`HT|RQh$snC);UDtc9PX{LkM~+c#?bm5v{ACvd9a@un> z{Zw=7-EDEs-|Q%`s{PqKG?wde43WnSBvlX+{uJ%>g|C2g)Y~V!uNt|i+fT=~>Qil_ znd=n4T?wtLF3))UdoAq28R0MKV`+4Rub?7$$_JHtFJH%S@5&KClX0&J1fLQhzUqg; zH;22#`t`yQ-MBJF92qO~#>^~d&WL!-0mcYH$TM){F_ve-7dOFlX z*%>3K*<)`FCG4hxD`^S_9<-6Yh&a=9PL|i}xk*8m@8rXAI|$JC0jBM(3_jG?6z}=H zlXL>apJxe;`g%+YWS2wre*K z;LhzJ>>vW8c%sX1IF@JXpsBa~C%u88^&5~1;u{9*YB!V*ph4XYuY6^6+m*pF?0FS~ zo0V}oG>9*@PF2Z{B1E*x7Z<%0czEvnZJ!=Fj5_qP#pwq81>N}DKsa+BB@Rubp-zz0 z=?-PDKGd^d^+5J;3Uv2qRHMr~wNSyKht~;4oN|#=Rrcas(WJvoGIqo zoeGMB54Sks) zoF&Ty5o7(l3R_w-ZLR@V_@d9_WrvnNLRi1xbLZDGp#UeI=vhv!B+4)9K8t`gUq{ z?6@BXx%#=vR_rmkMDta{TpQmD!ICcYS5sEk_6lWOe2ys|?~z;Mb#6rIpuy9R7BsuZ~K#y#g_$UG|+jk3)+c;ZM1QiHd2yxM z)wwf0YkQ$}o>{}fmCJ*Q>Z&H#(v~SGd@HOu+I?8&SrY)S^?(IDlNTh{L)694&L&~6lN64bFTx2f)Xc*R_%cGVZ4&qzGR8Je6Tqy`3t#> zv_J0QzV0>H;+h#Y-iY*wt`hEA=c@LU&Q-Ch==xVyiqEVJ#GhE-Dv=cf&H;syHDrwzq5=*9>Y#;@up-_6}&O{7ma zy1=70gHbOpd$4y)HkfU*>_`Snb5-VTftmqpY`b%^nY$lt1TA_J^G?6hv#Lb`RFveR z+#MQa;*yL5zLx*afea(LlFd+*J6=>g{i&mmG^7Wr2g=z?u5E=>dNOLwq&dcf5b{{J zN&ri|*p@0*OlTz|9dg_83*3Jv4e+JCQ$k%@eEcsgD>jI5oe^(MtzYw;3KmuH+)K5U zLFSRPq{q+m%C6c43?*Vs@~t6R*E_b{2u}D;uWPJzjTExT9vCn)Q#`O&xAMy5R&lj1 zBe2L!59dJsS0%_swVzWnx~7%dI#|M?fqCrh&_j>;rJL{}C)p3uY>{Uh<8y3T!)=+b zZ&+a$$D{#>+=Q0*BaG_?raH%NZXDlWlK34Mc6MPBP75=zMfAi%B1p=75s`ZqQTR{)%#g%II$ak?*BOK z-gzf1;zMmCt`|tQogqL0KW46y@4YXu(hccibYHtcHG!MkWEM^Y=8 z!?=zsJG=EiCNDf$;&dOMh+@{aB?Hq(y-tFsZg(+R`c3AVZ(sV?_EUvc$s9>7&)kd@ zcAjpp*07{$HzX5%!x)T-+%ON8s3>$oUJ=f?uJl7QH(DqltisO{FX{m@&(f|I7Xjq9Rt zN501Fph`}qXA4>;nqkC^R#Ajftj}BIo!nO-rPIHP5#-Cdd9gtZ!@is6gwUgPSnPLqJ5V_#-+TlX{XVY+;e*^$31JQyVnuar@Mw%{Z! zdKj}ItJodG^NM~Cr%l|?OPvU(b+H10jg9|oH?d<-pX*oHC$}%S(r+_<5PB)P z_`}xl3UUdVZG7Y%qB!Q~T+jGK1Vjoar9t{pssu1%_3XN6BW~`)RGpT5oG~O;d5{bDY)p2<*6Nqz$nT zl&P2K6!NLwSw&0PpM!gx&z%9fQ8olx$m}Ps78iAkdCH=N)JuVd6-dQXjy0j0u5sA2u7-4?X!MrHp4u+QR_Ie5C@`?DiwN-j!<=GL^IPb7<5) z_7~^tqEN?H6e1?IkAV2wozTZCg<^J8UHLU9X8lxJ>s3lZ6l}4iT+WAk zzxuQPYKGFBh%6&GpwhTmh+q9p?`miI&l!h<(GLj!;f@jaEhvk92poT=`0K~|lHFUb zxXGr}oThR7s7Kxd$LZW>!H7~-SKinJ70J?g6e-6vZ8ImBTJJDp=nHbQLbEEqG`;ux z{4yvet&kB>OY~FpndR7Nj~ead5i>+q#tN>!h1jfLbG0YXcL0_E$3=_O^am4MntQ7w zg5Y<{vm{{IFQ_8Ej#`&dV-qH164>)w8_&>_f!NH(><=UL+8S{A_cx;Ub+xPU7$BQ@ zc-OFDNQ?9k-jyAZm}iOSdXj90&R|KV3%uWe4Cg}2l^8lm2`A@Y%VyO31KajNXo0F9 zk!Nwgdb#`IeO$#24Rj)phKE;WB`VnG=#74^-&;2Vg}osggQEiZh3fdQ0JP<1#Cp2Q z)&}9peYrt`&C69BK=fm2Up}UV;OG!eh*7X48z=?O>NAKTlB=sN%v`dEE-6PGYihL4lT0cZsy)fQtJY` z$f@4>S}k4!8jo)b2E3@x<;x$MlAHNw8oLXF=iaSfy7AVDK!f0&>}0=Jgcr`T&8@?% zBk41_b0Z2Zo#~qTI}2S*pbqOyyy^0CG5{D@kg+Z?XY$K*HOUfQM#PzvqtuBolqU!3 zjL#N?n&gV|Pn4}q|79@IvpLB8h#fgav(T!q(fV=s>PExj_SHFyrT{bWtr}zYsecH6 z=W!~}CMV;Q#q>KFHmEd@FZjRI3@aL~k{@ve(IgG-h=qN!2nPP%yKiBcY-_rLd3a67K z==DG!ukkba+}tRKdWf<%-dv~vqn*p&8hW6l8F6yDt z-K+dkbQ`dIQG9*QL5I7-E_4nmJ^smKzxK|IU4b}g&h5}@;Kx3sxcNL3h=!kq^zzmz z>dmP-QY5sHX=aRxOZ)k^twq3gtW(Zwucjm8%jhWO)I!DT0I-2G$Q9ewuEYxZ1J5Z&OwauUj!Uxddj}! z`)l|gUx^Q?rKsJKRIqe==UOU-nnX+Q+x-dY(d>iam+xxGg};6qE9&JfbaD8}e zU6)mWFZXx*$QI4;CJU`yCEYj`Zgrw~A>@>{`PrN*2LYj)0V zGW~}-TifMPQ^f22(mKoOlxZ9cqj^Wvvbrn&>ks(tIg67n2&yV#YLqW27BRp z(<2>+A^53u;23vFJZ+x+&ZWW8>Ri>9moEL#aYG*by>+HBE-SdOaB=cUc=RqC;3xfA zca`in(%$UcK|L|MVBOBf6ZhG2dByInrLMM@mlSu3QxchLezp^74P-r&4f}3AW-$&- zk-BvsiVP6@8J-r?1Fjy;=H~4K@!y<7==nw@@sz(<30Aii5*i18!Z%|i=6p`_KG+6{ zJL|1Twh!0#%~|&KjxKvzf+-(>BbPcT3+B#bT2{pS1T9?`(nFa3@S>mi{^Bj1Q@vLc zHt!e}eB#ZPf(j7AE<1FG3x^xb^$lDD6f)yRB3k+9M7q&4tJx@A(^xKI@3ji+=^kFS zp6?3v%~UdNUGl6VUG6_gt^Gz+os;#zvIQAhR)t8LfI|&mdj@zc$q!uId-%l*%JfZ* zlH<7X=cUnPMFhTczud#lo)J(fYr4LJpm^&8k6165Cfw>EY-+*r|LKW5b#*?PvQIr8 zRxKSef!ucWZk>Q29AhP)4#kffDg4KW8%-ND8?*?DqHoXlqqsRF+GZEkaLYq|Z2!2P zG4=nc%q3SP9uk*nTjOHSh2TapJrFUeK1}0HdIy-ismAZmrY|pYH6a!|7N`>cA@m0I zYU{+tC;X6;0~;0Gb5l+w+)IyUkv+83c;5pq&2TF1-Lho+f}{#1MT*CB1X-x(IJs2y zJvY^`MErTtC;YRkEGqD|CgHmJ_fntc@fGv)FYf?*RF;vz`>8DNP?fdQv)8=L-Z z+Jn+6dfzGrEC-k&r#M)0u*!AuNyi0fGnu6(hQos#CWN>F^5jSeH1z{s%7c$^+;pvM!RWatuiXg3QhMc``AyXuY6n}Q z<;AKmj73SgewlBS;NT+-h3hRhmrfI>crRfYPBjTd3Xjj3mc6x_^$l+mY?Ge2{QAI| zzDKy34CZPa{(-s}dxmot6zE3mckrWOI>k7)pu!nHyiD7|Yc~B*44IcBmK8ywq=*0e zKfX(0=Fu@s)RBH>Y8>()!g;vFS=7Gr>qr(MdWYib$@Nx|#o0Y1n$Gcdu+vQy%8RX0 znA*8a;<>4a!ok($K;XS0LQl)N@6=Tp-#>~&>)zG~KgNcCwOlR3V4iL2n}LNLBKXds zJ&PN7v{P&rkN@N*XmmUWC3n#V$6XWm)$94MOJi>9dbKajPa?NSGx%oHRd~Gv<*e`dir(Ov*n{Urai7M$I^i^m<;#1~HGD(r)Ry*)I?cT4x!%E) zu+?kg?}@p1bgHLFZxq)B|La$=WFfplT1i*I>|!K8+L9jbQ904aXr#Eo_L%YJt zZvW50xldo}y>~;{qK+!7DB%x4nY{H$f!N6<>~~!~f9$DjYkPjxL!E=aKybk5KHKRw z;d(0Yva-C3rlYUNLIpjg1d&imd_hwdJ-8*g8Eu`AP#|*NwDc5xK?`nMb z>T&tPT0W^=AYl5p@x6q{{T+FBMKX^|&;PgDx~X$0Iu~^+Ypbsi zsjpG8KJN+ZbrVz`+rXSanx4De@kGb3s^}#h>i<~rfw2hvFrKB`WVtPmg1ruHx#7D~ zaHk7!UhU=^;R29lUz_~4-O+j3sGUqX98mjhqhIJ!p>Y0H8P&!o&k6LK24y`XUok~J zo3~`8-uEv#vP{@t^bm_Nptdt~ZrOwKuP-gFyPVrmbdOeMWkuaUm0!-$b-R=@3G=*} z>s2KZadD3UEDi)zwH&!u7X_Z*93F59qz$+Dd|^v}Jg(LG3j-*5pS47q7BhH3QP3t3%~b-V800Oo&xs>*c>F-Mj(2z^-T(v*95&QE{fF} zmriOSl()nZbP@?qQ-hTPDC(3Yf_DTk|EiD1k8egB+v9?_oO44Wc&r0AA;FZv_%kWz*Ew^G00nmQnBdT+#%IUk}ulN zjeTS95-161z#`EVQ4#hzvNfypj-@}1?MMH8h*YzsmYdJt9^K=|**-ibz<%oISWT1? zqE|iVexYeJd@+iYh*+};SnIHd+Uj#bm!Z$(%ZS+jgLc|mrn3dHYGt5_1JNGFRfS5} zg4R2j7a=~E83&v6*5Xe&ARDdO!SPbR(-y1ZgVieM8amI2osbT?>$6!I*y&t6_IWHg z1wzG(EVRztyRNZ}w-ZABsT%Ey&dc~A>&R%{Rr!^ggm;#7O2+^eLZ{6+$Zx8c9TH{f z7J^13tl4QdJS*m-CE0L;+)f7he~JWB>5)G6TX`+)$bR;Zw2Q)tYykSBM=>0)qx`(x z%9s>)8X{7DqIfv)Y}XD?^`bT_?O}fwVw5@fJ*eSnwsLfN1)=7Fv^Xscp7z=tlJ+*j zm)S9edR*&E$!tBgO_8C8R)oW#rvo&TwA|mdb^-m;)k*}pt@o2TH2NKA|6RNvGectz zbo1xZJGG@L+RD#AEQ!x2x)ouM!!(<#CLZ09Lke~iKV@5%6Z}`?ZkIRRgA8Z%2%77< zl?}R9UxttEel67Kya;+p6gkq8G$Pzj%~$jCL4-O!oaAKOCSWOi$hGz?>`h>qh``rE zvMxRq=VAW!G=+5yq%6Wr$n~nVy9M+uQ$-oLU+R4}a&P1wh*r6WmHdtpE9e|vqk=E; z&M~oSXc`{li!ox8YVxn@CKS)Onk?H=<%Gp^e+}0Z(d330zhaUMs^Q}ADhj7&Fncbh zS2U_EF~MZ1PuAC^@<93rpRQK1wQKW12c1~J)QbugDDh1U z%L{=r{a*Y#ev8+rqyX}f{|a~de3)Az0b&YP=|K$4VBn`iHKIB1ojfmdtN*h$gOEL0QFCg;-uRoP`l*+lKQIrAbH&) z@MWKNebl3@i@pBUjl2Kn)gR2;P*%`f;b{xX0G(1>ms2$^5{=@iH&PsI`JIdO_(0Tw zk3Pui`A|m$^9trR!3x`0tspwRxl4Kou{ywaF1zULuB3=F&|T3&LvKnz@XXgg_|EY# z+Tbe|iuJ|Im%tXMniBB*g69jxWS-2yroXeI;}gf=RlGz$?x%yj@Ipu;BeDX7U& z%37kssBBn8`^(zkyKxCSZ=#9{mc2{4yOhRaeBl$*YpK4fFq3Jc$ORc-=pa5S$Sxy@ zA5`wYnUf#nVFllTx!A<~ulT>H!IXbY+ItitzVG(sx<)vm;kGAr{As6U5DgS7`p=_rZ)X5#VRh#_muj$PzU50lJwP(T=z>gAhj^*t3-{bLG~J^sVGr3b0kd?jxIY zmrrZG%)c6NxdG}yfcOxnh#-*%r#RO;B7e$5JK-rj>{qT|hr1}QUn-$%MU`BZQ+4mY zWMON19aXaUTx`wCe{G2>1S+vma7b%7 literal 0 HcmV?d00001 diff --git a/qml/AppToolBar.qml b/qml/AppToolBar.qml index efe3643..980493a 100644 --- a/qml/AppToolBar.qml +++ b/qml/AppToolBar.qml @@ -32,16 +32,15 @@ ToolBar { Text { anchors { - top: parent.top horizontalCenter: parent.horizontalCenter - topMargin: ( parent.height / 2 ) - ( height / 2 ) + verticalCenter: parent.verticalCenter } id: errorText font.family: "Helvetica" color: "White" font.pointSize: 8 - + visible: parent.height !== 0 text: window.error } } @@ -50,12 +49,10 @@ ToolBar { State { name: "moveOut" PropertyChanges { target: errorField; height: 0 } - PropertyChanges { target: errorText; height: 0 } }, State { name: "moveIn" PropertyChanges { target: errorField; height: 30 } - PropertyChanges { target: errorText; height: 0 } } ] diff --git a/qml/FoodPlanForm.qml b/qml/FoodPlanForm.qml index 03fbd33..db419e5 100644 --- a/qml/FoodPlanForm.qml +++ b/qml/FoodPlanForm.qml @@ -7,6 +7,7 @@ Page { //anchors.fill: parent property bool cookplanChanged title: qsTr("Speiseplanplan") + property string icon: "qrc:/graphics/TreffpunktFannyLogo.png" // Image{ // source: "qrc:/graphics/chat_background.jpg"; diff --git a/qml/HomeForm.qml b/qml/HomeForm.qml index e3a8fd3..5164979 100644 --- a/qml/HomeForm.qml +++ b/qml/HomeForm.qml @@ -6,6 +6,7 @@ Page { //anchors.fill: parent title: qsTr("Vertretungsplan") + property string icon: "qrc:/graphics/FannyLogo.png" // Image{ // source: "qrc:/graphics/chat_background.jpg"; diff --git a/qml/MainPage.qml b/qml/MainPage.qml index a2c2a74..e77e578 100644 --- a/qml/MainPage.qml +++ b/qml/MainPage.qml @@ -11,7 +11,6 @@ Page { enabled: stackView.depth > 1 onActivated: { stackView.pop() - listView.currentIndex = -1 } } @@ -27,7 +26,7 @@ Page { } background: Label { - text: stackView.depth > 1 ? "\u25C0" : "\u4E09" + text: stackView.depth > 1 ? "\u2BC7" : "\u4E09" font.pixelSize: Qt.application.font.pixelSize * 2 color: "white" } @@ -43,18 +42,60 @@ Page { Label { text: stackView.currentItem.title - anchors.centerIn: parent + anchors { + verticalCenter: parent.verticalCenter + left: toolButton.right + leftMargin: parent.width *0.01 + } + color: "white" } + + Image { + source: stackView.currentItem.icon + anchors.right: parent.right + anchors.rightMargin: parent.width *0.1 + anchors.top: parent.top + height: parent.height + fillMode: Image.PreserveAspectFit + mipmap: true + asynchronous: true + } } Drawer { id: drawer width: window.width * 0.66 height: window.height + AppToolBar { + id: header + showErrorBar: false + anchors { + top: parent.top + left: parent.left + right: parent.right + } + Label { + text: "Menü" + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: 17 + } + + font.bold: true + } + } Column { - anchors.fill: parent + anchors { + top: header.bottom + bottom: parent.bottom + left: parent.left + right: parent.right + } + + ItemDelegate { text: qsTr("Fanny Webseite") width: parent.width @@ -79,11 +120,19 @@ Page { } ItemDelegate { - text: qsTr("abmelden") - width: parent.width - onClicked: { - confirmationDialog.open() + Label { + text: "abmelden" + color: "red" + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: 17 + } + + font.bold: true } + width: parent.width + Dialog { id: confirmationDialog diff --git a/qml/WebsitePage.qml b/qml/WebsitePage.qml index 4522a63..dac2cb6 100644 --- a/qml/WebsitePage.qml +++ b/qml/WebsitePage.qml @@ -13,6 +13,7 @@ Page { objectName: "WebsitePage"; title: qsTr("Fanny Webseite") + property string icon: "qrc:/graphics/FannyLogo.png" ProgressBar { id: progress diff --git a/shared.qrc b/shared.qrc index f87ef6e..eda4938 100644 --- a/shared.qrc +++ b/shared.qrc @@ -4,5 +4,7 @@ graphics/sheute.png graphics/smorgen.png graphics/chat_background.jpg + graphics/FannyLogo.png + graphics/TreffpunktFannyLogo.png