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 | 30 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 29 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 1 |
6 files changed, 47 insertions, 32 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 @@ -3,9 +3,11 @@ 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? 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,2 +1,11 @@ +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 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 @@ -4,5 +4,5 @@ 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 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 @@ -27,4 +27,5 @@ #include <qpe/qcopenvelope_qws.h> #include <qpe/qprocess.h> +#include <qpe/resource.h> #include <qdir.h> @@ -37,4 +38,5 @@ #include <qlabel.h> #include <qtimer.h> +#include <qpixmap.h> //#include <iostream.h> @@ -59,10 +61,5 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) 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(); @@ -77,5 +74,5 @@ void Today::draw() getTodo(); // how often refresh - QTimer::singleShot( 30*1000, this, SLOT(draw()) ); + QTimer::singleShot( 5*1000, this, SLOT(draw()) ); } @@ -83,4 +80,10 @@ void Today::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"); @@ -148,4 +151,5 @@ void Today::startConfig() + /* * Get all events that are in the datebook xml file for today @@ -182,4 +186,8 @@ void Today::getDates() { msg += "<B>" + (*it).description() + "</B>"; + if ( (*it).event().hasAlarm() ) + { + msg += " <b>[with alarm]</b>"; + } // include location or not if (SHOW_LOCATION == 1) @@ -202,4 +210,8 @@ void Today::getDates() { msg += "<B>" + (*it).description() + "</B>"; + if ( (*it).event().hasAlarm() ) + { + msg += " <b>[with alarm]</b>"; + } // include location or not if (SHOW_LOCATION == 1) @@ -231,5 +243,4 @@ void Today::getDates() /* * Parse in the todolist.xml - * */ QList<TodoItem> Today::loadTodo(const char *filename) @@ -263,5 +274,6 @@ QList<TodoItem> Today::loadTodo(const char *filename) 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")) { 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 @@ -28,5 +28,6 @@ #include <qimage.h> #include <qpixmap.h> -//#include <qscrollview.h> +#include <qscrollview.h> +#include <qvbox.h> #include <qpe/resource.h> @@ -65,6 +66,6 @@ this->setPalette(pal); QVBoxLayout * layout = new QVBoxLayout(this); - Frame4 = new QFrame( this, "Frame4" ); + Frame4->setPalette( pal ); Frame4->setFrameShape( QScrollView::StyledPanel ); Frame4->setFrameShadow( QScrollView::Sunken ); @@ -103,5 +104,5 @@ this->setPalette(pal); TextLabel1->setFont( TextLabel1_font ); TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); - TextLabel1->setTextFormat( QLabel::AutoText ); + TextLabel1->setTextFormat( RichText ); // todo @@ -112,7 +113,5 @@ this->setPalette(pal); 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 ); @@ -126,5 +125,4 @@ this->setPalette(pal); PushButton1 = new QPushButton (Frame15, "PushButton1" ); PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); - //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin ); PushButton1->setPixmap( config ); PushButton1->setPalette( pal ); @@ -136,9 +134,7 @@ this->setPalette(pal); 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 ); @@ -146,12 +142,9 @@ this->setPalette(pal); 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); @@ -159,9 +152,8 @@ this->setPalette(pal); 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); } @@ -171,5 +163,4 @@ this->setPalette(pal); 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 @@ -30,4 +30,5 @@ public: ~TodayBase(); + //QScrollView* Frame4; QFrame* Frame4; QPushButton* DatesButton; |