summaryrefslogtreecommitdiff
Unidiff
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
@@ -4,7 +4,9 @@ TODO for today:
4 4
5* autoupdate 5* show alarm icons on alarm events
6 6
7 * fix 23 pm bug (done??) 7* problems with updating
8
9* add am/pm mode instead of 24 h, take system default
8 10
9* add mail support 11 * fix 23 pm bug (done??)
10 12
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 +1,10 @@
10.2.5
2
3* some other minor fixes regarding autoupdate
4* fixed segfault with todolist > 7 entries
5* fixed the "ugly grey border around buttons" issue
6* fixed the "empty calendar field" "bug"
7* shown only later appointments as option
8
9
10.2.4 100.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
@@ -5,3 +5,3 @@ Maintainer: Maximilian Reiß <max.reiss@gmx.de>
5Architecture: arm 5Architecture: arm
6Version: 0.2.4 6Version: 0.2.5
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
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
@@ -28,2 +28,3 @@
28#include <qpe/qprocess.h> 28#include <qpe/qprocess.h>
29#include <qpe/resource.h>
29 30
@@ -38,2 +39,3 @@
38#include <qtimer.h> 39#include <qtimer.h>
40#include <qpixmap.h>
39 41
@@ -60,8 +62,3 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
60 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); 62 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
61 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); 63 QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
62
63 QDate date = QDate::currentDate();
64 QString time = (date.toString());
65 TextLabel1->setText(time);
66 db = new DateBookDB;
67 64
@@ -78,3 +75,3 @@ void Today::draw()
78 // how often refresh 75 // how often refresh
79 QTimer::singleShot( 30*1000, this, SLOT(draw()) ); 76 QTimer::singleShot( 5*1000, this, SLOT(draw()) );
80 77
@@ -84,2 +81,8 @@ void Today::init()
84{ 81{
82 QDate date = QDate::currentDate();
83 QString time = (date.toString());
84
85 TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>");
86 db = new DateBookDB;
87
85 // read config 88 // read config
@@ -149,2 +152,3 @@ void Today::startConfig()
149 152
153
150/* 154/*
@@ -160,3 +164,3 @@ void Today::getDates()
160 // if 24 h format 164 // if 24 h format
161 // bool ampm = config.readBoolEntry( "AMPM", TRUE ); 165 //bool ampm = config.readBoolEntry( "AMPM", TRUE );
162 166
@@ -182,16 +186,20 @@ void Today::getDates()
182 { 186 {
183 msg += "<B>" + (*it).description() + "</B>"; 187 msg += "<B>" + (*it).description() + "</B>";
184 // include location or not 188 if ( (*it).event().hasAlarm() )
185 if (SHOW_LOCATION == 1) 189 {
186 { 190 msg += " <b>[with alarm]</b>";
191 }
192 // include location or not
193 if (SHOW_LOCATION == 1)
194 {
187 msg+= "<BR>" + (*it).location(); 195 msg+= "<BR>" + (*it).location();
188 } 196 }
189 msg += "<BR>" 197 msg += "<BR>"
190 // start time of event 198 // start time of event
191 + TimeString::timeString(QTime((*it).event().start().time()) ) 199 + TimeString::timeString(QTime((*it).event().start().time()) )
192 // end time of event 200 // end time of event
193 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) 201 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
194 + "<BR>"; 202 + "<BR>";
195 // include possible note or not 203 // include possible note or not
196 if (SHOW_NOTES == 1) 204 if (SHOW_NOTES == 1)
197 { 205 {
@@ -203,2 +211,6 @@ void Today::getDates()
203 msg += "<B>" + (*it).description() + "</B>"; 211 msg += "<B>" + (*it).description() + "</B>";
212 if ( (*it).event().hasAlarm() )
213 {
214 msg += " <b>[with alarm]</b>";
215 }
204 // include location or not 216 // include location or not
@@ -232,3 +244,2 @@ void Today::getDates()
232 * Parse in the todolist.xml 244 * Parse in the todolist.xml
233 *
234 */ 245 */
@@ -264,3 +275,4 @@ QList<TodoItem> Today::loadTodo(const char *filename)
264 { 275 {
265 if(!attlist[i]->name) continue; 276 // SEGFAULT HERE WITH MORE THAN 7 ENTRIES
277 if(!attlist[j]->name) continue;
266 if(!strcmp(attlist[j]->name, "Description")) 278 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
@@ -29,3 +29,4 @@
29#include <qpixmap.h> 29#include <qpixmap.h>
30//#include <qscrollview.h> 30#include <qscrollview.h>
31#include <qvbox.h>
31 32
@@ -52,13 +53,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
52 53
53QPalette pal2; 54 QPalette pal2;
54 QColorGroup cg; 55 QColorGroup cg;
55 cg.setColor( QColorGroup::Text, white ); 56 cg.setColor( QColorGroup::Text, white );
56 cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); 57 cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
57 pal2.setActive( cg ); 58 pal2.setActive( cg );
58 59
59 60
60QPalette pal = this->palette(); 61 QPalette pal = this->palette();
61QColor col = pal.color(QPalette::Active, QColorGroup::Background); 62 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
62pal.setColor(QPalette::Active, QColorGroup::Button, col); 63 pal.setColor(QPalette::Active, QColorGroup::Button, col);
63this->setPalette(pal); 64 this->setPalette(pal);
64 65
@@ -66,4 +67,4 @@ this->setPalette(pal);
66 67
67
68 Frame4 = new QFrame( this, "Frame4" ); 68 Frame4 = new QFrame( this, "Frame4" );
69 Frame4->setPalette( pal );
69 Frame4->setFrameShape( QScrollView::StyledPanel ); 70 Frame4->setFrameShape( QScrollView::StyledPanel );
@@ -104,3 +105,3 @@ this->setPalette(pal);
104 TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); 105 TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
105 TextLabel1->setTextFormat( QLabel::AutoText ); 106 TextLabel1->setTextFormat( RichText );
106 107
@@ -113,5 +114,3 @@ this->setPalette(pal);
113 TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); 114 TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
114 //TodoButton->setBackgroundMode(NoBackground);
115 TodoButton->setPalette( pal ); 115 TodoButton->setPalette( pal );
116 //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
117 TodoButton->setPixmap( todo ); 116 TodoButton->setPixmap( todo );
@@ -127,3 +126,2 @@ this->setPalette(pal);
127 PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 126 PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) );
128 //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin );
129 PushButton1->setPixmap( config ); 127 PushButton1->setPixmap( config );
@@ -137,7 +135,5 @@ this->setPalette(pal);
137 MailFrame->setFrameShadow( QScrollView::Sunken ); 135 MailFrame->setFrameShadow( QScrollView::Sunken );
138 //MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); 136
139
140 MailButton = new QPushButton (MailFrame, "MailButton" ); 137 MailButton = new QPushButton (MailFrame, "MailButton" );
141 MailButton->setGeometry( QRect( 2, 10, 36, 19 ) ); 138 MailButton->setGeometry( QRect( 2, 3, 36, 19 ) );
142 //MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
143 MailButton->setPalette( pal ); 139 MailButton->setPalette( pal );
@@ -147,10 +143,7 @@ this->setPalette(pal);
147 MailField = new QLabel( MailFrame, "DatesField" ); 143 MailField = new QLabel( MailFrame, "DatesField" );
148 MailField->setGeometry( QRect( 40, 10, 203, 120 ) ); 144 MailField->setGeometry( QRect( 40, 4, 203, 120 ) );
149 MailField->setText( tr( "Opiemail not installed" ) ); 145 MailField->setText( tr( "Opiemail not installed" ) );
150 MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); 146 MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
151 MailField->setMaximumHeight(15); 147 MailField->setMaximumHeight(40);
152 MailField->setMinimumHeight(10); 148 MailField->setMinimumHeight(30);
153
154
155
156 149
@@ -160,7 +153,6 @@ this->setPalette(pal);
160 layout->addWidget(Frame15); 153 layout->addWidget(Frame15);
161 //layout->addWidget(split);
162 154
163 layout->setStretchFactor(Frame4,4); 155 layout->setStretchFactor(Frame4,5);
164 layout->setStretchFactor(MailFrame,1); 156 layout->setStretchFactor(MailFrame,1);
165 layout->setStretchFactor(Frame15,3); 157 layout->setStretchFactor(Frame15,4);
166} 158}
@@ -172,3 +164,2 @@ TodayBase::~TodayBase()
172{ 164{
173
174} 165}
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
@@ -31,2 +31,3 @@ public:
31 31
32 //QScrollView* Frame4;
32 QFrame* Frame4; 33 QFrame* Frame4;