author | harlekin <harlekin> | 2002-02-21 16:57:40 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-21 16:57:40 (UTC) |
commit | ec52599a5a9ca3397e6375b7aeb4ee391c614bfb (patch) (side-by-side diff) | |
tree | 5570c7a511f7d089e410a5fecadb2fee0fb73d63 /core | |
parent | 4c965fa187f642cb3db4cd32d70a68cfa8c41022 (diff) | |
download | opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.zip opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.tar.gz opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.tar.bz2 |
all day detection, bumped to 0.2.6
-rw-r--r-- | core/pim/today/TODO | 4 | ||||
-rw-r--r-- | core/pim/today/changelog | 6 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 43 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 16 |
5 files changed, 39 insertions, 32 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 @@ -1,17 +1,13 @@ TODO for today: * start the app on "resume" * 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,12 +1,18 @@ +0.2.6 + +* added scrollbars to dates and todo +* all day detection +* some smaller bugfixes + 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 72e8f2b..f16ddfb 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -1,10 +1,10 @@ Files: bin/today apps/Applications/today.desktop pics/today_icon.png pics/today/today_logo.png pics/today/config.png pics/today/mail.png Priority: optional Section: opie/applications Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm -Version: 0.2.5 +Version: 0.2.6 Depends: opie-base ($QPE_VERSION) License: GPL Description: today screen A short overview over current appointments and tasks. 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 @@ -180,57 +180,72 @@ void Today::getDates() // decide if to get all day or only later appointments if (!ONLY_LATER) { 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><i>" + (*it).location(); } - msg += "<BR>" + msg += "</i><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>"; + 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 + + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); + } + msg += "<BR>"; // include possible note or not if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } 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) { - msg+= "<BR>" + (*it).location(); + msg+= "<BR><i>" + (*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>"; + msg += "</i><BR>"; + + 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 + + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); + } + msg += "<BR>"; // include possible note or not if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } } } if (msg.isEmpty()) { msg = "No more appointments today"; } 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 @@ -45,35 +45,31 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo QPixmap config = Resource::loadPixmap( "today/config" ); // config icon QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon QPalette pal = this->palette(); QColor col = pal.color(QPalette::Active, QColorGroup::Background); pal.setColor(QPalette::Active, QColorGroup::Button, col); this->setPalette(pal); 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; QColorGroup cg; cg.setColor( QColorGroup::Text, white ); cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); pal2.setActive( cg ); // today logo Frame = new QLabel( this, "Frame" ); Frame->setPalette( pal2 ); Frame->setFrameShape( QFrame::StyledPanel ); Frame->setFrameShadow( QFrame::Raised ); @@ -112,75 +108,69 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) DatesButton->setPalette( pal ); DatesButton->setPixmap( datebook ); DatesButton->setFlat( TRUE ); DatesField = new QLabel( sv1->viewport(), "DatesField" ); sv1->addChild(DatesField); DatesField->setText( tr( "No appointments today" ) ); DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); // --- 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" ); MailButton->setGeometry( QRect( 2, 3, 36, 19 ) ); MailButton->setPalette( pal ); MailButton->setPixmap( mail ); MailButton->setFlat( TRUE ); MailField = new QLabel( MailFrame, "MailField" ); MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); MailField->setText( tr( "Opiemail not installed" ) ); MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); MailField->setMaximumHeight(40); MailField->setMinimumHeight(15); // --- 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" ); TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); TodoButton->setPalette( pal ); TodoButton->setPixmap( todo ); TodoButton->setFlat( TRUE ); QScrollView* sv2 = new QScrollView( Frame15 ); sv2->setResizePolicy(QScrollView::AutoOneFit); sv2->setHScrollBarMode( QScrollView::AlwaysOff ); sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); sv2->setFrameShape(QFrame::NoFrame); 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 ) ); PushButton1 = new QPushButton (Frame15, "PushButton1" ); PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) ); PushButton1->setPixmap( config ); PushButton1->setPalette( pal ); PushButton1->setAutoDefault( TRUE ); PushButton1->setFlat( TRUE ); // -- layout -- |