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
@@ -1281,12 +1281,20 @@
 { "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
@@ -138,13 +138,13 @@ bool ListItemVisitor::visit(Event *e)
 
     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());
@@ -187,17 +187,17 @@ bool ListItemVisitor::visit(Todo *t)
     }
     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,"---");
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5181eaf..8a175c9 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -188,31 +188,37 @@ bool  Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2
     }
     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;
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
@@ -194,13 +194,13 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
         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);
@@ -896,21 +896,21 @@ 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()
@@ -1381,13 +1381,13 @@ void PwM::copyToClipboard(const QString &s)
 
 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)
 {
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
@@ -85,13 +85,13 @@ PwMInit::PwMInit(PwMApplication *_app)
         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();
 
@@ -152,13 +152,13 @@ void PwMInit::initializeApp()
                 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;
         }
 
@@ -396,13 +396,13 @@ again:
                 } 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
@@ -412,13 +412,13 @@ again:
                         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());
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
@@ -202,13 +202,13 @@ void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
          */
         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