summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp44
-rw-r--r--core/pim/today/todayconfig.cpp18
-rw-r--r--core/pim/today/todayconfig.h1
3 files changed, 53 insertions, 10 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index eb8b50c..0f6e598 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -38,25 +38,25 @@
#include <qtimer.h>
//#include <iostream.h>
//#include <unistd.h>
#include <stdlib.h>
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;
int MAX_LINES_MEET;
int SHOW_LOCATION;
int SHOW_NOTES;
// show only later dates
-int ONLY_LATER = 1;
+int ONLY_LATER;
/*
* Constructs a Example which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
Today::Today( QWidget* parent, const char* name, WFlags fl )
: TodayBase( parent, name, fl )
{
QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
@@ -66,82 +66,89 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
db = new DateBookDB;
draw();
}
void Today::draw()
{
init();
getDates();
getMail();
getTodo();
- QTimer::singleShot( 60*1000, this, SLOT(draw()) );
+ // how often refresh
+ QTimer::singleShot( 30*1000, this, SLOT(draw()) );
}
void Today::init()
{
// read config
Config cfg("today");
cfg.setGroup("BaseConfig");
// how many lines should be showed in the task section
MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
// after how many chars should the be cut off on tasks and notes
MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",30);
// 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()
{
@@ -160,45 +167,72 @@ void Today::getDates()
for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
it!=list.end(); ++it ) {
count++;
if ( count <= MAX_LINES_MEET )
{
//only get events past current time (start or end??)
//cout << time.toString() << endl;
//cout << TimeString::dateString((*it).event().end()) << endl;
// still some bug in here, 1 h off
- if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER )
+
+ // decide if to get all day or only later appointments
+ if (!ONLY_LATER)
+ {
+ msg += "<B>" + (*it).description() + "</B>";
+ // include location or not
+ if (SHOW_LOCATION == 1)
+ {
+ msg+= "<BR>" + (*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>";
+ // 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())) && ONLY_LATER )
{
msg += "<B>" + (*it).description() + "</B>";
// include location or not
if (SHOW_LOCATION == 1)
{
msg+= "<BR>" + (*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>";
// 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;
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 0f00802..4f2633d 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -39,49 +39,57 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) );
TabWidget3->setAutoMask( FALSE );
TabWidget3->setTabShape( QTabWidget::Rounded );
tab = new QWidget( TabWidget3, "tab" );
Frame8 = new QFrame( tab, "Frame8" );
Frame8->setGeometry( QRect( -5, 0, 200, 300 ) );
Frame8->setFrameShape( QFrame::StyledPanel );
Frame8->setFrameShadow( QFrame::Raised );
TextLabel4 = new QLabel( Frame8, "TextLabel4" );
- TextLabel4->setGeometry( QRect( 20, 89, 100, 60 ) );
+ TextLabel4->setGeometry( QRect( 20, 65, 100, 60 ) );
TextLabel4->setText( tr( "Should the \n"
"location \n"
"be shown?" ) );
TextLabel5 = new QLabel( Frame8, "TextLabel5" );
TextLabel5->setGeometry( QRect( 20, 160, 120, 40 ) );
TextLabel5->setText( tr( "Should the notes \n"
"be shown?" ) );
CheckBox2 = new QCheckBox( Frame8, "CheckBox2" );
CheckBox2->setGeometry( QRect( 158, 170, 27, 21 ) );
- CheckBox2->setText( tr( "" ) );
+ //CheckBox2->setText( tr( "" ) );
CheckBox1 = new QCheckBox( Frame8, "CheckBox1" );
- CheckBox1->setGeometry( QRect( 158, 90, 27, 50 ) );
- CheckBox1->setText( tr( "" ) );
+ CheckBox1->setGeometry( QRect( 158, 65, 27, 50 ) );
+ //CheckBox1->setText( tr( "" ) );
+
+ CheckBox3 = new QCheckBox (Frame8, "CheckBox3" );
+ CheckBox3->setGeometry( QRect( 158, 125, 27, 21 ) );
+
+ TextLabel6 = new QLabel( Frame8, "All Day");
+ TextLabel6->setGeometry( QRect( 20, 120, 100, 30 ) );
+ TextLabel6->setText( tr( "Show only later\n"
+ "appointments") );
SpinBox1 = new QSpinBox( Frame8, "SpinBox1" );
SpinBox1->setGeometry( QRect( 115, 20, 58, 25 ) );
SpinBox1->setMaxValue( 10 );
SpinBox1->setValue( 5 );
TextLabel3 = new QLabel( Frame8, "TextLabel3" );
- TextLabel3->setGeometry( QRect( 20, 10, 90, 70 ) );
+ TextLabel3->setGeometry( QRect( 20, 10, 90, 60 ) );
TextLabel3->setText( tr( "How many \n"
"appointment\n"
"should should \n"
"be shown?" ) );
TabWidget3->insertTab( tab, tr( "Calendar" ) );
tab_2 = new QWidget( TabWidget3, "tab_2" );
Frame9 = new QFrame( tab_2, "Frame9" );
Frame9->setGeometry( QRect( -5, 0, 230, 310 ) );
Frame9->setFrameShape( QFrame::StyledPanel );
Frame9->setFrameShadow( QFrame::Raised );
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 38e9beb..7facf85 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -25,24 +25,25 @@ class todayconfig : public QDialog
{
Q_OBJECT
public:
todayconfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~todayconfig();
QTabWidget* TabWidget3;
QWidget* tab;
QFrame* Frame8;
QLabel* TextLabel4;
QLabel* TextLabel5;
+ QCheckBox* CheckBox3;
QCheckBox* CheckBox2;
QCheckBox* CheckBox1;
QSpinBox* SpinBox1;
QLabel* TextLabel3;
QWidget* tab_2;
QFrame* Frame9;
QLabel* TextLabel6;
QSpinBox* SpinBox2;
QWidget* tab_3;
QFrame* Frame14;
QLabel* TextLabel1;
QSpinBox* SpinBox7;