6 files changed, 49 insertions, 10 deletions

diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 14e5c0b..f8fd0a8 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -272,11 +272,20 @@
 { "Select SMTP Account","Wähle SMTP Zugang" },
 { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" },
 { "Error sending mail","Fehler beim Mailversand" },
 { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." },
 { "Colors","Farben" },
 { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
 { "Configure OM/Pi...","Konfiguriere OM/Pi..." },
 { "Global Settings...","Globale Einstellungen..." },
+{ " Local Mailfolders"," Lokale Mailordner" },
+{ "Refreshing %1 ... please wait","Lese %1 neu ein ... bitte warten" },
+{ "Refresh\n%1\n?","%1\nneu einlesen?" },
+{ "Refresh","Neu einlesen" },
+{ "Select all","Selektiere alle" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
-{ "","" },
\ No newline at end of file
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index fcb2052..985a762 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -778,19 +778,19 @@ void IMAPfolderItem::contextMenuSelected(int id)
  */
 /* MH is a little bit different - the top folder can contains messages other than in IMAP and
    POP3 and MBOX */
 MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
         : AccountViewItem( parent )
 {
     m_Path = aPath;
     /* 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 );
     folder = 0;
 }
 
 MHviewItem::~MHviewItem()
 {
     delete wrapper;
 }
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index cef55ab..4879d57 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -92,21 +92,32 @@ void AccountView::populate( QList<Account> list )
        }
      }
 }
 
 void AccountView::refresh(QListViewItem *item)
 {
     if ( item )
     {
-        int result = KMessageBox::warningContinueCancel(this,
+        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,
                                                         i18n("Refresh\n%1\n?").arg( item->text(0) ),
                                                         i18n("Refresh"),i18n("Refresh"),i18n("Cancel"),
                                                         true);
-        if (result != KMessageBox::Continue) return;
+            if (result != KMessageBox::Continue) return;
+        }
         m_currentItem = item;
         topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
         QTimer::singleShot( 500, this, SLOT ( refreshCurrentSelected() ) );
      
     }
 }
 void AccountView::refreshOutgoing()
 {
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 82a915e..3dde3cd 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -360,26 +360,40 @@ void MainWindow::slotAdjustLayout() {
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
     */
 }
 
 void MainWindow::slotAdjustColumns()
 {
-    bool hidden = folderView->isHidden();
-    if ( hidden ) folderView->show();
-    folderView->setColumnWidth( 0, folderView->visibleWidth() );
-    if ( hidden ) folderView->hide();
+   
+    if ( !folderView->isHidden() )
+        folderView->setColumnWidth( 0, folderView->visibleWidth() );
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 100 );
     mailView->setColumnWidth( 2, 100 );
     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 )
         mailView->setColumnWidth( 5, 100 );
     mailView->setColumnAlignment( 3, AlignRight);
 }
 
 void MainWindow::slotEditSettings()
 {
 }
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 178d2bb..f65f3b4 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -29,16 +29,17 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~MainWindow();
 
 public slots:
     virtual void slotAdjustColumns();
+    virtual void slotAdjustColumnsWide();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void slotComposeMail();
 
 protected slots:
     virtual void setInfoFields(QListViewItem* );
     virtual void slotSendQueued();
     virtual void slotEditAccounts();
     virtual void slotShowFolders( bool show );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index e296d9c..75a75b9 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -536,21 +536,25 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
         delete m;
     }
 }
 
 void OpieMail::slotShowFolders( bool show )
 {
     if ( show && folderView->isHidden() )
     {
+        slotAdjustColumns();
         folderView->show();
+        //slotAdjustColumns();
     }
     else if ( !show && !folderView->isHidden() )
     {
+        slotAdjustColumnsWide();
         folderView->hide();
+        //slotAdjustColumnsWide();
     }
 }
 
 void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 {
     MailListViewItem*item = 0;
     mailView->clear();