ompi fix

5 files changed, 36 insertions, 6 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index fcb2052..985a762 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -785,5 +785,5 @@ MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
     /* be carefull - the space within settext is wanted - thats why the string twice */
-    wrapper = AbstractMail::getWrapper( m_Path,"Local Folders");
+    wrapper = AbstractMail::getWrapper( m_Path,"Local Mailfolders");
     setPixmap( 0, PIXMAP_LOCALFOLDER );
-    setText( 0, " Local Folders" );
+    setText( 0, i18n(" Local Mailfolders") );
     setOpen( true );
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index cef55ab..4879d57 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -99,2 +99,12 @@ void AccountView::refresh(QListViewItem *item)
     {
+        bool ask = true;
+        qDebug("text -%s- ",item->text( 0 ).latin1() );
+        if ( item->text( 0 ) == i18n (" Local Mailfolders") )
+            ask = false;
+        else {
+            if ( item->parent() )
+                if ( item->parent()->text( 0 ) == i18n (" Local Mailfolders") )
+                    ask = false;
+        }
+        if ( ask ) {
         int result = KMessageBox::warningContinueCancel(this,
@@ -104,2 +114,3 @@ void AccountView::refresh(QListViewItem *item)
         if (result != KMessageBox::Continue) return;
+        }
         m_currentItem = item;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 82a915e..3dde3cd 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -367,6 +367,5 @@ void MainWindow::slotAdjustColumns()
 {
-    bool hidden = folderView->isHidden();
-    if ( hidden ) folderView->show();
+   
+    if ( !folderView->isHidden() )
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
-    if ( hidden ) folderView->hide();
 
@@ -376,3 +375,18 @@ void MainWindow::slotAdjustColumns()
     mailView->setColumnWidth( 3, 70 );
-    mailView->setColumnWidth( 4, 170 );
+    mailView->setColumnWidth( 4, 180 );
+    if ( KOPrefs::instance()->mShowToField )
+        mailView->setColumnWidth( 5, 100 );
+    mailView->setColumnAlignment( 3, AlignRight);
+    mailView->setColumnAlignment( 4, AlignRight);
+}
+void MainWindow::slotAdjustColumnsWide()
+{
+    if ( !folderView->isHidden() )
+        folderView->setColumnWidth( 0, folderView->visibleWidth() );
+
+    mailView->setColumnWidth( 0, 10 );
+    mailView->setColumnWidth( 1, 200 );
+    mailView->setColumnWidth( 2, 200 );
+    mailView->setColumnWidth( 3, 70 );
+    mailView->setColumnWidth( 4, 180 );
     if ( KOPrefs::instance()->mShowToField )
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 178d2bb..f65f3b4 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -36,2 +36,3 @@ public slots:
     virtual void slotAdjustColumns();
+    virtual void slotAdjustColumnsWide();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index e296d9c..75a75b9 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -543,3 +543,5 @@ void OpieMail::slotShowFolders( bool show )
     {
+        slotAdjustColumns();
         folderView->show();
+        //slotAdjustColumns();
     }
@@ -547,3 +549,5 @@ void OpieMail::slotShowFolders( bool show )
     {
+        slotAdjustColumnsWide();
         folderView->hide();
+        //slotAdjustColumnsWide();
     }