author | harlekin <harlekin> | 2002-02-16 19:59:21 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-16 19:59:21 (UTC) |
commit | 4e6ec847f469a3669be864db69dee0d8b0e4a93b (patch) (side-by-side diff) | |
tree | db92798a54f2eca93aa71fcf4d9aab3d116f0c5e /core/pim/today | |
parent | be1704ffdb21c6d304ba36bfd5ef1f5db622baea (diff) | |
download | opie-4e6ec847f469a3669be864db69dee0d8b0e4a93b.zip opie-4e6ec847f469a3669be864db69dee0d8b0e4a93b.tar.gz opie-4e6ec847f469a3669be864db69dee0d8b0e4a93b.tar.bz2 |
new features: auto update and opiemail support
-rw-r--r-- | core/pim/today/changelog | 8 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 4 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 48 | ||||
-rw-r--r-- | core/pim/today/today.h | 4 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 40 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 4 |
6 files changed, 88 insertions, 20 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 96a4163..dd4cfc1 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1,6 +1,14 @@ +0.2.4 + +* added support for email +* autoupdates after 1 min +* QCopEnvelope instead of system() +* starting to use qvbox in gui + + 0.2.3 * the 4 am release * several bugfixes diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 515632b..3362a54 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -1,10 +1,10 @@ -Files: bin/today apps/Applications/today.desktop pics/today_icon.png pics/today/today_logo.png pics/today/config.png +Files: bin/today apps/Applications/today.desktop pics/today_icon.png pics/today/today_logo.png pics/today/config.png pics/today/mail.png Priority: optional Section: opie/applications Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm -Version: 0.2.3 +Version: 0.2.4 Depends: opie-base ($QPE_VERSION) License: GPL Description: today screen A short overview over current appointments and tasks. diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 00a8842..eb8b50c 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -32,12 +32,13 @@ #include <qdatetime.h> #include <qtextstream.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qpushbutton.h> #include <qlabel.h> +#include <qtimer.h> //#include <iostream.h> //#include <unistd.h> #include <stdlib.h> int MAX_LINES_TASK; @@ -54,23 +55,32 @@ int ONLY_LATER = 1; Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ) { QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); + QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); QDate date = QDate::currentDate(); QString time = (date.toString()); TextLabel1->setText(time); db = new DateBookDB; + draw(); +} + + +void Today::draw() +{ init(); getDates(); - getTodo(); -} + getMail(); + getTodo(); + QTimer::singleShot( 60*1000, this, SLOT(draw()) ); +} void Today::init() { // read config Config cfg("today"); cfg.setGroup("BaseConfig"); @@ -123,16 +133,13 @@ void Today::startConfig() cfg.writeEntry("maxlinesmeet",maxmeet); cfg.writeEntry("showlocation",location); cfg.writeEntry("shownotes", notes); // sync it to "disk" cfg.write(); - init(); - getDates(); - getTodo(); - //cout << location << endl; + draw(); } /* * Get all events that are in the datebook xml file for today */ @@ -259,12 +266,28 @@ QList<TodoItem> Today::loadTodo(const char *filename) minidom_free(todo); return loadtodolist; } +void Today::getMail() +{ + Config cfg("opiemail"); + cfg.setGroup("today"); + + // how many lines should be showed in the task section + int NEW_MAILS = cfg.readNumEntry("newmails",0); + int OUTGOING = cfg.readNumEntry("outgoing",0); + + QString output = tr("<b>%1</b> new mails, <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING); + + + MailField->setText(output); +} + + /* * Get the todos * */ void Today::getTodo() { @@ -305,29 +328,38 @@ void Today::getTodo() } TodoField->setText(output); } /* - * lanches datebook + * launches datebook */ void Today::startDatebook() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("datebook"); } /* - * lanches todolist + * launches todolist */ void Today::startTodo() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("todolist"); } +/* + * launch opiemail + */ +void Today::startMail() +{ + QCopEnvelope e("QPE/System", "execute(QString)"); + e << QString("opiemail"); +} + /* * Destroys the object and frees any allocated resources */ Today::~Today() { // no need to delete child widgets, Qt does it all for us diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 50a10f1..6b8c0bf 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -38,17 +38,19 @@ class Today : public TodayBase ~Today(); private slots: void startConfig(); void startTodo(); void startDatebook(); - + void startMail(); + void draw(); private: void init(); void getDates(); void getTodo(); + void getMail(); QList<TodoItem> loadTodo(const char *filename); private: DateBookDB *db; todayconfig *conf; //Config cfg; int MAX_LINES_TASK; diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index b60c915..9331ee3 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -43,16 +43,19 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // datebook QPixmap datebook = Resource::loadPixmap("DateBook"); // todo QPixmap todo = Resource::loadPixmap( "TodoList" ); // config icon QPixmap config = Resource::loadPixmap( "today/config" ); + // mail icon + QPixmap mail = Resource::loadPixmap( "today/mail" ); - if ( !name ) - setName( "TodayBase" ); - resize( 223, 307 ); + + //if ( !name ) + // setName( "TodayBase" ); + //resize( 223, 307 ); QVBoxLayout * layout = new QVBoxLayout(this); Frame4 = new QFrame( this, "Frame4" ); Frame4->setFrameShape( QScrollView::StyledPanel ); Frame4->setFrameShadow( QScrollView::Sunken ); @@ -60,19 +63,19 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // hehe, qt is ... getridoffuckingstrippeldlinesbutton = new QPushButton (Frame4, "asdfsad" ); getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); DatesButton = new QPushButton (Frame4, "DatesButton" ); - DatesButton->setGeometry( QRect( 2, 10, 36, 32 ) ); + DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) ); DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); DatesButton->setPixmap( datebook ); DatesButton->setFlat( TRUE ); DatesField = new QLabel( Frame4, "DatesField" ); - DatesField->setGeometry( QRect( 40, 10, 203, 120 ) ); + DatesField->setGeometry( QRect( 40, 4, 203, 120 ) ); DatesField->setText( tr( "No appointments today" ) ); DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); // today logo Frame = new QLabel( this, "Frame" ); QPalette pal; @@ -106,30 +109,51 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); TodoButton->setPixmap( todo ); TodoButton->setFlat( TRUE ); TodoField = new QLabel( Frame15, "TodoField" ); - TodoField->setGeometry( QRect( 40, 10, 196, 120 ) ); + TodoField->setGeometry( QRect( 40, 4, 196, 120 ) ); TodoField->setFrameShadow( QLabel::Plain ); TodoField->setText( tr( "No current todos" ) ); TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); PushButton1 = new QPushButton (Frame15, "PushButton1" ); PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin ); PushButton1->setPixmap( config ); PushButton1->setAutoDefault( TRUE ); PushButton1->setFlat( TRUE ); + // mail + MailFrame = new QFrame( this, "MailFrame" ); + MailFrame->setFrameShape( QScrollView::StyledPanel ); + MailFrame->setFrameShadow( QScrollView::Sunken ); + MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); + + MailButton = new QPushButton (MailFrame, "MailButton" ); + MailButton->setGeometry( QRect( 2, 10, 36, 19 ) ); + MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); + MailButton->setPixmap( mail ); + MailButton->setFlat( TRUE ); + + MailField = new QLabel( MailFrame, "DatesField" ); + MailField->setGeometry( QRect( 40, 10, 203, 120 ) ); + MailField->setText( tr( "Opiemail not installed" ) ); + MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + MailField->setMaximumHeight(15); + MailField->setMinimumHeight(10); + layout->addWidget(Frame); layout->addWidget(Frame4); + layout->addWidget(MailFrame); layout->addWidget(Frame15); - layout->setStretchFactor(Frame4,3); - layout->setStretchFactor(Frame15,2); + layout->setStretchFactor(Frame4,4); + layout->setStretchFactor(MailFrame,1); + layout->setStretchFactor(Frame15,3); } /* * Destroys the object and frees any allocated resources */ TodayBase::~TodayBase() diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 69c6363..15f021a 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h @@ -29,18 +29,20 @@ public: ~TodayBase(); QFrame* Frame4; QPushButton* DatesButton; QLabel* DatesField; QLabel* Frame; - //QFrame* Frame; + QFrame* MailFrame; QLabel* TextLabel1; QFrame* Frame15; QLabel* TodoField; + QLabel* MailField; QPushButton* PushButton1; QPushButton* TodoButton; + QPushButton* MailButton; QPushButton* getridoffuckingstrippeldlinesbutton; protected: }; |