[meego-commits] 8251: Changes to Trunk:Handset/meego-handset-calendar

[Kaitlin Rupert]

Hi,
I have made the following changes to meego-handset-calendar in project Trunk:Handset. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #8251:

  submit:   devel:ux:handset/meego-handset-calendar(r18) -> Trunk:Handset/meego-handset-calendar


Message:
    * Fri Oct 08 2010  Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.2
- Change build requires from messageserver to qmfmessageserver
* Wed Sep 29 2010 Sirisha Muppavarapu <sirisha.muppavarapu at intel.com> - 0.2
- Bug#7247 FIXED 	Date and time representations are not correct

State:   new          2010-10-08T16:34:40 krupert
Comment: None



changes files:
--------------
--- meego-handset-calendar.changes
+++ meego-handset-calendar.changes
@@ -0,0 +1,6 @@
+* Fri Oct 08 2010  Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.2
+- Change build requires from messageserver to qmfmessageserver
+
+* Wed Sep 29 2010 Sirisha Muppavarapu <sirisha.muppavarapu at intel.com> - 0.2
+- Bug#7247 FIXED 	Date and time representations are not correct
+

new:
----
  Fixed7247_Time_Edit_Displayed_Incorrectly.patch

spec files:
-----------
--- meego-handset-calendar.spec
+++ meego-handset-calendar.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
@@ -14,6 +14,7 @@
 URL:        http://www.meego.com
 Source0:    %{name}-%{version}.tar.gz
 Source100:  meego-handset-calendar.yaml
+Patch0:     Fixed7247_Time_Edit_Displayed_Incorrectly.patch
 Requires:   kcalcore
 Requires:   mkcal
 Requires:   timed
@@ -21,7 +22,7 @@
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  pkgconfig(meegotouch)
-BuildRequires:  pkgconfig(messageserver)
+BuildRequires:  pkgconfig(qmfmessageserver)
 BuildRequires:  kcalcore-devel
 BuildRequires:  mkcal-devel
 BuildRequires:  timed-devel
@@ -37,6 +38,8 @@
 %prep
 %setup -q -n %{name}
 
+# Fixed7247_Time_Edit_Displayed_Incorrectly.patch
+%patch0 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ Fixed7247_Time_Edit_Displayed_Incorrectly.patch (new)
--- Fixed7247_Time_Edit_Displayed_Incorrectly.patch
+++ Fixed7247_Time_Edit_Displayed_Incorrectly.patch
+diff --git a/src/mcreatenewdialog.cpp b/src/mcreatenewdialog.cpp
+index a56e801..7a548dc 100644
+--- a/src/mcreatenewdialog.cpp
++++ b/src/mcreatenewdialog.cpp
+@@ -231,41 +231,19 @@ editEvent(eventToEdit)
+     startAmPm = new MAmPmButton();
+     stTimeHourEdit->setContentType(M::NumberContentType);
+     stTimeMinEdit->setContentType(M::NumberContentType);   
++    //Bug# 7247 Author: Sirisha Muppavarapu
++    //Fixed the issue with the display of Time in the edit screen
++    QDateTime datetime;
+     if ( editEvent ) {
+-        QDateTime datetime = editEvent->StartDate();
+-        QString	hourStr = datetime.toString ( "hh" );
+-        QString	ampm = datetime.toString ( "AP" );
+-        int hourInt = hourStr.toInt() % 12;
+-        if ( hourInt == 0 )
+-        {
+-            hourInt = 12;
+-        }
+-        QTime time = datetime.time();
+-        QString hour;
+-        QString minute;
+-        hour.setNum( hourInt );
+-        minute.setNum( time.minute() );
+-        stTimeHourEdit->setText( hour );
+-        stTimeMinEdit->setText( minute );
+-        startAmPm->setState( ampm );
++        datetime = editEvent->StartDate();
+     } else {
+-        QDateTime datetime = QDateTime::currentDateTime();
+-        QString	hourStr = datetime.toString ( "hh" );
+-        QString	ampm = datetime.toString ( "AP" );
+-        int hourInt = hourStr.toInt() % 12;
+-        if ( hourInt == 0 )
+-        {
+-            hourInt = 12;
+-        }
+-        QTime time = datetime.time();
+-        QString hour;
+-        QString minute;
+-        hour.setNum( hourInt );
+-        minute.setNum( time.minute() );
+-        stTimeHourEdit->setText( hour );
+-        stTimeMinEdit->setText( minute );
+-        startAmPm->setState( ampm );
++        datetime = QDateTime::currentDateTime();
+     }
++    QString stDateTimeStr = datetime.toString("hh:mm AP");
++    stTimeHourEdit->setText( stDateTimeStr.section(":",0,0) );
++    stTimeMinEdit->setText( datetime.toString("mm") );
++    startAmPm->setState( datetime.toString ( "AP" ) );
++
+     startDtLinLayout->addItem(startTimeNameLabel);
+     startDtLinLayout->addItem(stTimeHourEdit);
+     startDtLinLayout->addItem(stTimeMinEdit);
+@@ -323,41 +301,18 @@ editEvent(eventToEdit)
+     endAmPm = new MAmPmButton();
+     endTimeHourEdit->setContentType(M::NumberContentType);
+     endTimeMinEdit->setContentType(M::NumberContentType);
++    //Bug# 7247 Author: Sirisha Muppavarapu
++    //Fixed the issue with the display of Time in the edit screen
+     if ( editEvent ) {
+-        QDateTime datetime = editEvent->EndDate();
+-        QString	hourStr = datetime.toString ( "hh" );
+-        QString	ampm = datetime.toString ( "AP" );
+-        int hourInt = hourStr.toInt() % 12;
+-        if ( hourInt == 0 )
+-        {
+-            hourInt = 12;
+-        }
+-        QTime time = datetime.time();
+-        QString hour;
+-        QString minute;
+-        hour.setNum( hourInt );
+-        minute.setNum( time.minute() );
+-        endTimeHourEdit->setText( hour );
+-        endTimeMinEdit->setText( minute );
+-        endAmPm->setState( ampm );
++        datetime = editEvent->EndDate();
+     } else {
+-        QDateTime datetime = QDateTime::currentDateTime().addSecs(60*60);
+-        QString	hourStr = datetime.toString ( "hh" );
+-        QString	ampm = datetime.toString ( "AP" );
+-        int hourInt = hourStr.toInt() % 12;
+-        if ( hourInt == 0 )
+-        {
+-            hourInt = 12;
+-        }
+-        QTime time = datetime.time();
+-        QString hour;
+-        QString minute;
+-        hour.setNum( hourInt );
+-        minute.setNum( time.minute() );
+-        endTimeHourEdit->setText( hour );
+-        endTimeMinEdit->setText( minute );
+-        endAmPm->setState( ampm );
++        datetime = QDateTime::currentDateTime().addSecs(60*60);
+     }
++    QString endDateTimeStr = datetime.toString("hh:mm AP");
++    endTimeHourEdit->setText( endDateTimeStr.section(":",0,0) );
++    endTimeMinEdit->setText( datetime.toString("mm") );
++    endAmPm->setState( datetime.toString ( "AP" ) );
++
+     endDtLinLayout->addItem(endTimeNameLabel);
+     endDtLinLayout->addItem(endTimeHourEdit);
+     endDtLinLayout->addItem(endTimeMinEdit);

++++++ meego-handset-calendar.yaml
--- meego-handset-calendar.yaml
+++ meego-handset-calendar.yaml
@@ -23,12 +23,15 @@
     - QtDBus
     - QtGui
     - meegotouch
-    - messageserver
+    - qmfmessageserver
 Provides:
     - calendar
 Configure: none
 Builder: make
 
+Patches:
+    - "Fixed7247_Time_Edit_Displayed_Incorrectly.patch"
+
 Files:
     - "%{_datadir}/l10n/meegotouch/%{name}.qm"