10 files changed, 78 insertions, 18 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 46d59a3..ec75fad 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -13,2 +13,12 @@ A journal is deleted, if you clear all the text of the journal.
 
+Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
+
+KA/Pi  starting in 480x640 resolution:
+Hide the filter action in toolbar
+and added icons for undo/delete/redo in toolbar.
+
+Change in OM/Pi ViewMail dialog:
+When clicking on the "delete" icon the mail is deleted after confirmation as usual. But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
+
+Fixed a crash when deleting mail-accounts in OM/Pi.
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b7edccd..f6bdda4 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -789,2 +789,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
         return;
+    //qDebug("KABCore::resizeEvent(QResizeEvent* e ) ");
     if ( QApplication::desktop()->width() >= 480 ) {
@@ -2194,3 +2195,6 @@ void KABCore::addActionsManually()
       mViewManager->getFilterAction()->plug ( tb);
-      if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
+      //LR hide filteraction on started in 480x640
+      if (QApplication::desktop()->width() == 480 ) {
+          mViewManager->getFilterAction()->setComboWidth( 0 );
+      }
           mActionUndo->plug( tb );
@@ -2198,3 +2202,2 @@ void KABCore::addActionsManually()
           mActionRedo->plug( tb );
-      }
   } else {
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 0d91c12..33bef5a 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -62,2 +62,3 @@ $Id$
 #include <qlayout.h>
+#include <qapplication.h>
 #include <qwidgetstack.h>
@@ -108,3 +109,6 @@ void ViewManager::restoreSettings()
   mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter );
-  mActionSelectFilter->setComboWidth( 150 );
+  int cw = 150;
+  if (QApplication::desktop()->width() == 480 )
+      cw = 0; 
+  mActionSelectFilter->setComboWidth( cw );
   // Tell the views to reread their config, since they may have
@@ -599,3 +603,6 @@ void ViewManager::configureFilters()
   setActiveFilter( pos );
-  mActionSelectFilter->setComboWidth( 150 );
+  int cw = 150;
+  if (QApplication::desktop()->width() == 480 )
+      cw = 0; 
+  mActionSelectFilter->setComboWidth( cw );
 }
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 04afe7c..19093b1 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -52,4 +52,4 @@ void Settings::delAccount( Account *account )
 {
-    accounts.remove( account );
     account->remove();
+    accounts.remove( account );
 }
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index ec192ea..915b3e8 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -301,2 +301,26 @@ void OpieMail::replyMail()
 }
+void OpieMail::closeViewMail(ViewMail * vm)
+{
+    vm->hide();
+}
+void OpieMail::deleteAndDisplayNextMail(ViewMail * vm)
+{
+    QListViewItem*item = mailView->currentItem();
+    if (!item ) {
+        closeViewMail(vm);
+        return;
+    }
+    RecMailP mail = ((MailListViewItem*)item)->data();
+    mail->Wrapper()->deleteMail( mail );
+    item = item->itemBelow();
+    if (!item ) {
+        closeViewMail(vm);
+        return;
+    }
+    mailView->setCurrentItem(item);
+    mail = ((MailListViewItem*)item)->data();
+    RecBodyP body = folderView->fetchBody(mail);
+    vm->setBody( body );
+    vm->setMail( mail );
+}
 void OpieMail::displayNextMail(ViewMail * vm)
@@ -305,2 +329,3 @@ void OpieMail::displayNextMail(ViewMail * vm)
     if (!item) return;
+    ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     item = item->itemBelow();
@@ -331,2 +356,4 @@ void OpieMail::displayMail()
     connect(  &readMail,SIGNAL( showNextMail(ViewMail *)  ), this, SLOT( displayNextMail(ViewMail *) ) );
+    connect(  &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) );
+
     readMail.exec();
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 30968a7..a81a34c 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -28,2 +28,3 @@ public slots:
 protected slots:
+    virtual void deleteAndDisplayNextMail(ViewMail * vm);
     virtual void displayNextMail(ViewMail * vm);
@@ -49,2 +50,3 @@ protected slots:
 private:
+    void closeViewMail(ViewMail * vm);
     QString mPendingEmail;
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 60c764c..6d88cad 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -508,4 +508,5 @@ void ViewMail::slotDeleteMail( )
     {
-        m_recMail->Wrapper()->deleteMail( m_recMail );
-        hide();
+        emit deleteAndDisplayNextMail( this);
+        //m_recMail->Wrapper()->deleteMail( m_recMail );
+        //hide();
         deleted = true;
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index c2c2ce3..d85b8b2 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -46,2 +46,3 @@ public:
     void showNextMail(ViewMail*);
+    void deleteAndDisplayNextMail(ViewMail *);
 protected:
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 15c5dd9..a46cd87 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2475,4 +2475,5 @@ void CalendarView::showEventEditor()
 #else
-    if ( mEventEditor->width() != QApplication::desktop()->width() ) {
-        qDebug("CalendarView: recreate mEventEditor ");
+    if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
+        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
+        qDebug("CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
         delete mEventEditor;
@@ -2488,4 +2489,5 @@ void CalendarView::showTodoEditor()
 #else
-    if ( mTodoEditor->width() != QApplication::desktop()->width() ) {
-        qDebug("CalendarView: recreate mTodoEditor ");
+    if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
+        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
+        qDebug("CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         delete mTodoEditor;  
@@ -2544,4 +2546,4 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
         Todo* t = (Todo*) newInc; 
-        mTodoEditor->editTodo( t );
         showTodoEditor();
+        mTodoEditor->editTodo( t );
         if ( mTodoEditor->exec() ) {
@@ -2555,4 +2557,4 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
         Event*  e = (Event*)  newInc;
-        mEventEditor->editEvent( e );
         showEventEditor();
+        mEventEditor->editEvent( e );
         if ( mEventEditor->exec() ) {
@@ -2608,2 +2610,3 @@ void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
   
+    showEventEditor();
     mEventEditor->newEvent(fromHint,toHint,allDay);
@@ -2617,3 +2620,2 @@ void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
     }
-    showEventEditor();
 }
@@ -2646,2 +2648,3 @@ void CalendarView::newTodo()
  
+    showTodoEditor();
     mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),0,true);
@@ -2655,3 +2658,2 @@ void CalendarView::newTodo()
     }
-    showTodoEditor();
 }
@@ -2667,4 +2669,4 @@ void CalendarView::newSubTodo(Todo *parentEvent)
   
-    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true);
     showTodoEditor();
+    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true);
 }
@@ -2689,4 +2691,4 @@ void CalendarView::editEvent( Event *event )
     }
-    mEventEditor->editEvent( event , mFlagEditDescription);
     showEventEditor();
+    mEventEditor->editEvent( event , mFlagEditDescription);
 }
@@ -2707,4 +2709,4 @@ void CalendarView::editTodo( Todo *todo )
     }
-    mTodoEditor->editTodo( todo ,mFlagEditDescription);
     showTodoEditor();
+    mTodoEditor->editTodo( todo ,mFlagEditDescription);
 
diff --git a/qtcompat/qinputdialog.cpp b/qtcompat/qinputdialog.cpp
index 770b281..64c581e 100644
--- a/qtcompat/qinputdialog.cpp
+++ b/qtcompat/qinputdialog.cpp
@@ -37,2 +37,4 @@
 
+//Edited Lutz Rogowski 2004-12-13
+
 #include "qinputdialog.h"
@@ -455,2 +457,7 @@ QString QInputDialog::getItem( const QString &caption, const QString &label, con
     QString result;
+    int fixWid = 320;
+    if ( QApplication::desktop()->width() <= 240 ) {
+        fixWid = 230;
+    }
+    dlg->setFixedWidth( fixWid);
     ok_ = dlg->exec() == QDialog::Accepted;