summaryrefslogtreecommitdiffabout
path: root/kmicromail
Side-by-side diff
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/accountitem.cpp14
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp4
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.cpp2
-rw-r--r--kmicromail/libmailwrapper/settings.cpp4
-rw-r--r--kmicromail/mainwindow.cpp7
-rw-r--r--kmicromail/mainwindow.h1
-rw-r--r--kmicromail/opiemail.cpp10
-rw-r--r--kmicromail/opiemail.h1
8 files changed, 28 insertions, 15 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 7b9b881..59c8abb 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -16,6 +16,8 @@
#include <qmessagebox.h>
#include <kiconloader.h>
+#define GET_NEW_MAILS 101
+
using namespace Opie::Core;
#define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
/**
@@ -92,12 +94,12 @@ QPopupMenu * POP3viewItem::getContextMenu()
{
m->insertItem(QObject::tr("Disconnect",contextName),0);
m->insertItem(QObject::tr("Set offline",contextName),1);
- m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
+ m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
}
else
{
m->insertItem(QObject::tr("Set online",contextName),1);
- m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
+ m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
}
}
return m;
@@ -137,7 +139,7 @@ void POP3viewItem::contextMenuSelected(int which)
case 1:
setOnOffline();
break;
- case 2: // daunlood
+ case GET_NEW_MAILS: // daunlood
if (account->getOffline())
setOnOffline();
AccountView*bl = accountView();
@@ -517,13 +519,13 @@ QPopupMenu * IMAPviewItem::getContextMenu()
m->insertItem(QObject::tr("Disconnect",contextName),2);
m->insertItem(QObject::tr("Set offline",contextName),3);
m->insertSeparator();
- m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
+ m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
}
else
{
m->insertItem(QObject::tr("Set online",contextName),3);
m->insertSeparator();
- m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
+ m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
}
}
return m;
@@ -577,7 +579,7 @@ void IMAPviewItem::contextMenuSelected(int id)
SETPIX(PIXMAP_IMAPFOLDER);
refreshFolders(false);
break;
- case 4: // daunlood
+ case GET_NEW_MAILS: // daunlood
{
if (account->getOffline()) {
contextMenuSelected( 3 );
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 5441a9b..91332c3 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -171,7 +171,7 @@ void IMAPwrapper::login()
}
if ( ssl ) {
- qDebug("using ssl ");
+ //qDebug("using ssl ");
err = mailimap_ssl_connect( m_imap, (char*)server.latin1(), port );
} else {
err = mailimap_socket_connect( m_imap, (char*)server.latin1(), port );
@@ -1247,7 +1247,7 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
mMax = 0;
progress( tr("Copy"));
AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb);
- qDebug("IMAPwrapper::mvcpAllMails::Using generic");
+ //qDebug("IMAPwrapper::mvcpAllMails::Using generic");
// odebug << "Using generic" << oendl;
return;
}
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 962dac0..641d4d9 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -65,7 +65,6 @@ MHwrapper::~MHwrapper()
void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
{
- qDebug("MHwrapper::listMessages ");
init_storage();
if (!m_storage) {
return;
@@ -194,7 +193,6 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri
qDebug("error creating folder ");
return 0;
}
- qDebug("Folder created ");
return 1;
}
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 766eba0..40b5591 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -26,7 +26,6 @@ Settings::Settings()
void Settings::checkDirectory()
{
- qDebug("Settings::checkDirectory() ");
return;
locateLocal("data", "kopiemail" );
/*
@@ -210,7 +209,6 @@ void IMAPaccount::read()
int lf = conf->readNumEntry( "LastFetch",0 );
QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
leaveOnServer = conf->readBoolEntry("LeaveOnServer",false);
- qDebug("reading last fetch: %d ", lf);
if ( lf < 0 ) lf = 0;
lastFetch = dt.addSecs( lf );
delete conf;
@@ -218,7 +216,7 @@ void IMAPaccount::read()
void IMAPaccount::save()
{
- qDebug("saving %s ",getFileName().latin1() );
+
Settings::checkDirectory();
KConfig *conf = new KConfig( getFileName() );
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 21edfd2..5f777a3 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -35,7 +35,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
addToolBar( toolBar );
toolBar->setHorizontalStretchable( true );
-
+ QAction* getMail = new QAction( tr( "Get new mail" ), SmallIcon("add"),
+ 0, 0, this );
+ getMail->addTo( toolBar );
+ getMail->addTo( mailMenu );
+ connect(getMail, SIGNAL( activated() ),
+ SLOT( slotGetMail() ) );
composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
0, 0, this );
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 680f0a9..ff0ff20 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -41,6 +41,7 @@ protected slots:
virtual void slotShowFolders( bool show );
virtual void refreshMailView(const QValueList<RecMailP>&);
virtual void displayMail();
+ virtual void slotGetMail() = 0;
virtual void slotDeleteMail();
virtual void mailHold(int, QListViewItem *,const QPoint&,int);
virtual void slotAdjustLayout();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index b2119e6..19ffdb3 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -9,6 +9,7 @@
#include "viewmail.h"
#include "selectstore.h"
#include "selectsmtp.h"
+#include "accountitem.h"
#include <qmessagebox.h>
#include <qtimer.h>
@@ -244,7 +245,14 @@ void OpieMail::displayMail()
( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
}
}
-
+void OpieMail::slotGetMail()
+{
+ QListViewItem * item = folderView->currentItem();
+ if ( ! item ) return;
+ while ( item->parent () )
+ item = item->parent ();
+ ((AccountViewItem *)item)->contextMenuSelected( 101 );
+}
void OpieMail::slotDeleteMail()
{
if (!mailView->currentItem()) return;
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 1de5f6b..e054b9e 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -30,6 +30,7 @@ protected slots:
virtual void slotEditAccounts();
virtual void displayMail();
virtual void slotDeleteMail();
+ virtual void slotGetMail();
virtual void slotDeleteAllMail();
virtual void mailHold(int, QListViewItem *,const QPoint&,int);
virtual void slotShowFolders( bool show );