author | harlekin <harlekin> | 2002-02-20 20:04:58 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-20 20:04:58 (UTC) |
commit | 17e96f64d6b66fac5f0e206492149d461e2ad900 (patch) (side-by-side diff) | |
tree | a2af1d60dc0a44e6e7991fc25d5ed8d9646e3620 /core/pim | |
parent | f5ce2ee04b4b9aed2a93e9a730ad22ced791dfd8 (diff) | |
download | opie-17e96f64d6b66fac5f0e206492149d461e2ad900.zip opie-17e96f64d6b66fac5f0e206492149d461e2ad900.tar.gz opie-17e96f64d6b66fac5f0e206492149d461e2ad900.tar.bz2 |
new release fixing several bugs, look at changelog .-)
-rw-r--r-- | core/pim/today/TODO | 8 | ||||
-rw-r--r-- | core/pim/today/changelog | 9 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 58 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 53 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 1 |
6 files changed, 73 insertions, 58 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO index 91c933b..95b9b51 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO @@ -1,13 +1,15 @@ TODO for today: * start the app on "resume" -* autoupdate +* show alarm icons on alarm events -* fix 23 pm bug (done??) +* problems with updating + +* add am/pm mode instead of 24 h, take system default -* add mail support +* fix 23 pm bug (done??) * scrollbar? * qcop integration for updating events? diff --git a/core/pim/today/changelog b/core/pim/today/changelog index dd4cfc1..3f99052 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1,4 +1,13 @@ +0.2.5 + +* some other minor fixes regarding autoupdate +* fixed segfault with todolist > 7 entries +* fixed the "ugly grey border around buttons" issue +* fixed the "empty calendar field" "bug" +* shown only later appointments as option + + 0.2.4 * added support for email * autoupdates after 1 min diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 3362a54..72e8f2b 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -2,9 +2,9 @@ Files: bin/today apps/Applications/today.desktop pics/today_icon.png pics/today/ Priority: optional Section: opie/applications Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm -Version: 0.2.4 +Version: 0.2.5 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 7a2d0c9..bed3a74 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -25,8 +25,9 @@ #include <qpe/timestring.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qprocess.h> +#include <qpe/resource.h> #include <qdir.h> #include <qfile.h> #include <qdatetime.h> @@ -35,8 +36,9 @@ #include <qspinbox.h> #include <qpushbutton.h> #include <qlabel.h> #include <qtimer.h> +#include <qpixmap.h> //#include <iostream.h> //#include <unistd.h> #include <stdlib.h> @@ -57,14 +59,9 @@ Today::Today( QWidget* parent, const char* name, WFlags 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; + QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); draw(); } @@ -75,14 +72,20 @@ void Today::draw() getDates(); getMail(); getTodo(); // how often refresh - QTimer::singleShot( 30*1000, this, SLOT(draw()) ); + QTimer::singleShot( 5*1000, this, SLOT(draw()) ); } void Today::init() { + QDate date = QDate::currentDate(); + QString time = (date.toString()); + + TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>"); + db = new DateBookDB; + // read config Config cfg("today"); cfg.setGroup("BaseConfig"); @@ -146,8 +149,9 @@ void Today::startConfig() draw(); } + /* * Get all events that are in the datebook xml file for today */ void Today::getDates() @@ -157,9 +161,9 @@ void Today::getDates() QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); Config config( "qpe" ); // if 24 h format - // bool ampm = config.readBoolEntry( "AMPM", TRUE ); + //bool ampm = config.readBoolEntry( "AMPM", TRUE ); int count=0; if ( list.count() > 0 ) { @@ -179,29 +183,37 @@ void Today::getDates() // decide if to get all day or only later appointments if (!ONLY_LATER) { - msg += "<B>" + (*it).description() + "</B>"; - // include location or not - if (SHOW_LOCATION == 1) - { + msg += "<B>" + (*it).description() + "</B>"; + if ( (*it).event().hasAlarm() ) + { + msg += " <b>[with alarm]</b>"; + } + // include location or not + if (SHOW_LOCATION == 1) + { msg+= "<BR>" + (*it).location(); - } - msg += "<BR>" - // start time of event - + TimeString::timeString(QTime((*it).event().start().time()) ) - // end time of event - + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) - + "<BR>"; - // include possible note or not - if (SHOW_NOTES == 1) + } + msg += "<BR>" + // start time of event + + TimeString::timeString(QTime((*it).event().start().time()) ) + // end time of event + + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) + + "<BR>"; + // include possible note or not + if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) { msg += "<B>" + (*it).description() + "</B>"; + if ( (*it).event().hasAlarm() ) + { + msg += " <b>[with alarm]</b>"; + } // include location or not if (SHOW_LOCATION == 1) { msg+= "<BR>" + (*it).location(); @@ -229,9 +241,8 @@ void Today::getDates() } /* * Parse in the todolist.xml - * */ QList<TodoItem> Today::loadTodo(const char *filename) { DOM *todo; @@ -261,9 +272,10 @@ QList<TodoItem> Today::loadTodo(const char *filename) priority = -1; completed = -1; while((attlist) && (attlist[j])) { - if(!attlist[i]->name) continue; + // SEGFAULT HERE WITH MORE THAN 7 ENTRIES + if(!attlist[j]->name) continue; if(!strcmp(attlist[j]->name, "Description")) { description = attlist[j]->value; } diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index b0de1bf..32b45f7 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -26,9 +26,10 @@ #include <qtooltip.h> #include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> -//#include <qscrollview.h> +#include <qscrollview.h> +#include <qvbox.h> #include <qpe/resource.h> /* @@ -49,24 +50,24 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // mail icon QPixmap mail = Resource::loadPixmap( "today/mail" ); -QPalette pal2; - QColorGroup cg; - cg.setColor( QColorGroup::Text, white ); - cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); - pal2.setActive( cg ); - - -QPalette pal = this->palette(); -QColor col = pal.color(QPalette::Active, QColorGroup::Background); -pal.setColor(QPalette::Active, QColorGroup::Button, col); -this->setPalette(pal); + QPalette pal2; + QColorGroup cg; + cg.setColor( QColorGroup::Text, white ); + cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); + pal2.setActive( cg ); + + + QPalette pal = this->palette(); + QColor col = pal.color(QPalette::Active, QColorGroup::Background); + pal.setColor(QPalette::Active, QColorGroup::Button, col); + this->setPalette(pal); QVBoxLayout * layout = new QVBoxLayout(this); - Frame4 = new QFrame( this, "Frame4" ); + Frame4->setPalette( pal ); Frame4->setFrameShape( QScrollView::StyledPanel ); Frame4->setFrameShadow( QScrollView::Sunken ); Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); @@ -101,20 +102,18 @@ this->setPalette(pal); QFont TextLabel1_font( TextLabel1->font() ); TextLabel1_font.setBold( TRUE ); TextLabel1->setFont( TextLabel1_font ); TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); - TextLabel1->setTextFormat( QLabel::AutoText ); + TextLabel1->setTextFormat( RichText ); // todo Frame15 = new QFrame( this, "Frame15" ); Frame15->setFrameShape( QFrame::StyledPanel ); Frame15->setFrameShadow( QFrame::Sunken ); TodoButton = new QPushButton (Frame15, "TodoButton" ); TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); - //TodoButton->setBackgroundMode(NoBackground); TodoButton->setPalette( pal ); - //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); TodoButton->setPixmap( todo ); TodoButton->setFlat( TRUE ); TodoField = new QLabel( Frame15, "TodoField" ); @@ -124,9 +123,8 @@ this->setPalette(pal); 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->setPalette( pal ); PushButton1->setAutoDefault( TRUE ); PushButton1->setFlat( TRUE ); @@ -134,42 +132,35 @@ this->setPalette(pal); // 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->setGeometry( QRect( 2, 3, 36, 19 ) ); MailButton->setPalette( pal ); MailButton->setPixmap( mail ); MailButton->setFlat( TRUE ); MailField = new QLabel( MailFrame, "DatesField" ); - MailField->setGeometry( QRect( 40, 10, 203, 120 ) ); + MailField->setGeometry( QRect( 40, 4, 203, 120 ) ); MailField->setText( tr( "Opiemail not installed" ) ); MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); - MailField->setMaximumHeight(15); - MailField->setMinimumHeight(10); - - - + MailField->setMaximumHeight(40); + MailField->setMinimumHeight(30); layout->addWidget(Frame); layout->addWidget(Frame4); layout->addWidget(MailFrame); layout->addWidget(Frame15); - //layout->addWidget(split); - layout->setStretchFactor(Frame4,4); + layout->setStretchFactor(Frame4,5); layout->setStretchFactor(MailFrame,1); - layout->setStretchFactor(Frame15,3); + layout->setStretchFactor(Frame15,4); } /* * 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 c84cc67..13fbb8d 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h @@ -28,8 +28,9 @@ class TodayBase : public QWidget public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TodayBase(); + //QScrollView* Frame4; QFrame* Frame4; QPushButton* DatesButton; QLabel* DatesField; QLabel* Frame; |