-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 1 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmicromail/mainwindow.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index b890725..d9496af 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp | |||
@@ -50,25 +50,24 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum ) | |||
50 | qApp->processEvents(); | 50 | qApp->processEvents(); |
51 | return; | 51 | return; |
52 | //qDebug("imap progress %d of %d ",current,maximum ); | 52 | //qDebug("imap progress %d of %d ",current,maximum ); |
53 | //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum)); | 53 | //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum)); |
54 | //qApp->processEvents() | 54 | //qApp->processEvents() |
55 | static unsigned int last = 0; | 55 | static unsigned int last = 0; |
56 | if ( last != current ) | 56 | if ( last != current ) |
57 | IMAPwrapper::progress(); | 57 | IMAPwrapper::progress(); |
58 | last = current; | 58 | last = current; |
59 | } | 59 | } |
60 | void IMAPwrapper::progress( QString m ) | 60 | void IMAPwrapper::progress( QString m ) |
61 | { | 61 | { |
62 | |||
63 | static QString mProgrMess; | 62 | static QString mProgrMess; |
64 | if ( m != QString::null ) { | 63 | if ( m != QString::null ) { |
65 | mProgrMess = m; | 64 | mProgrMess = m; |
66 | mCurrent = 1; | 65 | mCurrent = 1; |
67 | return; | 66 | return; |
68 | } | 67 | } |
69 | QString mess; | 68 | QString mess; |
70 | //qDebug("progress "); | 69 | //qDebug("progress "); |
71 | if ( mMax ) mess = mProgrMess +i18n(" message %1 of %2").arg( mCurrent++).arg(mMax); | 70 | if ( mMax ) mess = mProgrMess +i18n(" message %1 of %2").arg( mCurrent++).arg(mMax); |
72 | else mess = mProgrMess +i18n(" message %1").arg( mCurrent++); | 71 | else mess = mProgrMess +i18n(" message %1").arg( mCurrent++); |
73 | Global::statusMessage(mess); | 72 | Global::statusMessage(mess); |
74 | //qDebug("Progress %s %s", mess.latin1(), m.latin1()); | 73 | //qDebug("Progress %s %s", mess.latin1(), m.latin1()); |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 0e4a64f..1dc374b 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -82,25 +82,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
82 | 82 | ||
83 | /* | 83 | /* |
84 | searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ), | 84 | searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ), |
85 | 0, 0, this ); | 85 | 0, 0, this ); |
86 | searchMails->addTo( toolBar ); | 86 | searchMails->addTo( toolBar ); |
87 | searchMails->addTo( mailMenu ); | 87 | searchMails->addTo( mailMenu ); |
88 | */ | 88 | */ |
89 | 89 | ||
90 | deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this); | 90 | deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this); |
91 | deleteMails->addTo( toolBar ); | 91 | deleteMails->addTo( toolBar ); |
92 | deleteMails->addTo( mailMenu ); | 92 | deleteMails->addTo( mailMenu ); |
93 | connect( deleteMails, SIGNAL( activated() ), | 93 | connect( deleteMails, SIGNAL( activated() ), |
94 | SLOT( slotDeleteMail() ) ); | 94 | SLOT( slotDeleteAllMail() ) ); |
95 | 95 | ||
96 | editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") , | 96 | editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") , |
97 | 0, 0, this ); | 97 | 0, 0, this ); |
98 | editSettings->addTo( settingsMenu ); | 98 | editSettings->addTo( settingsMenu ); |
99 | connect( editSettings, SIGNAL( activated() ), | 99 | connect( editSettings, SIGNAL( activated() ), |
100 | SLOT( slotEditSettings() ) ); | 100 | SLOT( slotEditSettings() ) ); |
101 | editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") , | 101 | editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") , |
102 | 0, 0, this ); | 102 | 0, 0, this ); |
103 | editAccounts->addTo( settingsMenu ); | 103 | editAccounts->addTo( settingsMenu ); |
104 | codecMenu = new QPopupMenu( menuBar ); | 104 | codecMenu = new QPopupMenu( menuBar ); |
105 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); | 105 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); |
106 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); | 106 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); |
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index d0a5caf..016e44c 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h | |||
@@ -36,24 +36,25 @@ public slots: | |||
36 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 36 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
37 | virtual void slotComposeMail(); | 37 | virtual void slotComposeMail(); |
38 | 38 | ||
39 | protected slots: | 39 | protected slots: |
40 | virtual void slotSendQueued(); | 40 | virtual void slotSendQueued(); |
41 | virtual void slotEditAccounts(); | 41 | virtual void slotEditAccounts(); |
42 | virtual void slotShowFolders( bool show ); | 42 | virtual void slotShowFolders( bool show ); |
43 | virtual void refreshMailView(const QValueList<RecMailP>&); | 43 | virtual void refreshMailView(const QValueList<RecMailP>&); |
44 | virtual void displayMail(); | 44 | virtual void displayMail(); |
45 | virtual void slotGetMail() = 0; | 45 | virtual void slotGetMail() = 0; |
46 | virtual void slotGetAllMail() = 0; | 46 | virtual void slotGetAllMail() = 0; |
47 | virtual void slotDeleteMail(); | 47 | virtual void slotDeleteMail(); |
48 | virtual void slotDeleteAllMail() = 0; | ||
48 | virtual void slotSetCodec(int); | 49 | virtual void slotSetCodec(int); |
49 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 50 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
50 | virtual void slotAdjustLayout(); | 51 | virtual void slotAdjustLayout(); |
51 | virtual void slotEditSettings(); | 52 | virtual void slotEditSettings(); |
52 | virtual void mailLeftClicked( QListViewItem * ); | 53 | virtual void mailLeftClicked( QListViewItem * ); |
53 | void showLicence(); | 54 | void showLicence(); |
54 | void showAbout(); | 55 | void showAbout(); |
55 | void showEtpanLicence(); | 56 | void showEtpanLicence(); |
56 | 57 | ||
57 | protected: | 58 | protected: |
58 | QToolBar *toolBar; | 59 | QToolBar *toolBar; |
59 | StatusWidget *statusWidget; | 60 | StatusWidget *statusWidget; |