-rw-r--r-- | kde2file/abdump/main.cpp | 3 | ||||
-rw-r--r-- | kde2file/caldump/main.cpp | 3 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 4 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 6 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 10 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 4 | ||||
-rw-r--r-- | korganizer/koglobals.cpp | 31 | ||||
-rw-r--r-- | korganizer/koglobals.h | 5 | ||||
-rw-r--r-- | korganizer/koincidenceeditor.cpp | 1 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 9 | ||||
-rw-r--r-- | korganizer/kolistview.h | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 14 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 2 | ||||
-rw-r--r-- | korganizer/korganizerE.pro | 2 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 31 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 10 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 2 | ||||
-rw-r--r-- | korganizer/ktimeedit.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 9 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 3 |
23 files changed, 33 insertions, 129 deletions
diff --git a/kde2file/abdump/main.cpp b/kde2file/abdump/main.cpp index b359cfe..824d054 100644 --- a/kde2file/abdump/main.cpp +++ b/kde2file/abdump/main.cpp | |||
@@ -103,5 +103,6 @@ int main( int argc, char *argv[] ) | |||
103 | QString datastream; | 103 | QString datastream; |
104 | for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { | 104 | for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { |
105 | if ( (*it).isEmpty() || ! (*it).resource() ) | 105 | // if ( (*it).isEmpty() || ! (*it).resource() ) |
106 | if ( (*it).isEmpty() ) | ||
106 | continue; | 107 | continue; |
107 | KABC::Addressee a = ( *it ); | 108 | KABC::Addressee a = ( *it ); |
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp index 9cc1a73..c8755cd 100644 --- a/kde2file/caldump/main.cpp +++ b/kde2file/caldump/main.cpp | |||
@@ -130,5 +130,6 @@ int main( int argc, char *argv[] ) | |||
130 | for( it = allInc.begin(); it != allInc.end(); ++it ) { | 130 | for( it = allInc.begin(); it != allInc.end(); ++it ) { |
131 | ResourceCalendar * re = calendarResource->resource( (*it) ); | 131 | ResourceCalendar * re = calendarResource->resource( (*it) ); |
132 | if ( re ) { | 132 | //if ( re ) |
133 | { | ||
133 | ++num; | 134 | ++num; |
134 | Incidence* cl = (*it)->clone(); | 135 | Incidence* cl = (*it)->clone(); |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 5aa1c9b..6697602 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -146,9 +146,7 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b) | |||
146 | } | 146 | } |
147 | *b = true; | 147 | *b = true; |
148 | //qDebug("fooooooooooooooooooooooouuuuund "); | ||
149 | break; | 148 | break; |
150 | } | 149 | } |
151 | } | 150 | } |
152 | //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() ); | ||
153 | return fo; | 151 | return fo; |
154 | } | 152 | } |
@@ -369,5 +367,5 @@ void KDateNavigator::updateConfig() | |||
369 | void KDateNavigator::setShowWeekNums(bool enabled) | 367 | void KDateNavigator::setShowWeekNums(bool enabled) |
370 | { | 368 | { |
371 | qDebug("KDateNavigator::setShowWeekNums***************************** "); | 369 | |
372 | m_bShowWeekNums = enabled; | 370 | m_bShowWeekNums = enabled; |
373 | for(int i=0; i<6; i++) { | 371 | for(int i=0; i<6; i++) { |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index b43c40e..b5a4199 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -917,5 +917,5 @@ void KOAgendaView::updateConfig() | |||
917 | int old = KOPrefs::instance()->mHourSize; | 917 | int old = KOPrefs::instance()->mHourSize; |
918 | KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; | 918 | KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; |
919 | qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize ); | 919 | //qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize ); |
920 | } | 920 | } |
921 | 921 | ||
@@ -1165,8 +1165,8 @@ void KOAgendaView::fillAgenda() | |||
1165 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); | 1165 | mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); |
1166 | } else { | 1166 | } else { |
1167 | qDebug("days %d %s",endX , currentDate.toString().latin1()); | 1167 | //qDebug("days %d %s",endX , currentDate.toString().latin1()); |
1168 | QDate dateit = currentDate.addDays( -endX ); | 1168 | QDate dateit = currentDate.addDays( -endX ); |
1169 | if ( event->recursOn( dateit ) ) { | 1169 | if ( event->recursOn( dateit ) ) { |
1170 | qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); | 1170 | //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); |
1171 | if ( curCol-endX < 0 ) { | 1171 | if ( curCol-endX < 0 ) { |
1172 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); | 1172 | mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index ecca374..17a1d13 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -498,5 +498,4 @@ void KODayMatrix::updateViewTimed() | |||
498 | eDays.clearBit(i); | 498 | eDays.clearBit(i); |
499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
500 | qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); | ||
501 | ushort recurType = event->recurrence()->doesRecur(); | 500 | ushort recurType = event->recurrence()->doesRecur(); |
502 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 501 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 9df76e7..0045b7f 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -233,5 +233,5 @@ void KOEditorGeneral::pickAlarmSound() | |||
233 | { | 233 | { |
234 | 234 | ||
235 | qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); | 235 | //qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); |
236 | 236 | ||
237 | bool oldState = mAlarmSoundButton->isOn(); | 237 | bool oldState = mAlarmSoundButton->isOn(); |
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 01c5773..47e73dd 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -940,5 +940,5 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
940 | { | 940 | { |
941 | recurrenceType = RecurrenceChooser::Yearly; | 941 | recurrenceType = RecurrenceChooser::Yearly; |
942 | qDebug("Recurrence::rYearlyMonth: "); | 942 | //qDebug("Recurrence::rYearlyMonth: "); |
943 | day = event->dtStart().date().day(); | 943 | day = event->dtStart().date().day(); |
944 | rmd = r->yearNums(); | 944 | rmd = r->yearNums(); |
@@ -949,5 +949,5 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
949 | mYearly->setByMonth( month, day ); | 949 | mYearly->setByMonth( month, day ); |
950 | #if 0 | 950 | #if 0 |
951 | qDebug("2day = %d ",day ); | 951 | //qDebug("2day = %d ",day ); |
952 | QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions(); | 952 | QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions(); |
953 | int month; | 953 | int month; |
@@ -964,5 +964,5 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
964 | break; | 964 | break; |
965 | case Recurrence::rYearlyDay: | 965 | case Recurrence::rYearlyDay: |
966 | qDebug("Recurrence::rYearlyDay: "); | 966 | //qDebug("Recurrence::rYearlyDay: "); |
967 | recurrenceType = RecurrenceChooser::Yearly; | 967 | recurrenceType = RecurrenceChooser::Yearly; |
968 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); | 968 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); |
@@ -1022,5 +1022,5 @@ void KOEditorRecurrence::writeEvent( Incidence *event ) | |||
1022 | if ( !found ) { | 1022 | if ( !found ) { |
1023 | days.setBit( event->dtStart().date().dayOfWeek()-1); | 1023 | days.setBit( event->dtStart().date().dayOfWeek()-1); |
1024 | qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); | 1024 | //qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); |
1025 | } | 1025 | } |
1026 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); | 1026 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); |
@@ -1052,5 +1052,5 @@ void KOEditorRecurrence::writeEvent( Incidence *event ) | |||
1052 | } | 1052 | } |
1053 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { | 1053 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { |
1054 | qDebug("RecurrenceChooser::Yearly "); | 1054 | //qDebug("RecurrenceChooser::Yearly "); |
1055 | int freq = mYearly->frequency(); | 1055 | int freq = mYearly->frequency(); |
1056 | if ( mYearly->byDay() ) { | 1056 | if ( mYearly->byDay() ) { |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index fefc778..f39b5e1 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -100,7 +100,5 @@ void KOEventViewer::printMe() | |||
100 | 100 | ||
101 | p.translate( m.width()/10,0 ); | 101 | p.translate( m.width()/10,0 ); |
102 | qDebug("Scale: %f ", scale ); | ||
103 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { | 102 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { |
104 | qDebug("SCALE "); | ||
105 | p.scale( scale, scale ); | 103 | p.scale( scale, scale ); |
106 | } | 104 | } |
@@ -168,9 +166,7 @@ void KOEventViewer::setSource(const QString& n) | |||
168 | #ifndef DESKTOP_VERSION | 166 | #ifndef DESKTOP_VERSION |
169 | if ( n.mid(7,3) == "ALL" ) { | 167 | if ( n.mid(7,3) == "ALL" ) { |
170 | qDebug("all "); | ||
171 | mailToAttendees( true ); | 168 | mailToAttendees( true ); |
172 | } else if ( n.mid(7,4) == "RSVP" ) { | 169 | } else if ( n.mid(7,4) == "RSVP" ) { |
173 | mailToAttendees( false ); | 170 | mailToAttendees( false ); |
174 | qDebug("rsvp "); | ||
175 | } else { | 171 | } else { |
176 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); | 172 | QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" ); |
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 8016034..9ece77f 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp | |||
@@ -33,21 +33,8 @@ | |||
33 | #include <kcalendarsystem.h> | 33 | #include <kcalendarsystem.h> |
34 | 34 | ||
35 | #ifndef KORG_NOKALARMD | ||
36 | #include "kalarmdclient.h" | ||
37 | #endif | ||
38 | #include "simplealarmclient.h" | ||
39 | 35 | ||
40 | #include "koglobals.h" | 36 | #include "koglobals.h" |
41 | #include "koprefs.h" | 37 | #include "koprefs.h" |
42 | 38 | ||
43 | class NopAlarmClient : public AlarmClient | ||
44 | { | ||
45 | public: | ||
46 | void startDaemon() {} | ||
47 | bool setCalendars( const QStringList & ) { return false; } | ||
48 | bool addCalendar( const QString & ) { return false; } | ||
49 | bool removeCalendar( const QString & ) { return false; } | ||
50 | bool reloadCalendar( const QString & ) { return false; } | ||
51 | }; | ||
52 | 39 | ||
53 | KOGlobals *KOGlobals::mSelf = 0; | 40 | KOGlobals *KOGlobals::mSelf = 0; |
@@ -69,15 +56,4 @@ KOGlobals::KOGlobals() | |||
69 | mCalendarSystem = KGlobal::locale()->calendar(); | 56 | mCalendarSystem = KGlobal::locale()->calendar(); |
70 | 57 | ||
71 | cfg->setGroup("AlarmDaemon"); | ||
72 | QString alarmClient = cfg->readEntry( "Daemon", "kalarmd" ); | ||
73 | if ( alarmClient == "simple" ) { | ||
74 | mAlarmClient = new SimpleAlarmClient; | ||
75 | #ifndef KORG_NOKALARMD | ||
76 | } else if ( alarmClient == "kalarmd" ) { | ||
77 | mAlarmClient = new KalarmdClient; | ||
78 | #endif | ||
79 | } else { | ||
80 | mAlarmClient = new NopAlarmClient; | ||
81 | } | ||
82 | } | 58 | } |
83 | 59 | ||
@@ -95,5 +71,5 @@ KConfig* KOGlobals::config() | |||
95 | KOGlobals::~KOGlobals() | 71 | KOGlobals::~KOGlobals() |
96 | { | 72 | { |
97 | delete mAlarmClient; | 73 | |
98 | } | 74 | } |
99 | 75 | ||
@@ -103,9 +79,4 @@ const KCalendarSystem *KOGlobals::calendarSystem() const | |||
103 | } | 79 | } |
104 | 80 | ||
105 | AlarmClient *KOGlobals::alarmClient() const | ||
106 | { | ||
107 | return mAlarmClient; | ||
108 | } | ||
109 | |||
110 | void KOGlobals::fitDialogToScreen( QWidget *wid, bool force ) | 81 | void KOGlobals::fitDialogToScreen( QWidget *wid, bool force ) |
111 | { | 82 | { |
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index 357ff5f..b3ff67b 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h | |||
@@ -44,6 +44,4 @@ class KOGlobals | |||
44 | const KCalendarSystem *calendarSystem() const; | 44 | const KCalendarSystem *calendarSystem() const; |
45 | 45 | ||
46 | AlarmClient *alarmClient() const; | ||
47 | |||
48 | protected: | 46 | protected: |
49 | KOGlobals(); | 47 | KOGlobals(); |
@@ -53,6 +51,5 @@ class KOGlobals | |||
53 | static KOGlobals *mSelf; | 51 | static KOGlobals *mSelf; |
54 | 52 | ||
55 | const KCalendarSystem *mCalendarSystem; | 53 | const KCalendarSystem *mCalendarSystem; |
56 | AlarmClient *mAlarmClient; | ||
57 | }; | 54 | }; |
58 | 55 | ||
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 51df123..9813a80 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp | |||
@@ -43,5 +43,4 @@ | |||
43 | 43 | ||
44 | #include "koprefs.h" | 44 | #include "koprefs.h" |
45 | #include "koglobals.h" | ||
46 | 45 | ||
47 | #include "koincidenceeditor.h" | 46 | #include "koincidenceeditor.h" |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 341f473..e1b393d 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -332,4 +332,5 @@ KOListView::~KOListView() | |||
332 | delete mPopupMenu; | 332 | delete mPopupMenu; |
333 | } | 333 | } |
334 | |||
334 | QString KOListView::getWhatsThisText(QPoint p) | 335 | QString KOListView::getWhatsThisText(QPoint p) |
335 | { | 336 | { |
@@ -429,4 +430,5 @@ void KOListView::setAlarm() | |||
429 | qDebug("KO: Set alarm for %d items", count); | 430 | qDebug("KO: Set alarm for %d items", count); |
430 | calendar()->reInitAlarmSettings(); | 431 | calendar()->reInitAlarmSettings(); |
432 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
431 | } | 433 | } |
432 | void KOListView::setCategories( bool removeOld ) | 434 | void KOListView::setCategories( bool removeOld ) |
@@ -476,4 +478,5 @@ void KOListView::setCategories( bool removeOld ) | |||
476 | addIncidence( inc ); | 478 | addIncidence( inc ); |
477 | } | 479 | } |
480 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
478 | } | 481 | } |
479 | 482 | ||
@@ -700,4 +703,5 @@ void KOListView::writeToFile( bool iCal ) | |||
700 | } | 703 | } |
701 | } | 704 | } |
705 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | ||
702 | } | 706 | } |
703 | void KOListView::deleteAll() | 707 | void KOListView::deleteAll() |
@@ -830,6 +834,9 @@ void KOListView::hideDates() | |||
830 | showDates(false); | 834 | showDates(false); |
831 | } | 835 | } |
836 | |||
832 | void KOListView::resetFocus() | 837 | void KOListView::resetFocus() |
833 | { | 838 | { |
839 | topLevelWidget()->setActiveWindow(); | ||
840 | topLevelWidget()->raise(); | ||
834 | mListView->setFocus(); | 841 | mListView->setFocus(); |
835 | } | 842 | } |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index bb0e23e..eb5bb6e 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -260,5 +260,4 @@ class KOListView : public KOEventView | |||
260 | int count(); | 260 | int count(); |
261 | QString getWhatsThisText(QPoint p); | 261 | QString getWhatsThisText(QPoint p); |
262 | void resetFocus(); | ||
263 | signals: | 262 | signals: |
264 | void signalNewEvent(); | 263 | void signalNewEvent(); |
@@ -266,4 +265,5 @@ class KOListView : public KOEventView | |||
266 | 265 | ||
267 | public slots: | 266 | public slots: |
267 | void resetFocus(); | ||
268 | virtual void updateView(); | 268 | virtual void updateView(); |
269 | virtual void showDates(const QDate &start, const QDate &end); | 269 | virtual void showDates(const QDate &start, const QDate &end); |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 2b7e41f..843526d 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -288,5 +288,4 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
288 | mdayPos = 0; | 288 | mdayPos = 0; |
289 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; | 289 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; |
290 | //qDebug("NEWWWWWWWWWWWWW "); | ||
291 | } | 290 | } |
292 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | 291 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) |
@@ -301,5 +300,4 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | |||
301 | mInfo = false; | 300 | mInfo = false; |
302 | mdayPos = 0; | 301 | mdayPos = 0; |
303 | //qDebug("recucleeeeeeeeeeeeeeeee "); | ||
304 | } | 302 | } |
305 | 303 | ||
@@ -307,8 +305,6 @@ void MonthViewItem::paint(QPainter *p) | |||
307 | { | 305 | { |
308 | if ( mblockRepaint ) { | 306 | if ( mblockRepaint ) { |
309 | //qDebug("block "); | ||
310 | return; | 307 | return; |
311 | } | 308 | } |
312 | //qDebug("NON block "); | ||
313 | #if QT_VERSION >= 0x030000 | 309 | #if QT_VERSION >= 0x030000 |
314 | bool sel = isSelected(); | 310 | bool sel = isSelected(); |
@@ -461,5 +457,4 @@ int MonthViewItem::width(const QListBox *lb) const | |||
461 | if ( ! lb ) | 457 | if ( ! lb ) |
462 | return 10; | 458 | return 10; |
463 | //qDebug("ret wid %d ", lb->width()); | ||
464 | return lb->width(); | 459 | return lb->width(); |
465 | } | 460 | } |
@@ -613,10 +608,5 @@ void MonthViewCell::startUpdateCell() | |||
613 | mAvailItemList.setAutoDelete( false ); | 608 | mAvailItemList.setAutoDelete( false ); |
614 | } | 609 | } |
615 | /* | 610 | |
616 | if ( !isVisible() ){ | ||
617 | return; | ||
618 | } | ||
619 | */ | ||
620 | // qDebug("MonthViewCell::updateCell() "); | ||
621 | setPrimary( mDate.month()%2 ); | 611 | setPrimary( mDate.month()%2 ); |
622 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); | 612 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); |
@@ -872,5 +862,4 @@ void MonthViewCell::finishUpdateCell() | |||
872 | void MonthViewCell::updateCell() | 862 | void MonthViewCell::updateCell() |
873 | { | 863 | { |
874 | //qDebug("MonthViewCell::updateCell() "); | ||
875 | if ( !mMonthView->isUpdatePossible() ) | 864 | if ( !mMonthView->isUpdatePossible() ) |
876 | return; | 865 | return; |
@@ -1054,5 +1043,4 @@ void MonthViewCell::cellClicked( QListBoxItem *item ) | |||
1054 | { | 1043 | { |
1055 | mMonthView->setSelectedCell( this ); | 1044 | mMonthView->setSelectedCell( this ); |
1056 | qDebug("CELL "); | ||
1057 | if ( item == 0 ) { | 1045 | if ( item == 0 ) { |
1058 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 1046 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 1a81c7d..d88c300 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -136,5 +136,4 @@ HEADERS += datenavigatorcontainer.h \ | |||
136 | savetemplatedialog.h \ | 136 | savetemplatedialog.h \ |
137 | searchdialog.h \ | 137 | searchdialog.h \ |
138 | simplealarmclient.h \ | ||
139 | statusdialog.h \ | 138 | statusdialog.h \ |
140 | timeline.h \ | 139 | timeline.h \ |
@@ -196,5 +195,4 @@ filteredit_base.cpp \ | |||
196 | savetemplatedialog.cpp \ | 195 | savetemplatedialog.cpp \ |
197 | searchdialog.cpp \ | 196 | searchdialog.cpp \ |
198 | simplealarmclient.cpp \ | ||
199 | statusdialog.cpp \ | 197 | statusdialog.cpp \ |
200 | timeline.cpp \ | 198 | timeline.cpp \ |
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index 91b5a01..553c265 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro | |||
@@ -86,5 +86,4 @@ HEADERS = datenavigatorcontainer.h \ | |||
86 | savetemplatedialog.h \ | 86 | savetemplatedialog.h \ |
87 | searchdialog.h \ | 87 | searchdialog.h \ |
88 | simplealarmclient.h \ | ||
89 | statusdialog.h \ | 88 | statusdialog.h \ |
90 | timeline.h \ | 89 | timeline.h \ |
@@ -145,5 +144,4 @@ SOURCES = datenavigatorcontainer.cpp \ | |||
145 | savetemplatedialog.cpp \ | 144 | savetemplatedialog.cpp \ |
146 | searchdialog.cpp \ | 145 | searchdialog.cpp \ |
147 | simplealarmclient.cpp \ | ||
148 | statusdialog.cpp \ | 146 | statusdialog.cpp \ |
149 | timeline.cpp \ | 147 | timeline.cpp \ |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index dd2c081..0a608dc 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -709,10 +709,5 @@ void KOTodoView::updateView() | |||
709 | todo = todoList.next(); | 709 | todo = todoList.next(); |
710 | } | 710 | } |
711 | // qDebug("again .... "); | 711 | |
712 | // for(todo = todoList.first(); todo; todo = todoList.next()) { | ||
713 | |||
714 | // qDebug("yytodo %s ", todo->summary().latin1()); | ||
715 | // } | ||
716 | //qDebug("for "); | ||
717 | for(todo = todoList.first(); todo; todo = todoList.next()) { | 712 | for(todo = todoList.first(); todo; todo = todoList.next()) { |
718 | if (!mTodoMap.contains(todo) && checkTodo( todo ) ) | 713 | if (!mTodoMap.contains(todo) && checkTodo( todo ) ) |
@@ -721,5 +716,4 @@ void KOTodoView::updateView() | |||
721 | } | 716 | } |
722 | } | 717 | } |
723 | //qDebug("for end "); | ||
724 | // Restore opened/closed state | 718 | // Restore opened/closed state |
725 | mTodoListView->blockSignals( true ); | 719 | mTodoListView->blockSignals( true ); |
@@ -913,5 +907,4 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd, | |||
913 | void KOTodoView::editItem(QListViewItem *item ) | 907 | void KOTodoView::editItem(QListViewItem *item ) |
914 | { | 908 | { |
915 | // qDebug("editItem(QListViewItem *item ) "); | ||
916 | emit editTodoSignal(((KOTodoViewItem *)item)->todo()); | 909 | emit editTodoSignal(((KOTodoViewItem *)item)->todo()); |
917 | } | 910 | } |
@@ -1097,5 +1090,5 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) | |||
1097 | //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); | 1090 | //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); |
1098 | int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() ); | 1091 | int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() ); |
1099 | qDebug("ROW %d ", row); | 1092 | //qDebug("ROW %d ", row); |
1100 | if (!item) { | 1093 | if (!item) { |
1101 | newTodo(); | 1094 | newTodo(); |
@@ -1171,23 +1164,5 @@ void KOTodoView::itemClicked(QListViewItem *item) | |||
1171 | } | 1164 | } |
1172 | } | 1165 | } |
1173 | #if 0 | 1166 | |
1174 | // handled by the item itself | ||
1175 | bool completed = todoItem->todo()->isCompleted(); // Completed or not? | ||
1176 | qDebug("com %d ",completed ); | ||
1177 | qDebug("itemclicked "); | ||
1178 | if (todoItem->isOn()) { | ||
1179 | qDebug("on "); | ||
1180 | if (!completed) { | ||
1181 | qDebug("set true "); | ||
1182 | todoItem->todo()->setCompleted(QDateTime::currentDateTime()); | ||
1183 | } | ||
1184 | } else { | ||
1185 | qDebug("not on "); | ||
1186 | if (completed) { | ||
1187 | qDebug("set false "); | ||
1188 | todoItem->todo()->setCompleted(false); | ||
1189 | } | ||
1190 | } | ||
1191 | #endif | ||
1192 | } | 1167 | } |
1193 | 1168 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index f1f2dd2..3aa9b6c 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -551,13 +551,5 @@ void KOViewManager::showWorkWeekView() | |||
551 | void KOViewManager::showWeekView() | 551 | void KOViewManager::showWeekView() |
552 | { | 552 | { |
553 | /* | 553 | |
554 | globalFlagBlockAgenda = 2; | ||
555 | qDebug("4globalFlagBlockAgenda = 2; "); | ||
556 | //globalFlagBlockPainting = true; | ||
557 | mMainView->dateNavigator()->selectWeek(); | ||
558 | showAgendaView(); | ||
559 | */ | ||
560 | |||
561 | |||
562 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 554 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
563 | mFlagShowNextxDays = false; | 555 | mFlagShowNextxDays = false; |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 8473db9..65d8ac3 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -85,7 +85,5 @@ void WhatsNextTextBrowser::printMe() | |||
85 | scale = dy; | 85 | scale = dy; |
86 | p.translate( m.width()/10,0 ); | 86 | p.translate( m.width()/10,0 ); |
87 | qDebug("Scale: %f ", scale ); | ||
88 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { | 87 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { |
89 | qDebug("SCALE "); | ||
90 | p.scale( scale, scale ); | 88 | p.scale( scale, scale ); |
91 | } | 89 | } |
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp index 61a0931..df9b2fc 100644 --- a/korganizer/ktimeedit.cpp +++ b/korganizer/ktimeedit.cpp | |||
@@ -338,5 +338,4 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e) | |||
338 | break; | 338 | break; |
339 | case Key_Backspace: | 339 | case Key_Backspace: |
340 | qDebug("+++++++++++back "); | ||
341 | if ( cpos > 0) { | 340 | if ( cpos > 0) { |
342 | if ( cpos == 3 ) | 341 | if ( cpos == 3 ) |
@@ -349,5 +348,4 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e) | |||
349 | setSelect ( cpos , 1 ); | 348 | setSelect ( cpos , 1 ); |
350 | changedText(); | 349 | changedText(); |
351 | qDebug("---------back "); | ||
352 | } | 350 | } |
353 | break; | 351 | break; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8e5d108..95bef66 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -61,5 +61,4 @@ | |||
61 | #include "klocale.h" | 61 | #include "klocale.h" |
62 | #include "kconfig.h" | 62 | #include "kconfig.h" |
63 | #include "simplealarmclient.h" | ||
64 | #include "externalapphandler.h" | 63 | #include "externalapphandler.h" |
65 | 64 | ||
@@ -286,5 +285,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
286 | QFileInfo finfo ( defaultFileName() ); | 285 | QFileInfo finfo ( defaultFileName() ); |
287 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 286 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
288 | qDebug("oldfile %s ", oldFile.latin1()); | ||
289 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 287 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
290 | finfo.setFile( oldFile ); | 288 | finfo.setFile( oldFile ); |
@@ -419,5 +417,5 @@ void MainWindow::toggleBeamReceive() | |||
419 | #ifndef DESKTOP_VERSION | 417 | #ifndef DESKTOP_VERSION |
420 | if ( infrared ) { | 418 | if ( infrared ) { |
421 | qDebug("disable BeamReceive "); | 419 | qDebug("KO: Disable BeamReceive "); |
422 | delete infrared; | 420 | delete infrared; |
423 | infrared = 0; | 421 | infrared = 0; |
@@ -425,5 +423,5 @@ void MainWindow::toggleBeamReceive() | |||
425 | return; | 423 | return; |
426 | } | 424 | } |
427 | qDebug("enable BeamReceive "); | 425 | qDebug("KO: Enable BeamReceive "); |
428 | brAction->setOn(true); | 426 | brAction->setOn(true); |
429 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; | 427 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index f2a6c60..45ed04d 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -11,5 +11,4 @@ | |||
11 | 11 | ||
12 | #include <libkcal/incidence.h> | 12 | #include <libkcal/incidence.h> |
13 | #include "simplealarmclient.h" | ||
14 | #include <ksyncmanager.h> | 13 | #include <ksyncmanager.h> |
15 | #ifndef DESKTOP_VERSION | 14 | #ifndef DESKTOP_VERSION |
@@ -32,11 +31,4 @@ class CalendarLocal; | |||
32 | } | 31 | } |
33 | 32 | ||
34 | class KOMenuBar : public QMenuBar | ||
35 | { | ||
36 | public: | ||
37 | KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} | ||
38 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} | ||
39 | }; | ||
40 | |||
41 | using namespace KCal; | 33 | using namespace KCal; |
42 | 34 | ||
@@ -165,5 +157,4 @@ class MainWindow : public QMainWindow | |||
165 | 157 | ||
166 | void closeEvent( QCloseEvent* ce ); | 158 | void closeEvent( QCloseEvent* ce ); |
167 | SimpleAlarmClient mAlarmClient; | ||
168 | QTimer mSaveTimer; | 159 | QTimer mSaveTimer; |
169 | //bool mBlockSaveFlag; | 160 | //bool mBlockSaveFlag; |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 7a945e3..de65b53 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -446,9 +446,8 @@ void SearchDialog::keyPressEvent ( QKeyEvent *e) | |||
446 | switch ( e->key() ) { | 446 | switch ( e->key() ) { |
447 | case Qt::Key_Escape: | 447 | case Qt::Key_Escape: |
448 | hide(); | 448 | close(); |
449 | break; | 449 | break; |
450 | case Qt::Key_F: | 450 | case Qt::Key_F: |
451 | if ( e->state() == Qt::ControlButton ) { | 451 | if ( e->state() == Qt::ControlButton ) { |
452 | qDebug("full "); | ||
453 | 452 | ||
454 | } | 453 | } |