summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-02-17 18:34:25 (UTC)
committer harlekin <harlekin>2002-02-17 18:34:25 (UTC)
commit687d0c760684392c89f4e99fbf803c8f4d67b2b1 (patch) (unidiff)
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
@@ -47,7 +47,7 @@ int MAX_LINES_MEET;
47int SHOW_LOCATION; 47int SHOW_LOCATION;
48int SHOW_NOTES; 48int SHOW_NOTES;
49// show only later dates 49// show only later dates
50int ONLY_LATER = 1; 50int ONLY_LATER;
51/* 51/*
52 * Constructs a Example which is a child of 'parent', with the 52 * Constructs a Example which is a child of 'parent', with the
53 * name 'name' and widget flags set to 'f' 53 * name 'name' and widget flags set to 'f'
@@ -75,7 +75,8 @@ void Today::draw()
75 getDates(); 75 getDates();
76 getMail(); 76 getMail();
77 getTodo(); 77 getTodo();
78 QTimer::singleShot( 60*1000, this, SLOT(draw()) ); 78 // how often refresh
79 QTimer::singleShot( 30*1000, this, SLOT(draw()) );
79 80
80} 81}
81 82
@@ -95,6 +96,8 @@ void Today::init()
95 SHOW_LOCATION = cfg.readNumEntry("showlocation",1); 96 SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
96 // if notes should be shown 97 // if notes should be shown
97 SHOW_NOTES = cfg.readNumEntry("shownotes",0); 98 SHOW_NOTES = cfg.readNumEntry("shownotes",0);
99 ONLY_LATER = cfg.readNumEntry("onlylater",1);
100
98} 101}
99 102
100void Today::startConfig() 103void Today::startConfig()
@@ -119,7 +122,9 @@ void Today::startConfig()
119 conf->SpinBox2->setValue(MAX_LINES_TASK); 122 conf->SpinBox2->setValue(MAX_LINES_TASK);
120 // clip when? 123 // clip when?
121 conf->SpinBox7->setValue(MAX_CHAR_CLIP); 124 conf->SpinBox7->setValue(MAX_CHAR_CLIP);
122 125 // only later
126 conf->CheckBox3->setChecked(ONLY_LATER);
127
123 conf->exec(); 128 conf->exec();
124 129
125 int maxlinestask = conf->SpinBox2->value(); 130 int maxlinestask = conf->SpinBox2->value();
@@ -127,12 +132,14 @@ void Today::startConfig()
127 int location = conf->CheckBox1->isChecked(); 132 int location = conf->CheckBox1->isChecked();
128 int notes = conf->CheckBox2->isChecked(); 133 int notes = conf->CheckBox2->isChecked();
129 int maxcharclip = conf->SpinBox7->value(); 134 int maxcharclip = conf->SpinBox7->value();
130 135 int onlylater = conf->CheckBox3->isChecked();
136
131 cfg.writeEntry("maxlinestask",maxlinestask); 137 cfg.writeEntry("maxlinestask",maxlinestask);
132 cfg.writeEntry("maxcharclip", maxcharclip); 138 cfg.writeEntry("maxcharclip", maxcharclip);
133 cfg.writeEntry("maxlinesmeet",maxmeet); 139 cfg.writeEntry("maxlinesmeet",maxmeet);
134 cfg.writeEntry("showlocation",location); 140 cfg.writeEntry("showlocation",location);
135 cfg.writeEntry("shownotes", notes); 141 cfg.writeEntry("shownotes", notes);
142 cfg.writeEntry("onlylater", onlylater);
136 // sync it to "disk" 143 // sync it to "disk"
137 cfg.write(); 144 cfg.write();
138 145
@@ -169,7 +176,29 @@ void Today::getDates()
169 //cout << time.toString() << endl; 176 //cout << time.toString() << endl;
170 //cout << TimeString::dateString((*it).event().end()) << endl; 177 //cout << TimeString::dateString((*it).event().end()) << endl;
171 // still some bug in here, 1 h off 178 // still some bug in here, 1 h off
172 if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) 179
180 // decide if to get all day or only later appointments
181 if (!ONLY_LATER)
182 {
183 msg += "<B>" + (*it).description() + "</B>";
184 // include location or not
185 if (SHOW_LOCATION == 1)
186 {
187 msg+= "<BR>" + (*it).location();
188 }
189 msg += "<BR>"
190 // start time of event
191 + TimeString::timeString(QTime((*it).event().start().time()) )
192 // end time of event
193 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
194 + "<BR>";
195 // include possible note or not
196 if (SHOW_NOTES == 1)
197 {
198 msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
199 }
200 }
201 else if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER )
173 { 202 {
174 msg += "<B>" + (*it).description() + "</B>"; 203 msg += "<B>" + (*it).description() + "</B>";
175 // include location or not 204 // include location or not
@@ -190,6 +219,11 @@ void Today::getDates()
190 } 219 }
191 } 220 }
192 } 221 }
222
223 if (msg.isEmpty())
224 {
225 msg = "No more appointments today";
226 }
193 } 227 }
194 DatesField->setText(msg); 228 DatesField->setText(msg);
195 } 229 }
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
48 Frame8->setFrameShadow( QFrame::Raised ); 48 Frame8->setFrameShadow( QFrame::Raised );
49 49
50 TextLabel4 = new QLabel( Frame8, "TextLabel4" ); 50 TextLabel4 = new QLabel( Frame8, "TextLabel4" );
51 TextLabel4->setGeometry( QRect( 20, 89, 100, 60 ) ); 51 TextLabel4->setGeometry( QRect( 20, 65, 100, 60 ) );
52 TextLabel4->setText( tr( "Should the \n" 52 TextLabel4->setText( tr( "Should the \n"
53 "location \n" 53 "location \n"
54 "be shown?" ) ); 54 "be shown?" ) );
@@ -60,11 +60,19 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
60 60
61 CheckBox2 = new QCheckBox( Frame8, "CheckBox2" ); 61 CheckBox2 = new QCheckBox( Frame8, "CheckBox2" );
62 CheckBox2->setGeometry( QRect( 158, 170, 27, 21 ) ); 62 CheckBox2->setGeometry( QRect( 158, 170, 27, 21 ) );
63 CheckBox2->setText( tr( "" ) ); 63 //CheckBox2->setText( tr( "" ) );
64 64
65 CheckBox1 = new QCheckBox( Frame8, "CheckBox1" ); 65 CheckBox1 = new QCheckBox( Frame8, "CheckBox1" );
66 CheckBox1->setGeometry( QRect( 158, 90, 27, 50 ) ); 66 CheckBox1->setGeometry( QRect( 158, 65, 27, 50 ) );
67 CheckBox1->setText( tr( "" ) ); 67 //CheckBox1->setText( tr( "" ) );
68
69 CheckBox3 = new QCheckBox (Frame8, "CheckBox3" );
70 CheckBox3->setGeometry( QRect( 158, 125, 27, 21 ) );
71
72 TextLabel6 = new QLabel( Frame8, "All Day");
73 TextLabel6->setGeometry( QRect( 20, 120, 100, 30 ) );
74 TextLabel6->setText( tr( "Show only later\n"
75 "appointments") );
68 76
69 SpinBox1 = new QSpinBox( Frame8, "SpinBox1" ); 77 SpinBox1 = new QSpinBox( Frame8, "SpinBox1" );
70 SpinBox1->setGeometry( QRect( 115, 20, 58, 25 ) ); 78 SpinBox1->setGeometry( QRect( 115, 20, 58, 25 ) );
@@ -72,7 +80,7 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags
72 SpinBox1->setValue( 5 ); 80 SpinBox1->setValue( 5 );
73 81
74 TextLabel3 = new QLabel( Frame8, "TextLabel3" ); 82 TextLabel3 = new QLabel( Frame8, "TextLabel3" );
75 TextLabel3->setGeometry( QRect( 20, 10, 90, 70 ) ); 83 TextLabel3->setGeometry( QRect( 20, 10, 90, 60 ) );
76 TextLabel3->setText( tr( "How many \n" 84 TextLabel3->setText( tr( "How many \n"
77 "appointment\n" 85 "appointment\n"
78 "should should \n" 86 "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:
34 QFrame* Frame8; 34 QFrame* Frame8;
35 QLabel* TextLabel4; 35 QLabel* TextLabel4;
36 QLabel* TextLabel5; 36 QLabel* TextLabel5;
37 QCheckBox* CheckBox3;
37 QCheckBox* CheckBox2; 38 QCheckBox* CheckBox2;
38 QCheckBox* CheckBox1; 39 QCheckBox* CheckBox1;
39 QSpinBox* SpinBox1; 40 QSpinBox* SpinBox1;