summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-02-17 18:34:25 (UTC)
committer harlekin <harlekin>2002-02-17 18:34:25 (UTC)
commit687d0c760684392c89f4e99fbf803c8f4d67b2b1 (patch) (side-by-side diff)
treebb0a80e71a3272ab222a36836cc24c9fc9471f46
parentf47194f17380a4af76d185036eff2dc4d1a44bed (diff)
downloadopie-687d0c760684392c89f4e99fbf803c8f4d67b2b1.zip
opie-687d0c760684392c89f4e99fbf803c8f4d67b2b1.tar.gz
opie-687d0c760684392c89f4e99fbf803c8f4d67b2b1.tar.bz2
new config option to decide if to show all appointments, also fixes the empty calendar part -bug-
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
@@ -49,3 +49,3 @@ int SHOW_NOTES;
// show only later dates
-int ONLY_LATER = 1;
+int ONLY_LATER;
/*
@@ -77,3 +77,4 @@ void Today::draw()
getTodo();
- QTimer::singleShot( 60*1000, this, SLOT(draw()) );
+ // how often refresh
+ QTimer::singleShot( 30*1000, this, SLOT(draw()) );
@@ -97,2 +98,4 @@ void Today::init()
SHOW_NOTES = cfg.readNumEntry("shownotes",0);
+ ONLY_LATER = cfg.readNumEntry("onlylater",1);
+
}
@@ -121,3 +124,5 @@ void Today::startConfig()
conf->SpinBox7->setValue(MAX_CHAR_CLIP);
-
+ // only later
+ conf->CheckBox3->setChecked(ONLY_LATER);
+
conf->exec();
@@ -129,3 +134,4 @@ void Today::startConfig()
int maxcharclip = conf->SpinBox7->value();
-
+ int onlylater = conf->CheckBox3->isChecked();
+
cfg.writeEntry("maxlinestask",maxlinestask);
@@ -135,2 +141,3 @@ void Today::startConfig()
cfg.writeEntry("shownotes", notes);
+ cfg.writeEntry("onlylater", onlylater);
// sync it to "disk"
@@ -171,3 +178,25 @@ void Today::getDates()
// 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 )
{
@@ -192,2 +221,7 @@ void Today::getDates()
}
+
+ if (msg.isEmpty())
+ {
+ msg = "No more appointments today";
+ }
}
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
@@ -50,3 +50,3 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
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"
@@ -62,7 +62,15 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
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") );
@@ -74,3 +82,3 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
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"
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
@@ -36,2 +36,3 @@ public:
QLabel* TextLabel5;
+ QCheckBox* CheckBox3;
QCheckBox* CheckBox2;