graphical improvements

This commit is contained in:
Dorian Zedler 2018-07-19 17:19:09 +02:00
parent 4653182bc0
commit 32a09777a9
7 changed files with 64 additions and 13 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

View file

@ -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 }
}
]

View file

@ -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";

View file

@ -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";

View file

@ -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

View file

@ -13,6 +13,7 @@ Page {
objectName: "WebsitePage";
title: qsTr("Fanny Webseite")
property string icon: "qrc:/graphics/FannyLogo.png"
ProgressBar {
id: progress

View file

@ -4,5 +4,7 @@
<file>graphics/sheute.png</file>
<file>graphics/smorgen.png</file>
<file>graphics/chat_background.jpg</file>
<file>graphics/FannyLogo.png</file>
<file>graphics/TreffpunktFannyLogo.png</file>
</qresource>
</RCC>