today in HEAD up to date

22 files changed, 165 insertions, 56 deletions

diff --git a/core/pim/today/plugins/datebook/.cvsignore b/core/pim/today/plugins/datebook/.cvsignore
index 2888d4a..10cf625 100644
--- a/core/pim/today/plugins/datebook/.cvsignore
+++ b/core/pim/today/plugins/datebook/.cvsignore
@@ -1,2 +1,3 @@
 Makefile*
+datebookpluginconfigbase*
 moc*
diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in
index 621510f..7a14438 100644
--- a/core/pim/today/plugins/datebook/config.in
+++ b/core/pim/today/plugins/datebook/config.in
@@ -1,4 +1,4 @@
   config TODAY_DATEBOOK
-    boolean "opie-today-datebookplugin (datebook plugin)"
+    boolean "datebook"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index bd45f71..1f75964 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -19,3 +19,22 @@ DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
 
+TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \
+	 ../../../../../i18n/nl/libtodaydatebookplugin.ts \
+         ../../../../../i18n/xx/libtodaydatebookplugin.ts \
+         ../../../../../i18n/en/libtodaydatebookplugin.ts \
+         ../../../../../i18n/es/libtodaydatebookplugin.ts \
+         ../../../../../i18n/fr/libtodaydatebookplugin.ts \
+         ../../../../../i18n/hu/libtodaydatebookplugin.ts \
+         ../../../../../i18n/ja/libtodaydatebookplugin.ts \
+         ../../../../../i18n/ko/libtodaydatebookplugin.ts \
+         ../../../../../i18n/no/libtodaydatebookplugin.ts \
+         ../../../../../i18n/pl/libtodaydatebookplugin.ts \
+         ../../../../../i18n/pt/libtodaydatebookplugin.ts \
+         ../../../../../i18n/pt_BR/libtodaydatebookplugin.ts \
+         ../../../../../i18n/sl/libtodaydatebookplugin.ts \
+         ../../../../../i18n/zh_CN/libtodaydatebookplugin.ts \
+         ../../../../../i18n/zh_TW/libtodaydatebookplugin.ts \
+         ../../../../../i18n/it/libtodaydatebookplugin.ts \
+         ../../../../../i18n/da/libtodaydatebookplugin.ts
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 3c1e97a..e595047 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -2,5 +2,5 @@
  * datebookevent.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
@@ -20,4 +20,5 @@
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/calendar.h>
 
 #include <opie/odevice.h>
@@ -29,4 +30,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 			     bool show_location,
 			     bool show_notes,
+                             bool timeExtraLine,
                              int maxCharClip,
                              const char* name,
@@ -53,15 +55,23 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
 
+    QString timeSpacer = "   ";
+    if ( timeExtraLine )  {
+        timeSpacer = "<br>";
+    }
+
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
          &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) {
-        msg += "<br>All day";
+        msg += tr ( "All day" );
     }  else {
         // start time of event
-        QDate tempDate = (ev).event().start().date();
-        msg += "<br>"
-               + ampmTime( QTime( (ev).event().start().time() ) )
+//         QDate tempDate = (ev).event().start().date();
+        msg += timeSpacer;
+        msg += ampmTime( QTime( (ev).event().start().time() ) )
                // end time of event
-               + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) )
-               + differDate( tempDate );
+               + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) );
+    }
+
+    if ( (ev).date() != QDate::currentDate() )  {
+        msg += differDate( (ev).date() /* tempDate*/ );
     }
 
@@ -102,16 +112,16 @@ QString DateBookEvent::ampmTime( QTime tm ) {
 
 QString DateBookEvent::differDate( QDate date ) {
-    QDate currentDate = QDate::currentDate();
+//     QDate currentDate = QDate::currentDate();
     QString returnText = "<font color = #407DD9><b> ";
-    int differDate = currentDate.daysTo( date );
-    if ( currentDate.dayOfWeek() == date.dayOfWeek() ) {
-        returnText += "" ;
-        // not working right for recurring events
-        //} else if ( differDate == 1 ) {
-        //returnText += tr( "tomorrow" );
-    } else {
-        //returnText += tr( "in %1 days" ).arg( differDate );
-        returnText += "   [ " + date.dayName( date.dayOfWeek() ) + " ] ";
-    }
+//     int differDate = currentDate.daysTo( date );
+//     if ( currentDate.dayOfWeek() == date.dayOfWeek() ) {
+//         returnText += "" ;
+//         // not working right for recurring events
+//         //} else if ( differDate == 1 ) {
+//         //returnText += tr( "tomorrow" );
+//     } else {
+//          returnText += "   [ " + Calendar::nameOfDay( date.dayOfWeek() )  + " ] ";
+//     }
+    returnText += "   [ " + Calendar::nameOfDay( date.dayOfWeek() )  + " ] ";
     returnText += "</b></font>";
     return returnText;
@@ -127,5 +137,5 @@ void DateBookEvent::editEventSlot( const Event &e ) {
         QCopEnvelope env( "QPE/Application/datebook", "raise()" );
     } else {
-        QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
+        QCopEnvelope env( "QPE/Application/datebook", "editEvent(int)" );
         env << e.uid();
     }
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index 8027809..1a090e3 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -2,5 +2,5 @@
  * datebookplugin.h
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
@@ -31,8 +31,10 @@ public:
 		    bool show_location = 0,
 		    bool show_notes = 0,
+		    bool timeExtraLine = 0,
 		    int maxCharClip = 0,
 		    const char* name = 0,
 		    WFlags fl = 0 );
      ~DateBookEvent();
+
  signals:
      void editEvent( const Event &e );
@@ -41,4 +43,5 @@ private slots:
     void editEventSlot( const Event &e );
     void editMe();
+
  private:
   
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 4e650ee..f77e440 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -70,2 +70,9 @@ void DatebookPlugin::refresh() {
     }
 }
+
+void DatebookPlugin::reinitialize()  {
+    if ( m_widget )  {
+        m_widget->reinitialize();
+    }
+}
+
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index db899e8..890c59b 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -40,4 +40,5 @@ public:
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index 1970654..9e95bcd 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -31,9 +31,4 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name )
     m_layoutDates = 0l;
 
-    if ( db ) {
-        delete db;
-    }
-    db = new DateBookDB;
-
     if ( m_layoutDates )  {
         delete m_layoutDates;
@@ -46,5 +41,4 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name )
     readConfig();
     getDates();
-    m_layoutDates->addStretch(5);
 }
 
@@ -63,4 +57,10 @@ void DatebookPluginWidget::readConfig() {
     m_onlyLater = cfg.readNumEntry( "onlylater", 1 );
     m_moreDays = cfg.readNumEntry( "moredays", 0 );
+    m_timeExtraLine = cfg.readNumEntry( "timeextraline",  1 );
+}
+
+void DatebookPluginWidget::reinitialize()  {
+    readConfig();
+    refresh();
 }
 
@@ -75,5 +75,4 @@ void DatebookPluginWidget::refresh()  {
 
     getDates();
-    m_layoutDates->addStretch(5);
 }
 
@@ -83,4 +82,10 @@ void DatebookPluginWidget::refresh()  {
 void DatebookPluginWidget::getDates() {
 
+
+    if ( db ) {
+        delete db;
+    }
+    db = new DateBookDB;
+
     QDate date = QDate::currentDate();
     QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays )  );
@@ -95,16 +100,29 @@ void DatebookPluginWidget::getDates() {
                 if ( !m_onlyLater ) {
                     count++;
-                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
-                    m_eventsList.append( l );
-                    l->show();
-                    QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
-                } else if ( QDateTime::currentDateTime()  <= (*it).event().end() ||  (*it).event().start().date() != date  ) {
-                    count++;
-                    // show only later appointments
-                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
+                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
                     m_eventsList.append( l );
                     l->show();
                     QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
-                }
+                } else { 
+			if ( ( QDateTime::currentDateTime()  <=  (*it).event().end() )  
+			     // Show events which span over many days and are not elapsed.
+			     || ( ( (*it).event().start().date() != date ) &&  (  QDateTime::currentDateTime()  <=  (*it).event().end() )  )
+			     // Show repeated event for today that is not elapsed.
+ 			     || ( ( (*it).event().repeatType() != Event::NoRepeat )
+				  && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) 
+				       && ( QTime::currentTime() < (*it).event().start().time() ) ) ) 
+			     // Show repeated event for next days.
+			     || ( ( (*it).event().repeatType() != Event::NoRepeat )
+				  && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) )  
+			     ) 
+			     {
+				count++;
+				// show only later appointments
+				DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
+				m_eventsList.append( l );
+				l->show();
+				QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
+			     }
+		}
             }
         }
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index 35d43cd..8988073 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -35,4 +35,5 @@ public:
     ~DatebookPluginWidget();
     void refresh();
+    void reinitialize();
 
 private:
@@ -53,5 +54,6 @@ private:
     bool m_onlyLater;
     int m_moreDays;
-
+    // true if time of an appointment should be an extra line
+    bool m_timeExtraLine;
 };
 
diff --git a/core/pim/today/plugins/mail/config.in b/core/pim/today/plugins/mail/config.in
index 6f3e06d..6f4450f 100644
--- a/core/pim/today/plugins/mail/config.in
+++ b/core/pim/today/plugins/mail/config.in
@@ -1,4 +1,4 @@
   config TODAY_MAIL
-    boolean "opie-today-mailplugin (mail plugin)"
+    boolean "mail"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 60ed87d..70c484d 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt plugin release
+CONFIG += qt release
 
 # Input
@@ -17,3 +17,21 @@ DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
 
+TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \
+	 ../../../../../i18n/nl/libtodaymailplugin.ts \
+         ../../../../../i18n/xx/libtodaymailplugin.ts \
+         ../../../../../i18n/en/libtodaymailplugin.ts \
+         ../../../../../i18n/es/libtodaymailplugin.ts \
+         ../../../../../i18n/fr/libtodaymailplugin.ts \
+         ../../../../../i18n/hu/libtodaymailplugin.ts \
+         ../../../../../i18n/ja/libtodaymailplugin.ts \
+         ../../../../../i18n/ko/libtodaymailplugin.ts \
+         ../../../../../i18n/no/libtodaymailplugin.ts \
+         ../../../../../i18n/pl/libtodaymailplugin.ts \
+         ../../../../../i18n/pt/libtodaymailplugin.ts \
+         ../../../../../i18n/pt_BR/libtodaymailplugin.ts \
+         ../../../../../i18n/sl/libtodaymailplugin.ts \
+         ../../../../../i18n/zh_CN/libtodaymailplugin.ts \
+         ../../../../../i18n/zh_TW/libtodaymailplugin.ts \
+         ../../../../../i18n/it/libtodaymailplugin.ts \
+         ../../../../../i18n/da/libtodaymailplugin.ts
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp
index 9430c30..bf30538 100644
--- a/core/pim/today/plugins/mail/mailplugin.cpp
+++ b/core/pim/today/plugins/mail/mailplugin.cpp
@@ -68,2 +68,5 @@ void MailPlugin::refresh()  {
     }
 }
+
+void MailPlugin::reinitialize()  {
+}
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index 295a88c..5b93314 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -42,4 +42,5 @@ public:
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index 3c1d908..646996a 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -30,5 +30,5 @@ MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
     }
     m_mailLabel = new OClickableLabel( this );
-    m_mailLabel->setMaximumHeight( 15 );
+    //m_mailLabel->setMaximumHeight( 15 );
     connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
 
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index 1419557..e69de29 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -1,9 +0,0 @@
-Package: opie-today-mailplugin
-Files: plugins/today/libtodaymailplugin.so*
-Priority: optional
-Section: opie/applications
-Maintainer: Maximilian Reiss <harlekin@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqte2, opie-today
-Description: Mail plugin for today
diff --git a/core/pim/today/plugins/todolist/.cvsignore b/core/pim/today/plugins/todolist/.cvsignore
index 2888d4a..b9284b8 100644
--- a/core/pim/today/plugins/todolist/.cvsignore
+++ b/core/pim/today/plugins/todolist/.cvsignore
@@ -1,2 +1,3 @@
 Makefile*
+todopluginconfigbase*
 moc*
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in
index c862f37..48ba226 100644
--- a/core/pim/today/plugins/todolist/config.in
+++ b/core/pim/today/plugins/todolist/config.in
@@ -1,4 +1,4 @@
   config TODAY_TODOLIST
-    boolean "opie-today-todolistplugin (shows the next todo entries)"
+    boolean "todolist"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 0343223..6a63f4e 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -20,3 +20,22 @@ DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
 
+TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \
+	 ../../../../../i18n/nl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/xx/libtodaytodolistplugin.ts \
+         ../../../../../i18n/en/libtodaytodolistplugin.ts \
+         ../../../../../i18n/es/libtodaytodolistplugin.ts \
+         ../../../../../i18n/fr/libtodaytodolistplugin.ts \
+         ../../../../../i18n/hu/libtodaytodolistplugin.ts \
+         ../../../../../i18n/ja/libtodaytodolistplugin.ts \
+         ../../../../../i18n/ko/libtodaytodolistplugin.ts \
+         ../../../../../i18n/no/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pt/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pt_BR/libtodaytodolistplugin.ts \
+         ../../../../../i18n/sl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/zh_CN/libtodaytodolistplugin.ts \
+         ../../../../../i18n/zh_TW/libtodaytodolistplugin.ts \
+         ../../../../../i18n/it/libtodaytodolistplugin.ts \
+         ../../../../../i18n/da/libtodaytodolistplugin.ts
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 7eeb8f1..801de9d 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -2,5 +2,5 @@
  * todoplugin.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002,2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
@@ -69,2 +69,8 @@ void TodolistPlugin::refresh()  {
     }
 }
+
+void TodolistPlugin::reinitialize()  {
+    if ( m_widget )  {
+        m_widget->reinitialize();
+    }
+}
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index d7b51b4..f68162f 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -42,4 +42,5 @@ public:
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index 15081ec..0364f94 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -64,5 +64,12 @@ void TodolistPluginWidget::readConfig() {
 }
 
-void TodolistPluginWidget:: refresh()  {
+void TodolistPluginWidget:: refresh() {
+    todo->reload();
+    getTodo();
+}
+
+void TodolistPluginWidget::reinitialize() {
+    readConfig();
+    todo->reload();
     getTodo();
 }
@@ -80,5 +87,5 @@ void TodolistPluginWidget::getTodo() {
 
     // get overdue todos first
-    m_list = todo->overDue();
+    m_list = todo->sorted( true, 3, 2, 1);
 
     for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
@@ -88,5 +95,5 @@ void TodolistPluginWidget::getTodo() {
                 desc = (*m_it).description();
             }
-            tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
+            tmpout += "<font color=#e00000><b>[" +  QString("%1").arg((*m_it).priority() )  + "]" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
             ammount++ ;
         }
@@ -105,5 +112,5 @@ void TodolistPluginWidget::getTodo() {
                 desc = (*m_it).description();
             }
-            tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
+            tmpout += "<b> [" +  QString("%1").arg((*m_it).priority() )  + "] </b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
             ammount++;
         }
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h
index 0db65c4..9cac43d 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.h
+++ b/core/pim/today/plugins/todolist/todopluginwidget.h
@@ -33,4 +33,5 @@ public:
 
     void refresh();
+    void reinitialize();
 
 protected slots: