summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/TODO8
-rw-r--r--core/pim/today/changelog9
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/today.cpp58
-rw-r--r--core/pim/today/todaybase.cpp53
-rw-r--r--core/pim/today/todaybase.h1
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
@@ -2,11 +2,13 @@ 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,3 +1,12 @@
+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
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
@@ -3,7 +3,7 @@ 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
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
@@ -26,6 +26,7 @@
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qprocess.h>
+#include <qpe/resource.h>
#include <qdir.h>
#include <qfile.h>
@@ -36,6 +37,7 @@
#include <qpushbutton.h>
#include <qlabel.h>
#include <qtimer.h>
+#include <qpixmap.h>
//#include <iostream.h>
//#include <unistd.h>
@@ -58,12 +60,7 @@ 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();
}
@@ -76,12 +73,18 @@ void Today::draw()
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");
@@ -147,6 +150,7 @@ void Today::startConfig()
}
+
/*
* Get all events that are in the datebook xml file for today
*/
@@ -158,7 +162,7 @@ void Today::getDates()
Config config( "qpe" );
// if 24 h format
- // bool ampm = config.readBoolEntry( "AMPM", TRUE );
+ //bool ampm = config.readBoolEntry( "AMPM", TRUE );
int count=0;
@@ -180,20 +184,24 @@ 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>";
}
@@ -201,6 +209,10 @@ void Today::getDates()
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)
{
@@ -230,7 +242,6 @@ void Today::getDates()
/*
* Parse in the todolist.xml
- *
*/
QList<TodoItem> Today::loadTodo(const char *filename)
{
@@ -262,7 +273,8 @@ QList<TodoItem> Today::loadTodo(const char *filename)
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
@@ -27,7 +27,8 @@
#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
-//#include <qscrollview.h>
+#include <qscrollview.h>
+#include <qvbox.h>
#include <qpe/resource.h>
@@ -50,22 +51,22 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
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 );
@@ -102,7 +103,7 @@ this->setPalette(pal);
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" );
@@ -111,9 +112,7 @@ 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 );
@@ -125,7 +124,6 @@ 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 );
PushButton1->setAutoDefault( TRUE );
@@ -135,34 +133,28 @@ this->setPalette(pal);
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);
}
/*
@@ -170,6 +162,5 @@ 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
@@ -29,6 +29,7 @@ public:
TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TodayBase();
+ //QScrollView* Frame4;
QFrame* Frame4;
QPushButton* DatesButton;
QLabel* DatesField;