recur fixes

6 files changed, 29 insertions, 15 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ab6d220..58be545 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1263,30 +1263,38 @@
 { "Receiving synced file...","Gesyncte Daten erhalten..." },
 { "Received %1 bytes","%1 Bytes erhalten" },
 { "Writing file to disk...","Speichere Datei..." },
 { "Pi-Sync successful!","Pi-Sync erfolgreich!" },
 { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
 { "Synchronize!","Synchronisiere!" },
 { "High clock skew!","Großer Uhrzeitunterschied!" },
 { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
 { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },
 { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." },
 { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" },
 { "List week view","Listenwochenansicht" },
 { "List week","Listenwochenansicht" },
 { "Next Week","Nächste Woche" },
 { "Previous Week","Vorherige Woche" },
 { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." },
 { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" },
 { "Details","Details" },
 { "Created time","Erstellt Zeit" },
 { "Last modified time","Geändert Zeit" },
 { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" },
 { "View Options","Anzeige Optionen" },
 { "<b>Created: ","<b>Erstellt am: " },
 { "<b>Last modified: ","<b>Zuletzt geändert am: " },
+{ "Journal: ","Journal: " },
+{ "yearly","jährlich" },
+{ "(%1) ","%1-" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 1f5afc0..4a6e17d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -120,102 +120,102 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setText(2,e->dtStartTimeStr());
     mItem->setText(3,end);
     mItem->setText(4,e->dtEndTimeStr());
     mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
     mItem->setText(6, e->recurrence()->recurrenceText());
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,e->categoriesStr());
 
     QString key;
     QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
     key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
     key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
     mItem->setSortKey(3,key);
 
     return true;
 }
 
 bool ListItemVisitor::visit(Todo *t)
 {
-    mItem->setText(0,i18n("To-Do: %1").arg(t->summary()));
+    mItem->setText(0,i18n("Todo: %1").arg(t->summary()));
     if (t->hasStartDate()) {
         mItem->setText(1,t->dtStartDateStr());
         if (t->doesFloat()) {
             mItem->setText(2,"---");
         } else {
             mItem->setText(2,t->dtStartTimeStr());
         }
     } else {
         mItem->setText(1,"---");
         mItem->setText(2,"---");
     }
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
     mItem->setText(6, t->recurrence()->recurrenceText());
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
         if (t->doesFloat()) {
             mItem->setText(8,"---");
         } else {
             mItem->setText(8,t->dtDueTimeStr());
         }
     } else {
         mItem->setText(7,"---");
         mItem->setText(8,"---");
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
 
     QString key;
     QDate d;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         QTime 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);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
-    QString des = j->description().left(50);
+    QString des = j->description().left(30);
     des = des.simplifyWhiteSpace ();
     des.replace (QRegExp ("\\n"),"" );
     des.replace (QRegExp ("\\r"),"" );
-    mItem->setText(0,i18n("Journal")+": "+des.left(25));
+    mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
 
     QString key;
     QDate d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5181eaf..8a175c9 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -170,67 +170,73 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
     case rMinutely:
     case rHourly:
     case rDaily:
     default:
       return true;
   }
 }
 /*
 bool  Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2)
 {
     if ( l1.count() != l2.count() )
         return false;
     int count = l1.count();
     int i;
     for ( i = 0; i < count ; ++i ) {
         // if ( l1.at(i) != l2.at(i)   )
         return false;
         qDebug("compüare ");
     }
     return true;
 }
 */
 QString Recurrence::recurrenceText() const
 {
-    QString recurText = i18n("No");
+    QString recurText;
     if ( recurs == Recurrence::rMinutely  )
         recurText = i18n("minutely");
     else if ( recurs == Recurrence::rHourly  )
         recurText = i18n("hourly");
     else if ( recurs == Recurrence::rDaily  )
         recurText = i18n("daily");
     else if ( recurs ==  Recurrence::rWeekly ) 
         recurText = i18n("weekly");
     else if ( recurs == Recurrence::rMonthlyPos  )
         recurText = i18n("monthly");
     else if ( recurs ==  Recurrence::rMonthlyDay )
-        recurText = i18n("day-monthly");
+        recurText = i18n("monthly");
     else if ( recurs ==  Recurrence::rYearlyMonth )
-        recurText = i18n("month-yearly");
+        recurText = i18n("yearly");
     else if ( recurs ==  Recurrence::rYearlyDay )
         recurText = i18n("day-yearly");
     else if ( recurs ==  Recurrence::rYearlyPos )
         recurText = i18n("position-yearly");
+    if ( !recurText.isEmpty() ) {
+        if ( rFreq > 1 ){
+            recurText = i18n("(%1) ").arg(rFreq ) + recurText;
+        }
+    } else
+         recurText = i18n("No");
     return recurText;
 }
 
 void Recurrence::setCompatVersion(int version)
 {
   mCompatVersion = version ? version : INT_MAX;
 }
 
 ushort Recurrence::doesRecur() const
 {
   return recurs;
 }
 
 bool Recurrence::recursOnPure(const QDate &qd) const
 {
   switch(recurs) {
     case rMinutely:
       return recursSecondly(qd, rFreq*60);
     case rHourly:
       return recursSecondly(qd, rFreq*3600);
     case rDaily:
       return recursDaily(qd);
     case rWeekly:
       return recursWeekly(qd);
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 083e6d1..48257ef 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -176,49 +176,49 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
  , forceQuit (false)
  , forceMinimizeToTray (false)
 {
     syncManager = 0;
     virgin = !virginity;
         init = _init;
         connect(doc, SIGNAL(docClosed(PwMDoc *)),
                 this, SLOT(docClosed(PwMDoc *)));
         initMenubar();
         initToolbar();
         initMetrics();
         setVirgin(virginity);
         setFocusPolicy(QWidget::WheelFocus);
 #ifndef PWM_EMBEDDED
         statusBar()->show();
 #endif
         view = makeNewListView(doc);
         setCentralWidget(view);
         updateCaption();
         showStatMsg(i18n("Ready."));
 }
 
 PwM::~PwM()
 {
-    qDebug("PwM::~PwM() %x", this);
+    //qDebug("PwM::~PwM() %x", this);
         disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
                    this, SLOT(docClosed(PwMDoc *)));
         conf()->confWndMainWndSize(size());
     //LR closing of windows changed
     //needed for fastload option on PDA
         //emit closed(this);
         //qDebug("PwM::~PwM() emited closed(this)");
         delete view;
     delete syncManager;
 }
 
 void PwM::initMenubar()
 {
   KIconLoader* picons;
 #ifndef PWM_EMBEDDED
         KIconLoader icons;
         picons = &icons;
 #else
         picons = KGlobal::iconLoader();
 
 
         syncPopup = new KPopupMenu(this);
         
         syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::PWMPI, PWMPrefs::instance(), syncPopup);
@@ -878,57 +878,57 @@ void PwM::config_slot()
                                           end2 = ml->end();
 #else
         QValueList<PwM *>::ConstIterator i2 = ml->begin(),
                                           end2 = ml->end();
 #endif
         PwM *pwm;
         while (i2 != end2) {
                 pwm = *i2;
                 // reinitialize the window style.
                 if (oldStyle != newStyle)
                         pwm->curView()->initStyle(newStyle);
                 // set the new font
                 pwm->curView()->setFont(conf()->confGlobEntryFont());
                 ++i2;
         }
 }
 
 void PwM::activateMpButton(bool activate)
 {
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate);
 }
 
 void PwM::closeEvent(QCloseEvent *e)
 {
-    qDebug("PwM::closeEvent ");
+    //qDebug("PwM::closeEvent ");
     emit closed( this );
     return;
         e->accept();
 }
 
 void PwM::docClosed(PwMDoc *doc)
 {
-    qDebug("PwM::docClosed ");
+    //qDebug("PwM::docClosed ");
         PARAM_UNUSED(doc);
         PWM_ASSERT(doc == curDoc());
         close();
 }
 
 void PwM::find_slot()
 {
         PWM_ASSERT(curDoc());
         if (curDoc()->isDocEmpty())
                 return;
         if (curDoc()->isDeepLocked())
                 return;
         curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
         FindWndImpl findWnd(view);
         findWnd.exec();
         curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 void PwM::exportToText()
 {
         PWM_ASSERT(curDoc());
         if (curDoc()->isDocEmpty()) {
                 KMessageBox::information(this,
                                          i18n
@@ -1363,49 +1363,49 @@ void PwM::goToURL_slot()
         else
                 showStatMsg(i18n("ERROR: Couldn't start browser! Maybe invalid URL?"));
 }
 
 void PwM::copyToClipboard(const QString &s)
 {
         QClipboard *cb = QApplication::clipboard();
 #ifndef PWM_EMBEDDED
         if (cb->supportsSelection())
                 cb->setText(s, QClipboard::Selection);
         cb->setText(s, QClipboard::Clipboard);
 #else
         cb->setText(s);
 
 #endif
 
 }
 
 
 void PwM::showStatMsg(const QString &msg)
 {
 #ifdef DESKTOP_VERSION
         statusBar()->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
 #else
-        qDebug("Statusbar : %s",msg.latin1());
+        //qDebug("Statusbar : %s",msg.latin1());
     Global::statusMessage(msg);
 #endif
 }
 
 void PwM::focusInEvent(QFocusEvent *e)
 {
         if (e->gotFocus()) {
                 emit gotFocus(this);
         } else if (e->lostFocus()) {
                 emit lostFocus(this);
         }
 }
 
 
 #ifdef PWM_EMBEDDED
 
 void PwM::category_slot()
 {
         PwMDoc *doc = curDoc();
         PWM_ASSERT(doc);
         doc->timer()->getLock(DocTimer::id_autoLockTimer);
 
         editCategoryWnd w(doc, this, "editcategory");
 /*
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 0cf248c..d59d4d8 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -67,49 +67,49 @@ static NOREGPARM void sig_handler(int signum)
                         sig_init_pointer->shutdownApp(20 + signum);
                         break;
                 default:
                         printDebug(string("unhandled signal ")
                                    + tostr(signum));
         }
 }
 
 
 
 PwMInit::PwMInit(PwMApplication *_app)
  : runStatus (unknown)
  , _curWidget (0)
  , _dcopClient (0)
  , _kwalletEmu (0)
  , _keycard (0)
  , _tray (0)
 {
         sig_init_pointer = this;
         app = _app;
 }
 
 PwMInit::~PwMInit()
 {
-    qDebug("PwMInit::~PwMInit() ");
+    //qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
         SelfTest::cancel();
         // close all open mainwnds
         QValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 
 #else
         // close all open mainwnds
         QValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
                 disconnect(*i, SIGNAL(closed(PwM *)),
                            this, SLOT(mainWndClosed(PwM *)));
                 delete *i;
                 ++i;
         }
         _mainWndList.clear();
         // close all remaining open documents
         PwMDocList *_dl = PwMDoc::getOpenDocList();
         vector<PwMDocList::listItem> dl = *(_dl->getList());
         vector<PwMDocList::listItem>::iterator i2 = dl.begin(),
                                                end2 = dl.end();
         while (i2 != end2) {
@@ -134,49 +134,49 @@ PwMInit::~PwMInit()
 void PwMInit::initializeApp()
 {
     //qDebug("PwMInit::initializeApp() ");
         PWM_ASSERT(runStatus == unknown);
         runStatus = init;
         initPosixSignalHandler();
         Randomizer::init();
 #ifndef PWM_EMBEDDED
         Configuration::init();
 #endif
         initDCOP();
         initKWalletEmu();
         initKeycard();
         initTray();
         handleCmdLineArgs();
         bool openDeeplocked = false;
         if (conf()->confGlobAutostartDeepLocked() ||
             savedCmd.open_deeplocked)
                 openDeeplocked = true;
     if ( false ){
     // LR is not working
         //if (conf()->confWndAutoMinimizeOnStart() ||
     //   savedCmd.minToTray) {
                 PwMDoc *newDoc = createDoc();
-        qDebug("  createDoc()");
+        //qDebug("  createDoc()");
                 if (!newDoc->openDocUi(newDoc,
                                        conf()->confGlobAutoStart(),
                                        openDeeplocked)) {
                         delete newDoc;
         }
 
                         //US ENH for embedded devices: in the case of failure, open a document the default way  
                         createMainWnd(conf()->confGlobAutoStart(),
                               openDeeplocked,
                               true,
                               0,
                               savedCmd.minimized);
                         
 
 
 
                     //}
         } else {
                 createMainWnd(conf()->confGlobAutoStart(),
                               openDeeplocked,
                               true,
                               0,
                               savedCmd.minimized);
         }
@@ -378,65 +378,65 @@ again:
                         /* This should not happen! If we set forceMinimizeToTray ,
                          * we must be sure that _tray exists.
                          */
                         BUG();
                         wnd->setForceMinimizeToTray(false);
                         goto again;
                 }
                 doMinimizeToTray = true;
         } else {
           // Ask to minimize to tray. If not, delete doc.
                 if (_tray &&
                     runStatus != shutdown &&
                     !wnd->isForceQuit() &&
                     !wnd->curDoc()->isDeleted()) {
                             if (conf()->confWndClose())
                                 doDeleteDoc = true;
                         else
                                 doMinimizeToTray = true;
                 } else {
                         doDeleteDoc = true;
                 }
         }
 
         if (doMinimizeToTray) {
-        qDebug("doMinimizeToTray ");
+        //qDebug("doMinimizeToTray ");
                 PWM_ASSERT(_tray);
                 int mmlock = conf()->confGlobMinimizeLock();
                 switch (mmlock) {
                         case 0:         // don't lock anything
                         break;
                         case 1:         // normal lock
                         wnd->curDoc()->lockAll(true);
                         break;
                         case 2:         // deep-lock
                         wnd->curDoc()->deepLock();
                         break;
                 default:
                         WARN();
                 }
         } else if (doDeleteDoc) {
-        qDebug("doDeleteDoc ");
+        //qDebug("doDeleteDoc ");
                 if (!wnd->curDoc()->tryDelete()) {
                         /* We failed deleting the doc,
                          * so open a new window with it, again.
                          */
                         createMainWnd(QString::null, false,
                                       false, wnd->curDoc());
                 }
         }
 #ifndef PWM_EMBEDDED
         // find the closed window in the "mainWndList" and delete it.
         QValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #else
         // find the closed window in the "mainWndList" and delete it.
         QValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
         //qDebug("iii %x  end %x  wnd %x",  (*i), (*end), wnd);
                 if (*i == wnd) {
 #ifndef PWM_EMBEDDED
                         _mainWndList.erase(i);
 #else
                         _mainWndList.remove(i);
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index cd816e5..8c4d9cc 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -184,49 +184,49 @@ void PwMView::handleToggle(QListViewItem *item)
                         return;         // this is just a click somewhere on the entry
         if (doc->isDeepLocked()) {
                 PwMerror ret;
                 ret = doc->deepLock(false);
                 if (ret != e_success)
                         clItem->setOn(false);
                 return;
         }
         doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn());
 }
 
 void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
 {
         if (!item)
                 return;
         ctxMenu->move(point);
         /* don't use ctxMenu->exec() here, as it generates race conditions
          * with the card interface code. Believe it or not. :)
          */
         ctxMenu->show();
 }
 
 void PwMView::updateCategories()
 {
-    qDebug("PwMView::updateCategories() ");
+    //qDebug("PwMView::updateCategories() ");
         QString oldSel(getCurrentCategory());
         delAllCategories();
         QStringList catList;
         document()->getCategoryList(&catList);
         catList.sort();
 #ifndef PWM_EMBEDDED
         QStringList::iterator i = catList.begin(),
                               end = catList.end();
 #else
         QStringList::Iterator i = catList.begin(),
                               end = catList.end();
 #endif
         while (i != end) {
                 addCategory(*i);
                 ++i;
         }
         selectCategory(oldSel);
 }
 
 void PwMView::shiftToView()
 {
         int cX = lv->contentsX();
         int cY = lv->contentsY();
         commentBox->clear();