summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-25 11:29:28 (UTC)
committer zautrix <zautrix>2005-02-25 11:29:28 (UTC)
commitff810f8f74f6928e664bf52f8e8d128edb8ac5ad (patch) (side-by-side diff)
treed5473801c69b42d90879104fc4d05a5ad9b69e87
parentff8a2f593fae5ffe82f889ab70d32bf02a45f4fb (diff)
downloadkdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.zip
kdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.tar.gz
kdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.tar.bz2
many small fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt6
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--kabc/addresseedialog.cpp38
-rw-r--r--korganizer/koeventviewerdialog.cpp6
-rw-r--r--korganizer/kolistview.cpp2
-rw-r--r--korganizer/searchdialog.cpp9
-rw-r--r--korganizer/searchdialog.h4
-rw-r--r--microkde/kdialogbase.cpp6
-rw-r--r--version2
9 files changed, 57 insertions, 18 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,5 +1,11 @@
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:
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,6 +1,6 @@
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
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 34f4160..b3429e3 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -23,6 +23,8 @@
#include <qgroupbox.h>
#include <qapplication.h>
#include <qregexp.h>
+#include <qvbox.h>
+#include <qlabel.h>
#include <klocale.h>
#include <kdebug.h>
@@ -31,6 +33,7 @@
#include "stdaddressbook.h"
#include "addresseedialog.h"
+#include "KDGanttMinimizeSplitter.h"
//#include "addresseedialog.moc"
using namespace KABC;
@@ -59,15 +62,24 @@ 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 );
@@ -76,7 +88,7 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
SLOT( slotOk() ) );
- mAddresseeEdit = new QLineEdit( topWidget );
+ mAddresseeEdit = new QLineEdit( listWidget );
connect( mAddresseeEdit, SIGNAL( returnPressed() ),
SLOT( loadAddressBook() ) );
mAddresseeEdit->setFocus();
@@ -84,13 +96,13 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
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") );
@@ -117,6 +129,10 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
SLOT( addressBookChanged() ) );
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
@@ -262,12 +262,18 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
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 );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1083,8 +1083,8 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
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
@@ -26,6 +26,7 @@
#include <qcheckbox.h>
#include <qgroupbox.h>
#include <qlabel.h>
+#include <qlistview.h>
#include <qwhatsthis.h>
#include <qlineedit.h>
#include <qpushbutton.h>
@@ -37,6 +38,7 @@
#include "koglobals.h"
#include "koprefs.h"
+#include "klineedit.h"
#include "calendarview.h"
#include "koviewmanager.h"
@@ -57,7 +59,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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 );
@@ -114,6 +116,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
layout->addWidget(listView);
listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+ connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
setCaption( i18n("KO/Pi Find: "));
#ifdef DESKTOP_VERSION
@@ -126,6 +129,10 @@ 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
@@ -36,6 +36,7 @@
class KDateEdit;
class QCheckBox;
class QLineEdit;
+class KLineEdit;
class QLabel;
class CalendarView;
@@ -54,6 +55,7 @@ class SearchDialog : public QVBox
void updateConfig();
void updateList();
protected slots:
+ void setFocusToList();
void accept();
void doSearch();
void searchTextChanged( const QString &_text );
@@ -73,7 +75,7 @@ class SearchDialog : public QVBox
QPtrList<Journal> mMatchedJournals;
QLabel *searchLabel;
- QLineEdit *searchEdit;
+ KLineEdit *searchEdit;
KOListView *listView;
KDateEdit *mStartDate;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 801094a..f453331 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -40,8 +40,10 @@ KDialogBase::KDialogBase( int dialogFace, const QString &caption,
KDialog( parent, name, modal )
{
init( caption, buttonMask, user1, user2 );
- if (findButton( defaultButton ) )
+ if (findButton( defaultButton ) ) {
(findButton( defaultButton ) )->setFocus();
+ (findButton( defaultButton ) )->setDefault( true );
+ }
}
@@ -76,7 +78,7 @@ 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;
}
diff --git a/version b/version
index e90e80d..0ec83d8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.12";
+version = "2.0.13";