urgs. bug fixes

3 files changed, 21 insertions, 18 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e0e138e..341f473 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1204,23 +1204,23 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
     KListView::contentsMouseMoveEvent(e);
 }
 #endif
 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();
     }
     KListView::contentsMousePressEvent( e );
     if (  e->button() == RightButton    ) {
         QListViewItem* ci =  currentItem();
         //clearSelection();
@@ -1239,12 +1239,12 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
     //  qDebug("start: %d  current %d ",mYMousePos , mapToGlobal( (e->pos())).y()   );
     int diff = mYMousePos - mapToGlobal( (e->pos())).y();
     if ( diff < 0 ) diff = -diff;
     if ( diff > 15 )
         mPopupTimer->stop();
     else {
-        mEventPos = e->pos();
+        mEventPos = contentsToViewport(e->pos());
         mEventGlobalPos = e->globalPos();
     }
     KListView::contentsMouseMoveEvent(e);
 }
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8439b81..e72f94b 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -823,42 +823,39 @@ void KOPrefsDialog::setupViewsTab()
   
   topLayout->addWidget(hdummy,ii++,0);
 
   QHBox *prioBox = new QHBox(topFrame);
   // 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 )
       mPrioSpin->setFixedWidth( 40 );
 
   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
@@ -203,13 +203,16 @@ void SearchDialog::searchTextChanged( const QString &_text )
 void SearchDialog::doSearch()
 {
     QRegExp re;
 
     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,
                            i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals"));
         return;
     }
     if (!re.isValid() ) {
@@ -244,14 +247,17 @@ void SearchDialog::updateConfig()
 }
 void SearchDialog::updateView()
 {
     //qDebug("SearchDialog::updateView() %d ", isVisible());
     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);
     } else {
         mMatchedEvents.clear();
         mMatchedTodos.clear();
         mMatchedJournals.clear();