beter time edit

1 files changed, 14 insertions, 68 deletions

diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index f5a1c50..5222ac9 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -26,4 +26,5 @@
 #include <qdatetime.h>
 #include <qlineedit.h>
+#include <qlistbox.h>
 #include <qapplication.h>
 
@@ -40,42 +41,4 @@
 // Validator for a time value with only hours and minutes (no seconds)
 // Mostly locale aware. Author: David Faure <faure@kde.org>
-class KOTimeValidator : public QValidator
-{
-public:
-    KOTimeValidator(QWidget* parent, const char* name=0) : QValidator(parent, name) {}
-
-    virtual State validate(QString& str, int& /*cursorPos*/) const
-    {
-        return Acceptable;
-        bool ok = false;
-        // TODO use KLocale::WithoutSeconds in HEAD
-        /*QTime time =*/ KGlobal::locale()->readTime(str, &ok);
-        if ( ok )
-            return Acceptable;
-        // readTime doesn't help knowing when the string is "Intermediate".
-        int length = str.length();
-        if ( !str ) // empty string?
-            return Invalid; // there should always be a ':' in it, right?
-        // HACK. Not fully locale aware etc. (esp. the separator is '.' in sv_SE...)
-        QChar sep = ':';
-        // I want to allow "HH:", ":MM" and ":" to make editing easier
-        if ( str[0] == sep )
-        {
-            if ( length == 1 ) // just ":"
-                return Intermediate;
-            QString minutes = str.mid(1);
-            int m = minutes.toInt(&ok);
-            if ( ok && m >= 0 && m < 60 )
-                return Intermediate;
-        } else if ( str.at(str.length()-1) == sep )
-        {
-            QString hours = str.left(length-1);
-            int h = hours.toInt(&ok);
-            if ( ok && h >= 0 && h < 24 )
-                return Intermediate;
-        }
-        return Invalid;
-    }
-};
 
 // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
@@ -86,5 +49,4 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
 {
   setInsertionPolicy(NoInsertion);
-  setValidator( new KOTimeValidator( this ) );
     mFlagKeyPressed = false;
 
@@ -146,9 +108,5 @@ bool KOTimeEdit::hasTime() const
 QTime KOTimeEdit::getTime() const
 {
-  //kdDebug(5850) << "KOTimeEdit::getTime(), currentText() = " << currentText() << endl;
-  // TODO use KLocale::WithoutSeconds in HEAD
-  QTime time = KGlobal::locale()->readTime(currentText());
-  // kdDebug(5850) << "KOTimeEdit::getTime(): " << time.toString() << endl;
-  return time;
+  return KGlobal::locale()->readTime(currentText());
 }
 /*
@@ -166,6 +124,4 @@ void KOTimeEdit::setTime(QTime newTime)
   if ( mTime != newTime )
   {
-    kdDebug(5850) << "KOTimeEdit::setTime(): " << newTime.toString() << endl;
-
     mTime = newTime;
     updateText();
@@ -380,4 +336,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
     break;
   case Key_Backspace:
+      qDebug("+++++++++++back ");
       if ( cpos >  0) {
           if ( cpos == 3 )
@@ -390,4 +347,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
           setSelect ( cpos , 1 );
       changedText();
+      qDebug("---------back ");
       }
     break;
@@ -487,5 +445,6 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
 void KOTimeEdit::updateText()
 {
-//  kdDebug(5850) << "KOTimeEdit::updateText() " << endl
+    listBox()->blockSignals( true );
+    blockSignals( true );
   QString s = KGlobal::locale()->formatTime(mTime);
   // Set the text but without emitting signals, nor losing the cursor position
@@ -493,36 +452,23 @@ void KOTimeEdit::updateText()
   line->blockSignals(true);
   int pos = line->cursorPosition();
-  // qDebug("    settext *%s* ", s.latin1());
-  line->setText(s);
- //  line->setCursorPosition(pos);
-//   line->blockSignals(false);
-
-//  kdDebug(5850) << "KOTimeEdit::updateText(): " << s << endl;
-
-  if (!mTime.minute() % 15) {
     setCurrentItem((mTime.hour()*4)+(mTime.minute()/15));
-  }
+    line->setText(s);
  line->setCursorPosition(pos);
   line->blockSignals(false);
+    blockSignals( false );
+    listBox()->blockSignals( false );
 
 }
 
-bool KOTimeEdit::inputIsValid() const
-{
-  int cursorPos = lineEdit()->cursorPosition();
-  QString str = currentText();
-  return validator()->validate( str, cursorPos ) == QValidator::Acceptable;
-}
-
 void KOTimeEdit::changedText()
 {
-  //kdDebug(5850) << "KOTimeEdit::changedText()" << endl;
-  if ( inputIsValid() )
-  {
       int pos = lineEdit()->cursorPosition();
       mTime = getTime();
-      // updateText();
+    blockSignals( true );
+    QString text = lineEdit()->text();
+    setCurrentItem((mTime.hour()*4)+(mTime.minute()/15));
+    lineEdit()->setText(text);
+    blockSignals( false );
       emit timeChanged(mTime);
       lineEdit()->setCursorPosition(pos);
   }
-}