I have made the following changes intended for : CE:UX:MTF / lipstick-colorful-home
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8112 Thank You, Robin Burchell [This message was auto-generated] --- Request # 8112: Messages from BOSS: State: review at 2013-02-18T19:42:20 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:w00t:branches:CE:UX:MTF / lipstick-colorful-home -> CE:UX:MTF / lipstick-colorful-home changes files: -------------- --- lipstick-colorful-home.changes +++ lipstick-colorful-home.changes @@ -0,0 +1,5 @@ +* Mon Feb 18 2013 Robin Burchell <[email protected]> - 0.1.1 +- Fixes NEMO#521: Lock screen: Reset Y when height changes (from Thomas Perl) +- Fixes NEMO#519: Lock screen: Add timer to update clock (from Thomas Perl) +- Add some visual distinction to the clock on the lockscreen (from Thomas Perl) + old: ---- lipstick-colorful-home-0.0.14.tar.bz2 new: ---- lipstick-colorful-home-0.1.1.tar.bz2 spec files: ----------- --- lipstick-colorful-home.spec +++ lipstick-colorful-home.spec @@ -9,7 +9,7 @@ # << macros Summary: A nice homescreen -Version: 0.0.14 +Version: 0.1.1 Release: 1 Group: System/GUI/Other License: BSD @@ -20,6 +20,7 @@ Source100: lipstick-colorful-home.yaml Requires: lipstick >= 0.6.1 Requires: nemo-qml-plugins-configuration +Requires: nemo-qml-plugins-time BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtDeclarative) BuildRequires: pkgconfig(QtOpenGL) other changes: -------------- ++++++ lipstick-colorful-home-0.0.14.tar.bz2 -> lipstick-colorful-home-0.1.1.tar.bz2 --- src/qml/components/Lockscreen.qml +++ src/qml/components/Lockscreen.qml @@ -4,6 +4,23 @@ id: lockScreen source: "file://" + wallpaperSource.value property bool animating: y != 0 && y != -height + property bool heightIsChanging: false + + onHeightChanged: { + /* Fixes: https://bugs.nemomobile.org/show_bug.cgi?id=521 */ + + if (animating) { + return; + } + + heightIsChanging = true; + if (LipstickSettings.lockscreenVisible) { + show(); + } else { + hide(); + } + heightIsChanging = false; + } function hide() { y = -height @@ -26,7 +43,7 @@ Behavior on y { id: yBehavior - enabled: !mouseArea.fingerDown + enabled: !mouseArea.fingerDown && !heightIsChanging PropertyAnimation { properties: "y" easing.type: Easing.OutBounce @@ -86,23 +103,12 @@ } } - Text { - id: time - text: Qt.formatDateTime(new Date(), "hh:mm") - font.pixelSize: 130 - color: "white" - horizontalAlignment: Text.AlignHCenter - anchors.top: parent.top - width: parent.width - } - - Text { - horizontalAlignment: Text.AlignHCenter - anchors.top: time.bottom - text: Qt.formatDateTime(new Date(), "dd/MM/yyyy") - color: "white" - font.pixelSize: 50 - width: parent.width + LockscreenClock { + anchors { + top: parent.top + left: parent.left + right: parent.right + } } } --- src/qml/components/LockscreenClock.qml +++ src/qml/components/LockscreenClock.qml @@ -0,0 +1,69 @@ + +import QtQuick 1.1 +import org.nemomobile.time 1.0 + +Rectangle { + id: lockscreenClock + property int spacing: 35 + + height: timeDisplay.height + dateDisplay.height + 3.9 * spacing + + gradient: Gradient { + GradientStop { position: 0.0; color: '#dd000000' } + GradientStop { position: 0.5; color: '#aa000000' } + GradientStop { position: 1.0; color: '#00000000' } + } + + WallClock { + id: wallClock + enabled: LipstickSettings.lockscreenVisible + updateFrequency: WallClock.Minute + } + + Column { + id: clockColumn + + anchors { + margins: parent.spacing + left: parent.left + right: parent.right + top: parent.top + } + + Text { + id: timeDisplay + + font.pixelSize: 120 + color: "white" + style: Text.Outline + styleColor: "black" + horizontalAlignment: Text.AlignRight + + anchors { + left: parent.left + right: parent.right + rightMargin: -5 + } + + text: Qt.formatDateTime(wallClock.time, "hh:mm") + } + + Text { + id: dateDisplay + + font.pixelSize: 30 + color: "white" + style: Text.Outline + styleColor: "black" + horizontalAlignment: Text.AlignRight + + anchors { + left: parent.left + right: parent.right + } + + text: Qt.formatDateTime(wallClock.time, "dd/MM/yyyy") + } + } +} + --- src/resources-qml.qrc +++ src/resources-qml.qrc @@ -3,6 +3,7 @@ <file>qml/components/Pager.qml</file> <file>qml/components/TabBar.qml</file> <file>qml/components/Lockscreen.qml</file> + <file>qml/components/LockscreenClock.qml</file> <file>qml/pages/AppLauncher.qml</file> <file>qml/pages/AppSwitcher.qml</file> <file>qml/pages/AppSwitcher/SwitcherItem.qml</file> ++++++ lipstick-colorful-home.yaml --- lipstick-colorful-home.yaml +++ lipstick-colorful-home.yaml @@ -1,6 +1,6 @@ Name: lipstick-colorful-home Summary: A nice homescreen -Version: 0.0.14 +Version: 0.1.1 Release: 1 Group: System/GUI/Other License: BSD @@ -21,6 +21,7 @@ Requires: - lipstick >= 0.6.1 - nemo-qml-plugins-configuration + - nemo-qml-plugins-time PkgConfigBR: - QtCore - QtDeclarative
