progress fixes

6 files changed, 31 insertions, 14 deletions

diff --git a/kmicromail/imapconfigui.ui b/kmicromail/imapconfigui.ui
index 2e4c9ca..d24c9ea 100644
--- a/kmicromail/imapconfigui.ui
+++ b/kmicromail/imapconfigui.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>306</width>
-            <height>396</height>
+            <width>269</width>
+            <height>388</height>
         </rect>
     </property>
     <property stdset="1">
@@ -407,7 +407,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Download only messages smaller</string>
+                        <string>Get only messages smaller</string>
                     </property>
                 </widget>
                 <widget>
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 44878e0..8f67566 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -148,10 +148,12 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
     // this is currently re-implemented in pop3wrapper and imapwrapper
     int iii = 0;
     int count = target.count(); 
-    QWidget wid;
+    QProgressBar wid ( count );
+    wid.setCaption( tr("Deleting ..."));
     wid.show();
     while (iii < count ) {   
-        Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+        Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); 
+        wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         RecMailP mail = (*target.at( iii ));
@@ -237,11 +239,14 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
     if ( count == 0 )
         return;
     // wel, processevents is qite strange, we need a widget for getting  
-    // Global::statusMessage(tr("Copy2 message %1").arg(iii)); displayed
-    QWidget wid;
+    // Global::statusMessage(tr("Copy2 message %1").arg(iii)); displaye
+
+    QProgressBar wid ( count );
+    wid.setCaption( tr("Copying ..."));
     wid.show();
     while (iii < count ) {  
         Global::statusMessage(tr("Copy message %1 of %2").arg(iii).arg(count));
+        wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         RecMailP r = (*t.at( iii ));
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 91332c3..d79df4f 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -944,10 +944,13 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
     
     mMax = count;
     //progress( tr("Delete")); 
-    QWidget wid;
+
+    QProgressBar wid ( count );
+    wid.setCaption( tr("Deleting ..."));
     wid.show();
     while (iii < count ) {
         Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+        wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         RecMailP mail = (*target.at( iii ));
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 1edec9e..9d52f52 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -200,10 +200,13 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
         return;
     int iii = 0;
     int count = target.count(); 
-    QWidget wid;
+
+    QProgressBar wid ( count );
+    wid.setCaption( tr("Deleting ..."));
     wid.show();
     while (iii < count ) {  
         Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+        wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         //qDebug("delete ");
@@ -239,10 +242,15 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
         Global::statusMessage(tr("Error getting folder info"));
         return 0;
     }
-    QWidget wid;
+
+
+
+    QProgressBar wid ( result );
+    wid.setCaption( tr("Deleting ..."));
     wid.show();
     for (unsigned int i = 0; i < result; ++i) { 
         Global::statusMessage(tr("Delete message %1 of %2").arg(i).arg(result));
+        wid.setProgress( i ); 
         wid.raise();
         qApp->processEvents();
       
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 5f777a3..d130317 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -156,7 +156,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
     QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); 
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
-    closeMail->addTo(toolBar);
+    if ( QApplication::desktop()->width() > 320 )
+        closeMail->addTo(toolBar);
         closeMail->addTo(mailMenu);
 
 
diff --git a/kmicromail/pop3configui.ui b/kmicromail/pop3configui.ui
index 6acd394..f1dda7a 100644
--- a/kmicromail/pop3configui.ui
+++ b/kmicromail/pop3configui.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>306</width>
-            <height>371</height>
+            <width>269</width>
+            <height>358</height>
         </rect>
     </property>
     <property stdset="1">
@@ -381,7 +381,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Download only messages smaller</string>
+                        <string>Get only messages smaller</string>
                     </property>
                 </widget>
                 <widget>