summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-27 01:07:05 (UTC)
committer zautrix <zautrix>2004-10-27 01:07:05 (UTC)
commit4efb020e137fbb8b94d845a2aa0ffc894561aea9 (patch) (unidiff)
tree62fa8844366362ccc7b8ed87b908e0222ab9a5f9
parentba3d660ed4f856362d2b914ed744874c235b4001 (diff)
downloadkdepimpi-4efb020e137fbb8b94d845a2aa0ffc894561aea9.zip
kdepimpi-4efb020e137fbb8b94d845a2aa0ffc894561aea9.tar.gz
kdepimpi-4efb020e137fbb8b94d845a2aa0ffc894561aea9.tar.bz2
fixed wn view
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kowhatsnextview.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 59b864c..0f0bf11 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,21 +65,28 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
65 // new QLabel(KGlobal::locale()->formatDate(QDate::currentDate()),this); 65 // new QLabel(KGlobal::locale()->formatDate(QDate::currentDate()),this);
66 // mDateLabel->setMargin(2); 66 // mDateLabel->setMargin(2);
67 // mDateLabel->setAlignment(AlignCenter); 67 // mDateLabel->setAlignment(AlignCenter);
68 setFont( KOPrefs::instance()->mWhatsNextFont ); 68 setFont( KOPrefs::instance()->mWhatsNextFont );
69 mView = new WhatsNextTextBrowser(this); 69 mView = new WhatsNextTextBrowser(this);
70 connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); 70 connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
71 QStyleSheet* stsh = mView->styleSheet(); 71 QStyleSheet* stsh = mView->styleSheet();
72 QStyleSheetItem * style ; 72 QStyleSheetItem * style ;
73 73 style = stsh->item ("a" );
74 if ( style ) {
75 style->setMargin(QStyleSheetItem::MarginAll,0);
76 }
74 style = stsh->item ("h2" ); 77 style = stsh->item ("h2" );
75 if ( style ) { 78 if ( style ) {
76 style->setMargin(QStyleSheetItem::MarginAll,0); 79 style->setMargin(QStyleSheetItem::MarginAll,0);
77 } 80 }
81 style = stsh->item ("h3" );
82 if ( style ) {
83 style->setMargin(QStyleSheetItem::MarginAll,0);
84 }
78 style = stsh->item ("table" ); 85 style = stsh->item ("table" );
79 if ( style ) { 86 if ( style ) {
80 style->setMargin(QStyleSheetItem::MarginAll,0); 87 style->setMargin(QStyleSheetItem::MarginAll,0);
81 } 88 }
82 mEventViewer = 0; 89 mEventViewer = 0;
83 90
84 QBoxLayout *topLayout = new QVBoxLayout(this); 91 QBoxLayout *topLayout = new QVBoxLayout(this);
85 // topLayout->addWidget(mDateLabel); 92 // topLayout->addWidget(mDateLabel);
@@ -259,17 +266,17 @@ void KOWhatsNextView::updateView()
259 //mText += "<ul>\n"; 266 //mText += "<ul>\n";
260 bool gotone = false; 267 bool gotone = false;
261 int priority = 1; 268 int priority = 1;
262 int priosFound = 0; 269 int priosFound = 0;
263#ifdef DESKTOP_VERSION 270#ifdef DESKTOP_VERSION
264 mText +="<p></p>"; 271 mText +="<p></p>";
265#endif 272#endif
266 273
267 mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Incomplete Todo:") + "</font></em></strong></big></big>\n"; 274 mText +="<h2><em><font color=\"#000080\">" + i18n("Incomplete Todo:") + "</font></em></h2>\n";
268 mText += "<ul>\n"; 275 mText += "<ul>\n";
269 while (!gotone && priority<6) { 276 while (!gotone && priority<6) {
270 todo = todos.first(); 277 todo = todos.first();
271 while(todo) { 278 while(todo) {
272 if (!todo->isCompleted() && (todo->priority() == priority) ) { 279 if (!todo->isCompleted() && (todo->priority() == priority) ) {
273 if ( appendTodo(todo) ) 280 if ( appendTodo(todo) )
274 gotone = true; 281 gotone = true;
275 } 282 }
@@ -298,17 +305,17 @@ void KOWhatsNextView::updateView()
298 if (replys == 0) { 305 if (replys == 0) {
299 mText += "<p></p>"; 306 mText += "<p></p>";
300 // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); 307 // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath);
301 //mText += "<h2>"; 308 //mText += "<h2>";
302 //<img src=\""; 309 //<img src=\"";
303 // mText += ipath; 310 // mText += ipath;
304 // mText += "\">"; 311 // mText += "\">";
305 //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; 312 //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n";
306 mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; 313 mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
307 mText += "<table>\n"; 314 mText += "<table>\n";
308 } 315 }
309 replys++; 316 replys++;
310 appendEvent(ev,true); 317 appendEvent(ev,true);
311 } 318 }
312 } 319 }
313 ev = events.next(); 320 ev = events.next();
314 } 321 }
@@ -317,17 +324,17 @@ void KOWhatsNextView::updateView()
317 if (todos.count() > 0) { 324 if (todos.count() > 0) {
318 Todo *to = todos.first(); 325 Todo *to = todos.first();
319 while(to) { 326 while(to) {
320 if ( !to->isCompleted() ){ 327 if ( !to->isCompleted() ){
321 Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); 328 Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
322 if (me!=0) { 329 if (me!=0) {
323 if (me->status()==Attendee::NeedsAction && me->RSVP()) { 330 if (me->status()==Attendee::NeedsAction && me->RSVP()) {
324 if (replys == 0) { 331 if (replys == 0) {
325 mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; 332 mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
326 mText += "<table>\n"; 333 mText += "<table>\n";
327 } 334 }
328 replys++; 335 replys++;
329 appendEvent(to, true); 336 appendEvent(to, true);
330 } 337 }
331 } 338 }
332 } 339 }
333 to = todos.next(); 340 to = todos.next();
@@ -360,18 +367,18 @@ void KOWhatsNextView::appendDay( int i, QDate eventDate )
360 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { 367 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
361 if ( i == 0 ) { 368 if ( i == 0 ) {
362 mText += "<table>\n"; 369 mText += "<table>\n";
363 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; 370 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>";
364 } 371 }
365 else if ( i == 1 ) 372 else if ( i == 1 )
366 date = "<em><font color=\"#000080\">" + day + "</font></em>" ; 373 date = "<em><font color=\"#000080\">" + day + "</font></em>" ;
367 else date = "<em><font color=\"#000080\">" + day + "</font></em>"; 374 else date = "<em><font color=\"#000080\">" + day + "</font></em>";
368 //mText += "<h2>" + date + "</h2>\n"; 375 mText += "<h2>" + date + "</h2>\n";
369 mText += "<big><big><strong>" + date + "</strong></big></big>\n"; 376 //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
370 mText += "<table>\n"; 377 mText += "<table>\n";
371 378
372 379
373 380
374 } else { 381 } else {
375 if ( i == 0 ) { 382 if ( i == 0 ) {
376 mText += "<table>\n"; 383 mText += "<table>\n";
377 return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>"; 384 return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>";
@@ -384,18 +391,18 @@ void KOWhatsNextView::appendDay( int i, QDate eventDate )
384 else date = "<h2><em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em></h2>"; 391 else date = "<h2><em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em></h2>";
385#else 392#else
386 else if ( i == 1 ) { 393 else if ( i == 1 ) {
387 date = "<em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em>" ; 394 date = "<em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em>" ;
388 } 395 }
389 else date = "<em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em>"; 396 else date = "<em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em>";
390 397
391#endif 398#endif
392 //mText += "<h2>" + date + "</h2>\n"; 399 mText += "<h2>" + date + "</h2>\n";
393 mText += "<big><big><strong>" + date + "</strong></big></big>\n"; 400 //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
394 mText += "<table>\n"; 401 mText += "<table>\n";
395 } 402 }
396} 403}
397 404
398 405
399void KOWhatsNextView::showDates(const QDate &, const QDate &) 406void KOWhatsNextView::showDates(const QDate &, const QDate &)
400{ 407{
401 updateView(); 408 updateView();