From 31e3450a84df7c1c64617299180813c975fbb877 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Mon, 13 May 2013 01:34:28 +0200 Subject: bump to 0.5 and random fixes --- libsowatch/notificationsmodel.cpp | 1 - metawatch/metawatchdigital.cpp | 11 +++---- .../javispedro/sowatch/metawatch/MWScrollable.qml | 3 -- metawatch/qml/metawatch-digital-config.qml | 33 --------------------- metawatchwatchlets/ChatBubble.qml | 7 +++-- metawatchwatchlets/bubble.png | Bin 263 -> 314 bytes .../metawatch-digital-notification.qml | 14 +++++---- metawatchwatchlets/metawatch-digital-watchface.qml | 2 +- qtc_packaging/debian_harmattan/changelog | 8 +++++ 9 files changed, 26 insertions(+), 53 deletions(-) diff --git a/libsowatch/notificationsmodel.cpp b/libsowatch/notificationsmodel.cpp index 86adabc..53b714e 100644 --- a/libsowatch/notificationsmodel.cpp +++ b/libsowatch/notificationsmodel.cpp @@ -112,7 +112,6 @@ int NotificationsModel::fullCountByType(int type) const Notification* NotificationsModel::getMostRecentByType(Notification::Type type) const { if (!_list[type].empty()) { - qDebug() << "Returning most recent" << _list[type].first(); // TODO Actually get the most recent (sort by date) return _list[type].first(); } else { diff --git a/metawatch/metawatchdigital.cpp b/metawatch/metawatchdigital.cpp index 0d2a3cf..ccb0da3 100644 --- a/metawatch/metawatchdigital.cpp +++ b/metawatch/metawatchdigital.cpp @@ -197,18 +197,15 @@ void MetaWatchDigital::setupBluetoothWatch() // Grab all of the buttons that are of interest to us // We do not grab the F button, as it triggers the LED. grabButton(IdleMode, BtnA); // Required for app-switch - // TODO: Grabbing these buttons seems to break everything since gen2 firmware. - //grabButton(IdleMode, BtnB); // What does this do? - //grabButton(IdleMode, BtnE); // Music mode is currently not supported + grabButton(NotificationMode, BtnA); + grabButton(NotificationMode, BtnB); // Scrolling + grabButton(NotificationMode, BtnC); grabButton(ApplicationMode, BtnA); grabButton(ApplicationMode, BtnB); grabButton(ApplicationMode, BtnC); grabButton(ApplicationMode, BtnD); grabButton(ApplicationMode, BtnE); - grabButton(NotificationMode, BtnA); - grabButton(NotificationMode, BtnB); - grabButton(NotificationMode, BtnC); // Configure to show watch-rendered clock in idle screen - configureLcdIdleSystemArea(false); + // configureLcdIdleSystemArea(false); // No need to. } diff --git a/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml b/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml index 3b6c44e..4d5d477 100644 --- a/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml +++ b/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml @@ -14,11 +14,8 @@ Flickable { contentHeight: contentItem.childrenRect.height function scrollDown() { - console.log(contentHeight + " " + height); - console.log(childrenRect.height); var maxY = Math.max(0, contentHeight - height); var newContentY = contentY + 96/3; - console.log(maxY + " " + newContentY); if (newContentY > maxY) { contentY = maxY; // Never overscroll. diff --git a/metawatch/qml/metawatch-digital-config.qml b/metawatch/qml/metawatch-digital-config.qml index 72912f4..98185ef 100644 --- a/metawatch/qml/metawatch-digital-config.qml +++ b/metawatch/qml/metawatch-digital-config.qml @@ -96,37 +96,4 @@ Column { source: "image://theme/meegotouch-combobox-indicator" + (theme.inverted ? "-inverted" : "") } } - - Item { - id: autoBacklightItem - width: parent.width - height: UiConstants.ListItemHeightDefault - - GConfKey { - id: autoBacklightKey - key: configKey + "/auto-backlight" - } - Column { - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - - Label { - text: qsTr("Automatic backlight") - font: UiConstants.TitleFont - } - - Label { - text: qsTr("Turn backlight on during notifications") - font: UiConstants.SubtitleFont - color: UiConstants.FieldLabelColor - } - } - CheckBox { - id: autoBacklightSwitch - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - checked: autoBacklightKey.value - onCheckedChanged: autoBacklightKey.value = checked - } - } } diff --git a/metawatchwatchlets/ChatBubble.qml b/metawatchwatchlets/ChatBubble.qml index ba69e64..1076afd 100644 --- a/metawatchwatchlets/ChatBubble.qml +++ b/metawatchwatchlets/ChatBubble.qml @@ -2,11 +2,12 @@ import QtQuick 1.0 Item { id: container - height: bubble.height + 4 + height: tip.height + bubble.height default property alias children: childContainer.children Image { + id: tip anchors { top: parent.top; left: parent.left; leftMargin: 18; @@ -19,9 +20,9 @@ Item { id: bubble anchors { top: parent.top; left: parent.left; right: parent.right; - topMargin: 8; + topMargin: 9; } - border { left: 16; top: 16; right: 16; bottom: 16; } + border { left: 14; top: 14; right: 14; bottom: 14; } height: childContainer.height + 16 source: "bubble.png" Item { diff --git a/metawatchwatchlets/bubble.png b/metawatchwatchlets/bubble.png index 59718f8..32eaa02 100644 Binary files a/metawatchwatchlets/bubble.png and b/metawatchwatchlets/bubble.png differ diff --git a/metawatchwatchlets/metawatch-digital-notification.qml b/metawatchwatchlets/metawatch-digital-notification.qml index dd4dc66..6856bac 100644 --- a/metawatchwatchlets/metawatch-digital-notification.qml +++ b/metawatchwatchlets/metawatch-digital-notification.qml @@ -21,7 +21,9 @@ MWPage { Column { id: defaultContainer visible: false - width: page.width + anchors.left: parent.left + anchors.leftMargin: 1 + width: page.width - 3 MWLabel { text: curNotification ? curNotification.title : "" @@ -37,7 +39,9 @@ MWPage { Column { id: emailContainer visible: false - width: page.width + anchors.left: parent.left + anchors.leftMargin: 1 + width: page.width - 3 Image { source: "notification-email.png" @@ -56,7 +60,9 @@ MWPage { Column { id: chatContainer visible: false - width: page.width + anchors.left: parent.left + anchors.leftMargin: 1 + width: page.width - 5 MWLabel { id: chatTitle @@ -106,8 +112,6 @@ MWPage { Connections { target: watch onButtonPressed: { - console.log(emailContainer.height); - console.log() switch (button) { case 1: scrollable.scrollUp(); diff --git a/metawatchwatchlets/metawatch-digital-watchface.qml b/metawatchwatchlets/metawatch-digital-watchface.qml index 535cbab..68af34c 100644 --- a/metawatchwatchlets/metawatch-digital-watchface.qml +++ b/metawatchwatchlets/metawatch-digital-watchface.qml @@ -65,7 +65,7 @@ MWPage { height: 30 spacing: 8 Column { - spacing: 4 + spacing: 2 Image { width: 24 height: 18 diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index 5c97e59..3a89d7f 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,11 @@ +sowatch (0.5.0) unstable; urgency=low + + * MetaWatch face and notifications are now rendered using QML. + * Sony's LiveView watch is now supported. + * Removal of lots of old code. + + -- Javier S. Pedro Mon, 13 May 2013 01:06:03 +0200 + sowatch (0.4.6) unstable; urgency=low * New status bar for metawatch watchlets -- cgit v1.2.3