-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 16 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.h | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index 9c0d32f..ce1e7ac 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp @@ -13,22 +13,22 @@ #include "mailapplet.h" /* UNIX */ #include <signal.h> using namespace Opie::Core; MailApplet::MailApplet( QWidget *parent ) -: QWidget( parent ) { +: QLabel( parent ) { m_config = new Config( "mail" ); m_config->setGroup( "Applet" ); - setFixedWidth( AppLnk::smallIconSize() ); + //setFixedWidth( AppLnk::smallIconSize() ); setFixedHeight( AppLnk::smallIconSize() ); hide(); m_newMails = 0; m_statusMail = 0l; /* for networking we must block SIGPIPE and Co. */ @@ -48,26 +48,29 @@ MailApplet::MailApplet( QWidget *parent ) MailApplet::~MailApplet() { if ( m_statusMail ) delete m_statusMail; if ( m_config ) delete m_config; } -void MailApplet::paintEvent( QPaintEvent* ) { +void MailApplet::paintEvent( QPaintEvent*ev ) +{ QPainter p( this ); p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) ); + QLabel::paintEvent(ev); +#if 0 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 ) ); +#endif return; - } void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { slotClicked(); } void MailApplet::slotClicked() { QCopEnvelope e( "QPE/System", "execute(QString)" ); @@ -129,22 +132,21 @@ void MailApplet::slotCheck() { } if ( m_config->readBoolEntry( "PlaySound", false ) ) device->playAlarmSound(); } Config cfg( "mail" ); cfg.setGroup( "Status" ); cfg.writeEntry( "newMails", m_newMails ); { - odebug << "QCop abschicken" << oendl; QCopEnvelope env( "QPE/Pim", "newMails(int)" ); env << m_newMails; } - odebug << "QCop abschicken done" << oendl; - repaint( true ); + setText(QString::number( m_newMails )); +// repaint( true ); } else { ODevice *device = ODevice::inst(); if ( !isHidden() ) hide(); if ( !device->ledList().isEmpty() ) { OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; device->setLedState( led, Led_Off ); } diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h index b4d3742..f28f274 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.h +++ b/noncore/net/mail/taskbarapplet/mailapplet.h @@ -1,19 +1,20 @@ #ifndef MAILAPPLET_H #define MAILAPPLET_H #include <qbutton.h> +#include <qlabel.h> #include <libmailwrapper/statusmail.h> class Config; class QTimer; -class MailApplet : public QWidget { +class MailApplet : public QLabel { Q_OBJECT public: MailApplet( QWidget *parent = 0 ); ~MailApplet(); protected: |