From 2510314d5a13187076b8c17a42c67bcf7b94fa5c Mon Sep 17 00:00:00 2001 From: Oscar Andreasson Date: Fri, 14 Aug 2015 11:34:16 +0200 Subject: [PATCH] Minor changes --- Calendar.qml | 20 +++++--------------- Clock.qml | 37 +++++++++++++++++-------------------- Main.qml | 4 ++-- QmlMirror.qml | 1 - 4 files changed, 24 insertions(+), 38 deletions(-) diff --git a/Calendar.qml b/Calendar.qml index c4c7ab0..db66c9a 100644 --- a/Calendar.qml +++ b/Calendar.qml @@ -75,24 +75,14 @@ Rectangle { } TableViewColumn { - role: "number" - title: "No" + role: "time" + title: "Time" width: tableView.width / 6 } TableViewColumn { - role: "destination" - title: "Destination" - width: (tableView.width / 6) * 3 - } - TableViewColumn { - role: "arriving" - title: "Arriving" - width: tableView.width / 6 - } - TableViewColumn { - role: "next" - title: "Next" - width: (tableView.width / 6) + role: "heading" + title: "Entry" + width: (tableView.width / 6) * 5 } } diff --git a/Clock.qml b/Clock.qml index 6afec10..8577b1d 100644 --- a/Clock.qml +++ b/Clock.qml @@ -12,8 +12,8 @@ import QtQuick.Controls 1.1 import QtQuick.Window 2.0 Rectangle { - width: 480 - height: 200 + width: 360 + height: 160 color: "#000000" property date currDate: new Date() @@ -26,24 +26,21 @@ Rectangle { } } - ColumnLayout { - id: layout - anchors.fill: parent + Text { + id: time + anchors.top: parent.top + font.pointSize: 48 + font.family: "Helvetica" + color: "#ffffff" + anchors.horizontalCenter: parent.horizontalCenter - Text { - id: time - font.pointSize: 48 - font.family: "Helvetica" - color: "#ffffff" - anchors.horizontalCenter: parent.horizontalCenter - - } - Text { - id: datum - anchors.horizontalCenter: parent.horizontalCenter - font.pointSize: 24 - color: "#ffffff" - font.family: "Helvetica" - } + } + Text { + id: datum + anchors.top: time.bottom + anchors.horizontalCenter: parent.horizontalCenter + font.pointSize: 24 + color: "#ffffff" + font.family: "Helvetica" } } diff --git a/Main.qml b/Main.qml index bff4baf..6c7d4ec 100644 --- a/Main.qml +++ b/Main.qml @@ -12,8 +12,8 @@ import QtQuick.Window 2.0 ApplicationWindow { title: qsTr("MagicMirror") - width: 1080 - height: 1920 + width: 1024 + height: 1280 QmlMirror { anchors.fill: parent diff --git a/QmlMirror.qml b/QmlMirror.qml index 13f0be7..7beb105 100644 --- a/QmlMirror.qml +++ b/QmlMirror.qml @@ -27,7 +27,6 @@ Rectangle { anchors.top: positionId.bottom anchors.left: parent.left width: 360 - height: 240 } Calendar {