| -rw-r--r-- | kmicromail/imapconfigui.ui | 6 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 13 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 5 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/pop3wrapper.cpp | 12 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | kmicromail/pop3configui.ui | 6 |
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 @@ -13,4 +13,4 @@ <y>0</y> - <width>306</width> - <height>396</height> + <width>269</width> + <height>388</height> </rect> @@ -409,3 +409,3 @@ <name>text</name> - <string>Download only messages smaller</string> + <string>Get only messages smaller</string> </property> 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 @@ -150,6 +150,8 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) 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(); @@ -239,4 +241,6 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, // 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(); @@ -244,2 +248,3 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, Global::statusMessage(tr("Copy message %1 of %2").arg(iii).arg(count)); + wid.setProgress( iii ); wid.raise(); 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 @@ -946,3 +946,5 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) //progress( tr("Delete")); - QWidget wid; + + QProgressBar wid ( count ); + wid.setCaption( tr("Deleting ...")); wid.show(); @@ -950,2 +952,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); + wid.setProgress( iii ); wid.raise(); 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 @@ -202,3 +202,5 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) int count = target.count(); - QWidget wid; + + QProgressBar wid ( count ); + wid.setCaption( tr("Deleting ...")); wid.show(); @@ -206,2 +208,3 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); + wid.setProgress( iii ); wid.raise(); @@ -241,3 +244,7 @@ int POP3wrapper::deleteAllMail(const FolderP&) { } - QWidget wid; + + + + QProgressBar wid ( result ); + wid.setCaption( tr("Deleting ...")); wid.show(); @@ -245,2 +252,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) { Global::statusMessage(tr("Delete message %1 of %2").arg(i).arg(result)); + wid.setProgress( i ); wid.raise(); diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 5f777a3..d130317 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -158,3 +158,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>306</width> - <height>371</height> + <width>269</width> + <height>358</height> </rect> @@ -383,3 +383,3 @@ <name>text</name> - <string>Download only messages smaller</string> + <string>Get only messages smaller</string> </property> |