diff options
Diffstat (limited to 'metawatch')
| -rw-r--r-- | metawatch/metawatchdigital.cpp | 11 | ||||
| -rw-r--r-- | metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml | 3 | ||||
| -rw-r--r-- | metawatch/qml/metawatch-digital-config.qml | 33 |
3 files changed, 4 insertions, 43 deletions
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 - } - } } |