summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt9
-rw-r--r--kmicromail/accountitem.cpp4
-rw-r--r--kmicromail/accountview.cpp11
-rw-r--r--kmicromail/mainwindow.cpp22
-rw-r--r--kmicromail/mainwindow.h1
-rw-r--r--kmicromail/opiemail.cpp4
6 files changed, 45 insertions, 6 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
@@ -278,4 +278,13 @@
{ "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" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index fcb2052..985a762 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -784,7 +784,7 @@ MHviewItem::MHviewItem( const QString&aPath, AccountView *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;
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index cef55ab..4879d57 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -98,4 +98,14 @@ void AccountView::refresh(QListViewItem *item)
if ( 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,
i18n("Refresh\n%1\n?").arg( item->text(0) ),
@@ -103,4 +113,5 @@ void AccountView::refresh(QListViewItem *item)
true);
if (result != KMessageBox::Continue) return;
+ }
m_currentItem = item;
topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 82a915e..3dde3cd 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -366,8 +366,7 @@ void MainWindow::slotAdjustLayout() {
void MainWindow::slotAdjustColumns()
{
- bool hidden = folderView->isHidden();
- if ( hidden ) folderView->show();
+
+ if ( !folderView->isHidden() )
folderView->setColumnWidth( 0, folderView->visibleWidth() );
- if ( hidden ) folderView->hide();
mailView->setColumnWidth( 0, 10 );
@@ -375,5 +374,20 @@ void MainWindow::slotAdjustColumns()
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 );
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 178d2bb..f65f3b4 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -35,4 +35,5 @@ public:
public slots:
virtual void slotAdjustColumns();
+ virtual void slotAdjustColumnsWide();
virtual void appMessage(const QCString &msg, const QByteArray &data);
virtual void slotComposeMail();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index e296d9c..75a75b9 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -542,9 +542,13 @@ void OpieMail::slotShowFolders( bool show )
if ( show && folderView->isHidden() )
{
+ slotAdjustColumns();
folderView->show();
+ //slotAdjustColumns();
}
else if ( !show && !folderView->isHidden() )
{
+ slotAdjustColumnsWide();
folderView->hide();
+ //slotAdjustColumnsWide();
}
}