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
@@ -264,19 +264,28 @@
 { "Show "From" info field","Zeige "Von" Info Feld" },
 { "Show "To" info field","Zeige "An" Info Feld" },
 { "Mail saved as draft!","Mail als Entwurf gespeichert!" },
 { "Save signature","Speichere Signatur" },
 { "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." },
 { "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" },
 { "Sending all mails","Senden aller Mails" },
 { "SMTP Account:","SMTP Zugang:" },
 { "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
@@ -770,35 +770,35 @@ void IMAPfolderItem::contextMenuSelected(int id)
         break;
     default:
         break;
     }
 }
 
 /**
  * MH Account stuff
  */
 /* 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;
 }
 
 AbstractMail *MHviewItem::getWrapper()
 {
     return wrapper;
 }
 
 void MHviewItem::refresh( QValueList<RecMailP> & target)
 {
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index cef55ab..4879d57 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -84,37 +84,48 @@ void AccountView::populate( QList<Account> list )
             /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
         }
          else if ( it->getType() == MAILLIB::A_NNTP )
         {
             NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
        }
      }
 }
 
 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()
 {
     m_currentItem = currentItem();
     if ( !m_currentItem ) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     if ( !view->getFolder() )
         return;
     QString bName = view->getFolder()->getDisplayName();
     if (bName.startsWith("/")&&bName.length()>1)
     {
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 82a915e..3dde3cd 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -352,42 +352,56 @@ void MainWindow::appMessage(const QCString &, const QByteArray &)
 
 void MainWindow::slotAdjustLayout() {
 
     /*
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } 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()
 {
 }
 void MainWindow::slotEditGlobalSettings()
 {
 }
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 178d2bb..f65f3b4 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -21,32 +21,33 @@
 
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 
 class RecMail;
 
 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 );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotGetMail() = 0;
     virtual void slotGetAllMail() = 0;
     virtual void slotDeleteMail();
     virtual void slotDeleteAllMail() = 0;
     virtual void slotSetCodec(int);
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index e296d9c..75a75b9 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -528,37 +528,41 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
             m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
             m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
             m->insertSeparator();
             m->insertItem(i18n("Select all"),this,SLOT(selectAll()));
             m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
         }
         m->setFocus();
         m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
         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();
 
     QValueList<RecMailP>::ConstIterator it;
     for (it = list.begin(); it != list.end();++it)
     {
         item = new MailListViewItem(mailView,item);
         item->storeData((*it));
         item->showEntry();
     }
     mailView->setSorting ( 4, false );