new config option to decide if to show all appointments, also fixes the empty calendar part -bug-

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
@@ -47,7 +47,7 @@ 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' 
@@ -75,7 +75,8 @@ void Today::draw()
   getDates();
   getMail();
   getTodo(); 
-  QTimer::singleShot( 60*1000, this, SLOT(draw()) );
+  // how often refresh
+  QTimer::singleShot( 30*1000, this, SLOT(draw()) );
 
 }
 
@@ -95,6 +96,8 @@ void Today::init()
   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() 
@@ -119,7 +122,9 @@ void Today::startConfig()
   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();
@@ -127,12 +132,14 @@ void Today::startConfig()
   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(); 
   
@@ -169,7 +176,29 @@ void Today::getDates()
           //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
@@ -190,6 +219,11 @@ void Today::getDates()
                 }
             }
         }
+      
+      if (msg.isEmpty())
+        {
+          msg = "No more appointments today";
+        }
     }
     DatesField->setText(msg);
   }
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
@@ -48,7 +48,7 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   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?" ) );
@@ -60,11 +60,19 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   
   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 ) ); 
@@ -72,7 +80,7 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   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"
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
@@ -34,6 +34,7 @@ public:
     QFrame* Frame8;
     QLabel* TextLabel4;
     QLabel* TextLabel5;
+    QCheckBox* CheckBox3;
     QCheckBox* CheckBox2;
     QCheckBox* CheckBox1;
     QSpinBox* SpinBox1;