summaryrefslogtreecommitdiff
path: root/noncore
authorharlekin <harlekin>2004-01-06 12:33:20 (UTC)
committer harlekin <harlekin>2004-01-06 12:33:20 (UTC)
commita1270a04613d9adbd72c41ae1cde4683b036eebd (patch) (side-by-side diff)
tree0ba4084bb84bd7e9e75fe1918f5b0b5cf0059410 /noncore
parent1c484a5dfcea2e7e3dc4774c706ca03cab229d40 (diff)
downloadopie-a1270a04613d9adbd72c41ae1cde4683b036eebd.zip
opie-a1270a04613d9adbd72c41ae1cde4683b036eebd.tar.gz
opie-a1270a04613d9adbd72c41ae1cde4683b036eebd.tar.bz2
less icons
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/defines.h5
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp17
-rw-r--r--noncore/net/mail/mainwindow.cpp8
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp1
-rw-r--r--noncore/net/mail/viewmailbase.cpp2
5 files changed, 16 insertions, 17 deletions
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index 36c85c7..ebe8e08 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -3,14 +3,11 @@
#include <qpe/resource.h>
-#define USER_AGENT "OpieMail v0.1"
+#define USER_AGENT "OpieMail v0.3"
#define PIC_COMPOSEMAIL "mail/composemail"
#define PIC_SENDQUEUED "mail/sendqueued"
#define PIC_SHOWFOLDERS "mail/showfolders"
-#define PIC_SEARCHMAILS "mail/searchmails"
-#define PIC_EDITSETTINGS "mail/editsettings"
-#define PIC_EDITACCOUNTS "mail/editaccounts"
#define PIC_SYNC "mail/sync"
#define PIC_IMAPFOLDER "mail/imapfolder"
#define PIC_MBOXFOLDER "mail/mboxfolder"
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index ec4dcd2..cceb22e 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -39,7 +39,7 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
int err = MAILPOP3_NO_ERROR;
char *message = 0;
size_t length = 0;
-
+
login();
if ( !m_pop3 ) {
return RecBody();
@@ -51,11 +51,11 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
qDebug("Message to large: %i",mail.Msgsize());
return body;
}
-
+
QFile msg_cache(msgTempName);
cleanMimeCache();
-
+
if (mail.getNumber()!=last_msg_id) {
if (msg_cache.exists()) {
msg_cache.remove();
@@ -88,11 +88,11 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
msg_data->msg_length = strlen(message);
}
body = parseMail(mailmsg);
-
+
/* clean up */
- if (mailmsg) mailmessage_free(mailmsg);
+ if (mailmsg) mailmessage_free(mailmsg);
if (message) free(message);
-
+
return body;
}
@@ -153,6 +153,7 @@ void POP3wrapper::login()
}
err = mailfolder_connect(m_folder);
if (err != MAIL_NO_ERROR) {
+ qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) );
Global::statusMessage(tr("Error initializing folder"));
mailfolder_free(m_folder);
m_folder = 0;
@@ -214,7 +215,7 @@ int POP3wrapper::deleteAllMail(const Folder*)
res=0;
}
break;
- }
+ }
return res;
}
@@ -237,7 +238,7 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail)
mailmessage * mailmsg = 0;
int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
err = mailmessage_fetch(mailmsg,&target,&length);
- if (mailmsg) mailmessage_free(mailmsg);
+ if (mailmsg) mailmessage_free(mailmsg);
if (target) {
res = new encodedString(target,length);
}
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 43d02e7..3c659e4 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -64,24 +64,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
SLOT( slotShowFolders( bool ) ) );
/*
- searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS,
+ searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ),
0, 0, this );
searchMails->addTo( toolBar );
searchMails->addTo( mailMenu );
*/
- deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
+ deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this);
deleteMails->addTo( toolBar );
deleteMails->addTo( mailMenu );
connect( deleteMails, SIGNAL( activated() ),
SLOT( slotDeleteMail() ) );
- editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS,
+ editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) ,
0, 0, this );
editSettings->addTo( settingsMenu );
connect( editSettings, SIGNAL( activated() ),
SLOT( slotEditSettings() ) );
- editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
+ editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) ,
0, 0, this );
editAccounts->addTo( settingsMenu );
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index a261d14..991b5fb 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -49,6 +49,7 @@ void MailApplet::paintEvent( QPaintEvent* ) {
QFont f( "vera", AppLnk::smallIconSize() );
QFontMetrics fm( f );
p.setFont( f );
+ p.setPen( Qt::blue );
p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) );
return;
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 0e994d4..153ba9d 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -48,7 +48,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
showHtml->addTo( toolbar );
showHtml->addTo( mailmenu );
- deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
+ deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
deleteMail->addTo(toolbar);
deleteMail->addTo(mailmenu);