Bugfix: (Bug #0000716) The timepicker now works in am/pm mode also, I also changed datebook to use the otimepicker class in libopie.

5 files changed, 14 insertions, 167 deletions

diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index b4206a9..a6ee799 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -10,7 +10,6 @@ HEADERS	= datebookday.h \
           datebookweeklst.h \
           datebookweekheaderimpl.h \
           repeatentry.h \
-          timepicker.h \
           noteentryimpl.h \
           onoteedit.h
         SOURCES= main.cpp \
@@ -23,7 +22,6 @@ SOURCES	= main.cpp \
           datebookweeklst.cpp \
           datebookweekheaderimpl.cpp \
           repeatentry.cpp \
-          timepicker.cpp \
           noteentryimpl.cpp \
           onoteedit.cpp
         INTERFACES= dateentry.ui \
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index fadbc35..197eb30 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -288,7 +288,7 @@
         </spacer>
 
         <widget row="5"  column="1" colspan="3">
-            <class>TimePicker</class>
+            <class>OTimePicker</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>timePickerStart</cstring>
@@ -540,8 +540,8 @@
         <pixmap>image1</pixmap>
     </customwidget>
     <customwidget>
-        <class>TimePicker</class>
-        <header location="local">timepicker.h</header>
+        <class>OTimePicker</class>
+        <header location="local">opie/otimepicker.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 33b9d9b..13d2ce2 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -40,7 +40,7 @@
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 
-#include "timepicker.h"
+#include <opie/otimepicker.h>
 #include "onoteedit.h"
 
 #include <stdlib.h>
@@ -82,16 +82,16 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
       m_showStart = false;
     }
   } else if( ev->type() == QEvent::FocusOut ){
-    if( obj == comboEnd ){
-      QString s;
-      s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute());
-      comboEnd->setText(s);
-    }
-    else if( obj == comboStart ){
-      QString s;
-      s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
-      comboStart->setText(s);
-    }
+//    if( obj == comboEnd ){
+//      QString s;
+//      s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute());
+//      comboEnd->setText(s);
+//    }
+//    else if( obj == comboStart ){
+//      QString s;
+//      s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
+//      comboStart->setText(s);
+//    }
   }
 
   return false;
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp
deleted file mode 100644
index f2cb71d..0000000
--- a/core/pim/datebook/timepicker.cpp
+++ b/dev/null
@@ -1,119 +0,0 @@
-#include "timepicker.h"
-
-#include <qbuttongroup.h>
-#include <qtoolbutton.h>
-#include <qlayout.h>
-#include <qstring.h>
-#include <stdio.h>
-
-TimePicker::TimePicker(QWidget* parent, const char* name, 
-                       WFlags fl) :
-  QWidget(parent,name,fl)
-{
-  QVBoxLayout *vbox=new QVBoxLayout(this);
-
-  OClickableLabel *r;
-  QString s;
-
-  // Hour Row
-  QWidget *row=new QWidget(this);
-  QHBoxLayout *l=new QHBoxLayout(row);
-  vbox->addWidget(row);
-  
-  
-  for (int i=0; i<24; i++) {
-    r=new OClickableLabel(row);
-    hourLst.append(r);
-    s.sprintf("%.2d",i);
-    r->setText(s);
-    r->setToggleButton(true);
-    r->setAlignment(AlignHCenter | AlignVCenter);
-    l->addWidget(r);
-    connect(r, SIGNAL(toggled(bool)),
-            this, SLOT(slotHour(bool)));
-
-    if (i==11) { // Second row
-      row=new QWidget(this);
-      l=new QHBoxLayout(row);
-      vbox->addWidget(row);
-    }
-  }
-
-  // Minute Row
-  row=new QWidget(this);
-  l=new QHBoxLayout(row);
-  vbox->addWidget(row);
-  
-  for (int i=0; i<60; i+=5) {
-    r=new OClickableLabel(row);
-    minuteLst.append(r);
-    s.sprintf("%.2d",i);
-    r->setText(s);
-    r->setToggleButton(true);
-    r->setAlignment(AlignHCenter | AlignVCenter);
-    l->addWidget(r);
-    connect(r, SIGNAL(toggled(bool)),
-            this, SLOT(slotMinute(bool)));
-  }
-}
-
-void TimePicker::slotHour(bool b) {
-
-  OClickableLabel *r = (OClickableLabel *) sender();
-
-  if (b) {
-    QValueListIterator<OClickableLabel *> it;
-    for (it=hourLst.begin(); it!=hourLst.end(); it++) {
-      if (*it != r) (*it)->setOn(false);
-      else tm.setHMS((*it)->text().toInt(), tm.minute(), 0);
-    }
-    emit timeChanged(tm);
-  } else {
-    r->setOn(true);
-  }
-
-}
-
-void TimePicker::slotMinute(bool b) {
-
-  OClickableLabel *r = (OClickableLabel *) sender();
-
-  if (b) {
-    QValueListIterator<OClickableLabel *> it;
-    for (it=minuteLst.begin(); it!=minuteLst.end(); it++) {
-      if (*it != r) (*it)->setOn(false);
-      else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0);
-    }
-    emit timeChanged(tm);
-  } else {
-    r->setOn(true);
-  }
-
-}
-
-void TimePicker::setMinute(int m) {
-
-  QString minute;
-  minute.sprintf("%.2d",m);
-
-  QValueListIterator<OClickableLabel *> it;
-  for (it=minuteLst.begin(); it!=minuteLst.end(); it++) {
-    if ((*it)->text() == minute) (*it)->setOn(true);
-    else (*it)->setOn(false);
-  }  
-
-  tm.setHMS(tm.hour(),m,0);
-}
-
-void TimePicker::setHour(int h) {
-
-  QString hour;
-  hour.sprintf("%.2d",h);
-
-  QValueListIterator<OClickableLabel *> it;
-  for (it=hourLst.begin(); it!=hourLst.end(); it++) {
-    if ((*it)->text() == hour) (*it)->setOn(true);
-    else (*it)->setOn(false);
-  }  
-  tm.setHMS(h,tm.minute(),0);
-}
diff --git a/core/pim/datebook/timepicker.h b/core/pim/datebook/timepicker.h
deleted file mode 100644
index 1c35600..0000000
--- a/core/pim/datebook/timepicker.h
+++ b/dev/null
@@ -1,32 +0,0 @@
-#ifndef TIMEPICKER_H
-#define TIMEPICKER_H
-
-#include <qwidget.h>
-#include <qvaluelist.h>
-#include <opie/oclickablelabel.h>
-#include <qdatetime.h>
-
-class TimePicker: public QWidget {
-  Q_OBJECT
-
- public:
-    TimePicker(QWidget* parent = 0, const char* name = 0, 
-               WFlags fl = 0);
-    void setHour(int h);
-    void setMinute(int m);
-
- private:
-    QValueList<OClickableLabel *> hourLst;
-    QValueList<OClickableLabel *> minuteLst;
-    QTime tm;
-
- private slots:
-    void slotHour(bool b);
-    void slotMinute(bool b);
-
- signals:
-    void timeChanged(const QTime &);
-};
-
-
-#endif