-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 13 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.h | 3 | ||||
-rw-r--r-- | korganizer/koeventeditor.cpp | 1 |
4 files changed, 15 insertions, 6 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 524f6fc..c598214 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,6 +1,10 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.0.25 ************ + +And again fixed some bugs. + ********** VERSION 2.0.24 ************ Fixed again a lot of small bugs. Some performance optimizations in date navigator. diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index abc80d4..f54660f 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -58,8 +58,9 @@ KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) : QObject( parent, name) { + mNextFocus = 0; } KOEditorGeneral::~KOEditorGeneral() { @@ -104,17 +105,21 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) headerLayout->setColStretch( 1, 10); } void KOEditorGeneral::setFocusOn( int i ) { - qApp->processEvents(); - if ( i == 1 ) { + mNextFocus = i; + QTimer::singleShot( 0, this, SLOT ( slotSetFocusOn() )); +} +void KOEditorGeneral::slotSetFocusOn() +{ + mNextFocus; + if ( mNextFocus == 1 ) { mDescriptionEdit->setFocus(); mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333); } - if ( i == 2 ) { + if ( mNextFocus == 2 ) { mSummaryEdit->setFocus(); } - } void KOEditorGeneral::editCategories() { // qDebug("KOEditorGeneral::editCategories() "); diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index f4728c7..2069e9c 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -80,14 +80,15 @@ class KOEditorGeneral : public QObject void disableAlarmEdit( bool disable ); void alarmDisable( bool disable ); void pickAlarmSound(); void pickAlarmProgram(); - + void slotSetFocusOn(); signals: void openCategoryDialog(); void allAccepted(); protected: + int mNextFocus; //QLineEdit *mSummaryEdit; //QLineEdit *mLocationEdit; KOLocationBox *mSummaryEdit; KOLocationBox *mLocationEdit; diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 337db9b..e23e680 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -185,9 +185,8 @@ void KOEventEditor::editEvent(Event *event, bool showDescription) // init(); mEvent = event; readEvent(mEvent); - qApp->processEvents(); if ( showDescription ) { showPage( 1 ); mGeneral->setFocusOn( 1 ); } else { |