summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt17
-rw-r--r--korganizer/kolistview.cpp10
-rw-r--r--korganizer/koprefsdialog.cpp17
-rw-r--r--korganizer/searchdialog.cpp12
-rw-r--r--libkdepim/categoryeditdialog.cpp4
-rw-r--r--libkdepim/categoryselectdialog.cpp4
6 files changed, 36 insertions, 28 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 711509d..7e7f8b7 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -353,3 +353,2 @@
{ "Shopping","Einkaufen" },
-{ "Use short date in (WN/E) view","Kurzdatum in (WN/Termin) Ansicht" },
{ "Show Dates","Zeige Daten" },
@@ -362,4 +361,2 @@
{ "Show Todo...","Zeige To-Do" },
-{ "Show topmost todo prios in What's N.:","Anz. höchster Prios in What's N.:"},
-{ "Show topmost todo prios in What's Next:","Anz. höchster Prios in What's Next:"},
{ "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
@@ -668,4 +665,4 @@
{ "Frames, labels, etc.:","Rahmen, Label, etc.:" },
-{ "Show parent To-Do's in What's Next view","Zeige Ober-Todo in What's Next Anz." },
-{ "Show location in What's Next view","Zeige Ort in What's Next Anz." },
+{ "Show parent To-Do's","Zeige Ober-Todos" },
+{ "Show location","Zeige Orte" },
{ "Show events that recur ","Zeige Termine, die sich wiederholen:" },
@@ -804,3 +801,2 @@
{ "Playing '%1'","Abspielen '%1'" },
-{ "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" },
{ "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
@@ -933,4 +929,2 @@
{ "What's Next View","What's Next Ansicht" },
-{ "Show Sync Events in \nWhat's Next/Agenda view","Zeige Sync Termine in \nWhat's Next/Agenda view" },
-{ "Use short date in \nWhat's Next/Event view","Zeige Kurzdatum in \nWhat's Next/Event view" },
{ "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
@@ -1096,3 +1090,3 @@
{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
-{ "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
+{ "Show events, that are done","Zeige abgelaufene Termine" },
{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
@@ -1337,2 +1331,6 @@
{ "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." },
+{ "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" },
+{ "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" },
+{ "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" },
+{ "","" },
{ "","" },
@@ -1342,2 +1340 @@
{ "","" },
-{ "","" }, \ No newline at end of file
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e0e138e..341f473 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1209,5 +1209,5 @@ void KOListViewListView::popupMenu()
mPopupTimer->stop();
- //qDebug("HUUUUUUUUUUUUUUUUUUUU ");
QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
- QApplication::postEvent( this->viewport(), e );
+ QApplication::postEvent( this->viewport(), e );
+
}
@@ -1215,3 +1215,3 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
{
- //qDebug("contentsMousePressEvent++++ ");
+ //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
mYMousePos = mapToGlobal( (e->pos())).y();
@@ -1219,3 +1219,3 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
mPopupTimer->start( 600 );
- mEventPos = e->pos();
+ mEventPos = contentsToViewport(e->pos());
mEventGlobalPos = e->globalPos();
@@ -1244,3 +1244,3 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
else {
- mEventPos = e->pos();
+ mEventPos = contentsToViewport(e->pos());
mEventGlobalPos = e->globalPos();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8439b81..e72f94b 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -828,7 +828,4 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(prioBox,ii++,0);
- QString messa = i18n("Show topmost todo prios in What's Next:");
-
- if ( QApplication::desktop()->width() < 300 )
- messa = i18n("Show topmost todo prios in What's N.:");
- QLabel *prioLabel = new QLabel(messa, prioBox);
+
+ QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
mPrioSpin = new QSpinBox(0,5,1,prioBox);
@@ -839,3 +836,3 @@ void KOPrefsDialog::setupViewsTab()
- addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
+ addWidBool(i18n("Show events, that are done"),
&(KOPrefs::instance()->mWNViewShowsPast),topFrame);
@@ -843,3 +840,3 @@ void KOPrefsDialog::setupViewsTab()
passwdk =
- addWidBool(i18n("Show parent To-Do's in What's Next view"),
+ addWidBool(i18n("Show parent To-Do's"),
&(KOPrefs::instance()->mWNViewShowsParents),topFrame);
@@ -848,3 +845,3 @@ void KOPrefsDialog::setupViewsTab()
passwdk =
- addWidBool(i18n("Show location in What's Next view"),
+ addWidBool(i18n("Show location"),
&(KOPrefs::instance()->mWNViewShowLocation),topFrame);
@@ -853,3 +850,3 @@ void KOPrefsDialog::setupViewsTab()
passwdk =
- addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
+ addWidBool(i18n("Show Sync Events in WN+Agenda"),
&(KOPrefs::instance()->mShowSyncEvents),topFrame);
@@ -857,3 +854,3 @@ void KOPrefsDialog::setupViewsTab()
passwdk =
- addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
+ addWidBool(i18n("Use short date in WN+Event view"),
&(KOPrefs::instance()->mShortDateInViewer),topFrame);
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index db60383..7a945e3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -208,3 +208,6 @@ void SearchDialog::doSearch()
re.setCaseSensitive(false);
- re.setPattern(searchEdit->text());
+ QString st = searchEdit->text();
+ if ( st.right(1) != "*")
+ st += "*";
+ re.setPattern(st);
if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) {
@@ -249,4 +252,7 @@ void SearchDialog::updateView()
re.setWildcard(true); // most people understand these better.
- re.setCaseSensitive(false);
- re.setPattern(searchEdit->text());
+ re.setCaseSensitive(false);
+ QString st = searchEdit->text();
+ if ( st.right(1) != "*")
+ st += "*";
+ re.setPattern(st);
if (re.isValid()) {
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index a19900f..e2325d2 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -57,2 +57,6 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
mButtonModify->setEnabled(categoriesExist);
+#ifndef DESKTOP_VERSION
+ mButtonOk->hide();
+ mButtonCancel->hide();
+#endif
mButtonAdd->setEnabled(!mEdit->text().isEmpty());
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 974752c..a4e0024 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -57,2 +57,6 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
// connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
+#ifndef DESKTOP_VERSION
+ mButtonOk->hide();
+ mButtonCancel->hide();
+#endif
}