I have made the following changes intended for : CE:UX:MTF / meegotouchcp-datetime
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/5662 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5662: Messages from BOSS: State: review at 2012-08-13T14:48:22 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: Project:MTF:UX / meegotouchcp-datetime -> CE:UX:MTF / meegotouchcp-datetime changes files: -------------- --- meegotouchcp-datetime.changes +++ meegotouchcp-datetime.changes @@ -0,0 +1,4 @@ +* Thu Aug 02 2012 Aapo Rantalainen <[email protected]> - 0.10.8 +- Fixed meegotouchcp-datetime-0.10.8-enable-done-without-timepicker.patch + to do what it is meant to do: fix enabling done-button when compiled without timepicker + spec files: ----------- --- meegotouchcp-datetime.spec +++ meegotouchcp-datetime.spec @@ -1,14 +1,16 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: meegotouchcp-datetime + # >> macros # << macros -Name: meegotouchcp-datetime Summary: MeeGo Language Settings Version: 0.10.8 -Release: 1 +Release: 6 Group: Application Framework/MeeGo Touch Settings License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpaneldatetimeapplet @@ -27,11 +29,9 @@ BuildRequires: pkgconfig(meegotouch-controlpanel) BuildRequires: pkgconfig(qmsystem2) - %description MeegoTouchControlPanel plugin to set date and time. - %package -n meegotouchcp-datetime-l10n-engineering-english Summary: Engineering English translations for the datetime applet Group: System/Libraries @@ -80,6 +80,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -90,16 +91,6 @@ # << install post - - - - - - - - - - %files %defattr(-,root,root,-) %{_libdir}/duicontrolpanel/* @@ -109,7 +100,6 @@ # >> files # << files - %files -n meegotouchcp-datetime-l10n-engineering-english %defattr(-,root,root,-) %{_datadir}/l10n/meegotouch/date-time.qm @@ -122,4 +112,3 @@ %{_datadir}/meegotouchcp-datetime-tests/* # >> files meegotouchcp-datetime-tests # << files meegotouchcp-datetime-tests - other changes: -------------- ++++++ meegotouchcp-datetime-0.10.8-enable-done-without-timepicker.patch --- meegotouchcp-datetime-0.10.8-enable-done-without-timepicker.patch +++ meegotouchcp-datetime-0.10.8-enable-done-without-timepicker.patch @@ -1,86 +1,37 @@ -From 29e37cfaf48eb7ae6329d93bb442c2544609e927 Mon Sep 17 00:00:00 2001 -From: Robin Burchell <[email protected]> -Date: Wed, 9 Nov 2011 12:37:29 +0100 -Subject: [PATCH] remove conditional use of displayTime() to hopefully fix - done button +From 08f4f2e4b3b73b87306d16fba218378a365c0a30 Mon Sep 17 00:00:00 2001 +From: Aapo Rantalainen <[email protected]> +Date: Thu, 2 Aug 2012 13:15:13 +0300 +Subject: [PATCH] Fix: Setting time with Time & Date control panel does not + work. +https://bugs.nemomobile.org/show_bug.cgi?id=16 :'Done'-button will not +activate. + +In the package "meegotouchcp-datetime", timeview.cpp is responsible for +changing time. + +TimeView supports analog and digital TimePicker control. By default digital +TimePicker is enabled (compile time option). After adjusting digital clock +there were missing setDoneButtonEnabled() (analog clock has it). + +Signed-off-by: Aapo Rantalainen <[email protected]> --- - dcpapplet/src/timeview.cpp | 12 ++++-------- - dcpapplet/src/timeview.h | 2 +- - 2 files changed, 5 insertions(+), 9 deletions(-) + dcpapplet/src/timeview.cpp | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/dcpapplet/src/timeview.cpp b/dcpapplet/src/timeview.cpp -index e83a50b..506cbed 100644 +index e83a50b..8e20401 100644 --- a/dcpapplet/src/timeview.cpp +++ b/dcpapplet/src/timeview.cpp -@@ -226,9 +226,7 @@ void TimeView::initWidget() - landscapeLayoutPolicy->addItem(m_TimePicker, 0, 1, 4, 1, Qt::AlignCenter); - #endif - --#ifdef HAVE_TIMEPICKER - displayTime(); --#endif - - setCentralWidget(mainWidget); - -@@ -265,9 +263,9 @@ void TimeView::addHeader() - setHeaderWidget(basicHeader); - } - --#ifdef HAVE_TIMEPICKER - void TimeView::displayTime() - { -+#ifdef HAVE_TIMEPICKER - int hour = m_TimePicker->hours(); - int minute = m_TimePicker->minutes(); - QDateTime dt(QDate(1970, 01, 03), QTime(hour, minute, 00)); -@@ -330,10 +328,10 @@ void TimeView::displayTime() - m_timeLabelLayout->setPolicy(m_hhSMmApLayout); - } - } -+#endif - - setDoneButtonEnabled (); - } --#endif - - void TimeView::finishView() - { -@@ -416,9 +414,8 @@ void TimeView::pickerTimeChangedSlot(int hour, int min) - dt.setTime(QTime(hour, min)); - #ifndef HAVE_TIMEPICKER - m_DigitalTime->setTime(dt); --#else -- displayTime(); - #endif -+ displayTime(); - /* user changed the values, stop update on changes */ - disconnect(&Settings::instance(), SIGNAL(datetimeChanged()), +@@ -445,6 +445,8 @@ void TimeView::digitalTimeChangedSlot() this, SLOT(timeOrDateChangedSlot())); -@@ -461,9 +458,8 @@ void TimeView::timeOrDateChangedSlot() - dt.setTime(QTime(hour, min)); - #ifndef HAVE_TIMEPICKER - m_DigitalTime->setTime(dt); --#else -- displayTime(); - #endif -+ displayTime(); + disconnect(&Settings::instance(), SIGNAL(timeChanged()), + this, SLOT(timeOrDateChangedSlot())); ++ ++ setDoneButtonEnabled(); m_BlockInfiniteTimeChangeLoop = false; } - -diff --git a/dcpapplet/src/timeview.h b/dcpapplet/src/timeview.h -index 2e3b9ee..b07c660 100644 ---- a/dcpapplet/src/timeview.h -+++ b/dcpapplet/src/timeview.h -@@ -75,8 +75,8 @@ class TimeView : public MSheet { - MLinearLayoutPolicy *m_hhSMmApLayout; - MLinearLayoutPolicy *m_hhSMmLayout; - MLocale *m_Locale; -- void displayTime(); #endif -+ void displayTime(); - bool m_BlockInfiniteTimeChangeLoop; - bool m_IsViewCreated; - #ifdef HAVE_TIMEPICKER -- -1.7.5.4 +1.7.9.5 + ++++++ meegotouchcp-datetime.yaml --- meegotouchcp-datetime.yaml +++ meegotouchcp-datetime.yaml @@ -1,7 +1,7 @@ Name: meegotouchcp-datetime Summary: MeeGo Language Settings Version: 0.10.8 -Release: 1 +Release: 6 Group: Application Framework/MeeGo Touch Settings License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpaneldatetimeapplet
