9 files changed, 69 insertions, 50 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 7c81b3a..d3a8bc1 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,8 +1,18 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.10 ************
+
+KO/Pi:
+In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
+This is fixed.
+Changed the search dialog a bit to make it more user friendly.
+(E.g.: Removed message box about "no items found" and set key focus to search line edit after search).
+
+Added config option to hide the week number in KO/Pi toolbar.
+
 ********** VERSION 2.0.9 ************
 
 Made month view icons for multiday events a bit nicer.
 Some minor fixes in KO/Pi
 (e.g. go to today did not work for new week view properly).
 
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 1073fe7..b526df9 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1289,13 +1289,13 @@
 { "(%1) ","%1-" },
 { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
 { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
 { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" },
 { "Summary/Loc.","Titel/Ort" },
 { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
-{ "","" },
+{ "Week Number","Wochennummer" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/bin/kdepim/korganizer/icons16/workweek2.png b/bin/kdepim/korganizer/icons16/workweek2.png
index e0e1fde..d3033d4 100644
--- a/bin/kdepim/korganizer/icons16/workweek2.png
+++ b/bin/kdepim/korganizer/icons16/workweek2.png
diff --git a/bin/kdepim/korganizer/workweek2.png b/bin/kdepim/korganizer/workweek2.png
index 76cb86c..9538d53 100644
--- a/bin/kdepim/korganizer/workweek2.png
+++ b/bin/kdepim/korganizer/workweek2.png
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a91074f..7e3deff 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -82,12 +82,13 @@ KOPrefs::KOPrefs() :
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
   addItemBool("ShowIconBack",&mShowIconBack,true);
   addItemBool("ShowIconToday",&mShowIconToday,true);
   addItemBool("ShowIconForward",&mShowIconForward,true);
   addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
   addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
+  addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   addItemBool("ShowIconNext",&mShowIconNext,true);
   addItemBool("ShowIconJournal",&mShowIconJournal,true); 
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
   addItemInt("LastLoadedLanguage",&mOldLanguage,0);
 
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index e4e3dd7..09a0dce 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -178,12 +178,13 @@ class KOPrefs : public KPimPrefs
     bool mShowIconBackFast;
     bool mShowIconBack;
     bool mShowIconToday;
     bool mShowIconForward;
     bool mShowIconForwardFast;
     bool mShowIconWhatsThis;
+    bool mShowIconWeekNum;
     bool mShowIconNextDays;
     bool mShowIconNext;
     bool mShowIconJournal;
     
     bool mShowIconStretch;
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a164fa4..4f2cccf 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -568,13 +568,14 @@ void MainWindow::initActions()
     }
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
-    mWeekAction->addTo( iconToolBar );
+    if ( p-> mShowIconWeekNum )
+        mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
     int fontWid =  f.width( "30" );
     while ( fontWid > pixWid ) {
@@ -620,12 +621,13 @@ void MainWindow::initActions()
              mView, SLOT( undo_delete() ) );
     actionMenu->insertSeparator();
 
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertSeparator();
+    configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
@@ -703,27 +705,27 @@ void MainWindow::initActions()
     icon = loadPixmap( pathString + "week" );
     configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
     QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
     day7_action->addTo( viewMenu );
     connect( day7_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWeekView() ) );
+    
+    icon = loadPixmap( pathString + "workweek2" );
+    configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
+    QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
+    day6_action->addTo( viewMenu );
+    connect( day6_action, SIGNAL( activated() ),
+             mView->viewManager(), SLOT( showMonthViewWeek() ) );
 
     icon = loadPixmap( pathString + "month" );
     configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
     QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
     month_action->addTo( viewMenu );
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
-    icon = loadPixmap( pathString + "workweek2" );
-    configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
-    QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
-    day6_action->addTo( viewMenu );
-    connect( day6_action, SIGNAL( activated() ),
-             mView->viewManager(), SLOT( showMonthViewWeek() ) );
-
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
     QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
     todoview_action->addTo( viewMenu );
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );
@@ -998,16 +1000,16 @@ void MainWindow::initActions()
     if (p-> mShowIconDay1)
         day1_action->addTo( iconToolBar  );
     if (p-> mShowIconDay5)
         day5_action->addTo( iconToolBar  );
     if (p-> mShowIconDay7)
         day7_action->addTo( iconToolBar  );
-    if (p-> mShowIconMonth)
-        month_action->addTo( iconToolBar  );
     if (p-> mShowIconDay6)
         day6_action->addTo( iconToolBar  );
+    if (p-> mShowIconMonth)
+        month_action->addTo( iconToolBar  );
     if (p-> mShowIconTodoview)
         todoview_action->addTo( iconToolBar  );
     if (p-> mShowIconJournal)
         viewjournal_action->addTo( iconToolBar  );
     icon = loadPixmap( pathString + "2leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
@@ -1084,13 +1086,14 @@ void MainWindow::initActions()
     if (p-> mShowIconNext)
         configureToolBarMenu->setItemChecked( 110, true );
     if (p-> mShowIconJournal)
         configureToolBarMenu->setItemChecked( 90, true );
     if (p-> mShowIconWhatsThis)
         configureToolBarMenu->setItemChecked( 300, true );
-
+    if (p-> mShowIconWeekNum)
+        configureToolBarMenu->setItemChecked( 400, true );
     QLabel* dummy = new QLabel( iconToolBar );
     dummy->setBackgroundColor( iconToolBar->backgroundColor() );
     if (!p-> mShowIconStretch)
         iconToolBar->setStretchableWidget ( dummy ) ;
     else
         configureToolBarMenu->setItemChecked( 5, true );
@@ -1825,12 +1828,13 @@ void MainWindow::configureToolBar( int item  )
     p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
     p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
     p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
     p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
     p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
     p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
+    p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
     // initActions();
 }
 
 void MainWindow::setCaptionToDates()
 {
     QString selDates;
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 3fd9740..aa1b244 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -23,12 +23,13 @@
 */
 
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
+#include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
 
@@ -39,39 +40,40 @@
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
-    : KDialogBase(Plain,i18n("KO/Pi Find "),User1|Close,User1,parent,0,false,false,
-                  i18n("&Find"))
+    : QVBox( 0  )
+
 {
     mCalendar = calendar;
-    QFrame *topFrame = plainPage();
-    QVBoxLayout *layout = new QVBoxLayout(topFrame,0,spacingHint());
+    QFrame *topFrame = new QFrame( this ) ;//plainPage();
+    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
 
     // Search expression
     QHBoxLayout *subLayout = new QHBoxLayout();
     layout->addLayout(subLayout);
-
     searchLabel = new QLabel(topFrame);
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
 
     searchEdit = new QLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
+    QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
+    //OkButton->setDefault( true );
+    connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
+    subLayout->addWidget(OkButton);
     searchEdit->setText("*"); // Find all events by default
     searchEdit->setFocus();
     connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
-
-
     QHBox *incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
     mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
@@ -93,48 +95,33 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     // Date range
     // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
     //                                    topFrame);
     // layout->addWidget(rangeGroup);
 
     QWidget *rangeWidget = new QWidget(topFrame);
-    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,spacingHint());
-
+    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint());
     rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
     mStartDate = new KDateEdit(rangeWidget);
     rangeLayout->addWidget(mStartDate);
     rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
     mEndDate = new KDateEdit(rangeWidget);
     mEndDate->setDate(QDate::currentDate().addDays(365));
     rangeLayout->addWidget(mEndDate);
-
-    // mInclusiveCheck = new QCheckBox(i18n("Events have to be completely included"), topFrame);
-    //mInclusiveCheck->setChecked(false);
+    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
+    rangeLayout->addWidget( (QWidget*)wt );
     layout->addWidget(rangeWidget);
-    //layout->addWidget(mInclusiveCheck);
-    // Subjects to search
- 
-
     // Results list view
     listView = new KOListView(mCalendar,topFrame);
-    //listView->showDates();
-
-
     layout->addWidget(listView);
 
-    //   if ( KOPrefs::instance()->mCompactDialogs ) {
-    //     KOGlobals::fitDialogToScreen( this, true );
-    //   }
-
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
-    connect(this,SIGNAL(user1Clicked()),SLOT(doSearch()));
-    QPushButton *CloseButton = findButton(  Close  );
-    //connect(CloseButton,SIGNAL(clicked()),listView, SLOT(clear()));
 
-#ifndef DESKTOP_VERSION
-    setCaption(i18n("Click OK to search ->"));
-    hideButtons();
+    setCaption( i18n("KO/Pi Find: "));
+#ifdef DESKTOP_VERSION
+    OkButton = new QPushButton(  i18n("Close"), this  );
+    connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 
 SearchDialog::~SearchDialog()
 {
   
@@ -155,13 +142,15 @@ void SearchDialog::updateList()
         //qDebug("SearchDialog::cleared ");
 
     }
 }
 void SearchDialog::searchTextChanged( const QString &_text )
 {
+#if 0
     enableButton( KDialogBase::User1, !_text.isEmpty() );
+#endif
 }
 
 void SearchDialog::doSearch()
 {
     QRegExp re;
 
@@ -387,15 +376,30 @@ void SearchDialog::search(const QRegExp &re)
                         }
             }
         }
     }
 
 }
-/*
+
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
- 
-    e->ignore();
- 
+    switch ( e->key() ) {
+    case Qt::Key_Escape:
+        hide();
+        break;
+    case Qt::Key_F:
+        if ( e->state() == Qt::ControlButton ) {
+            qDebug("full ");
+
+        }
+        break;
+    case Qt::Key_Return:
+    case Qt::Key_Enter:
+        doSearch();
+        break;
+   
+    default:
+        e->ignore();
+    }
 }
-*/
+
 //mMatchedJournals;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index ebcff7a..f4aad9e 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -24,26 +24,26 @@
 #ifndef SEARCHDIALOG_H
 #define SEARCHDIALOG_H
 
 #include <qregexp.h>
 
 #include <kdialogbase.h>
+#include <qvbox.h>
 
 #include <libkcal/calendar.h>
 
 #include "kolistview.h"
 
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
 class QLabel;
 class CalendarView;
 
 using namespace KCal;
-
-class SearchDialog : public KDialogBase
+class SearchDialog : public  QVBox 
 {
     Q_OBJECT
   public:
     SearchDialog(Calendar *calendar,CalendarView *parent=0);
     virtual ~SearchDialog();
     KOListView *listview(){ return listView;}
@@ -75,19 +75,18 @@ class SearchDialog : public KDialogBase
     QLabel *searchLabel;
     QLineEdit *searchEdit;
     KOListView *listView;
     
     KDateEdit *mStartDate;
     KDateEdit *mEndDate;
-    // QCheckBox *mInclusiveCheck;
     QCheckBox *mSummaryCheck;
     QCheckBox *mDescriptionCheck;
     QCheckBox *mCategoryCheck;
     QCheckBox *mSearchEvent;
     QCheckBox *mSearchTodo;
     QCheckBox *mSearchJournal;
     QCheckBox *mSearchAName;
     QCheckBox *mSearchAEmail;
-    //void keyPressEvent ( QKeyEvent *e) ;
+    void keyPressEvent ( QKeyEvent *e) ;
 };
 
 #endif