| -rw-r--r-- | kmicromail/imapconfigui.ui | 6 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 11 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 5 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/pop3wrapper.cpp | 12 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | kmicromail/pop3configui.ui | 6 |
6 files changed, 29 insertions, 12 deletions
diff --git a/kmicromail/imapconfigui.ui b/kmicromail/imapconfigui.ui index 2e4c9ca..d24c9ea 100644 --- a/kmicromail/imapconfigui.ui +++ b/kmicromail/imapconfigui.ui @@ -8,14 +8,14 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>306</width> - <height>396</height> + <width>269</width> + <height>388</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Configure IMAP</string> </property> @@ -404,13 +404,13 @@ <property stdset="1"> <name>name</name> <cstring>CheckBoxDown</cstring> </property> <property stdset="1"> <name>text</name> - <string>Download only messages smaller</string> + <string>Get only messages smaller</string> </property> </widget> <widget> <class>QSpinBox</class> <property stdset="1"> <name>name</name> 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 @@ -145,16 +145,18 @@ void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSma void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) { //qDebug("AbstractMail::deleteMailList:: Please reimplement! "); // 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)); + wid.setProgress( iii ); wid.raise(); qApp->processEvents(); RecMailP mail = (*target.at( iii )); deleteMail(mail); ++iii; } @@ -234,17 +236,20 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, encodedString*st = 0; int iii = 0; int count = t.count(); 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 )); st = fetchRawBody(r); if (st) { targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); 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 @@ -941,16 +941,19 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) int count = target.count(); // qDebug("imap remove count %d ", count); 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 )); //#if 0 //qDebug("IMAP remove %d %d ", iii, mail->getNumber() ); err = selectMbox(mail->getMbox()); 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 @@ -197,16 +197,19 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) { login(); if (!m_pop3) 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 "); RecMailP mail = (*target.at( iii )); int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber()); if (err != MAIL_NO_ERROR) { @@ -236,16 +239,21 @@ int POP3wrapper::deleteAllMail(const FolderP&) { uint32_t result = 0; int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result); if (err != MAIL_NO_ERROR) { 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(); err = mailsession_remove_message(m_pop3->sto_session,i+1); if (err != MAIL_NO_ERROR) { Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 5f777a3..d130317 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -153,12 +153,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) QLabel *spacer = new QLabel( toolBar ); spacer->setBackgroundMode( QWidget::PaletteButton ); toolBar->setStretchableWidget( spacer ); QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); + if ( QApplication::desktop()->width() > 320 ) closeMail->addTo(toolBar); closeMail->addTo(mailMenu); QPopupMenu* helpMenu = new QPopupMenu( menuBar ); menuBar->insertItem( tr( "Help" ), helpMenu ); diff --git a/kmicromail/pop3configui.ui b/kmicromail/pop3configui.ui index 6acd394..f1dda7a 100644 --- a/kmicromail/pop3configui.ui +++ b/kmicromail/pop3configui.ui @@ -8,14 +8,14 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>306</width> - <height>371</height> + <width>269</width> + <height>358</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Configure POP3</string> </property> @@ -378,13 +378,13 @@ <property stdset="1"> <name>name</name> <cstring>CheckBoxDown</cstring> </property> <property stdset="1"> <name>text</name> - <string>Download only messages smaller</string> + <string>Get only messages smaller</string> </property> </widget> <widget> <class>QSpinBox</class> <property stdset="1"> <name>name</name> |