summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-18 09:36:33 (UTC)
committer zautrix <zautrix>2005-02-18 09:36:33 (UTC)
commit59a00e603e2ba14885e81c09daf3bb89859ff176 (patch) (side-by-side diff)
treee257e5b0e338675c5448f9d4c57eadf68ed5e76b
parentb1e885da3b0a083121f940485d9c0eea53ff5139 (diff)
downloadkdepimpi-59a00e603e2ba14885e81c09daf3bb89859ff176.zip
kdepimpi-59a00e603e2ba14885e81c09daf3bb89859ff176.tar.gz
kdepimpi-59a00e603e2ba14885e81c09daf3bb89859ff176.tar.bz2
recur fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt8
-rw-r--r--korganizer/kolistview.cpp6
-rw-r--r--libkcal/recurrence.cpp12
-rw-r--r--pwmanager/pwmanager/pwm.cpp8
-rw-r--r--pwmanager/pwmanager/pwminit.cpp8
-rw-r--r--pwmanager/pwmanager/pwmview.cpp2
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
@@ -1284,6 +1284,14 @@
{ "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
@@ -141,7 +141,7 @@ bool ListItemVisitor::visit(Event *e)
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()) {
@@ -190,11 +190,11 @@ bool ListItemVisitor::visit(Todo *t)
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,"---");
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5181eaf..8a175c9 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -191,7 +191,7 @@ bool Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2
*/
QString Recurrence::recurrenceText() const
{
- QString recurText = i18n("No");
+ QString recurText;
if ( recurs == Recurrence::rMinutely )
recurText = i18n("minutely");
else if ( recurs == Recurrence::rHourly )
@@ -203,13 +203,19 @@ QString Recurrence::recurrenceText() const
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;
}
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
@@ -197,7 +197,7 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
PwM::~PwM()
{
- qDebug("PwM::~PwM() %x", this);
+ //qDebug("PwM::~PwM() %x", this);
disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
this, SLOT(docClosed(PwMDoc *)));
conf()->confWndMainWndSize(size());
@@ -899,7 +899,7 @@ void PwM::activateMpButton(bool activate)
void PwM::closeEvent(QCloseEvent *e)
{
- qDebug("PwM::closeEvent ");
+ //qDebug("PwM::closeEvent ");
emit closed( this );
return;
e->accept();
@@ -907,7 +907,7 @@ void PwM::closeEvent(QCloseEvent *e)
void PwM::docClosed(PwMDoc *doc)
{
- qDebug("PwM::docClosed ");
+ //qDebug("PwM::docClosed ");
PARAM_UNUSED(doc);
PWM_ASSERT(doc == curDoc());
close();
@@ -1384,7 +1384,7 @@ 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
}
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
@@ -88,7 +88,7 @@ PwMInit::PwMInit(PwMApplication *_app)
PwMInit::~PwMInit()
{
- qDebug("PwMInit::~PwMInit() ");
+ //qDebug("PwMInit::~PwMInit() ");
#ifndef PWM_EMBEDDED
SelfTest::cancel();
// close all open mainwnds
@@ -155,7 +155,7 @@ void PwMInit::initializeApp()
//if (conf()->confWndAutoMinimizeOnStart() ||
// savedCmd.minToTray) {
PwMDoc *newDoc = createDoc();
- qDebug(" createDoc()");
+ //qDebug(" createDoc()");
if (!newDoc->openDocUi(newDoc,
conf()->confGlobAutoStart(),
openDeeplocked)) {
@@ -399,7 +399,7 @@ again:
}
if (doMinimizeToTray) {
- qDebug("doMinimizeToTray ");
+ //qDebug("doMinimizeToTray ");
PWM_ASSERT(_tray);
int mmlock = conf()->confGlobMinimizeLock();
switch (mmlock) {
@@ -415,7 +415,7 @@ again:
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.
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
@@ -205,7 +205,7 @@ void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
void PwMView::updateCategories()
{
- qDebug("PwMView::updateCategories() ");
+ //qDebug("PwMView::updateCategories() ");
QString oldSel(getCurrentCategory());
delAllCategories();
QStringList catList;