fixxxx

11 files changed, 105 insertions, 56 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index f3f5333..ab8339f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -159,9 +159,9 @@
 { "Enable Recurrence","Wiederholung anschalten" },
 { "End after","Endet nach"},
 { "End by:","Endet am"},
-{ "End Date","End Datum" },
+{ "End/Due Date","Ende/Fällig am" },
 { "End:","Ende:" },
-{ "End Time","End Zeit" },
+{ "End/Due Time","Ende/Fällig um" },
 { "English","Englisch" },
 { "Event","Termin" },
 { "Event list","Termin Liste" },
@@ -364,9 +364,9 @@
 { "Sorry","Tut mir leid" },
 {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
 { "Start:","Start:" },
-{ "Start Date","Start Datum" },
+{ "Start Date","Start am" },
 { "Start date: %1","Start Datum: %1" },
-{ "Start Time","Start Zeit" },
+{ "Start Time","Start um" },
 { "Status:","Status:" },
 { "Status","Status:" },
 { "Summaries","Titel" },
@@ -1531,6 +1531,8 @@
 { "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" },
 { "Show times on two lines","Zeige Zeiten auf zwei Zeilen" },
 { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },
+{ "Duration","Dauer" },
+{ " day"," Tag" }, 
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 965cf47..10d9a8c 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -97,6 +97,16 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
   layoutTimeBox->setSpacing(KDialog::spacingHintSmall());
   layoutTimeBox->setColStretch( 1, 1 );
 
+  mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
+  layoutTimeBox->addWidget(mStartCheck,0,0);
+  connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
+
+  mStartDateEdit = new KDateEdit(timeBoxFrame);
+  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+
+  mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
+  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+
   mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame);
   layoutTimeBox->addWidget(mDueCheck,1,0);
   connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool)));
@@ -110,17 +120,6 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
   layoutTimeBox->addWidget(mDueTimeEdit,1,2);
 
 
-  mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mStartCheck,0,0);
-  connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
-
-  mStartDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
-
-  mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
-
-
   mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame);
   layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1);
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e7a5e0e..e560ce4 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -128,20 +128,19 @@ bool ListItemVisitor::visit(Event *e)
         mItem->setText(4,"---");
     else
         mItem->setText(4,e->dtEndTimeStr());
+    mItem->setText(5, e->durationText());
     if ( e->isAlarmEnabled() ) {
-        mItem->setText(5,e->alarms().first()->offsetText() );
+        mItem->setText(6,e->alarms().first()->offsetText() );
     } else {
-        mItem->setText(5, i18n("No"));
+        mItem->setText(6, i18n("No"));
     }
-    mItem->setText(6, e->recurrenceText());
+    mItem->setText(7, e->recurrenceText());
     if( ! e->doesRecur() )
-        mItem->setSortKey( 6, "-" );
-    mItem->setText(7,"---");
-    mItem->setText(8,"---");
-    mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
-    mItem->setText(10,e->categoriesStr());
-    mItem->setText(11, KOPrefs::instance()->calName( e->calID() ));
-    mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
+        mItem->setSortKey( 7, "-" );
+    mItem->setText(8, e->cancelled() ? i18n("Yes") : i18n("No"));
+    mItem->setText(9,e->categoriesStr());
+    mItem->setText(10, KOPrefs::instance()->calName( e->calID() ));
+    mItem->setText(11, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
 
     QString key; 
     QDate d = e->lastModified().date();
@@ -177,41 +176,40 @@ bool ListItemVisitor::visit(Todo *t)
         mItem->setText(1,"---");
         mItem->setText(2,"---");
     }
-    mItem->setText(3,"---");
-    mItem->setText(4,"---");  
     if ( t->isAlarmEnabled() ) {
-        mItem->setText(5,t->alarms().first()->offsetText() );
+        mItem->setText(6,t->alarms().first()->offsetText() );
     } else {
-        mItem->setText(5, i18n("No"));
+        mItem->setText(6, i18n("No"));
     }
-    mItem->setText(6, t->recurrenceText());
+    mItem->setText(7, t->recurrenceText());
     if( ! t->doesRecur() )
-        mItem->setSortKey( 6, "-" );
+        mItem->setSortKey( 7, "-" );
     if (t->hasDueDate()) {
-        mItem->setText(7,t->dtDueDateStr());
+        mItem->setText(3,t->dtDueDateStr());
         if (t->doesFloat()) {
-            mItem->setText(8,"---");
+            mItem->setText(4,"---");
         } else {
-            mItem->setText(8,t->dtDueTimeStr());
+            mItem->setText(4,t->dtDueTimeStr());
         }
     } else {
-        mItem->setText(7,"---");
-        mItem->setText(8,"---");
+        mItem->setText(3,"---");
+        mItem->setText(4,"---");
     }
-    mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
-    mItem->setText(10,t->categoriesStr());
-    mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
-    mItem->setText(12, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
+    mItem->setText(5, t->durationText());
+    mItem->setText(8, t->cancelled() ? i18n("Yes") : i18n("No"));
+    mItem->setText(9,t->categoriesStr());
+    mItem->setText(10, KOPrefs::instance()->calName( t->calID() ));
+    mItem->setText(11, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
     QString key;
     QDate d = t->lastModified().date();
     QTime tm = t->lastModified().time();
     key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
-    mItem->setSortKey(12,key);
+    mItem->setSortKey(11,key);
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
-        mItem->setSortKey(7,key);
+        mItem->setSortKey(3,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
@@ -243,12 +241,11 @@ bool ListItemVisitor::visit(Journal * j)
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
-    mItem->setText(7,j->dtStartDateStr());
+    mItem->setText(7,"---");
     mItem->setText(8,"---");
-    mItem->setText(9,"---");
-    mItem->setText(10,j->categoriesStr());
-    mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
-    mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
+    mItem->setText(9,j->categoriesStr());
+    mItem->setText(10, KOPrefs::instance()->calName( j->calID() ));
+    mItem->setText(11, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
 
     QString key; 
     QDate d = j->lastModified().date();
@@ -274,12 +271,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
-    mListView->addColumn(i18n("End Date"));
-    mListView->addColumn(i18n("End Time"));
+    mListView->addColumn(i18n("End/Due Date"));
+    mListView->addColumn(i18n("End/Due Time"));
+    mListView->addColumn(i18n("Duration"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
-    mListView->addColumn(i18n("Due Date"));
-    mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
@@ -297,11 +293,10 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
     mListView->setColumnAlignment(11,AlignLeft);
-    mListView->setColumnAlignment(12,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
-    for ( iii = 0; iii< 13 ; ++iii )
+    for ( iii = 0; iii< 12 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 77d0ac8..98a820d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -225,7 +225,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         filterToolBar = new QPEToolBar ( this );
         filterMenubar = new KMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
-            
+#ifndef DESKTOP_VERSION    
+        filterToolBar->setFocusPolicy( NoFocus );
+        filterMenubar->setFocusPolicy( NoFocus );
+#endif     
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 79e0464..3157214 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -350,7 +350,7 @@ int Alarm::offset()
         }
     
 }
-QString Alarm::offsetText() 
+QString Alarm::offsetText()
 {
     int min = -offset()/60;
     int hours = min /60;
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 0766fd9..fdf5657 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -414,3 +414,11 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_
      return QDateTime ();
 
 }
+
+QString Event::durationText()
+{
+    int sec = mDtStart.secsTo( mDtEnd );
+    if ( doesFloat() )
+        sec += 86400;
+    return durationText4Time( sec );
+}
diff --git a/libkcal/event.h b/libkcal/event.h
index 2da9770..6a58618 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -76,6 +76,7 @@ class Event : public Incidence
     bool contains ( Event*);
 
     bool isOverlapping (  Event*,  QDateTime*, QDateTime* );
+    QString durationText();
 
   private:
     bool accept(Visitor &v) { return v.visit(this); }
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 4643a3a..201f593 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -100,7 +100,36 @@ Incidence::~Incidence()
       delete mRecurrence; 
  
 }
+QString Incidence::durationText()
+{
+    return "---";
+}
+QString Incidence::durationText4Time( int offset )
+{
+    int min = offset/60;
+    int hours = min /60;
+    min = min % 60;
+    int days = hours /24;
+    hours = hours % 24;
+
+    if ( doesFloat() || ( min == 0 && hours == 0 )  ) {
+        if ( days == 1 )
+            return "1" + i18n(" day");
+        else
+            return QString::number( days )+   i18n(" days");
 
+    }
+    QString message = QString::number ( hours ) +":";
+    if ( min < 10 ) message += "0";
+    message += QString::number ( min );
+    if ( days > 0 ) { 
+        if ( days == 1 )
+            message =  "1" + i18n(" day") + " "+message;
+        else
+            message =  QString::number( days )+   i18n(" days") + " "+message;
+    }
+    return message; 
+}
 bool Incidence::isHoliday() const
 {
     return mHoliday;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 8519f01..88df217 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -281,7 +281,8 @@ class Incidence : public IncidenceBase
     QString recurrenceText() const;
     void setLastModifiedSubInvalid();
     
-
+    virtual QString durationText();
+    QString durationText4Time( int secs );
     Recurrence *mRecurrence;
 protected:
     QPtrList<Alarm> mAlarms;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 7bf756a..e4508a0 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -614,3 +614,13 @@ void Todo::checkSetCompletedFalse()
         }
     }
 }
+QString Todo::durationText()
+{
+    if ( mHasDueDate && hasStartDate() ) {
+        int sec = dtStart().secsTo( dtDue() );
+        if ( doesFloat() )
+            sec += 86400;
+        return durationText4Time( sec );
+    }
+    return "---";
+}
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 425dfad..7feb32e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -130,6 +130,7 @@ namespace KCal {
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
     void saveParents();
+    QString durationText();
   private:
     bool mRunning;
     QTimer * mRunSaveTimer;