summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/TODO4
-rw-r--r--core/pim/today/changelog6
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/today.cpp35
-rw-r--r--core/pim/today/todaybase.cpp16
5 files changed, 35 insertions, 28 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 95b9b51..5876e2b 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -4,14 +4,10 @@ TODO for today:
4 4
5* show alarm icons on alarm events 5* show alarm icons on alarm events
6 6
7* problems with updating
8
9* add am/pm mode instead of 24 h, take system default 7* add am/pm mode instead of 24 h, take system default
10 8
11 * fix 23 pm bug (done??) 9 * fix 23 pm bug (done??)
12 10
13* scrollbar?
14
15* qcop integration for updating events? 11* qcop integration for updating events?
16 12
17* sort todos by pri. \ No newline at end of file 13* sort todos by pri. \ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 3f99052..692c0dc 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,3 +1,9 @@
10.2.6
2
3* added scrollbars to dates and todo
4* all day detection
5* some smaller bugfixes
6
10.2.5 70.2.5
2 8
3* some other minor fixes regarding autoupdate 9* some other minor fixes regarding autoupdate
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 72e8f2b..f16ddfb 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -3,7 +3,7 @@ Priority: optional
3Section: opie/applications 3Section: opie/applications
4Maintainer: Maximilian Reiß <max.reiss@gmx.de> 4Maintainer: Maximilian Reiß <max.reiss@gmx.de>
5Architecture: arm 5Architecture: arm
6Version: 0.2.5 6Version: 0.2.6
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
8License: GPL 8License: GPL
9Description: today screen 9Description: today screen
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 9e5c27e..1f6f34e 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -189,15 +189,22 @@ void Today::getDates()
189 // include location or not 189 // include location or not
190 if (SHOW_LOCATION == 1) 190 if (SHOW_LOCATION == 1)
191 { 191 {
192 msg+= "<BR>" + (*it).location(); 192 msg+= "<BR><i>" + (*it).location();
193 } 193 }
194 msg += "<BR>" 194 msg += "</i><BR>";
195 195
196 if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") )
197 {
198 msg += "All day";
199 }
200 else
201 {
196 // start time of event 202 // start time of event
197 + TimeString::timeString(QTime((*it).event().start().time()) ) 203 msg += TimeString::timeString(QTime((*it).event().start().time()) )
198 // end time of event 204 // end time of event
199 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) 205 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
200 + "<BR>"; 206 }
207 msg += "<BR>";
201 // include possible note or not 208 // include possible note or not
202 if (SHOW_NOTES == 1) 209 if (SHOW_NOTES == 1)
203 { 210 {
@@ -214,14 +221,22 @@ void Today::getDates()
214 // include location or not 221 // include location or not
215 if (SHOW_LOCATION == 1) 222 if (SHOW_LOCATION == 1)
216 { 223 {
217 msg+= "<BR>" + (*it).location(); 224 msg+= "<BR><i>" + (*it).location();
218 } 225 }
219 msg += "<BR>" 226 msg += "</i><BR>";
227
228 if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") )
229 {
230 msg += "All day";
231 }
232 else
233 {
220 // start time of event 234 // start time of event
221 + TimeString::timeString(QTime((*it).event().start().time()) ) 235 msg += TimeString::timeString(QTime((*it).event().start().time()) )
222 // end time of event 236 // end time of event
223 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) 237 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
224 + "<BR>"; 238 }
239 msg += "<BR>";
225 // include possible note or not 240 // include possible note or not
226 if (SHOW_NOTES == 1) 241 if (SHOW_NOTES == 1)
227 { 242 {
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index ff6001a..5c1dc24 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -54,18 +54,14 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
54 QWidget *d = QApplication::desktop(); 54 QWidget *d = QApplication::desktop();
55 int w=d->width(); 55 int w=d->width();
56 int h=d->height(); 56 int h=d->height();
57 resize( w , h ); // not good, what happens on rotation 57 resize( w , h );
58 58
59 // hehe, qt is ... 59 // hehe, qt is ...
60 getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" ); 60 getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" );
61 getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); 61 getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
62 62
63
64
65 QVBoxLayout * layout = new QVBoxLayout(this); 63 QVBoxLayout * layout = new QVBoxLayout(this);
66 64
67
68
69 // --- logo Section --- 65 // --- logo Section ---
70 QPalette pal2; 66 QPalette pal2;
71 QColorGroup cg; 67 QColorGroup cg;
@@ -121,15 +117,12 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
121 117
122 // --- mail section --- 118 // --- mail section ---
123 MailFrame = new QFrame( this ,"MailFrame" ); 119 MailFrame = new QFrame( this ,"MailFrame" );
124 //MailFrame->setPalette( pal );
125 MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); 120 MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
126 //MailFrame->setFrameShape( QScrollView::StyledPanel );
127 //MailFrame->setFrameShadow( QScrollView::Sunken );
128 MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); 121 MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) );
129 MailFrame->setFrameStyle( QFrame::NoFrame ); 122 MailFrame->setFrameStyle( QFrame::NoFrame );
130 123
131 QFrame* Line1 = new QFrame( MailFrame); 124 QFrame* Line1 = new QFrame( MailFrame);
132 Line1->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); 125 Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
133 Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken ); 126 Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
134 127
135 MailButton = new QPushButton (MailFrame, "MailButton" ); 128 MailButton = new QPushButton (MailFrame, "MailButton" );
@@ -148,13 +141,11 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
148 141
149 // --- todo section -- 142 // --- todo section --
150 Frame15 = new QFrame( this, "Frame15" ); 143 Frame15 = new QFrame( this, "Frame15" );
151 //Frame15->setFrameShape( QFrame::StyledPanel );
152 //Frame15->setFrameShadow( QFrame::Sunken );
153 Frame15->setFrameStyle( QFrame::NoFrame ); 144 Frame15->setFrameStyle( QFrame::NoFrame );
154 Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); 145 Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) );
155 146
156 QFrame* Line2 = new QFrame( Frame15); 147 QFrame* Line2 = new QFrame( Frame15);
157 Line2->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); 148 Line2->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
158 Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken ); 149 Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken );
159 150
160 TodoButton = new QPushButton (Frame15, "TodoButton" ); 151 TodoButton = new QPushButton (Frame15, "TodoButton" );
@@ -171,7 +162,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
171 162
172 TodoField = new QLabel( sv2->viewport(), "TodoField" ); 163 TodoField = new QLabel( sv2->viewport(), "TodoField" );
173 sv2->addChild(TodoField); 164 sv2->addChild(TodoField);
174 //TodoField->setGeometry( QRect( 40, 4, 196, 120 ) );
175 TodoField->setFrameShadow( QLabel::Plain ); 165 TodoField->setFrameShadow( QLabel::Plain );
176 //TodoField->setText( tr( "No current todos" ) ); 166 //TodoField->setText( tr( "No current todos" ) );
177 TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); 167 TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );