author | zautrix <zautrix> | 2005-06-04 10:29:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-04 10:29:18 (UTC) |
commit | a7939017000e165e711e3f0cffeab46852a9fb2e (patch) (unidiff) | |
tree | 6b1c0d44051039e47f7b7f6cf55e25af9a6e7024 | |
parent | d40cf5135c640506011334364274b8ee5df9998b (diff) | |
download | kdepimpi-a7939017000e165e711e3f0cffeab46852a9fb2e.zip kdepimpi-a7939017000e165e711e3f0cffeab46852a9fb2e.tar.gz kdepimpi-a7939017000e165e711e3f0cffeab46852a9fb2e.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/korganizer/ic_family.png | bin | 0 -> 7865 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/ic_female.png | bin | 0 -> 6234 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/ic_kids.png | bin | 0 -> 9039 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/ic_male.png | bin | 0 -> 6440 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/ic_penguin.png | bin | 0 -> 5343 bytes | |||
-rw-r--r-- | korganizer/calendarview.cpp | 28 |
6 files changed, 21 insertions, 7 deletions
diff --git a/bin/kdepim/korganizer/ic_family.png b/bin/kdepim/korganizer/ic_family.png new file mode 100644 index 0000000..6b0dec6 --- a/dev/null +++ b/bin/kdepim/korganizer/ic_family.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/ic_female.png b/bin/kdepim/korganizer/ic_female.png new file mode 100644 index 0000000..74deae4 --- a/dev/null +++ b/bin/kdepim/korganizer/ic_female.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/ic_kids.png b/bin/kdepim/korganizer/ic_kids.png new file mode 100644 index 0000000..fdbdabc --- a/dev/null +++ b/bin/kdepim/korganizer/ic_kids.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/ic_male.png b/bin/kdepim/korganizer/ic_male.png new file mode 100644 index 0000000..f22eaab --- a/dev/null +++ b/bin/kdepim/korganizer/ic_male.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/ic_penguin.png b/bin/kdepim/korganizer/ic_penguin.png new file mode 100644 index 0000000..a78da37 --- a/dev/null +++ b/bin/kdepim/korganizer/ic_penguin.png | |||
Binary files differ | |||
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 42166ab..608b73b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -121,105 +121,112 @@ | |||
121 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
122 | #include <qtopia/alarmserver.h> | 122 | #include <qtopia/alarmserver.h> |
123 | #endif | 123 | #endif |
124 | #ifndef _WIN32_ | 124 | #ifndef _WIN32_ |
125 | #include <stdlib.h> | 125 | #include <stdlib.h> |
126 | #include <stdio.h> | 126 | #include <stdio.h> |
127 | #include <unistd.h> | 127 | #include <unistd.h> |
128 | #else | 128 | #else |
129 | #include <qprocess.h> | 129 | #include <qprocess.h> |
130 | #endif | 130 | #endif |
131 | 131 | ||
132 | #ifdef DESKTOP_VERSION | 132 | #ifdef DESKTOP_VERSION |
133 | #include <kabc/stdaddressbook.h> | 133 | #include <kabc/stdaddressbook.h> |
134 | #endif | 134 | #endif |
135 | using namespace KOrg; | 135 | using namespace KOrg; |
136 | using namespace KCal; | 136 | using namespace KCal; |
137 | extern int globalFlagBlockAgenda; | 137 | extern int globalFlagBlockAgenda; |
138 | extern int globalFlagBlockStartup; | 138 | extern int globalFlagBlockStartup; |
139 | 139 | ||
140 | 140 | ||
141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) | 141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) |
142 | 142 | ||
143 | { | 143 | { |
144 | mAlarms = alarms; | 144 | mAlarms = alarms; |
145 | setBackgroundColor( QColor( 86, 153, 205 ) ); | 145 | viewport()->setBackgroundColor( QColor( 255, 255, 255 ) ); |
146 | QString mText = "<table width=\"100%\">\n"; | 146 | QString mText = "<table width=\"100%\">\n"; |
147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
148 | #ifdef DESKTOP_VERSION | 148 | #ifdef DESKTOP_VERSION |
149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; | 149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; |
150 | #else | 150 | #else |
151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>"; | 151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>"; |
152 | #endif | 152 | #endif |
153 | // mText += "<img src=\""; | 153 | // mText += "<img src=\""; |
154 | // mText += ipath; | 154 | // mText += ipath; |
155 | // mText += "\">"; | 155 | // mText += "\">"; |
156 | //mEventDate = QDate::currentDate(); | 156 | //mEventDate = QDate::currentDate(); |
157 | #ifdef DESKTOP_VERSION | 157 | #ifdef DESKTOP_VERSION |
158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; | 158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; |
159 | #else | 159 | #else |
160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>"; | 160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>"; |
161 | #endif | 161 | #endif |
162 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; | 162 | //mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; |
163 | 163 | ||
164 | Incidence * inc = getNextInc( start ); | 164 | Incidence * inc = getNextInc( start ); |
165 | int time = 0; | 165 | int time = 0; |
166 | mText += "<table>"; | 166 | //mText += "<table>"; |
167 | while ( inc ) { | 167 | while ( inc ) { |
168 | QDateTime dt ; | 168 | QDateTime dt ; |
169 | QString tempText = "<a "; | 169 | QString tempText = "<a "; |
170 | bool ok; | 170 | bool ok; |
171 | dt = inc->getNextOccurence( start, &ok ); | 171 | dt = inc->getNextOccurence( start, &ok ); |
172 | if ( !ok ) continue; | 172 | if ( !ok ) continue; |
173 | if ( inc->type() == "Event" ) { | 173 | if ( inc->type() == "Event" ) { |
174 | tempText += "href=\"event:"; | 174 | tempText += "href=\"event:"; |
175 | } else if ( inc->type() == "Todo" ) { | 175 | } else if ( inc->type() == "Todo" ) { |
176 | tempText += "href=\"todo:"; | 176 | tempText += "href=\"todo:"; |
177 | } | 177 | } |
178 | tempText += inc->uid() + "\">"; | 178 | tempText += inc->uid() + "\">"; |
179 | if ( inc->type() == "Todo" ) | 179 | if ( inc->type() == "Todo" ) |
180 | tempText += i18n("Todo: "); | 180 | tempText += i18n("Todo: "); |
181 | if ( inc->summary().length() > 0 ) | 181 | if ( inc->summary().length() > 0 ) |
182 | tempText += inc->summary(); | 182 | tempText += inc->summary(); |
183 | else | 183 | else |
184 | tempText += i18n("-no summary-"); | 184 | tempText += i18n("-no summary-"); |
185 | QString timestr; | 185 | QString timestr; |
186 | if (!inc->doesFloat()) | 186 | if (!inc->doesFloat()) |
187 | timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": "; | 187 | timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": "; |
188 | else | 188 | else |
189 | timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 189 | timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
190 | if ( dt.date() == QDate::currentDate() && time == 0 ) { | 190 | if ( dt.date() < QDate::currentDate() && time == 0 ) { |
191 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; | ||
192 | mText += "<table>"; | ||
191 | time = 1; | 193 | time = 1; |
194 | } | ||
195 | if ( dt.date() == QDate::currentDate() && time <= 1 ) { | ||
196 | if ( time > 0 ) | ||
192 | mText +="</table>"; | 197 | mText +="</table>"; |
193 | mText += "</td></tr>\n<tr bgcolor=\"#FFDC64\"><td>"; | 198 | mText += "</td></tr>\n<tr bgcolor=\"#FFDC64\"><td>"; |
194 | mText += "<table>"; | 199 | mText += "<table>"; |
200 | time = 2; | ||
195 | 201 | ||
196 | } | 202 | } |
197 | if ( dt.date() > QDate::currentDate() && time != 2 ) { | 203 | if ( dt.date() > QDate::currentDate() && time <= 2 ) { |
198 | time = 2; | 204 | if ( time > 0 ) |
199 | mText +="</table>"; | 205 | mText +="</table>"; |
200 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; | 206 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; |
201 | mText += "<table>"; | 207 | mText += "<table>"; |
208 | time = 3; | ||
202 | } | 209 | } |
203 | mText +="<tr><td><b>"; | 210 | mText +="<tr><td><b>"; |
204 | mText += timestr; | 211 | mText += timestr; |
205 | mText += "</b></td><td>"; | 212 | mText += "</b></td><td>"; |
206 | mText += tempText; | 213 | mText += tempText; |
207 | mText += "</td></tr>\n"; | 214 | mText += "</td></tr>\n"; |
208 | inc = getNextInc( start ); | 215 | inc = getNextInc( start ); |
209 | } | 216 | } |
210 | mText +="</table>"; | 217 | mText +="</table>"; |
211 | setText( mText ); | 218 | setText( mText ); |
212 | } | 219 | } |
213 | 220 | ||
214 | MissedAlarmTextBrowser::~MissedAlarmTextBrowser() | 221 | MissedAlarmTextBrowser::~MissedAlarmTextBrowser() |
215 | { | 222 | { |
216 | //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); | 223 | //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); |
217 | } | 224 | } |
218 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) | 225 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) |
219 | { | 226 | { |
220 | QDateTime dt ; | 227 | QDateTime dt ; |
221 | Incidence * retInc; | 228 | Incidence * retInc; |
222 | Incidence * inc = mAlarms.first(); | 229 | Incidence * inc = mAlarms.first(); |
223 | if ( inc == 0 ) | 230 | if ( inc == 0 ) |
224 | return 0; | 231 | return 0; |
225 | bool ok; | 232 | bool ok; |
@@ -613,80 +620,87 @@ void CalendarView::init() | |||
613 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 620 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
614 | #endif | 621 | #endif |
615 | mDateNavigator->setCalendar( mCalendar ); | 622 | mDateNavigator->setCalendar( mCalendar ); |
616 | } | 623 | } |
617 | 624 | ||
618 | 625 | ||
619 | CalendarView::~CalendarView() | 626 | CalendarView::~CalendarView() |
620 | { | 627 | { |
621 | // kdDebug() << "~CalendarView()" << endl; | 628 | // kdDebug() << "~CalendarView()" << endl; |
622 | //qDebug("CalendarView::~CalendarView() "); | 629 | //qDebug("CalendarView::~CalendarView() "); |
623 | delete mDialogManager; | 630 | delete mDialogManager; |
624 | delete mViewManager; | 631 | delete mViewManager; |
625 | delete mStorage; | 632 | delete mStorage; |
626 | delete mDateFrame ; | 633 | delete mDateFrame ; |
627 | delete beamDialog; | 634 | delete beamDialog; |
628 | delete mEventViewerDialog; | 635 | delete mEventViewerDialog; |
629 | //kdDebug() << "~CalendarView() done" << endl; | 636 | //kdDebug() << "~CalendarView() done" << endl; |
630 | } | 637 | } |
631 | void CalendarView::checkAlarms() | 638 | void CalendarView::checkAlarms() |
632 | { | 639 | { |
633 | KConfig *config = KOGlobals::config(); | 640 | KConfig *config = KOGlobals::config(); |
634 | config->setGroup( "AppRun" ); | 641 | config->setGroup( "AppRun" ); |
635 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 642 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
636 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; | 643 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; |
637 | secs -= ( 3600 * 24*3 ); // debug only | 644 | //secs -= ( 3600 * 24*3 ); // debug only |
638 | QDateTime latest = dt.addSecs ( secs ); | 645 | QDateTime latest = dt.addSecs ( secs ); |
639 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 646 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
640 | QPtrList<Incidence> el = mCalendar->rawIncidences(); | 647 | QPtrList<Incidence> el = mCalendar->rawIncidences(); |
641 | QPtrList<Incidence> al; | 648 | QPtrList<Incidence> al; |
642 | Incidence* inL = el.first(); | 649 | Incidence* inL = el.first(); |
643 | while ( inL ) { | 650 | while ( inL ) { |
644 | bool ok = false; | 651 | bool ok = false; |
645 | int offset = 0; | 652 | int offset = 0; |
646 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; | 653 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; |
647 | if ( ok ) { | 654 | if ( ok ) { |
648 | //qDebug("OK %s",next.toString().latin1()); | 655 | //qDebug("OK %s",next.toString().latin1()); |
649 | if ( next < QDateTime::currentDateTime() ) { | 656 | if ( next < QDateTime::currentDateTime() ) { |
650 | al.append( inL ); | 657 | al.append( inL ); |
651 | //qDebug("found missed alarm: %s ", inL->summary().latin1() ); | 658 | //qDebug("found missed alarm: %s ", inL->summary().latin1() ); |
652 | } | 659 | } |
653 | } | 660 | } |
654 | inL = el.next(); | 661 | inL = el.next(); |
655 | } | 662 | } |
656 | if ( al.count() ) { | 663 | if ( al.count() ) { |
657 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); | 664 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); |
658 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); | 665 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); |
659 | QVBoxLayout* lay = new QVBoxLayout( dia ); | 666 | QVBoxLayout* lay = new QVBoxLayout( dia ); |
660 | lay->setSpacing( 0 ); | 667 | lay->setSpacing( 0 ); |
661 | lay->setMargin( 0 ); | 668 | lay->setMargin( 0 ); |
662 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); | 669 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
663 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | 670 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); |
664 | lay->addWidget( matb ); | 671 | lay->addWidget( matb ); |
672 | if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) { | ||
673 | int wid = 210; | ||
674 | int x = QApplication::desktop()->width() - wid - 7; | ||
675 | int y = QApplication::desktop()->height() - wid - 70; | ||
676 | dia->setGeometry ( x,y,wid,wid); | ||
677 | } else { | ||
665 | int si = 220; | 678 | int si = 220; |
666 | if ( QApplication::desktop()->width() > 470 ) | 679 | if ( QApplication::desktop()->width() > 470 ) |
667 | si = 400; | 680 | si = 400; |
668 | dia->resize(si,si/2); | 681 | dia->resize(si,si/2); |
682 | } | ||
669 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); | 683 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); |
670 | dia->show(); | 684 | dia->show(); |
671 | 685 | ||
672 | } | 686 | } |
673 | } | 687 | } |
674 | void CalendarView::showDay( QDate d ) | 688 | void CalendarView::showDay( QDate d ) |
675 | { | 689 | { |
676 | dateNavigator()->blockSignals( true ); | 690 | dateNavigator()->blockSignals( true ); |
677 | dateNavigator()->selectDate( d ); | 691 | dateNavigator()->selectDate( d ); |
678 | dateNavigator()->blockSignals( false ); | 692 | dateNavigator()->blockSignals( false ); |
679 | mViewManager->showDayView(); | 693 | mViewManager->showDayView(); |
680 | //dateNavigator()->selectDate( d ); | 694 | //dateNavigator()->selectDate( d ); |
681 | } | 695 | } |
682 | void CalendarView::timerAlarm() | 696 | void CalendarView::timerAlarm() |
683 | { | 697 | { |
684 | //qDebug("CalendarView::timerAlarm() "); | 698 | //qDebug("CalendarView::timerAlarm() "); |
685 | computeAlarm(mAlarmNotification ); | 699 | computeAlarm(mAlarmNotification ); |
686 | } | 700 | } |
687 | 701 | ||
688 | void CalendarView::suspendAlarm() | 702 | void CalendarView::suspendAlarm() |
689 | { | 703 | { |
690 | //qDebug(" CalendarView::suspendAlarm() "); | 704 | //qDebug(" CalendarView::suspendAlarm() "); |
691 | computeAlarm(mSuspendAlarmNotification ); | 705 | computeAlarm(mSuspendAlarmNotification ); |
692 | 706 | ||