urgs. bug fixes

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
@@ -352,5 +352,4 @@
 { "September","September" },
 { "Shopping","Einkaufen" },
-{ "Use short date in (WN/E) view","Kurzdatum in (WN/Termin) Ansicht" },
 { "Show Dates","Zeige Daten" },
 { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
@@ -361,6 +360,4 @@
 { "Show time as:","Zeige Zeit als" },
 { "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!)" },
 { "&Show","Zeige" },
@@ -667,6 +664,6 @@
 { "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" },
 { "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:" },
 { "Show in every cell ","Zeige in jeder Zelle " },
@@ -803,5 +800,4 @@
 { "Running '%1'","Ausführen '%1'" },
 { "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)" },
 { "Load!","Laden!" },
@@ -932,6 +928,4 @@
 { "Today","Heute" },
 { "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" },
 { "Alarm","Alarm" },
@@ -1095,5 +1089,5 @@
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "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" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
@@ -1336,4 +1330,8 @@
 { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" },
 { "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:" },
+{ "","" },
 { "","" },
 { "","" },
@@ -1341,3 +1339,2 @@
 { "","" },
 { "","" },
-{ "","" },
\ 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
@@ -1208,15 +1208,15 @@ 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 ); 
+
 }
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
-    //qDebug("contentsMousePressEvent++++ ");
+    //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
     mYMousePos = mapToGlobal( (e->pos())).y();
     if (  e->button() == LeftButton ) {
         mPopupTimer->start( 600 ); 
-        mEventPos = e->pos();
+        mEventPos = contentsToViewport(e->pos());
         mEventGlobalPos = e->globalPos();
     }
@@ -1243,5 +1243,5 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
         mPopupTimer->stop();
     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
@@ -827,9 +827,6 @@ void KOPrefsDialog::setupViewsTab()
   // intervalBox->setSpacing(mSpacingHint);
   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);
   if ( QApplication::desktop()->width() <  300 )
@@ -838,23 +835,23 @@ void KOPrefsDialog::setupViewsTab()
   KPrefsDialogWidBool *passwdk =
 
-      addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
+      addWidBool(i18n("Show events, that are done"),
                  &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
-      addWidBool(i18n("Show parent To-Do's in What's Next view"),
+      addWidBool(i18n("Show parent To-Do's"),
                  &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
-      addWidBool(i18n("Show location in What's Next view"),
+      addWidBool(i18n("Show location"),
                  &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
-      addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
+      addWidBool(i18n("Show Sync Events in WN+Agenda"),
                  &(KOPrefs::instance()->mShowSyncEvents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   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);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index db60383..7a945e3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -207,5 +207,8 @@ void SearchDialog::doSearch()
     re.setWildcard(true); // most people understand these better.
     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() ) {
         KMessageBox::sorry(this,
@@ -248,6 +251,9 @@ void SearchDialog::updateView()
     QRegExp re;
     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()) {
         search(re);
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index a19900f..e2325d2 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -56,4 +56,8 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
   mButtonRemove->setEnabled(categoriesExist);
   mButtonModify->setEnabled(categoriesExist);
+#ifndef DESKTOP_VERSION
+    mButtonOk->hide();
+    mButtonCancel->hide();
+#endif
   mButtonAdd->setEnabled(!mEdit->text().isEmpty());
   if ( QApplication::desktop()->width() > 460 )
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 974752c..a4e0024 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -56,4 +56,8 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
     connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) );
     // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
+#ifndef DESKTOP_VERSION
+    mButtonOk->hide();
+    mButtonCancel->hide();
+#endif
 }
 void CategorySelectDialog::editCategoriesDialog()