-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,39 +1,45 @@ +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 * autoupdates after 1 min * QCopEnvelope instead of system() * starting to use qvbox in gui 0.2.3 * the 4 am release * several bugfixes 0.2.2 * started working on calling other apps * and finished it 0.2.1 * images no more inline * config dialog 0.1.1 * started changelog. * fixed segfault on empty/nonexistant todolist.xml * better handling for file location 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 @@ -96,225 +96,240 @@ void Today::init() // how many lines should be showed in the datebook section MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5); // If location is to be showed too, 1 to activate it. SHOW_LOCATION = cfg.readNumEntry("showlocation",1); // if notes should be shown SHOW_NOTES = cfg.readNumEntry("shownotes",0); ONLY_LATER = cfg.readNumEntry("onlylater",1); } void Today::startConfig() { conf = new todayconfig ( this, "", true ); //Config cfg = new Config("today"); // read the config Config cfg("today"); cfg.setGroup("BaseConfig"); //init(); conf->SpinBox1->setValue(MAX_LINES_MEET); // location show box conf->CheckBox1->setChecked(SHOW_LOCATION); // notes show box conf->CheckBox2->setChecked(SHOW_NOTES); // task lines conf->SpinBox2->setValue(MAX_LINES_TASK); // clip when? conf->SpinBox7->setValue(MAX_CHAR_CLIP); // only later conf->CheckBox3->setChecked(ONLY_LATER); conf->exec(); int maxlinestask = conf->SpinBox2->value(); int maxmeet = conf->SpinBox1->value(); int location = conf->CheckBox1->isChecked(); int notes = conf->CheckBox2->isChecked(); int maxcharclip = conf->SpinBox7->value(); int onlylater = conf->CheckBox3->isChecked(); cfg.writeEntry("maxlinestask",maxlinestask); cfg.writeEntry("maxcharclip", maxcharclip); cfg.writeEntry("maxlinesmeet",maxmeet); cfg.writeEntry("showlocation",location); cfg.writeEntry("shownotes", notes); cfg.writeEntry("onlylater", onlylater); // sync it to "disk" cfg.write(); draw(); } /* * Get all events that are in the datebook xml file for today */ void Today::getDates() { QDate date = QDate::currentDate(); QTime time = QTime::currentTime(); QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); Config config( "qpe" ); // if 24 h format //bool ampm = config.readBoolEntry( "AMPM", TRUE ); int count=0; if ( list.count() > 0 ) { QString msg; for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) { count++; if ( count <= MAX_LINES_MEET ) { //cout << time.toString() << endl; //cout << TimeString::dateString((*it).event().end()) << endl; // 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"; } DatesField->setText(msg); } } /* * Parse in the todolist.xml */ QList<TodoItem> Today::loadTodo(const char *filename) { DOM *todo; ELE *tasks; ELE **tasklist; ATT **attlist; int i, j; char *description; int completed; int priority; TodoItem *tmp; QList<TodoItem> loadtodolist; todo = minidom_load(filename); tasks = todo->el; tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/ if(tasks) { tasklist = tasks->el; i = 0; while((tasklist) && (tasklist[i])) { attlist = tasklist[i]->at; j = 0; description = NULL; priority = -1; completed = -1; while((attlist) && (attlist[j])) { // SEGFAULT HERE WITH MORE THAN 7 ENTRIES if(!attlist[j]->name) continue; if(!strcmp(attlist[j]->name, "Description")) { description = attlist[j]->value; } // get Completed tag (0 or 1) if(!strcmp(attlist[j]->name, "Completed")) { QString s = attlist[j]->name; if(s == "Completed") { completed = QString(attlist[j]->value).toInt(); } } // get Priority (1 to 5) if(!strcmp(attlist[j]->name, "Priority")) { QString s = attlist[j]->name; if(s == "Priority") { priority = QString(attlist[j]->value).toInt(); } } j++; } if(description) { tmp = new TodoItem(description, completed, priority); loadtodolist.append(tmp); } i++; } } minidom_free(todo); return loadtodolist; } void Today::getMail() { Config cfg("opiemail"); cfg.setGroup("today"); // how many lines should be showed in the task section 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 @@ -1,203 +1,193 @@ /* * todaybase.cpp * * --------------------- * * begin : Sun 10 17:20:00 CEST 2002 * copyright : (c) 2002 by Maximilian Reiß * email : max.reiss@gmx.de * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "todaybase.h" #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> #include <qscrollview.h> #include <qvbox.h> #include <qapplication.h> #include <qpe/resource.h> /* * Constructs a TodayBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) : QWidget( parent, name, fl ) { QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook 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 ); Frame->setLineWidth( 0 ); Frame->setMaximumHeight(50); Frame->setMinimumHeight(50); // date TextLabel1 = new QLabel( Frame, "TextLabel1" ); TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); QFont TextLabel1_font( TextLabel1->font() ); TextLabel1_font.setBold( TRUE ); TextLabel1->setFont( TextLabel1_font ); TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); TextLabel1->setTextFormat( RichText ); // --- dates section --- Frame4 = new QFrame( this, "Frame4" ); Frame4->setPalette( pal ); Frame4->setFrameShape( QScrollView::StyledPanel ); Frame4->setFrameShadow( QScrollView::Sunken ); Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); Frame4->setFrameStyle( QFrame::NoFrame ); Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) ); QScrollView* sv1 = new QScrollView( Frame4 ); sv1->setResizePolicy(QScrollView::AutoOneFit); sv1->setHScrollBarMode( QScrollView::AlwaysOff ); // need to find a better way!!! sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) ); sv1->setFrameShape(QFrame::NoFrame); DatesButton = new QPushButton (Frame4, "DatesButton" ); DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) ); DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); 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 -- layout->addWidget(Frame); layout->addWidget(Frame4); layout->addWidget(MailFrame); layout->addWidget(Frame15); layout->setStretchFactor(Frame4,5); layout->setStretchFactor(MailFrame,1); layout->setStretchFactor(Frame15,4); } /* * Destroys the object and frees any allocated resources */ TodayBase::~TodayBase() { } |