File r905598.diff of Package kdepim4

Subject: korganizer: fix tab order
From: wstephenson@suse.de
Bug: 
Patch-upstream: 905598
--- korganizer/koeditorgeneraltodo.cpp	(revision 905597)
+++ korganizer/koeditorgeneraltodo.cpp	(revision 905598)
@@ -68,26 +68,25 @@ KOEditorGeneralTodo::~KOEditorGeneralTod
 void KOEditorGeneralTodo::finishSetup()
 {
   QWidget::setTabOrder( mSummaryEdit, mLocationEdit );
-  QWidget::setTabOrder( mLocationEdit, mStartCheck );
+  QWidget::setTabOrder( mLocationEdit, mCategoriesButton );
+  QWidget::setTabOrder( mCategoriesButton, mStartCheck );
   QWidget::setTabOrder( mStartCheck, mStartDateEdit );
   QWidget::setTabOrder( mStartDateEdit, mStartTimeEdit );
   QWidget::setTabOrder( mStartTimeEdit, mDueCheck );
+  QWidget::setTabOrder( mDueCheck, mTimeZoneComboStart );
+  QWidget::setTabOrder( mTimeZoneComboStart, mDueCheck );
   QWidget::setTabOrder( mDueCheck, mDueDateEdit );
   QWidget::setTabOrder( mDueDateEdit, mDueTimeEdit );
-  QWidget::setTabOrder( mDueTimeEdit, mTimeButton );
-  QWidget::setTabOrder( mTimeButton, mCompletedCombo );
+  QWidget::setTabOrder( mDueTimeEdit, mTimeZoneComboDue );
+  QWidget::setTabOrder( mTimeZoneComboDue, mTimeButton );
+  QWidget::setTabOrder( mTimeButton, mSecrecyCombo );
+  QWidget::setTabOrder( mSecrecyCombo, mCompletedCombo );
   QWidget::setTabOrder( mCompletedCombo, mPriorityCombo );
   QWidget::setTabOrder( mPriorityCombo, mAlarmButton );
   QWidget::setTabOrder( mAlarmButton, mAlarmTimeEdit );
   QWidget::setTabOrder( mAlarmTimeEdit, mAlarmIncrCombo );
-//   QWidget::setTabOrder( mAlarmIncrCombo, mAlarmSoundButton );
   QWidget::setTabOrder( mAlarmIncrCombo, mAlarmEditButton );
-//   QWidget::setTabOrder( mAlarmSoundButton, mAlarmProgramButton );
-//   QWidget::setTabOrder( mAlarmProgramButton, mDescriptionEdit );
   QWidget::setTabOrder( mAlarmEditButton, mDescriptionEdit );
-  QWidget::setTabOrder( mDescriptionEdit, mCategoriesButton );
-  QWidget::setTabOrder( mCategoriesButton, mSecrecyCombo );
-//  QWidget::setTabOrder( mSecrecyCombo, mDescriptionEdit );
 
   mSummaryEdit->setFocus();
 }
--- korganizer/koeditorgeneralevent.cpp	(revision 905597)
+++ korganizer/koeditorgeneralevent.cpp	(revision 905598)
@@ -74,23 +74,21 @@ KOEditorGeneralEvent::~KOEditorGeneralEv
 void KOEditorGeneralEvent::finishSetup()
 {
   QWidget::setTabOrder( mSummaryEdit, mLocationEdit );
-  QWidget::setTabOrder( mLocationEdit, mStartDateEdit );
+  QWidget::setTabOrder( mLocationEdit, mCategoriesButton );
+  QWidget::setTabOrder( mCategoriesButton, mStartDateEdit );
   QWidget::setTabOrder( mStartDateEdit, mStartTimeEdit );
-  QWidget::setTabOrder( mStartTimeEdit, mEndDateEdit );
+  QWidget::setTabOrder( mStartTimeEdit, mTimeZoneComboStart );
+  QWidget::setTabOrder( mTimeZoneComboStart, mEndDateEdit );
   QWidget::setTabOrder( mEndDateEdit, mEndTimeEdit );
-  QWidget::setTabOrder( mEndTimeEdit, mHasTimeCheckbox );
-  QWidget::setTabOrder( mHasTimeCheckbox, mAlarmButton );
+  QWidget::setTabOrder( mEndTimeEdit, mTimeZoneComboEnd );
+  QWidget::setTabOrder( mTimeZoneComboEnd, mHasTimeCheckbox );
+  QWidget::setTabOrder( mHasTimeCheckbox, mSecrecyCombo );
+  QWidget::setTabOrder( mSecrecyCombo, mFreeTimeCombo );
+  QWidget::setTabOrder( mFreeTimeCombo, mAlarmButton );
   QWidget::setTabOrder( mAlarmButton, mAlarmTimeEdit );
   QWidget::setTabOrder( mAlarmTimeEdit, mAlarmIncrCombo );
-//   QWidget::setTabOrder( mAlarmIncrCombo, mAlarmSoundButton );
   QWidget::setTabOrder( mAlarmIncrCombo, mAlarmEditButton );
-//   QWidget::setTabOrder( mAlarmSoundButton, mAlarmProgramButton );
-//   QWidget::setTabOrder( mAlarmProgramButton, mFreeTimeCombo );
-  QWidget::setTabOrder( mAlarmEditButton, mFreeTimeCombo );
-  QWidget::setTabOrder( mFreeTimeCombo, mDescriptionEdit );
-  QWidget::setTabOrder( mDescriptionEdit, mCategoriesButton );
-  QWidget::setTabOrder( mCategoriesButton, mSecrecyCombo );
-//  QWidget::setTabOrder( mSecrecyCombo, mDescriptionEdit );
+  QWidget::setTabOrder( mAlarmEditButton, mDescriptionEdit );
 
   mSummaryEdit->setFocus();
 }
--- korganizer/koeditorgeneraljournal.cpp	(revision 905597)
+++ korganizer/koeditorgeneraljournal.cpp	(revision 905598)
@@ -207,6 +207,8 @@ void KOEditorGeneralJournal::finishSetup
   QWidget::setTabOrder( mDateEdit, mTimeCheckBox );
   QWidget::setTabOrder( mTimeCheckBox, mTimeEdit );
   QWidget::setTabOrder( mTimeEdit, mDescriptionEdit );
+  QWidget::setTabOrder( mDescriptionEdit, mCategoriesButton );
+
   mSummaryEdit->setFocus();
 }
 
Index: korganizer/koeditorgeneraltodo.cpp
===================================================================
Index: korganizer/koeditorgeneralevent.cpp
===================================================================
Index: korganizer/koeditorgeneraljournal.cpp
===================================================================