9 files changed, 59 insertions, 20 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 86ac9b5..dc22fc6 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,6 +1,12 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.13 ************
+
+Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter.
+
+In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".  
+
 ********** VERSION 2.0.12 ************
 
 KO/Pi:
 Fixed a bug in todo start/due date handling for non recurring todos with a start and due date.
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 0d4c9d6..ff9f2dc 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,7 +1,7 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.12
+Version: 2.0.13
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 34f4160..b3429e3 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -22,16 +22,19 @@
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
+#include <qvbox.h>
+#include <qlabel.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
+#include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
@@ -58,40 +61,49 @@ QString AddresseeItem::key( int column, bool ) const
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
-               Ok|Cancel, Ok, parent ), mMultiple( multiple )
+               Ok|Cancel, No, parent ), mMultiple( multiple )
 {
   QWidget *topWidget = plainPage();
 
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
-  QBoxLayout *listLayout = new QVBoxLayout;
-  topLayout->addLayout( listLayout );
 
-  mAddresseeList = new KListView( topWidget );
+
+  KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget);
+  mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
+
+  topLayout->addWidget(mMiniSplitter );
+
+  QWidget *listWidget = new QWidget( mMiniSplitter );
+
+  QBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  //topLayout->addLayout( listLayout );
+
+  mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
   connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
            SLOT( slotOk() ) );
 
-  mAddresseeEdit = new QLineEdit( topWidget );
+  mAddresseeEdit = new QLineEdit( listWidget );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
  
   listLayout->addWidget( mAddresseeEdit );
 
   if ( mMultiple ) {
-    QBoxLayout *selectedLayout = new QVBoxLayout;
-    topLayout->addLayout( selectedLayout );
-    topLayout->setSpacing( spacingHint() );
+      //QBoxLayout *selectedLayout = new QVBoxLayout;
+      //topLayout->addLayout( selectedLayout );
+      //topLayout->setSpacing( spacingHint() );
 
-    QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
-                                              topWidget );
-    selectedLayout->addWidget( selectedGroup );
+    QVBox *selectedGroup = new QVBox( mMiniSplitter );
+    new QLabel ( i18n("Selected:"), selectedGroup );
+    //selectedLayout->addWidget( selectedGroup );
 
     mSelectedList = new KListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
@@ -115,9 +127,13 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
            SLOT( addressBookChanged() ) );
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 
-  loadAddressBook();
+  loadAddressBook();  
+  QValueList<int> splitterSize; 
+  splitterSize.append( ( width() / 5 ) * 3 );
+  splitterSize.append( ( width() / 5 ) *2 );
+  mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index e2c8e6e..f606124 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -261,14 +261,20 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
         editIncidence();
         break;
     case Qt::Key_C:
     case Qt::Key_Escape:
+        sendSignalViewerClosed = true;
         close();
         break; 
     case Qt::Key_I:
+#ifndef DESKTOP_VERSION
+        sendSignalViewerClosed = true;
+        close();
+#else
         sendSignalViewerClosed = true;
         slotViewerClosed();
         //accept();
+#endif
         break; 
     default:
         KDialogBase::keyPressEvent ( e );
         break; 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1082,10 +1082,10 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                 cn = cn->nextSibling();
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
-                emit showIncidence( ci->data());
                 }
+                emit showIncidence( ci->data());
             }
         }
         e->accept();
     }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index cef59a2..678e1bd 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -25,8 +25,9 @@
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
@@ -36,8 +37,9 @@
 #include <libkdepim/kdateedit.h>
 
 #include "koglobals.h"
 #include "koprefs.h"
+#include "klineedit.h"
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
@@ -56,9 +58,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     searchLabel = new QLabel(topFrame);
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
 
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
     QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
     //OkButton->setDefault( true );
     connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
@@ -113,8 +115,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     listView = new KOListView(mCalendar,topFrame);
     layout->addWidget(listView);
 
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
     setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
     OkButton = new QPushButton(  i18n("Close"), this  );
@@ -125,8 +128,12 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 SearchDialog::~SearchDialog()
 {
   
 }
+void SearchDialog::setFocusToList()
+{
+    listView->resetFocus();
+}
 void SearchDialog::accept()
 {
     doSearch();
 }
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f4aad9e..b730ed5 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -35,8 +35,9 @@
 
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
 class CalendarView;
 
 using namespace KCal;
@@ -53,8 +54,9 @@ class SearchDialog : public  QVBox
     void changeEventDisplay(Event *, int) { updateView(); } 
   void updateConfig();
   void updateList();
   protected slots:
+  void setFocusToList();
     void  accept();
     void doSearch();
             void searchTextChanged( const QString &_text );
 
@@ -72,9 +74,9 @@ class SearchDialog : public  QVBox
     QPtrList<Todo> mMatchedTodos;
     QPtrList<Journal> mMatchedJournals;
     
     QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
     KOListView *listView;
     
     KDateEdit *mStartDate;
     KDateEdit *mEndDate;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 801094a..f453331 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -39,10 +39,12 @@ KDialogBase::KDialogBase( int dialogFace, const QString &caption,
              const QString &user3) :
     KDialog( parent, name, modal )
 {
     init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
-  (findButton( defaultButton ) )->setFocus();
+    if (findButton( defaultButton ) ) {
+        (findButton( defaultButton ) )->setFocus();
+        (findButton( defaultButton ) )->setDefault( true );
+    }
 
 }
 
 KDialogBase::~KDialogBase()
@@ -75,9 +77,9 @@ void KDialogBase::init( const QString &caption, int buttonMask,
 
   if ( buttonMask & Ok ) {
     mOkButton = new QPushButton( i18n("Ok"), this );
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
-    mOkButton->setDefault( true );
+    //mOkButton->setDefault( true );
   } else {
     mOkButton = 0;
   }
   if ( buttonMask & Default ) {
diff --git a/version b/version
index e90e80d..0ec83d8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.12";
+version = "2.0.13";