many small fixes

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
@@ -2,2 +2,8 @@ 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 ************
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
@@ -2,3 +2,3 @@ Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.12
+Version: 2.0.13
 Release: SuSE_9.2
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 34f4160..b3429e3 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -25,2 +25,4 @@
 #include <qregexp.h>
+#include <qvbox.h>
+#include <qlabel.h>
 
@@ -33,2 +35,3 @@
 #include "addresseedialog.h"
+#include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
@@ -61,3 +64,3 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
-               Ok|Cancel, Ok, parent ), mMultiple( multiple )
+               Ok|Cancel, No, parent ), mMultiple( multiple )
 {
@@ -66,6 +69,15 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   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") );
@@ -78,3 +90,3 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
 
-  mAddresseeEdit = new QLineEdit( topWidget );
+  mAddresseeEdit = new QLineEdit( listWidget );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
@@ -86,9 +98,9 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   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 );
 
@@ -118,3 +130,7 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
 
-  loadAddressBook();
+  loadAddressBook();  
+  QValueList<int> splitterSize; 
+  splitterSize.append( ( width() / 5 ) * 3 );
+  splitterSize.append( ( width() / 5 ) *2 );
+  mMiniSplitter->setSizes( splitterSize );
 }
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index e2c8e6e..f606124 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -264,2 +264,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_Escape:
+        sendSignalViewerClosed = true;
         close();
@@ -267,2 +268,6 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_I:
+#ifndef DESKTOP_VERSION
+        sendSignalViewerClosed = true;
+        close();
+#else
         sendSignalViewerClosed = true;
@@ -270,2 +275,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
         //accept();
+#endif
         break; 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1085,4 +1085,4 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                     ensureItemVisible ( cn );
-                emit showIncidence( ci->data());
                 }
+                emit showIncidence( ci->data());
             }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index cef59a2..678e1bd 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -28,2 +28,3 @@
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
@@ -39,2 +40,3 @@
 #include "koprefs.h"
+#include "klineedit.h"
 
@@ -59,3 +61,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
@@ -116,2 +118,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
@@ -128,2 +131,6 @@ SearchDialog::~SearchDialog()
 }
+void SearchDialog::setFocusToList()
+{
+    listView->resetFocus();
+}
 void SearchDialog::accept()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f4aad9e..b730ed5 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -38,2 +38,3 @@ class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
@@ -56,2 +57,3 @@ class SearchDialog : public  QVBox
   protected slots:
+  void setFocusToList();
     void  accept();
@@ -75,3 +77,3 @@ class SearchDialog : public  QVBox
     QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
     KOListView *listView;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 801094a..f453331 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -42,4 +42,6 @@ KDialogBase::KDialogBase( int dialogFace, const QString &caption,
     init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
-  (findButton( defaultButton ) )->setFocus();
+    if (findButton( defaultButton ) ) {
+        (findButton( defaultButton ) )->setFocus();
+        (findButton( defaultButton ) )->setDefault( true );
+    }
 
@@ -78,3 +80,3 @@ void KDialogBase::init( const QString &caption, int buttonMask,
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
-    mOkButton->setDefault( true );
+    //mOkButton->setDefault( true );
   } else {
diff --git a/version b/version
index e90e80d..0ec83d8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.12";
+version = "2.0.13";