From ec52599a5a9ca3397e6375b7aeb4ee391c614bfb Mon Sep 17 00:00:00 2001 From: harlekin Date: Thu, 21 Feb 2002 16:57:40 +0000 Subject: all day detection, bumped to 0.2.6 --- (limited to 'core') 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: * show alarm icons on alarm events -* problems with updating - * add am/pm mode instead of 24 h, take system default * fix 23 pm bug (done??) -* scrollbar? - * qcop integration for updating events? * 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 @@ +0.2.6 + +* added scrollbars to dates and todo +* all day detection +* some smaller bugfixes + 0.2.5 * 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 Section: opie/applications Maintainer: Maximilian Reiß Architecture: arm -Version: 0.2.5 +Version: 0.2.6 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 9e5c27e..1f6f34e 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -189,15 +189,22 @@ void Today::getDates() // include location or not if (SHOW_LOCATION == 1) { - msg+= "
" + (*it).location(); + msg+= "
" + (*it).location(); } - msg += "
" + msg += "
"; - // start time of event - + TimeString::timeString(QTime((*it).event().start().time()) ) - // end time of event - + " - " + TimeString::timeString(QTime((*it).event().end().time()) ) - + "
"; + if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) + { + msg += "All day"; + } + else + { + // start time of event + msg += TimeString::timeString(QTime((*it).event().start().time()) ) + // end time of event + + " - " + TimeString::timeString(QTime((*it).event().end().time()) ); + } + msg += "
"; // include possible note or not if (SHOW_NOTES == 1) { @@ -214,14 +221,22 @@ void Today::getDates() // include location or not if (SHOW_LOCATION == 1) { - msg+= "
" + (*it).location(); + msg+= "
" + (*it).location(); } - msg += "
" - // start time of event - + TimeString::timeString(QTime((*it).event().start().time()) ) - // end time of event - + " - " + TimeString::timeString(QTime((*it).event().end().time()) ) - + "
"; + msg += "
"; + + if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) + { + msg += "All day"; + } + else + { + // start time of event + msg += TimeString::timeString(QTime((*it).event().start().time()) ) + // end time of event + + " - " + TimeString::timeString(QTime((*it).event().end().time()) ); + } + msg += "
"; // include possible note or not if (SHOW_NOTES == 1) { 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,17 +54,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) QWidget *d = QApplication::desktop(); int w=d->width(); int h=d->height(); - resize( w , h ); // not good, what happens on rotation + resize( w , h ); // hehe, qt is ... getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" ); getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); - - QVBoxLayout * layout = new QVBoxLayout(this); - - // --- logo Section --- QPalette pal2; @@ -121,15 +117,12 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // --- mail section --- MailFrame = new QFrame( this ,"MailFrame" ); - //MailFrame->setPalette( pal ); MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); - //MailFrame->setFrameShape( QScrollView::StyledPanel ); - //MailFrame->setFrameShadow( QScrollView::Sunken ); MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); MailFrame->setFrameStyle( QFrame::NoFrame ); QFrame* Line1 = new QFrame( MailFrame); - Line1->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); + Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) ); Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken ); MailButton = new QPushButton (MailFrame, "MailButton" ); @@ -148,13 +141,11 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // --- todo section -- Frame15 = new QFrame( this, "Frame15" ); - //Frame15->setFrameShape( QFrame::StyledPanel ); - //Frame15->setFrameShadow( QFrame::Sunken ); Frame15->setFrameStyle( QFrame::NoFrame ); Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); QFrame* Line2 = new QFrame( Frame15); - Line2->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) ); + Line2->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) ); Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken ); TodoButton = new QPushButton (Frame15, "TodoButton" ); @@ -171,7 +162,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) TodoField = new QLabel( sv2->viewport(), "TodoField" ); sv2->addChild(TodoField); - //TodoField->setGeometry( QRect( 40, 4, 196, 120 ) ); TodoField->setFrameShadow( QLabel::Plain ); //TodoField->setText( tr( "No current todos" ) ); TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); -- cgit v0.9.0.2