author | zautrix <zautrix> | 2005-07-27 23:40:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-27 23:40:19 (UTC) |
commit | 27ffa2e08ebb38e71f613af3a214750442418e2c (patch) (unidiff) | |
tree | de2bb4c541ab8795ee3739526e82ca8f4e952c09 | |
parent | 0e38cffd7ba745f237c659e1c48080fcb25b126c (diff) | |
download | kdepimpi-27ffa2e08ebb38e71f613af3a214750442418e2c.zip kdepimpi-27ffa2e08ebb38e71f613af3a214750442418e2c.tar.gz kdepimpi-27ffa2e08ebb38e71f613af3a214750442418e2c.tar.bz2 |
fixcxcx
-rw-r--r-- | korganizer/komonthview.cpp | 6 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 1 | ||||
-rw-r--r-- | libkcal/icalformat.cpp | 17 | ||||
-rw-r--r-- | libkcal/icalformat.h | 3 | ||||
-rw-r--r-- | libkcal/todo.cpp | 7 |
5 files changed, 24 insertions, 10 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index eea9a4d..4aeb20c 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -856,513 +856,517 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
856 | QStringList categories = todo->categories(); | 856 | QStringList categories = todo->categories(); |
857 | QString cat = categories.first(); | 857 | QString cat = categories.first(); |
858 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { | 858 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { |
859 | pal = getPalette(); | 859 | pal = getPalette(); |
860 | if (cat.isEmpty()) { | 860 | if (cat.isEmpty()) { |
861 | //pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); | 861 | //pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); |
862 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( todo->calID() )); | 862 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( todo->calID() )); |
863 | } else { | 863 | } else { |
864 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); | 864 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); |
865 | } | 865 | } |
866 | 866 | ||
867 | } else { | 867 | } else { |
868 | if (cat.isEmpty()) { | 868 | if (cat.isEmpty()) { |
869 | //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); | 869 | //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); |
870 | pal = QPalette(KOPrefs::instance()->defaultColor( todo->calID() ), KOPrefs::instance()->defaultColor( todo->calID() )); | 870 | pal = QPalette(KOPrefs::instance()->defaultColor( todo->calID() ), KOPrefs::instance()->defaultColor( todo->calID() )); |
871 | } else { | 871 | } else { |
872 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); | 872 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); |
873 | } | 873 | } |
874 | } | 874 | } |
875 | 875 | ||
876 | } else { | 876 | } else { |
877 | pal = mStandardPalette ; | 877 | pal = mStandardPalette ; |
878 | } | 878 | } |
879 | pal.setColor(QColorGroup::Highlight, KOPrefs::instance()->mHighlightColor); | 879 | pal.setColor(QColorGroup::Highlight, KOPrefs::instance()->mHighlightColor); |
880 | item->setPalette( pal ); | 880 | item->setPalette( pal ); |
881 | item->setRecur( todo->doesRecur() ); | 881 | item->setRecur( todo->doesRecur() ); |
882 | item->setAlarm( todo->isAlarmEnabled() && todo->alarmEnabled() ); | 882 | item->setAlarm( todo->isAlarmEnabled() && todo->alarmEnabled() ); |
883 | item->setMoreInfo( todo->description().length() > 0 ); | 883 | item->setMoreInfo( todo->description().length() > 0 ); |
884 | insertItem( item , count()); | 884 | insertItem( item , count()); |
885 | #ifdef DESKTOP_VERSION | 885 | #ifdef DESKTOP_VERSION |
886 | mToolTip.append( text ); | 886 | mToolTip.append( text ); |
887 | #endif | 887 | #endif |
888 | } | 888 | } |
889 | void MonthViewCell::repaintfinishUpdateCell() | 889 | void MonthViewCell::repaintfinishUpdateCell() |
890 | { | 890 | { |
891 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 891 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
892 | while ( mitem ) { | 892 | while ( mitem ) { |
893 | mitem->setBlockRepaint( false ); | 893 | mitem->setBlockRepaint( false ); |
894 | updateItem ( mitem ); | 894 | updateItem ( mitem ); |
895 | mitem = (MonthViewItem *)mitem->next(); | 895 | mitem = (MonthViewItem *)mitem->next(); |
896 | } | 896 | } |
897 | blockSignals( false ); | 897 | blockSignals( false ); |
898 | } | 898 | } |
899 | void MonthViewCell::finishUpdateCell() | 899 | void MonthViewCell::finishUpdateCell() |
900 | { | 900 | { |
901 | 901 | ||
902 | 902 | ||
903 | 903 | ||
904 | #ifdef DESKTOP_VERSION | 904 | #ifdef DESKTOP_VERSION |
905 | if (mToolTip.count() > 0 ) { | 905 | if (mToolTip.count() > 0 ) { |
906 | mToolTip.sort(); | 906 | mToolTip.sort(); |
907 | QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); | 907 | QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); |
908 | } | 908 | } |
909 | #endif | 909 | #endif |
910 | //sort(); | 910 | //sort(); |
911 | //setMyPalette(); | 911 | //setMyPalette(); |
912 | setMyPalette(); | 912 | setMyPalette(); |
913 | 913 | ||
914 | resizeEvent( 0 ); | 914 | resizeEvent( 0 ); |
915 | 915 | ||
916 | } | 916 | } |
917 | void MonthViewCell::updateCell() | 917 | void MonthViewCell::updateCell() |
918 | { | 918 | { |
919 | if ( !mMonthView->isUpdatePossible() ) | 919 | if ( !mMonthView->isUpdatePossible() ) |
920 | return; | 920 | return; |
921 | startUpdateCell(); | 921 | startUpdateCell(); |
922 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 922 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
923 | QPtrList<Event> events = mMonthView->calendar()->events( mDate, true ); | 923 | QPtrList<Event> events = mMonthView->calendar()->events( mDate, true ); |
924 | Event *event; | 924 | Event *event; |
925 | for( event = events.first(); event; event = events.next() ) { // for event | 925 | for( event = events.first(); event; event = events.next() ) { // for event |
926 | insertEvent(event); | 926 | insertEvent(event); |
927 | } | 927 | } |
928 | // insert due todos | 928 | // insert due todos |
929 | QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); | 929 | QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); |
930 | Todo *todo; | 930 | Todo *todo; |
931 | for(todo = todos.first(); todo; todo = todos.next()) { | 931 | for(todo = todos.first(); todo; todo = todos.next()) { |
932 | insertTodo( todo ); | 932 | insertTodo( todo ); |
933 | } | 933 | } |
934 | finishUpdateCell(); | 934 | finishUpdateCell(); |
935 | // if ( isVisible()) | 935 | // if ( isVisible()) |
936 | //qApp->processEvents(); | 936 | //qApp->processEvents(); |
937 | } | 937 | } |
938 | 938 | ||
939 | void MonthViewCell::updateConfig( bool bigFont ) // = false | 939 | void MonthViewCell::updateConfig( bool bigFont ) // = false |
940 | { | 940 | { |
941 | 941 | ||
942 | if ( bigFont ) { | 942 | if ( bigFont ) { |
943 | QFont fo = KOPrefs::instance()->mMonthViewFont; | 943 | QFont fo = KOPrefs::instance()->mMonthViewFont; |
944 | int ps = fo.pointSize() + 2; | 944 | int ps = fo.pointSize() + 2; |
945 | if ( ps < 18 ) | 945 | if ( ps < 18 ) |
946 | ps += 2; | 946 | ps += 2; |
947 | fo.setPointSize( ps ); | 947 | fo.setPointSize( ps ); |
948 | setFont( fo ); | 948 | setFont( fo ); |
949 | } else | 949 | } else |
950 | setFont( KOPrefs::instance()->mMonthViewFont ); | 950 | setFont( KOPrefs::instance()->mMonthViewFont ); |
951 | 951 | ||
952 | QFontMetrics fm( font() ); | 952 | QFontMetrics fm( font() ); |
953 | mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); | 953 | mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); |
954 | mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); | 954 | mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); |
955 | mHolidayPalette = mStandardPalette; | 955 | mHolidayPalette = mStandardPalette; |
956 | mPrimaryPalette = mStandardPalette; | 956 | mPrimaryPalette = mStandardPalette; |
957 | mNonPrimaryPalette = mStandardPalette; | 957 | mNonPrimaryPalette = mStandardPalette; |
958 | if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { | 958 | if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { |
959 | mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); | 959 | mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); |
960 | mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); | 960 | mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); |
961 | mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); | 961 | mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); |
962 | mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); | 962 | mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); |
963 | mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor); | 963 | mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor); |
964 | mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor); | 964 | mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor); |
965 | mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark()); | 965 | mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark()); |
966 | mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); | 966 | mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); |
967 | mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); | 967 | mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); |
968 | } | 968 | } |
969 | //updateCell(); | 969 | //updateCell(); |
970 | } | 970 | } |
971 | 971 | ||
972 | void MonthViewCell::enableScrollBars( bool enabled ) | 972 | void MonthViewCell::enableScrollBars( bool enabled ) |
973 | { | 973 | { |
974 | 974 | ||
975 | return; | 975 | return; |
976 | if ( enabled ) { | 976 | if ( enabled ) { |
977 | QListBoxItem *fi = firstItem (); | 977 | QListBoxItem *fi = firstItem (); |
978 | if (fi ) { | 978 | if (fi ) { |
979 | int ihei = fi->height( this ); | 979 | int ihei = fi->height( this ); |
980 | int hei = numRows () * ihei; | 980 | int hei = numRows () * ihei; |
981 | if ( hei < height() - horizontalScrollBar()->height () ) { | 981 | if ( hei < height() - horizontalScrollBar()->height () ) { |
982 | setVScrollBarMode(QScrollView::AlwaysOff); | 982 | setVScrollBarMode(QScrollView::AlwaysOff); |
983 | } | 983 | } |
984 | else | 984 | else |
985 | setVScrollBarMode(QScrollView::Auto); | 985 | setVScrollBarMode(QScrollView::Auto); |
986 | if ( ihei *3 > height() ) { | 986 | if ( ihei *3 > height() ) { |
987 | setHScrollBarMode(QScrollView::AlwaysOff); | 987 | setHScrollBarMode(QScrollView::AlwaysOff); |
988 | } | 988 | } |
989 | else { | 989 | else { |
990 | setHScrollBarMode(QScrollView::Auto); | 990 | setHScrollBarMode(QScrollView::Auto); |
991 | } | 991 | } |
992 | } else { | 992 | } else { |
993 | setVScrollBarMode(QScrollView::Auto); | 993 | setVScrollBarMode(QScrollView::Auto); |
994 | setHScrollBarMode(QScrollView::Auto); | 994 | setHScrollBarMode(QScrollView::Auto); |
995 | } | 995 | } |
996 | } else { | 996 | } else { |
997 | setVScrollBarMode(QScrollView::AlwaysOff); | 997 | setVScrollBarMode(QScrollView::AlwaysOff); |
998 | setHScrollBarMode(QScrollView::AlwaysOff); | 998 | setHScrollBarMode(QScrollView::AlwaysOff); |
999 | } | 999 | } |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | Incidence *MonthViewCell::selectedIncidence() | 1002 | Incidence *MonthViewCell::selectedIncidence() |
1003 | { | 1003 | { |
1004 | int index = currentItem(); | 1004 | int index = currentItem(); |
1005 | if ( index < 0 ) return 0; | 1005 | if ( index < 0 ) return 0; |
1006 | 1006 | ||
1007 | MonthViewItem *mitem = | 1007 | MonthViewItem *mitem = |
1008 | static_cast<MonthViewItem *>( item( index ) ); | 1008 | static_cast<MonthViewItem *>( item( index ) ); |
1009 | 1009 | ||
1010 | if ( !mitem ) return 0; | 1010 | if ( !mitem ) return 0; |
1011 | 1011 | ||
1012 | return mitem->incidence(); | 1012 | return mitem->incidence(); |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | QDate MonthViewCell::selectedIncidenceDate() | 1015 | QDate MonthViewCell::selectedIncidenceDate() |
1016 | { | 1016 | { |
1017 | QDate qd; | 1017 | QDate qd; |
1018 | int index = currentItem(); | 1018 | int index = currentItem(); |
1019 | if ( index < 0 ) return qd; | 1019 | if ( index < 0 ) return qd; |
1020 | return mDate; | 1020 | return mDate; |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | void MonthViewCell::deselect() | 1023 | void MonthViewCell::deselect() |
1024 | { | 1024 | { |
1025 | clearSelection(); | 1025 | clearSelection(); |
1026 | enableScrollBars( false ); | 1026 | enableScrollBars( false ); |
1027 | // updateCell(); | 1027 | // updateCell(); |
1028 | } | 1028 | } |
1029 | void MonthViewCell::select() | 1029 | void MonthViewCell::select() |
1030 | { | 1030 | { |
1031 | ;// updateCell(); | 1031 | ;// updateCell(); |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | void MonthViewCell::resizeEvent ( QResizeEvent * e ) | 1034 | void MonthViewCell::resizeEvent ( QResizeEvent * e ) |
1035 | { | 1035 | { |
1036 | if ( !mMonthView->isUpdatePossible() ) | 1036 | if ( !mMonthView->isUpdatePossible() ) |
1037 | return; | 1037 | return; |
1038 | //qDebug("++++++++++++++MonthViewCell::resizeEvent %d %d ", width(), height()); | 1038 | //qDebug("++++++++++++++MonthViewCell::resizeEvent %d %d ", width(), height()); |
1039 | deselect(); | 1039 | deselect(); |
1040 | mLabel->setMaximumHeight( height() - lineWidth()*2 ); | 1040 | mLabel->setMaximumHeight( height() - lineWidth()*2 ); |
1041 | 1041 | ||
1042 | QString text; | 1042 | QString text; |
1043 | //mLabel->setText( text ); | 1043 | //mLabel->setText( text ); |
1044 | bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog; | 1044 | bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog; |
1045 | if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { | 1045 | if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { |
1046 | text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " " + QString::number( mDate.day() ); | 1046 | text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " " + QString::number( mDate.day() ); |
1047 | mLabel->resize( mLabelBigSize ); | 1047 | mLabel->resize( mLabelBigSize ); |
1048 | } else { | 1048 | } else { |
1049 | mLabel->resize( mLabelSize ); | 1049 | mLabel->resize( mLabelSize ); |
1050 | text = QString::number( mDate.day() ); | 1050 | text = QString::number( mDate.day() ); |
1051 | } | 1051 | } |
1052 | mLabel->setText( text ); | 1052 | mLabel->setText( text ); |
1053 | 1053 | ||
1054 | int size = height() - mLabel->height() - lineWidth()-1; | 1054 | int size = height() - mLabel->height() - lineWidth()-1; |
1055 | //qDebug("LW %d ", lineWidth()); | 1055 | //qDebug("LW %d ", lineWidth()); |
1056 | if ( size > 0 ) | 1056 | if ( size > 0 ) |
1057 | verticalScrollBar()->setMaximumHeight( size ); | 1057 | verticalScrollBar()->setMaximumHeight( size ); |
1058 | size = width() - mLabel->width() -lineWidth()-1; | 1058 | size = width() - mLabel->width() -lineWidth()-1; |
1059 | if ( size > 0 ) | 1059 | if ( size > 0 ) |
1060 | horizontalScrollBar()->setMaximumWidth( size ); | 1060 | horizontalScrollBar()->setMaximumWidth( size ); |
1061 | mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() ); | 1061 | mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() ); |
1062 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 1062 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
1063 | // mItemList->resize ( width(), height () ); | 1063 | // mItemList->resize ( width(), height () ); |
1064 | if ( e ) | 1064 | if ( e ) |
1065 | KNoScrollListBox::resizeEvent ( e ); | 1065 | KNoScrollListBox::resizeEvent ( e ); |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | void MonthViewCell::defaultAction( QListBoxItem *item ) | 1068 | void MonthViewCell::defaultAction( QListBoxItem *item ) |
1069 | { | 1069 | { |
1070 | 1070 | ||
1071 | if ( !item ) { | 1071 | if ( !item ) { |
1072 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 1072 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
1073 | emit newEventSignal( dt ); | 1073 | emit newEventSignal( dt ); |
1074 | return; | 1074 | return; |
1075 | } | 1075 | } |
1076 | 1076 | ||
1077 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); | 1077 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); |
1078 | Incidence *incidence = eventItem->incidence(); | 1078 | Incidence *incidence = eventItem->incidence(); |
1079 | if ( incidence ) mMonthView->defaultAction( incidence ); | 1079 | if ( incidence ) mMonthView->defaultAction( incidence ); |
1080 | } | 1080 | } |
1081 | void MonthViewCell::showDay() | 1081 | void MonthViewCell::showDay() |
1082 | { | 1082 | { |
1083 | emit showDaySignal( date() ); | 1083 | emit showDaySignal( date() ); |
1084 | } | 1084 | } |
1085 | void MonthViewCell::newEvent() | 1085 | void MonthViewCell::newEvent() |
1086 | { | 1086 | { |
1087 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 1087 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
1088 | emit newEventSignal( dt ); | 1088 | emit newEventSignal( dt ); |
1089 | } | 1089 | } |
1090 | void MonthViewCell::cellClicked( QListBoxItem *item ) | 1090 | void MonthViewCell::cellClicked( QListBoxItem *item ) |
1091 | { | 1091 | { |
1092 | mMonthView->setSelectedCell( this ); | 1092 | mMonthView->setSelectedCell( this ); |
1093 | if ( item == 0 ) { | 1093 | if ( item == 0 ) { |
1094 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 1094 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
1095 | emit newEventSignal( dt ); | 1095 | emit newEventSignal( dt ); |
1096 | return; | 1096 | return; |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | void MonthViewCell::contextMenu( QListBoxItem *item ) | 1101 | void MonthViewCell::contextMenu( QListBoxItem *item ) |
1102 | { | 1102 | { |
1103 | mMonthView->setPopupCell( this ); | 1103 | mMonthView->setPopupCell( this ); |
1104 | if ( !item ) { | 1104 | if ( !item ) { |
1105 | mMonthView->showContextMenu( 0 ); | 1105 | mMonthView->showContextMenu( 0 ); |
1106 | return; | 1106 | return; |
1107 | } | 1107 | } |
1108 | //selection( item ); | 1108 | //selection( item ); |
1109 | //qApp->processEvents(); | 1109 | //qApp->processEvents(); |
1110 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); | 1110 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); |
1111 | Incidence *incidence = eventItem->incidence(); | 1111 | Incidence *incidence = eventItem->incidence(); |
1112 | if ( incidence ) mMonthView->showContextMenu( incidence ); | 1112 | if ( incidence ) { |
1113 | mMonthView->showContextMenu( incidence ); | ||
1114 | selection( item ); | ||
1115 | doHighLight( incidence ); | ||
1116 | } | ||
1113 | } | 1117 | } |
1114 | 1118 | ||
1115 | void MonthViewCell::selection( QListBoxItem *item ) | 1119 | void MonthViewCell::selection( QListBoxItem *item ) |
1116 | { | 1120 | { |
1117 | if ( !item ) { | 1121 | if ( !item ) { |
1118 | emit highlightIncidence( 0 , this, 0 ); | 1122 | emit highlightIncidence( 0 , this, 0 ); |
1119 | return; | 1123 | return; |
1120 | } | 1124 | } |
1121 | MonthViewItem * it = (static_cast<MonthViewItem *>( item )); | 1125 | MonthViewItem * it = (static_cast<MonthViewItem *>( item )); |
1122 | emit highlightIncidence( it->incidence(), this, it->multiDay() ); | 1126 | emit highlightIncidence( it->incidence(), this, it->multiDay() ); |
1123 | mMonthView->setSelectedCell( this ); | 1127 | mMonthView->setSelectedCell( this ); |
1124 | } | 1128 | } |
1125 | 1129 | ||
1126 | void MonthViewCell::deHighLight() | 1130 | void MonthViewCell::deHighLight() |
1127 | { | 1131 | { |
1128 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 1132 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
1129 | while ( mitem ) { | 1133 | while ( mitem ) { |
1130 | if ( mitem->setHighlightedFalse() ) | 1134 | if ( mitem->setHighlightedFalse() ) |
1131 | updateItem ( mitem ); | 1135 | updateItem ( mitem ); |
1132 | mitem = (MonthViewItem *)mitem->next(); | 1136 | mitem = (MonthViewItem *)mitem->next(); |
1133 | } | 1137 | } |
1134 | } | 1138 | } |
1135 | // returns true if no inc found | 1139 | // returns true if no inc found |
1136 | bool MonthViewCell::doHighLight( Incidence * inc ) | 1140 | bool MonthViewCell::doHighLight( Incidence * inc ) |
1137 | { | 1141 | { |
1138 | 1142 | ||
1139 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 1143 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
1140 | while ( mitem ) { | 1144 | while ( mitem ) { |
1141 | if ( mitem->incidence() == inc ) { | 1145 | if ( mitem->incidence() == inc ) { |
1142 | if ( mitem->setHighlighted( inc ) ) | 1146 | if ( mitem->setHighlighted( inc ) ) |
1143 | updateItem ( mitem ); | 1147 | updateItem ( mitem ); |
1144 | return false; | 1148 | return false; |
1145 | } | 1149 | } |
1146 | mitem = (MonthViewItem *)mitem->next(); | 1150 | mitem = (MonthViewItem *)mitem->next(); |
1147 | } | 1151 | } |
1148 | return true; | 1152 | return true; |
1149 | } | 1153 | } |
1150 | // ******************************************************************************* | 1154 | // ******************************************************************************* |
1151 | // ******************************************************************************* | 1155 | // ******************************************************************************* |
1152 | // ******************************************************************************* | 1156 | // ******************************************************************************* |
1153 | 1157 | ||
1154 | 1158 | ||
1155 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 1159 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
1156 | : KOEventView( calendar, parent, name ), | 1160 | : KOEventView( calendar, parent, name ), |
1157 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 1161 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
1158 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 1162 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
1159 | { | 1163 | { |
1160 | mFlagKeyPressed = false; | 1164 | mFlagKeyPressed = false; |
1161 | mShortDayLabelsM = false; | 1165 | mShortDayLabelsM = false; |
1162 | mShortDayLabelsW = false; | 1166 | mShortDayLabelsW = false; |
1163 | skipResize = false; | 1167 | skipResize = false; |
1164 | clPending = true; | 1168 | clPending = true; |
1165 | mPopupCell = 0; | 1169 | mPopupCell = 0; |
1166 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); | 1170 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); |
1167 | mWidStack = new QWidgetStack( this ); | 1171 | mWidStack = new QWidgetStack( this ); |
1168 | QVBoxLayout* hb = new QVBoxLayout( this ); | 1172 | QVBoxLayout* hb = new QVBoxLayout( this ); |
1169 | mMonthView = new QWidget( mWidStack ); | 1173 | mMonthView = new QWidget( mWidStack ); |
1170 | mWeekView = new QWidget( mWidStack ); | 1174 | mWeekView = new QWidget( mWidStack ); |
1171 | #if QT_VERSION >= 0x030000 | 1175 | #if QT_VERSION >= 0x030000 |
1172 | mWidStack->addWidget(mMonthView ); | 1176 | mWidStack->addWidget(mMonthView ); |
1173 | mWidStack->addWidget(mWeekView ); | 1177 | mWidStack->addWidget(mWeekView ); |
1174 | #else | 1178 | #else |
1175 | mWidStack->addWidget( mMonthView, 1 ); | 1179 | mWidStack->addWidget( mMonthView, 1 ); |
1176 | mWidStack->addWidget( mWeekView , 1 ); | 1180 | mWidStack->addWidget( mWeekView , 1 ); |
1177 | #endif | 1181 | #endif |
1178 | hb->addWidget( mNavigatorBar ); | 1182 | hb->addWidget( mNavigatorBar ); |
1179 | hb->addWidget( mWidStack ); | 1183 | hb->addWidget( mWidStack ); |
1180 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; | 1184 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; |
1181 | updatePossible = false; | 1185 | updatePossible = false; |
1182 | //updatePossible = true; | 1186 | //updatePossible = true; |
1183 | mCells.setAutoDelete( true ); | 1187 | mCells.setAutoDelete( true ); |
1184 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | 1188 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; |
1185 | mDayLabels.resize( mDaysPerWeek ); | 1189 | mDayLabels.resize( mDaysPerWeek ); |
1186 | mDayLabelsW.resize( mDaysPerWeek ); | 1190 | mDayLabelsW.resize( mDaysPerWeek ); |
1187 | QFont bfont = font(); | 1191 | QFont bfont = font(); |
1188 | if ( QApplication::desktop()->width() < 650 ) { | 1192 | if ( QApplication::desktop()->width() < 650 ) { |
1189 | bfont.setPointSize( bfont.pointSize() - 2 ); | 1193 | bfont.setPointSize( bfont.pointSize() - 2 ); |
1190 | } | 1194 | } |
1191 | bfont.setBold( true ); | 1195 | bfont.setBold( true ); |
1192 | int i; | 1196 | int i; |
1193 | 1197 | ||
1194 | for( i = 0; i < mDaysPerWeek; i++ ) { | 1198 | for( i = 0; i < mDaysPerWeek; i++ ) { |
1195 | QLabel *label = new QLabel( mMonthView ); | 1199 | QLabel *label = new QLabel( mMonthView ); |
1196 | label->setFont(bfont); | 1200 | label->setFont(bfont); |
1197 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1201 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1198 | label->setLineWidth(1); | 1202 | label->setLineWidth(1); |
1199 | label->setAlignment(AlignCenter); | 1203 | label->setAlignment(AlignCenter); |
1200 | mDayLabels.insert( i, label ); | 1204 | mDayLabels.insert( i, label ); |
1201 | label = new QLabel( mWeekView ); | 1205 | label = new QLabel( mWeekView ); |
1202 | label->setFont(bfont); | 1206 | label->setFont(bfont); |
1203 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1207 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1204 | label->setLineWidth(1); | 1208 | label->setLineWidth(1); |
1205 | label->setAlignment(AlignCenter); | 1209 | label->setAlignment(AlignCenter); |
1206 | mDayLabelsW.insert( i, label ); | 1210 | mDayLabelsW.insert( i, label ); |
1207 | } | 1211 | } |
1208 | 1212 | ||
1209 | bfont.setBold( false ); | 1213 | bfont.setBold( false ); |
1210 | mWeekLabels.resize( mNumWeeks+1 ); | 1214 | mWeekLabels.resize( mNumWeeks+1 ); |
1211 | mWeekLabelsW.resize( 2 ); | 1215 | mWeekLabelsW.resize( 2 ); |
1212 | for( i = 0; i < mNumWeeks+1; i++ ) { | 1216 | for( i = 0; i < mNumWeeks+1; i++ ) { |
1213 | KOWeekButton *label = new KOWeekButton( mMonthView ); | 1217 | KOWeekButton *label = new KOWeekButton( mMonthView ); |
1214 | label->setFocusPolicy(NoFocus); | 1218 | label->setFocusPolicy(NoFocus); |
1215 | label->setFont(bfont); | 1219 | label->setFont(bfont); |
1216 | connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); | 1220 | connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); |
1217 | label->setFlat(true); | 1221 | label->setFlat(true); |
1218 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); | 1222 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); |
1219 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1223 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1220 | //label->setLineWidth(1); | 1224 | //label->setLineWidth(1); |
1221 | //label->setAlignment(AlignCenter); | 1225 | //label->setAlignment(AlignCenter); |
1222 | mWeekLabels.insert( i, label ); | 1226 | mWeekLabels.insert( i, label ); |
1223 | } | 1227 | } |
1224 | mWeekLabels[mNumWeeks]->setText( i18n("W")); | 1228 | mWeekLabels[mNumWeeks]->setText( i18n("W")); |
1225 | mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus); | 1229 | mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus); |
1226 | QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number")); | 1230 | QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number")); |
1227 | 1231 | ||
1228 | for( i = 0; i < 1+1; i++ ) { | 1232 | for( i = 0; i < 1+1; i++ ) { |
1229 | KOWeekButton *label = new KOWeekButton( mWeekView ); | 1233 | KOWeekButton *label = new KOWeekButton( mWeekView ); |
1230 | label->setFocusPolicy(NoFocus); | 1234 | label->setFocusPolicy(NoFocus); |
1231 | label->setFont(bfont); | 1235 | label->setFont(bfont); |
1232 | connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); | 1236 | connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); |
1233 | label->setFlat(true); | 1237 | label->setFlat(true); |
1234 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); | 1238 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); |
1235 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1239 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1236 | //label->setLineWidth(1); | 1240 | //label->setLineWidth(1); |
1237 | //label->setAlignment(AlignCenter); | 1241 | //label->setAlignment(AlignCenter); |
1238 | mWeekLabelsW.insert( i, label ); | 1242 | mWeekLabelsW.insert( i, label ); |
1239 | } | 1243 | } |
1240 | mWeekLabelsW[1]->setText( i18n("W")); | 1244 | mWeekLabelsW[1]->setText( i18n("W")); |
1241 | mWeekLabelsW[1]->setFocusPolicy(WheelFocus); | 1245 | mWeekLabelsW[1]->setFocusPolicy(WheelFocus); |
1242 | 1246 | ||
1243 | 1247 | ||
1244 | int row, col; | 1248 | int row, col; |
1245 | mCells.resize( mNumCells ); | 1249 | mCells.resize( mNumCells ); |
1246 | for( row = 0; row < mNumWeeks; ++row ) { | 1250 | for( row = 0; row < mNumWeeks; ++row ) { |
1247 | for( col = 0; col < mDaysPerWeek; ++col ) { | 1251 | for( col = 0; col < mDaysPerWeek; ++col ) { |
1248 | MonthViewCell *cell = new MonthViewCell( this, mMonthView ); | 1252 | MonthViewCell *cell = new MonthViewCell( this, mMonthView ); |
1249 | mCells.insert( row * mDaysPerWeek + col, cell ); | 1253 | mCells.insert( row * mDaysPerWeek + col, cell ); |
1250 | 1254 | ||
1251 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 1255 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
1252 | SLOT( defaultAction( Incidence * ) ) ); | 1256 | SLOT( defaultAction( Incidence * ) ) ); |
1253 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 1257 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
1254 | SIGNAL( newEventSignal( QDateTime ) ) ); | 1258 | SIGNAL( newEventSignal( QDateTime ) ) ); |
1255 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 1259 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
1256 | SIGNAL( showDaySignal( QDate ) ) ); | 1260 | SIGNAL( showDaySignal( QDate ) ) ); |
1257 | connect( cell, SIGNAL( nextCell() ), | 1261 | connect( cell, SIGNAL( nextCell() ), |
1258 | SLOT( nextCell() ) ); | 1262 | SLOT( nextCell() ) ); |
1259 | connect( cell, SIGNAL( prevCell() ), | 1263 | connect( cell, SIGNAL( prevCell() ), |
1260 | SLOT( prevCell() ) ); | 1264 | SLOT( prevCell() ) ); |
1261 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), | 1265 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), |
1262 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); | 1266 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); |
1263 | } | 1267 | } |
1264 | } | 1268 | } |
1265 | mCellsW.resize( mDaysPerWeek ); | 1269 | mCellsW.resize( mDaysPerWeek ); |
1266 | for( col = 0; col < mDaysPerWeek; ++col ) { | 1270 | for( col = 0; col < mDaysPerWeek; ++col ) { |
1267 | MonthViewCell *cell = new MonthViewCell( this, mWeekView ); | 1271 | MonthViewCell *cell = new MonthViewCell( this, mWeekView ); |
1268 | mCellsW.insert( col, cell ); | 1272 | mCellsW.insert( col, cell ); |
1269 | 1273 | ||
1270 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 1274 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
1271 | SLOT( defaultAction( Incidence * ) ) ); | 1275 | SLOT( defaultAction( Incidence * ) ) ); |
1272 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 1276 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
1273 | SIGNAL( newEventSignal( QDateTime ) ) ); | 1277 | SIGNAL( newEventSignal( QDateTime ) ) ); |
1274 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 1278 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
1275 | SIGNAL( showDaySignal( QDate ) ) ); | 1279 | SIGNAL( showDaySignal( QDate ) ) ); |
1276 | connect( cell, SIGNAL( nextCell() ), | 1280 | connect( cell, SIGNAL( nextCell() ), |
1277 | SLOT( nextCell() ) ); | 1281 | SLOT( nextCell() ) ); |
1278 | connect( cell, SIGNAL( prevCell() ), | 1282 | connect( cell, SIGNAL( prevCell() ), |
1279 | SLOT( prevCell() ) ); | 1283 | SLOT( prevCell() ) ); |
1280 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), | 1284 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), |
1281 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); | 1285 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); |
1282 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); | 1286 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); |
1283 | } | 1287 | } |
1284 | 1288 | ||
1285 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); | 1289 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); |
1286 | mContextMenu = eventPopup(); | 1290 | mContextMenu = eventPopup(); |
1287 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), | 1291 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), |
1288 | i18n("New Event..."),this, | 1292 | i18n("New Event..."),this, |
1289 | SLOT(slotNewEvent()),false); | 1293 | SLOT(slotNewEvent()),false); |
1290 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), | 1294 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), |
1291 | i18n("New Todo..."),this, | 1295 | i18n("New Todo..."),this, |
1292 | SLOT(slotNewTodo()),false); | 1296 | SLOT(slotNewTodo()),false); |
1293 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), | 1297 | mContextMenu->addAdditionalItem(QIconSet(QPixmap()), |
1294 | i18n("Journal"),this, | 1298 | i18n("Journal"),this, |
1295 | SLOT(slotEditJournal()),false); | 1299 | SLOT(slotEditJournal()),false); |
1296 | 1300 | ||
1297 | connect (mContextMenu ,SIGNAL(categoryChanged( Incidence * )),this, | 1301 | connect (mContextMenu ,SIGNAL(categoryChanged( Incidence * )),this, |
1298 | SLOT( catChanged( Incidence * ) )); | 1302 | SLOT( catChanged( Incidence * ) )); |
1299 | 1303 | ||
1300 | 1304 | ||
1301 | QString pathString = ""; | 1305 | QString pathString = ""; |
1302 | if ( !KOPrefs::instance()->mToolBarMiniIcons ) { | 1306 | if ( !KOPrefs::instance()->mToolBarMiniIcons ) { |
1303 | if ( QApplication::desktop()->width() < 480 ) | 1307 | if ( QApplication::desktop()->width() < 480 ) |
1304 | pathString += "icons16/"; | 1308 | pathString += "icons16/"; |
1305 | } else | 1309 | } else |
1306 | pathString += "iconsmini/"; | 1310 | pathString += "iconsmini/"; |
1307 | mNewItemMenu = new QPopupMenu( this ); | 1311 | mNewItemMenu = new QPopupMenu( this ); |
1308 | mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent())); | 1312 | mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent())); |
1309 | mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false); | 1313 | mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false); |
1310 | mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false); | 1314 | mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false); |
1311 | 1315 | ||
1312 | // updateConfig(); //useless here... | 1316 | // updateConfig(); //useless here... |
1313 | // ... but we need mWidthLongDayLabel computed | 1317 | // ... but we need mWidthLongDayLabel computed |
1314 | QFontMetrics fontmetric(mDayLabels[0]->font()); | 1318 | QFontMetrics fontmetric(mDayLabels[0]->font()); |
1315 | mWidthLongDayLabel = 0; | 1319 | mWidthLongDayLabel = 0; |
1316 | for (int i = 0; i < 7; i++) { | 1320 | for (int i = 0; i < 7; i++) { |
1317 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 1321 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
1318 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 1322 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
1319 | } | 1323 | } |
1320 | 1324 | ||
1321 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 1325 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
1322 | 1326 | ||
1323 | #if 0 | 1327 | #if 0 |
1324 | if ( mShowWeekView ) | 1328 | if ( mShowWeekView ) |
1325 | mWidStack->raiseWidget( mWeekView ); | 1329 | mWidStack->raiseWidget( mWeekView ); |
1326 | else | 1330 | else |
1327 | mWidStack->raiseWidget( mMonthView ); | 1331 | mWidStack->raiseWidget( mMonthView ); |
1328 | #endif | 1332 | #endif |
1329 | 1333 | ||
1330 | emit incidenceSelected( 0 ); | 1334 | emit incidenceSelected( 0 ); |
1331 | 1335 | ||
1332 | mComputeLayoutTimer = new QTimer( this ); | 1336 | mComputeLayoutTimer = new QTimer( this ); |
1333 | connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout())); | 1337 | connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout())); |
1334 | 1338 | ||
1335 | 1339 | ||
1336 | #ifndef DESKTOP_VERSION | 1340 | #ifndef DESKTOP_VERSION |
1337 | resize( QApplication::desktop()->size() ); | 1341 | resize( QApplication::desktop()->size() ); |
1338 | #else | 1342 | #else |
1339 | resize(640, 480 ); | 1343 | resize(640, 480 ); |
1340 | updatePossible = true; | 1344 | updatePossible = true; |
1341 | #endif | 1345 | #endif |
1342 | computeLayout(); | 1346 | computeLayout(); |
1343 | 1347 | ||
1344 | if ( mShowWeekView ) | 1348 | if ( mShowWeekView ) |
1345 | mWidStack->raiseWidget( mWeekView ); | 1349 | mWidStack->raiseWidget( mWeekView ); |
1346 | else | 1350 | else |
1347 | mWidStack->raiseWidget( mMonthView ); | 1351 | mWidStack->raiseWidget( mMonthView ); |
1348 | } | 1352 | } |
1349 | 1353 | ||
1350 | KOMonthView::~KOMonthView() | 1354 | KOMonthView::~KOMonthView() |
1351 | { | 1355 | { |
1352 | delete mContextMenu; | 1356 | delete mContextMenu; |
1353 | } | 1357 | } |
1354 | 1358 | ||
1355 | void KOMonthView::catChanged( Incidence * ) | 1359 | void KOMonthView::catChanged( Incidence * ) |
1356 | { | 1360 | { |
1357 | updateView(); | 1361 | updateView(); |
1358 | } | 1362 | } |
1359 | void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday ) | 1363 | void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday ) |
1360 | { | 1364 | { |
1361 | static Incidence * lastInc = 0; | 1365 | static Incidence * lastInc = 0; |
1362 | static MonthViewCell * lastCell = 0; | 1366 | static MonthViewCell * lastCell = 0; |
1363 | 1367 | ||
1364 | if ( lastInc == inc && lastCell == mc ) | 1368 | if ( lastInc == inc && lastCell == mc ) |
1365 | return; | 1369 | return; |
1366 | lastInc = inc; | 1370 | lastInc = inc; |
1367 | lastCell = mc; | 1371 | lastCell = mc; |
1368 | //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); | 1372 | //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index e37a7ad..eef8327 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -1,323 +1,324 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | 3 | ||
4 | Copyright (c) 1998 Preston Brown | 4 | Copyright (c) 1998 Preston Brown |
5 | Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org> | 5 | Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org> |
6 | 6 | ||
7 | This library is free software; you can redistribute it and/or | 7 | This library is free software; you can redistribute it and/or |
8 | modify it under the terms of the GNU Library General Public | 8 | modify it under the terms of the GNU Library General Public |
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This library is distributed in the hope that it will be useful, | 12 | This library is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | Library General Public License for more details. | 15 | Library General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU Library General Public License | 17 | You should have received a copy of the GNU Library General Public License |
18 | along with this library; see the file COPYING.LIB. If not, write to | 18 | along with this library; see the file COPYING.LIB. If not, write to |
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qptrlist.h> | 25 | #include <qptrlist.h> |
26 | 26 | ||
27 | #include <kdebug.h> | 27 | #include <kdebug.h> |
28 | #include <kconfig.h> | 28 | #include <kconfig.h> |
29 | #include <kglobal.h> | 29 | #include <kglobal.h> |
30 | #include <klocale.h> | 30 | #include <klocale.h> |
31 | 31 | ||
32 | #include "vcaldrag.h" | 32 | #include "vcaldrag.h" |
33 | #include "vcalformat.h" | 33 | #include "vcalformat.h" |
34 | #include "icalformat.h" | 34 | #include "icalformat.h" |
35 | #include "exceptions.h" | 35 | #include "exceptions.h" |
36 | #include "incidence.h" | 36 | #include "incidence.h" |
37 | #include "journal.h" | 37 | #include "journal.h" |
38 | #include "filestorage.h" | 38 | #include "filestorage.h" |
39 | #include "calfilter.h" | 39 | #include "calfilter.h" |
40 | 40 | ||
41 | #include "calendarlocal.h" | 41 | #include "calendarlocal.h" |
42 | 42 | ||
43 | // #ifndef DESKTOP_VERSION | 43 | // #ifndef DESKTOP_VERSION |
44 | // #include <qtopia/alarmserver.h> | 44 | // #include <qtopia/alarmserver.h> |
45 | // #endif | 45 | // #endif |
46 | using namespace KCal; | 46 | using namespace KCal; |
47 | 47 | ||
48 | CalendarLocal::CalendarLocal() | 48 | CalendarLocal::CalendarLocal() |
49 | : Calendar() | 49 | : Calendar() |
50 | { | 50 | { |
51 | init(); | 51 | init(); |
52 | } | 52 | } |
53 | 53 | ||
54 | CalendarLocal::CalendarLocal(const QString &timeZoneId) | 54 | CalendarLocal::CalendarLocal(const QString &timeZoneId) |
55 | : Calendar(timeZoneId) | 55 | : Calendar(timeZoneId) |
56 | { | 56 | { |
57 | init(); | 57 | init(); |
58 | } | 58 | } |
59 | 59 | ||
60 | void CalendarLocal::init() | 60 | void CalendarLocal::init() |
61 | { | 61 | { |
62 | mNextAlarmIncidence = 0; | 62 | mNextAlarmIncidence = 0; |
63 | } | 63 | } |
64 | 64 | ||
65 | 65 | ||
66 | CalendarLocal::~CalendarLocal() | 66 | CalendarLocal::~CalendarLocal() |
67 | { | 67 | { |
68 | registerObserver( 0 ); | ||
68 | if ( mDeleteIncidencesOnClose ) | 69 | if ( mDeleteIncidencesOnClose ) |
69 | close(); | 70 | close(); |
70 | } | 71 | } |
71 | bool CalendarLocal::mergeCalendarFile( QString name ) | 72 | bool CalendarLocal::mergeCalendarFile( QString name ) |
72 | { | 73 | { |
73 | CalendarLocal calendar( timeZoneId() ); | 74 | CalendarLocal calendar( timeZoneId() ); |
74 | calendar.setDefaultCalendar( 1 ); | 75 | calendar.setDefaultCalendar( 1 ); |
75 | if ( calendar.load( name ) ) { | 76 | if ( calendar.load( name ) ) { |
76 | mergeCalendar( &calendar ); | 77 | mergeCalendar( &calendar ); |
77 | return true; | 78 | return true; |
78 | } | 79 | } |
79 | return false; | 80 | return false; |
80 | } | 81 | } |
81 | 82 | ||
82 | Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates) | 83 | Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates) |
83 | { | 84 | { |
84 | Todo *todo;; | 85 | Todo *todo;; |
85 | Incidence *retVal = 0; | 86 | Incidence *retVal = 0; |
86 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { | 87 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { |
87 | if ( todo->uid() == uid ) { | 88 | if ( todo->uid() == uid ) { |
88 | if ( doNotCheckDuplicates ) return todo; | 89 | if ( doNotCheckDuplicates ) return todo; |
89 | if ( retVal ) { | 90 | if ( retVal ) { |
90 | if ( retVal->calID() > todo->calID() ) { | 91 | if ( retVal->calID() > todo->calID() ) { |
91 | retVal = todo; | 92 | retVal = todo; |
92 | } | 93 | } |
93 | } else { | 94 | } else { |
94 | retVal = todo; | 95 | retVal = todo; |
95 | } | 96 | } |
96 | } | 97 | } |
97 | } | 98 | } |
98 | if ( retVal ) return retVal; | 99 | if ( retVal ) return retVal; |
99 | Event *event; | 100 | Event *event; |
100 | for ( event = mEventList.first(); event; event = mEventList.next() ) { | 101 | for ( event = mEventList.first(); event; event = mEventList.next() ) { |
101 | if ( event->uid() == uid ) { | 102 | if ( event->uid() == uid ) { |
102 | if ( doNotCheckDuplicates ) return event; | 103 | if ( doNotCheckDuplicates ) return event; |
103 | if ( retVal ) { | 104 | if ( retVal ) { |
104 | if ( retVal->calID() > event->calID() ) { | 105 | if ( retVal->calID() > event->calID() ) { |
105 | retVal = event; | 106 | retVal = event; |
106 | } | 107 | } |
107 | } else { | 108 | } else { |
108 | retVal = event; | 109 | retVal = event; |
109 | } | 110 | } |
110 | } | 111 | } |
111 | } | 112 | } |
112 | if ( retVal ) return retVal; | 113 | if ( retVal ) return retVal; |
113 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) | 114 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) |
114 | if ( it->uid() == uid ) { | 115 | if ( it->uid() == uid ) { |
115 | if ( doNotCheckDuplicates ) return it; | 116 | if ( doNotCheckDuplicates ) return it; |
116 | if ( retVal ) { | 117 | if ( retVal ) { |
117 | if ( retVal->calID() > it->calID() ) { | 118 | if ( retVal->calID() > it->calID() ) { |
118 | retVal = it; | 119 | retVal = it; |
119 | } | 120 | } |
120 | } else { | 121 | } else { |
121 | retVal = it; | 122 | retVal = it; |
122 | } | 123 | } |
123 | } | 124 | } |
124 | return retVal; | 125 | return retVal; |
125 | } | 126 | } |
126 | 127 | ||
127 | bool CalendarLocal::mergeCalendar( Calendar* remote ) | 128 | bool CalendarLocal::mergeCalendar( Calendar* remote ) |
128 | { | 129 | { |
129 | // 1 look for raw inc in local | 130 | // 1 look for raw inc in local |
130 | // if inc not in remote, delete in local | 131 | // if inc not in remote, delete in local |
131 | // 2 look for raw inc in remote | 132 | // 2 look for raw inc in remote |
132 | // if inc in local, replace it | 133 | // if inc in local, replace it |
133 | // if not in local, add it to default calendar | 134 | // if not in local, add it to default calendar |
134 | QPtrList<Incidence> localInc = rawIncidences(); | 135 | QPtrList<Incidence> localInc = rawIncidences(); |
135 | Incidence* inL = localInc.first(); | 136 | Incidence* inL = localInc.first(); |
136 | while ( inL ) { | 137 | while ( inL ) { |
137 | if ( ! inL->isReadOnly () ) | 138 | if ( ! inL->isReadOnly () ) |
138 | if ( !remote->incidenceForUid( inL->uid(), true )) | 139 | if ( !remote->incidenceForUid( inL->uid(), true )) |
139 | deleteIncidence( inL ); | 140 | deleteIncidence( inL ); |
140 | inL = localInc.next(); | 141 | inL = localInc.next(); |
141 | } | 142 | } |
142 | QPtrList<Incidence> er = remote->rawIncidences(); | 143 | QPtrList<Incidence> er = remote->rawIncidences(); |
143 | Incidence* inR = er.first(); | 144 | Incidence* inR = er.first(); |
144 | while ( inR ) { | 145 | while ( inR ) { |
145 | inL = incidenceForUid( inR->uid(),false ); | 146 | inL = incidenceForUid( inR->uid(),false ); |
146 | if ( inL ) { | 147 | if ( inL ) { |
147 | if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) { | 148 | if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) { |
148 | int calID = inL->calID(); | 149 | int calID = inL->calID(); |
149 | deleteIncidence( inL ); | 150 | deleteIncidence( inL ); |
150 | inL = inR->clone(); | 151 | inL = inR->clone(); |
151 | inL->setCalID( calID ); | 152 | inL->setCalID( calID ); |
152 | addIncidence( inL ); | 153 | addIncidence( inL ); |
153 | } | 154 | } |
154 | } else { | 155 | } else { |
155 | inL = inR->clone(); | 156 | inL = inR->clone(); |
156 | inL->setCalID( 0 );// add to default cal | 157 | inL->setCalID( 0 );// add to default cal |
157 | addIncidence( inL ); | 158 | addIncidence( inL ); |
158 | } | 159 | } |
159 | inR = er.next(); | 160 | inR = er.next(); |
160 | } | 161 | } |
161 | return true; | 162 | return true; |
162 | } | 163 | } |
163 | 164 | ||
164 | 165 | ||
165 | bool CalendarLocal::addCalendarFile( QString name, int id ) | 166 | bool CalendarLocal::addCalendarFile( QString name, int id ) |
166 | { | 167 | { |
167 | CalendarLocal calendar( timeZoneId() ); | 168 | CalendarLocal calendar( timeZoneId() ); |
168 | calendar.setDefaultCalendar( id ); | 169 | calendar.setDefaultCalendar( id ); |
169 | if ( calendar.load( name ) ) { | 170 | if ( calendar.load( name ) ) { |
170 | addCalendar( &calendar ); | 171 | addCalendar( &calendar ); |
171 | return true; | 172 | return true; |
172 | } | 173 | } |
173 | return false; | 174 | return false; |
174 | } | 175 | } |
175 | void CalendarLocal::setSyncEventsReadOnly() | 176 | void CalendarLocal::setSyncEventsReadOnly() |
176 | { | 177 | { |
177 | Event * ev; | 178 | Event * ev; |
178 | ev = mEventList.first(); | 179 | ev = mEventList.first(); |
179 | while ( ev ) { | 180 | while ( ev ) { |
180 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 181 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
181 | ev->setReadOnly( true ); | 182 | ev->setReadOnly( true ); |
182 | ev = mEventList.next(); | 183 | ev = mEventList.next(); |
183 | } | 184 | } |
184 | } | 185 | } |
185 | void CalendarLocal::addCalendar( Calendar* cal ) | 186 | void CalendarLocal::addCalendar( Calendar* cal ) |
186 | { | 187 | { |
187 | cal->setDontDeleteIncidencesOnClose(); | 188 | cal->setDontDeleteIncidencesOnClose(); |
188 | { | 189 | { |
189 | QPtrList<Event> EventList = cal->rawEvents(); | 190 | QPtrList<Event> EventList = cal->rawEvents(); |
190 | Event * ev = EventList.first(); | 191 | Event * ev = EventList.first(); |
191 | while ( ev ) { | 192 | while ( ev ) { |
192 | ev->unRegisterObserver( cal ); | 193 | ev->unRegisterObserver( cal ); |
193 | ev->registerObserver( this ); | 194 | ev->registerObserver( this ); |
194 | mEventList.append( ev ); | 195 | mEventList.append( ev ); |
195 | ev = EventList.next(); | 196 | ev = EventList.next(); |
196 | } | 197 | } |
197 | } | 198 | } |
198 | { | 199 | { |
199 | 200 | ||
200 | QPtrList<Todo> TodoList = cal->rawTodos(); | 201 | QPtrList<Todo> TodoList = cal->rawTodos(); |
201 | Todo * ev = TodoList.first(); | 202 | Todo * ev = TodoList.first(); |
202 | while ( ev ) { | 203 | while ( ev ) { |
203 | QString rel = ev->relatedToUid(); | 204 | QString rel = ev->relatedToUid(); |
204 | if ( !rel.isEmpty() ){ | 205 | if ( !rel.isEmpty() ){ |
205 | ev->setRelatedTo ( 0 ); | 206 | ev->setRelatedTo ( 0 ); |
206 | ev->setRelatedToUid( rel ); | 207 | ev->setRelatedToUid( rel ); |
207 | } | 208 | } |
208 | ev = TodoList.next(); | 209 | ev = TodoList.next(); |
209 | } | 210 | } |
210 | //TodoList = cal->rawTodos(); | 211 | //TodoList = cal->rawTodos(); |
211 | ev = TodoList.first(); | 212 | ev = TodoList.first(); |
212 | while ( ev ) { | 213 | while ( ev ) { |
213 | ev->unRegisterObserver( cal ); | 214 | ev->unRegisterObserver( cal ); |
214 | ev->registerObserver( this ); | 215 | ev->registerObserver( this ); |
215 | mTodoList.append( ev ); | 216 | mTodoList.append( ev ); |
216 | setupRelations( ev ); | 217 | setupRelations( ev ); |
217 | ev = TodoList.next(); | 218 | ev = TodoList.next(); |
218 | } | 219 | } |
219 | } | 220 | } |
220 | { | 221 | { |
221 | QPtrList<Journal> JournalList = cal->journals(); | 222 | QPtrList<Journal> JournalList = cal->journals(); |
222 | Journal * ev = JournalList.first(); | 223 | Journal * ev = JournalList.first(); |
223 | while ( ev ) { | 224 | while ( ev ) { |
224 | ev->unRegisterObserver( cal ); | 225 | ev->unRegisterObserver( cal ); |
225 | ev->registerObserver( this ); | 226 | ev->registerObserver( this ); |
226 | mJournalList.append( ev ); | 227 | mJournalList.append( ev ); |
227 | ev = JournalList.next(); | 228 | ev = JournalList.next(); |
228 | } | 229 | } |
229 | } | 230 | } |
230 | setModified( true ); | 231 | setModified( true ); |
231 | } | 232 | } |
232 | bool CalendarLocal::load( const QString &fileName ) | 233 | bool CalendarLocal::load( const QString &fileName ) |
233 | { | 234 | { |
234 | FileStorage storage( this, fileName ); | 235 | FileStorage storage( this, fileName ); |
235 | return storage.load(); | 236 | return storage.load(); |
236 | } | 237 | } |
237 | 238 | ||
238 | bool CalendarLocal::save( const QString &fileName, CalFormat *format ) | 239 | bool CalendarLocal::save( const QString &fileName, CalFormat *format ) |
239 | { | 240 | { |
240 | FileStorage storage( this, fileName, format ); | 241 | FileStorage storage( this, fileName, format ); |
241 | return storage.save(); | 242 | return storage.save(); |
242 | } | 243 | } |
243 | 244 | ||
244 | void CalendarLocal::stopAllTodos() | 245 | void CalendarLocal::stopAllTodos() |
245 | { | 246 | { |
246 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) | 247 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) |
247 | it->setRunning( false ); | 248 | it->setRunning( false ); |
248 | 249 | ||
249 | } | 250 | } |
250 | void CalendarLocal::close() | 251 | void CalendarLocal::close() |
251 | { | 252 | { |
252 | 253 | ||
253 | Todo * i; | 254 | Todo * i; |
254 | for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false); | 255 | for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false); |
255 | 256 | ||
256 | mEventList.setAutoDelete( true ); | 257 | mEventList.setAutoDelete( true ); |
257 | mTodoList.setAutoDelete( true ); | 258 | mTodoList.setAutoDelete( true ); |
258 | mJournalList.setAutoDelete( false ); | 259 | mJournalList.setAutoDelete( false ); |
259 | 260 | ||
260 | mEventList.clear(); | 261 | mEventList.clear(); |
261 | mTodoList.clear(); | 262 | mTodoList.clear(); |
262 | mJournalList.clear(); | 263 | mJournalList.clear(); |
263 | 264 | ||
264 | mEventList.setAutoDelete( false ); | 265 | mEventList.setAutoDelete( false ); |
265 | mTodoList.setAutoDelete( false ); | 266 | mTodoList.setAutoDelete( false ); |
266 | mJournalList.setAutoDelete( false ); | 267 | mJournalList.setAutoDelete( false ); |
267 | 268 | ||
268 | setModified( false ); | 269 | setModified( false ); |
269 | } | 270 | } |
270 | 271 | ||
271 | bool CalendarLocal::addAnniversaryNoDup( Event *event ) | 272 | bool CalendarLocal::addAnniversaryNoDup( Event *event ) |
272 | { | 273 | { |
273 | QString cat; | 274 | QString cat; |
274 | bool isBirthday = true; | 275 | bool isBirthday = true; |
275 | if( event->categoriesStr() == i18n( "Anniversary" ) ) { | 276 | if( event->categoriesStr() == i18n( "Anniversary" ) ) { |
276 | isBirthday = false; | 277 | isBirthday = false; |
277 | cat = i18n( "Anniversary" ); | 278 | cat = i18n( "Anniversary" ); |
278 | } else if( event->categoriesStr() == i18n( "Birthday" ) ) { | 279 | } else if( event->categoriesStr() == i18n( "Birthday" ) ) { |
279 | isBirthday = true; | 280 | isBirthday = true; |
280 | cat = i18n( "Birthday" ); | 281 | cat = i18n( "Birthday" ); |
281 | } else { | 282 | } else { |
282 | qDebug("addAnniversaryNoDup called without fitting category! "); | 283 | qDebug("addAnniversaryNoDup called without fitting category! "); |
283 | return false; | 284 | return false; |
284 | } | 285 | } |
285 | Event * eve; | 286 | Event * eve; |
286 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { | 287 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { |
287 | if ( !(eve->categories().contains( cat ) )) | 288 | if ( !(eve->categories().contains( cat ) )) |
288 | continue; | 289 | continue; |
289 | // now we have an event with fitting category | 290 | // now we have an event with fitting category |
290 | if ( eve->dtStart().date() != event->dtStart().date() ) | 291 | if ( eve->dtStart().date() != event->dtStart().date() ) |
291 | continue; | 292 | continue; |
292 | // now we have an event with fitting category+date | 293 | // now we have an event with fitting category+date |
293 | if ( eve->summary() != event->summary() ) | 294 | if ( eve->summary() != event->summary() ) |
294 | continue; | 295 | continue; |
295 | // now we have an event with fitting category+date+summary | 296 | // now we have an event with fitting category+date+summary |
296 | return false; | 297 | return false; |
297 | } | 298 | } |
298 | return addEvent( event ); | 299 | return addEvent( event ); |
299 | 300 | ||
300 | } | 301 | } |
301 | bool CalendarLocal::addEventNoDup( Event *event ) | 302 | bool CalendarLocal::addEventNoDup( Event *event ) |
302 | { | 303 | { |
303 | Event * eve; | 304 | Event * eve; |
304 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { | 305 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { |
305 | if ( *eve == *event ) { | 306 | if ( *eve == *event ) { |
306 | //qDebug("CalendarLocal::Duplicate event found! Not inserted! "); | 307 | //qDebug("CalendarLocal::Duplicate event found! Not inserted! "); |
307 | return false; | 308 | return false; |
308 | } | 309 | } |
309 | } | 310 | } |
310 | return addEvent( event ); | 311 | return addEvent( event ); |
311 | } | 312 | } |
312 | 313 | ||
313 | bool CalendarLocal::addEvent( Event *event ) | 314 | bool CalendarLocal::addEvent( Event *event ) |
314 | { | 315 | { |
315 | insertEvent( event ); | 316 | insertEvent( event ); |
316 | 317 | ||
317 | event->registerObserver( this ); | 318 | event->registerObserver( this ); |
318 | 319 | ||
319 | setModified( true ); | 320 | setModified( true ); |
320 | if ( event->calID() == 0 ) | 321 | if ( event->calID() == 0 ) |
321 | event->setCalID( mDefaultCalendar ); | 322 | event->setCalID( mDefaultCalendar ); |
322 | event->setCalEnabled( true ); | 323 | event->setCalEnabled( true ); |
323 | 324 | ||
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index 5877406..6f3a799 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp | |||
@@ -1,462 +1,469 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <qdatetime.h> | 21 | #include <qdatetime.h> |
22 | #include <qstring.h> | 22 | #include <qstring.h> |
23 | #include <qptrlist.h> | 23 | #include <qptrlist.h> |
24 | #include <qregexp.h> | 24 | #include <qregexp.h> |
25 | #include <qclipboard.h> | 25 | #include <qclipboard.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qtextstream.h> | 27 | #include <qtextstream.h> |
28 | #include <qtextcodec.h> | 28 | #include <qtextcodec.h> |
29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
30 | 30 | ||
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <kglobal.h> | 32 | #include <kglobal.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | 34 | ||
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ical.h> | 36 | #include <ical.h> |
37 | #include <icalss.h> | 37 | #include <icalss.h> |
38 | #include <icalparser.h> | 38 | #include <icalparser.h> |
39 | #include <icalrestriction.h> | 39 | #include <icalrestriction.h> |
40 | } | 40 | } |
41 | 41 | ||
42 | #include "calendar.h" | 42 | #include "calendar.h" |
43 | #include "calendarlocal.h" | 43 | #include "calendarlocal.h" |
44 | #include "journal.h" | 44 | #include "journal.h" |
45 | 45 | ||
46 | #include "icalformat.h" | 46 | #include "icalformat.h" |
47 | #include "icalformatimpl.h" | 47 | #include "icalformatimpl.h" |
48 | 48 | ||
49 | #define _ICAL_VERSION "2.0" | 49 | #define _ICAL_VERSION "2.0" |
50 | 50 | ||
51 | using namespace KCal; | 51 | using namespace KCal; |
52 | 52 | ||
53 | ICalFormat::ICalFormat( ) | 53 | ICalFormat::ICalFormat( bool pe ) |
54 | { | 54 | { |
55 | mProcessEvents = pe; | ||
55 | mImpl = new ICalFormatImpl( this ); | 56 | mImpl = new ICalFormatImpl( this ); |
56 | tzOffsetMin = 0; | 57 | tzOffsetMin = 0; |
57 | //qDebug("new ICalFormat() "); | 58 | //qDebug("new ICalFormat() "); |
58 | } | 59 | } |
59 | 60 | ||
60 | ICalFormat::~ICalFormat() | 61 | ICalFormat::~ICalFormat() |
61 | { | 62 | { |
62 | delete mImpl; | 63 | delete mImpl; |
63 | //qDebug("delete ICalFormat "); | 64 | //qDebug("delete ICalFormat "); |
64 | } | 65 | } |
65 | 66 | ||
66 | bool ICalFormat::load( Calendar *calendar, const QString &fileName) | 67 | bool ICalFormat::load( Calendar *calendar, const QString &fileName) |
67 | { | 68 | { |
68 | 69 | ||
69 | clearException(); | 70 | clearException(); |
70 | 71 | ||
71 | QFile file( fileName ); | 72 | QFile file( fileName ); |
72 | if (!file.open( IO_ReadOnly ) ) { | 73 | if (!file.open( IO_ReadOnly ) ) { |
73 | setException(new ErrorFormat(ErrorFormat::LoadError)); | 74 | setException(new ErrorFormat(ErrorFormat::LoadError)); |
74 | return false; | 75 | return false; |
75 | } | 76 | } |
76 | QTextStream ts( &file ); | 77 | QTextStream ts( &file ); |
77 | QString text; | 78 | QString text; |
78 | 79 | ||
79 | ts.setEncoding( QTextStream::Latin1 ); | 80 | ts.setEncoding( QTextStream::Latin1 ); |
80 | text = ts.read(); | 81 | text = ts.read(); |
81 | file.close(); | 82 | file.close(); |
82 | 83 | ||
83 | return fromString( calendar, text ); | 84 | return fromString( calendar, text ); |
84 | } | 85 | } |
85 | 86 | ||
86 | //#include <qdatetime.h> | 87 | //#include <qdatetime.h> |
87 | bool ICalFormat::save( Calendar *calendar, const QString &fileName ) | 88 | bool ICalFormat::save( Calendar *calendar, const QString &fileName ) |
88 | { | 89 | { |
89 | //kdDebug(5800) << "ICalFormat::save(): " << fileName << endl; | 90 | //kdDebug(5800) << "ICalFormat::save(): " << fileName << endl; |
90 | //qDebug("ICalFormat::save "); | 91 | //qDebug("ICalFormat::save "); |
91 | clearException(); | 92 | clearException(); |
92 | QString text = toString( calendar ); | 93 | QString text = toString( calendar ); |
93 | //return false; | 94 | //return false; |
94 | // qDebug("to string takes ms: %d ",is.elapsed() ); | 95 | // qDebug("to string takes ms: %d ",is.elapsed() ); |
95 | if ( text.isNull() ) return false; | 96 | if ( text.isNull() ) return false; |
96 | 97 | ||
97 | // TODO: write backup file | 98 | // TODO: write backup file |
98 | //is.restart(); | 99 | //is.restart(); |
99 | QFile file( fileName ); | 100 | QFile file( fileName ); |
100 | if (!file.open( IO_WriteOnly ) ) { | 101 | if (!file.open( IO_WriteOnly ) ) { |
101 | setException(new ErrorFormat(ErrorFormat::SaveError, | 102 | setException(new ErrorFormat(ErrorFormat::SaveError, |
102 | i18n("Could not open file '%1'").arg(fileName))); | 103 | i18n("Could not open file '%1'").arg(fileName))); |
103 | return false; | 104 | return false; |
104 | } | 105 | } |
105 | QTextStream ts( &file ); | 106 | QTextStream ts( &file ); |
106 | 107 | ||
107 | ts.setEncoding( QTextStream::Latin1 ); | 108 | ts.setEncoding( QTextStream::Latin1 ); |
108 | ts << text; | 109 | ts << text; |
109 | file.close(); | 110 | file.close(); |
110 | //qDebug("saving file takes ms: %d ", is.elapsed() ); | 111 | //qDebug("saving file takes ms: %d ", is.elapsed() ); |
111 | return true; | 112 | return true; |
112 | } | 113 | } |
113 | 114 | ||
114 | bool ICalFormat::fromString( Calendar *cal, const QString &text ) | 115 | bool ICalFormat::fromString( Calendar *cal, const QString &text ) |
115 | { | 116 | { |
116 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); | 117 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); |
117 | // qDebug("ICalFormat::fromString tz: %s ", cal->timeZoneId().latin1()); | 118 | // qDebug("ICalFormat::fromString tz: %s ", cal->timeZoneId().latin1()); |
118 | // Get first VCALENDAR component. | 119 | // Get first VCALENDAR component. |
119 | // TODO: Handle more than one VCALENDAR or non-VCALENDAR top components | 120 | // TODO: Handle more than one VCALENDAR or non-VCALENDAR top components |
120 | icalcomponent *calendar; | 121 | icalcomponent *calendar; |
121 | 122 | ||
122 | //calendar = icalcomponent_new_from_string( text.local8Bit().data()); | 123 | //calendar = icalcomponent_new_from_string( text.local8Bit().data()); |
123 | // good calendar = icalcomponent_new_from_string( text.utf8().data()); | 124 | // good calendar = icalcomponent_new_from_string( text.utf8().data()); |
124 | calendar = icalcomponent_new_from_string( (char*)text.latin1()); | 125 | calendar = icalcomponent_new_from_string( (char*)text.latin1()); |
125 | if (!calendar) { | 126 | if (!calendar) { |
126 | setException(new ErrorFormat(ErrorFormat::ParseErrorIcal)); | 127 | setException(new ErrorFormat(ErrorFormat::ParseErrorIcal)); |
127 | return false; | 128 | return false; |
128 | } | 129 | } |
129 | 130 | ||
130 | bool success = true; | 131 | bool success = true; |
131 | 132 | ||
132 | if (icalcomponent_isa(calendar) != ICAL_VCALENDAR_COMPONENT) { | 133 | if (icalcomponent_isa(calendar) != ICAL_VCALENDAR_COMPONENT) { |
133 | setException(new ErrorFormat(ErrorFormat::NoCalendar)); | 134 | setException(new ErrorFormat(ErrorFormat::NoCalendar)); |
134 | success = false; | 135 | success = false; |
135 | } else { | 136 | } else { |
136 | // put all objects into their proper places | 137 | // put all objects into their proper places |
137 | if ( !mImpl->populate( cal, calendar ) ) { | 138 | if ( !mImpl->populate( cal, calendar ) ) { |
138 | if ( !exception() ) { | 139 | if ( !exception() ) { |
139 | setException(new ErrorFormat(ErrorFormat::ParseErrorKcal)); | 140 | setException(new ErrorFormat(ErrorFormat::ParseErrorKcal)); |
140 | } | 141 | } |
141 | success = false; | 142 | success = false; |
142 | } else | 143 | } else |
143 | mLoadedProductId = mImpl->loadedProductId(); | 144 | mLoadedProductId = mImpl->loadedProductId(); |
144 | } | 145 | } |
145 | 146 | ||
146 | icalcomponent_free( calendar ); | 147 | icalcomponent_free( calendar ); |
147 | icalmemory_free_ring(); | 148 | icalmemory_free_ring(); |
148 | 149 | ||
149 | return success; | 150 | return success; |
150 | } | 151 | } |
151 | 152 | ||
152 | Incidence *ICalFormat::fromString( const QString &text ) | 153 | Incidence *ICalFormat::fromString( const QString &text ) |
153 | { | 154 | { |
154 | CalendarLocal cal( mTimeZoneId ); | 155 | CalendarLocal cal( mTimeZoneId ); |
155 | fromString(&cal, text); | 156 | fromString(&cal, text); |
156 | 157 | ||
157 | Incidence *ical = 0; | 158 | Incidence *ical = 0; |
158 | QPtrList<Event> elist = cal.events(); | 159 | QPtrList<Event> elist = cal.events(); |
159 | if ( elist.count() > 0 ) { | 160 | if ( elist.count() > 0 ) { |
160 | ical = elist.first(); | 161 | ical = elist.first(); |
161 | } else { | 162 | } else { |
162 | QPtrList<Todo> tlist = cal.todos(); | 163 | QPtrList<Todo> tlist = cal.todos(); |
163 | if ( tlist.count() > 0 ) { | 164 | if ( tlist.count() > 0 ) { |
164 | ical = tlist.first(); | 165 | ical = tlist.first(); |
165 | } else { | 166 | } else { |
166 | QPtrList<Journal> jlist = cal.journals(); | 167 | QPtrList<Journal> jlist = cal.journals(); |
167 | if ( jlist.count() > 0 ) { | 168 | if ( jlist.count() > 0 ) { |
168 | ical = jlist.first(); | 169 | ical = jlist.first(); |
169 | } | 170 | } |
170 | } | 171 | } |
171 | } | 172 | } |
172 | return ical; | 173 | return ical; |
173 | } | 174 | } |
174 | #include <qapp.h> | 175 | #include <qapp.h> |
175 | 176 | ||
176 | QString ICalFormat::toString( Calendar *cal ) | 177 | QString ICalFormat::toString( Calendar *cal ) |
177 | { | 178 | { |
178 | 179 | ||
179 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); | 180 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); |
180 | 181 | ||
181 | icalcomponent *calendar = mImpl->createCalendarComponent(cal); | 182 | icalcomponent *calendar = mImpl->createCalendarComponent(cal); |
182 | 183 | ||
183 | icalcomponent *component; | 184 | icalcomponent *component; |
184 | 185 | ||
185 | // todos | 186 | // todos |
186 | QPtrList<Todo> todoList = cal->rawTodos(); | 187 | QPtrList<Todo> todoList = cal->rawTodos(); |
187 | QPtrListIterator<Todo> qlt(todoList); | 188 | QPtrListIterator<Todo> qlt(todoList); |
188 | for (; qlt.current(); ++qlt) { | 189 | for (; qlt.current(); ++qlt) { |
189 | component = mImpl->writeTodo(qlt.current()); | 190 | component = mImpl->writeTodo(qlt.current()); |
190 | icalcomponent_add_component(calendar,component); | 191 | icalcomponent_add_component(calendar,component); |
191 | //qDebug(" todos "); | 192 | //qDebug(" todos "); |
192 | qApp->processEvents(); | 193 | if ( mProcessEvents ) { |
194 | //qDebug("mProcessEvents "); | ||
195 | qApp->processEvents(); | ||
196 | } | ||
193 | } | 197 | } |
194 | // events | 198 | // events |
195 | QPtrList<Event> events = cal->rawEvents(); | 199 | QPtrList<Event> events = cal->rawEvents(); |
196 | Event *ev; | 200 | Event *ev; |
197 | for(ev=events.first();ev;ev=events.next()) { | 201 | for(ev=events.first();ev;ev=events.next()) { |
198 | component = mImpl->writeEvent(ev); | 202 | component = mImpl->writeEvent(ev); |
199 | icalcomponent_add_component(calendar,component); | 203 | icalcomponent_add_component(calendar,component); |
200 | //qDebug("events "); | 204 | //qDebug("events "); |
201 | qApp->processEvents(); | 205 | if ( mProcessEvents ) |
206 | qApp->processEvents(); | ||
202 | } | 207 | } |
203 | 208 | ||
204 | // journals | 209 | // journals |
205 | QPtrList<Journal> journals = cal->journals(); | 210 | QPtrList<Journal> journals = cal->journals(); |
206 | Journal *j; | 211 | Journal *j; |
207 | for(j=journals.first();j;j=journals.next()) { | 212 | for(j=journals.first();j;j=journals.next()) { |
208 | component = mImpl->writeJournal(j); | 213 | component = mImpl->writeJournal(j); |
209 | icalcomponent_add_component(calendar,component); | 214 | icalcomponent_add_component(calendar,component); |
210 | //qDebug("journals "); | 215 | //qDebug("journals "); |
211 | qApp->processEvents(); | 216 | if ( mProcessEvents ) |
217 | qApp->processEvents(); | ||
212 | } | 218 | } |
213 | const char *text; | 219 | const char *text; |
214 | QString ret =""; | 220 | QString ret =""; |
215 | text = icalcomponent_as_ical_string( calendar ); | 221 | text = icalcomponent_as_ical_string( calendar ); |
216 | qApp->processEvents(); | 222 | if ( mProcessEvents ) |
223 | qApp->processEvents(); | ||
217 | 224 | ||
218 | // text = "BEGIN:VCALENDAR\nPRODID\n :-//K Desktop Environment//NONSGML libkcal 3.1//EN\nVERSION\n :2.0\nBEGIN:VEVENT\nDTSTAMP\n :20031231T213514Z\nORGANIZER\n :MAILTO:lutz@putz.de\nCREATED\n :20031231T213513Z\nUID\n :libkcal-1295166342.120\nSEQUENCE\n :0\nLAST-MODIFIED\n :20031231T213513Z\nSUMMARY\n :test1\nCLASS\n :PUBLIC\nPRIORITY\n :3\nDTSTART\n :20040101T090000Z\nDTEND\n :20040101T110000Z\nTRANSP\n :OPAQUE\nEND:VEVENT\nEND:VCALENDAR\n"; | 225 | // text = "BEGIN:VCALENDAR\nPRODID\n :-//K Desktop Environment//NONSGML libkcal 3.1//EN\nVERSION\n :2.0\nBEGIN:VEVENT\nDTSTAMP\n :20031231T213514Z\nORGANIZER\n :MAILTO:lutz@putz.de\nCREATED\n :20031231T213513Z\nUID\n :libkcal-1295166342.120\nSEQUENCE\n :0\nLAST-MODIFIED\n :20031231T213513Z\nSUMMARY\n :test1\nCLASS\n :PUBLIC\nPRIORITY\n :3\nDTSTART\n :20040101T090000Z\nDTEND\n :20040101T110000Z\nTRANSP\n :OPAQUE\nEND:VEVENT\nEND:VCALENDAR\n"; |
219 | 226 | ||
220 | 227 | ||
221 | if ( text ) { | 228 | if ( text ) { |
222 | ret = QString ( text ); | 229 | ret = QString ( text ); |
223 | } | 230 | } |
224 | icalcomponent_free( calendar ); | 231 | icalcomponent_free( calendar ); |
225 | 232 | ||
226 | if (!text) { | 233 | if (!text) { |
227 | setException(new ErrorFormat(ErrorFormat::SaveError, | 234 | setException(new ErrorFormat(ErrorFormat::SaveError, |
228 | i18n("libical error"))); | 235 | i18n("libical error"))); |
229 | icalmemory_free_ring(); | 236 | icalmemory_free_ring(); |
230 | return QString::null; | 237 | return QString::null; |
231 | } | 238 | } |
232 | icalmemory_free_ring(); | 239 | icalmemory_free_ring(); |
233 | return ret; | 240 | return ret; |
234 | } | 241 | } |
235 | 242 | ||
236 | QString ICalFormat::toICalString( Incidence *incidence ) | 243 | QString ICalFormat::toICalString( Incidence *incidence ) |
237 | { | 244 | { |
238 | CalendarLocal cal( mTimeZoneId ); | 245 | CalendarLocal cal( mTimeZoneId ); |
239 | cal.addIncidence( incidence->clone() ); | 246 | cal.addIncidence( incidence->clone() ); |
240 | return toString( &cal ); | 247 | return toString( &cal ); |
241 | } | 248 | } |
242 | 249 | ||
243 | QString ICalFormat::toString( Incidence *incidence ) | 250 | QString ICalFormat::toString( Incidence *incidence ) |
244 | { | 251 | { |
245 | icalcomponent *component; | 252 | icalcomponent *component; |
246 | 253 | ||
247 | component = mImpl->writeIncidence( incidence ); | 254 | component = mImpl->writeIncidence( incidence ); |
248 | 255 | ||
249 | const char *text = icalcomponent_as_ical_string( component ); | 256 | const char *text = icalcomponent_as_ical_string( component ); |
250 | 257 | ||
251 | icalcomponent_free( component ); | 258 | icalcomponent_free( component ); |
252 | 259 | ||
253 | return QString::fromLocal8Bit( text ); | 260 | return QString::fromLocal8Bit( text ); |
254 | } | 261 | } |
255 | 262 | ||
256 | QString ICalFormat::toString( Recurrence *recurrence ) | 263 | QString ICalFormat::toString( Recurrence *recurrence ) |
257 | { | 264 | { |
258 | icalproperty *property; | 265 | icalproperty *property; |
259 | property = mImpl->writeRecurrenceRule( recurrence ); | 266 | property = mImpl->writeRecurrenceRule( recurrence ); |
260 | const char *text = icalproperty_as_ical_string( property ); | 267 | const char *text = icalproperty_as_ical_string( property ); |
261 | icalproperty_free( property ); | 268 | icalproperty_free( property ); |
262 | return QString::fromLocal8Bit( text ); | 269 | return QString::fromLocal8Bit( text ); |
263 | } | 270 | } |
264 | /* | 271 | /* |
265 | bool ICalFormat::fromString( Recurrence * recurrence, const QString& rrule ) | 272 | bool ICalFormat::fromString( Recurrence * recurrence, const QString& rrule ) |
266 | { | 273 | { |
267 | bool success = true; | 274 | bool success = true; |
268 | icalerror_clear_errno(); | 275 | icalerror_clear_errno(); |
269 | struct icalrecurrencetype recur = icalrecurrencetype_from_string( rrule ); | 276 | struct icalrecurrencetype recur = icalrecurrencetype_from_string( rrule ); |
270 | if ( icalerrno != ICAL_NO_ERROR ) { | 277 | if ( icalerrno != ICAL_NO_ERROR ) { |
271 | kdDebug() << "Recurrence parsing error: " << icalerror_strerror( icalerrno ) << endl; | 278 | kdDebug() << "Recurrence parsing error: " << icalerror_strerror( icalerrno ) << endl; |
272 | success = false; | 279 | success = false; |
273 | } | 280 | } |
274 | 281 | ||
275 | if ( success ) { | 282 | if ( success ) { |
276 | mImpl->readRecurrence( recur, recurrence ); | 283 | mImpl->readRecurrence( recur, recurrence ); |
277 | } | 284 | } |
278 | 285 | ||
279 | return success; | 286 | return success; |
280 | } | 287 | } |
281 | */ | 288 | */ |
282 | 289 | ||
283 | QString ICalFormat::createScheduleMessage(IncidenceBase *incidence, | 290 | QString ICalFormat::createScheduleMessage(IncidenceBase *incidence, |
284 | Scheduler::Method method) | 291 | Scheduler::Method method) |
285 | { | 292 | { |
286 | icalcomponent *message = mImpl->createScheduleComponent(incidence,method); | 293 | icalcomponent *message = mImpl->createScheduleComponent(incidence,method); |
287 | 294 | ||
288 | QString messageText = icalcomponent_as_ical_string(message); | 295 | QString messageText = icalcomponent_as_ical_string(message); |
289 | 296 | ||
290 | 297 | ||
291 | 298 | ||
292 | return messageText; | 299 | return messageText; |
293 | } | 300 | } |
294 | 301 | ||
295 | ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, | 302 | ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, |
296 | const QString &messageText ) | 303 | const QString &messageText ) |
297 | { | 304 | { |
298 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); | 305 | setTimeZone( cal->timeZoneId(), !cal->isLocalTime() ); |
299 | clearException(); | 306 | clearException(); |
300 | 307 | ||
301 | if (messageText.isEmpty()) return 0; | 308 | if (messageText.isEmpty()) return 0; |
302 | 309 | ||
303 | icalcomponent *message; | 310 | icalcomponent *message; |
304 | message = icalparser_parse_string(messageText.local8Bit()); | 311 | message = icalparser_parse_string(messageText.local8Bit()); |
305 | 312 | ||
306 | if (!message) return 0; | 313 | if (!message) return 0; |
307 | 314 | ||
308 | icalproperty *m = icalcomponent_get_first_property(message, | 315 | icalproperty *m = icalcomponent_get_first_property(message, |
309 | ICAL_METHOD_PROPERTY); | 316 | ICAL_METHOD_PROPERTY); |
310 | 317 | ||
311 | if (!m) return 0; | 318 | if (!m) return 0; |
312 | 319 | ||
313 | icalcomponent *c; | 320 | icalcomponent *c; |
314 | 321 | ||
315 | IncidenceBase *incidence = 0; | 322 | IncidenceBase *incidence = 0; |
316 | c = icalcomponent_get_first_component(message,ICAL_VEVENT_COMPONENT); | 323 | c = icalcomponent_get_first_component(message,ICAL_VEVENT_COMPONENT); |
317 | if (c) { | 324 | if (c) { |
318 | incidence = mImpl->readEvent(c); | 325 | incidence = mImpl->readEvent(c); |
319 | } | 326 | } |
320 | 327 | ||
321 | if (!incidence) { | 328 | if (!incidence) { |
322 | c = icalcomponent_get_first_component(message,ICAL_VTODO_COMPONENT); | 329 | c = icalcomponent_get_first_component(message,ICAL_VTODO_COMPONENT); |
323 | if (c) { | 330 | if (c) { |
324 | incidence = mImpl->readTodo(c); | 331 | incidence = mImpl->readTodo(c); |
325 | } | 332 | } |
326 | } | 333 | } |
327 | 334 | ||
328 | if (!incidence) { | 335 | if (!incidence) { |
329 | c = icalcomponent_get_first_component(message,ICAL_VFREEBUSY_COMPONENT); | 336 | c = icalcomponent_get_first_component(message,ICAL_VFREEBUSY_COMPONENT); |
330 | if (c) { | 337 | if (c) { |
331 | incidence = mImpl->readFreeBusy(c); | 338 | incidence = mImpl->readFreeBusy(c); |
332 | } | 339 | } |
333 | } | 340 | } |
334 | 341 | ||
335 | if (!incidence) { | 342 | if (!incidence) { |
336 | kdDebug() << "ICalFormat:parseScheduleMessage: object is not a freebusy, event or todo" << endl; | 343 | kdDebug() << "ICalFormat:parseScheduleMessage: object is not a freebusy, event or todo" << endl; |
337 | return 0; | 344 | return 0; |
338 | } | 345 | } |
339 | 346 | ||
340 | kdDebug(5800) << "ICalFormat::parseScheduleMessage() getting method..." << endl; | 347 | kdDebug(5800) << "ICalFormat::parseScheduleMessage() getting method..." << endl; |
341 | 348 | ||
342 | icalproperty_method icalmethod = icalproperty_get_method(m); | 349 | icalproperty_method icalmethod = icalproperty_get_method(m); |
343 | Scheduler::Method method; | 350 | Scheduler::Method method; |
344 | 351 | ||
345 | switch (icalmethod) { | 352 | switch (icalmethod) { |
346 | case ICAL_METHOD_PUBLISH: | 353 | case ICAL_METHOD_PUBLISH: |
347 | method = Scheduler::Publish; | 354 | method = Scheduler::Publish; |
348 | break; | 355 | break; |
349 | case ICAL_METHOD_REQUEST: | 356 | case ICAL_METHOD_REQUEST: |
350 | method = Scheduler::Request; | 357 | method = Scheduler::Request; |
351 | break; | 358 | break; |
352 | case ICAL_METHOD_REFRESH: | 359 | case ICAL_METHOD_REFRESH: |
353 | method = Scheduler::Refresh; | 360 | method = Scheduler::Refresh; |
354 | break; | 361 | break; |
355 | case ICAL_METHOD_CANCEL: | 362 | case ICAL_METHOD_CANCEL: |
356 | method = Scheduler::Cancel; | 363 | method = Scheduler::Cancel; |
357 | break; | 364 | break; |
358 | case ICAL_METHOD_ADD: | 365 | case ICAL_METHOD_ADD: |
359 | method = Scheduler::Add; | 366 | method = Scheduler::Add; |
360 | break; | 367 | break; |
361 | case ICAL_METHOD_REPLY: | 368 | case ICAL_METHOD_REPLY: |
362 | method = Scheduler::Reply; | 369 | method = Scheduler::Reply; |
363 | break; | 370 | break; |
364 | case ICAL_METHOD_COUNTER: | 371 | case ICAL_METHOD_COUNTER: |
365 | method = Scheduler::Counter; | 372 | method = Scheduler::Counter; |
366 | break; | 373 | break; |
367 | case ICAL_METHOD_DECLINECOUNTER: | 374 | case ICAL_METHOD_DECLINECOUNTER: |
368 | method = Scheduler::Declinecounter; | 375 | method = Scheduler::Declinecounter; |
369 | break; | 376 | break; |
370 | default: | 377 | default: |
371 | method = Scheduler::NoMethod; | 378 | method = Scheduler::NoMethod; |
372 | kdDebug(5800) << "ICalFormat::parseScheduleMessage(): Unknow method" << endl; | 379 | kdDebug(5800) << "ICalFormat::parseScheduleMessage(): Unknow method" << endl; |
373 | break; | 380 | break; |
374 | } | 381 | } |
375 | 382 | ||
376 | 383 | ||
377 | if (!icalrestriction_check(message)) { | 384 | if (!icalrestriction_check(message)) { |
378 | setException(new ErrorFormat(ErrorFormat::Restriction, | 385 | setException(new ErrorFormat(ErrorFormat::Restriction, |
379 | Scheduler::translatedMethodName(method) + ": " + | 386 | Scheduler::translatedMethodName(method) + ": " + |
380 | mImpl->extractErrorProperty(c))); | 387 | mImpl->extractErrorProperty(c))); |
381 | return 0; | 388 | return 0; |
382 | } | 389 | } |
383 | 390 | ||
384 | icalcomponent *calendarComponent = mImpl->createCalendarComponent(cal); | 391 | icalcomponent *calendarComponent = mImpl->createCalendarComponent(cal); |
385 | 392 | ||
386 | Incidence *existingIncidence = cal->event(incidence->uid()); | 393 | Incidence *existingIncidence = cal->event(incidence->uid()); |
387 | if (existingIncidence) { | 394 | if (existingIncidence) { |
388 | // TODO: check, if cast is required, or if it can be done by virtual funcs. | 395 | // TODO: check, if cast is required, or if it can be done by virtual funcs. |
389 | if (existingIncidence->typeID() == todoID ) { | 396 | if (existingIncidence->typeID() == todoID ) { |
390 | Todo *todo = static_cast<Todo *>(existingIncidence); | 397 | Todo *todo = static_cast<Todo *>(existingIncidence); |
391 | icalcomponent_add_component(calendarComponent, | 398 | icalcomponent_add_component(calendarComponent, |
392 | mImpl->writeTodo(todo)); | 399 | mImpl->writeTodo(todo)); |
393 | } | 400 | } |
394 | if (existingIncidence->typeID() == eventID ) { | 401 | if (existingIncidence->typeID() == eventID ) { |
395 | Event *event = static_cast<Event *>(existingIncidence); | 402 | Event *event = static_cast<Event *>(existingIncidence); |
396 | icalcomponent_add_component(calendarComponent, | 403 | icalcomponent_add_component(calendarComponent, |
397 | mImpl->writeEvent(event)); | 404 | mImpl->writeEvent(event)); |
398 | } | 405 | } |
399 | } else { | 406 | } else { |
400 | calendarComponent = 0; | 407 | calendarComponent = 0; |
401 | } | 408 | } |
402 | qDebug("icalclassify commented out "); | 409 | qDebug("icalclassify commented out "); |
403 | ScheduleMessage::Status status; | 410 | ScheduleMessage::Status status; |
404 | #if 0 | 411 | #if 0 |
405 | 412 | ||
406 | icalclass result = icalclassify(message,calendarComponent,(char *)""); | 413 | icalclass result = icalclassify(message,calendarComponent,(char *)""); |
407 | 414 | ||
408 | 415 | ||
409 | 416 | ||
410 | switch (result) { | 417 | switch (result) { |
411 | case ICAL_PUBLISH_NEW_CLASS: | 418 | case ICAL_PUBLISH_NEW_CLASS: |
412 | status = ScheduleMessage::PublishNew; | 419 | status = ScheduleMessage::PublishNew; |
413 | break; | 420 | break; |
414 | case ICAL_OBSOLETE_CLASS: | 421 | case ICAL_OBSOLETE_CLASS: |
415 | status = ScheduleMessage::Obsolete; | 422 | status = ScheduleMessage::Obsolete; |
416 | break; | 423 | break; |
417 | case ICAL_REQUEST_NEW_CLASS: | 424 | case ICAL_REQUEST_NEW_CLASS: |
418 | status = ScheduleMessage::RequestNew; | 425 | status = ScheduleMessage::RequestNew; |
419 | break; | 426 | break; |
420 | case ICAL_REQUEST_UPDATE_CLASS: | 427 | case ICAL_REQUEST_UPDATE_CLASS: |
421 | status = ScheduleMessage::RequestUpdate; | 428 | status = ScheduleMessage::RequestUpdate; |
422 | break; | 429 | break; |
423 | case ICAL_UNKNOWN_CLASS: | 430 | case ICAL_UNKNOWN_CLASS: |
424 | default: | 431 | default: |
425 | status = ScheduleMessage::Unknown; | 432 | status = ScheduleMessage::Unknown; |
426 | break; | 433 | break; |
427 | } | 434 | } |
428 | #endif | 435 | #endif |
429 | status = ScheduleMessage::RequestUpdate; | 436 | status = ScheduleMessage::RequestUpdate; |
430 | return new ScheduleMessage(incidence,method,status); | 437 | return new ScheduleMessage(incidence,method,status); |
431 | } | 438 | } |
432 | 439 | ||
433 | void ICalFormat::setTimeZone( const QString &id, bool utc ) | 440 | void ICalFormat::setTimeZone( const QString &id, bool utc ) |
434 | { | 441 | { |
435 | 442 | ||
436 | 443 | ||
437 | mTimeZoneId = id; | 444 | mTimeZoneId = id; |
438 | mUtc = utc; | 445 | mUtc = utc; |
439 | 446 | ||
440 | tzOffsetMin = KGlobal::locale()->timezoneOffset(mTimeZoneId); | 447 | tzOffsetMin = KGlobal::locale()->timezoneOffset(mTimeZoneId); |
441 | 448 | ||
442 | //qDebug("ICalFormat::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(), tzOffsetMin); | 449 | //qDebug("ICalFormat::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(), tzOffsetMin); |
443 | } | 450 | } |
444 | 451 | ||
445 | QString ICalFormat::timeZoneId() const | 452 | QString ICalFormat::timeZoneId() const |
446 | { | 453 | { |
447 | return mTimeZoneId; | 454 | return mTimeZoneId; |
448 | } | 455 | } |
449 | 456 | ||
450 | bool ICalFormat::utc() const | 457 | bool ICalFormat::utc() const |
451 | { | 458 | { |
452 | return mUtc; | 459 | return mUtc; |
453 | } | 460 | } |
454 | int ICalFormat::timeOffset() | 461 | int ICalFormat::timeOffset() |
455 | { | 462 | { |
456 | return tzOffsetMin; | 463 | return tzOffsetMin; |
457 | } | 464 | } |
458 | const char *ICalFormat::tzString() | 465 | const char *ICalFormat::tzString() |
459 | { | 466 | { |
460 | const char* ret = (const char* ) mTzString; | 467 | const char* ret = (const char* ) mTzString; |
461 | return ret; | 468 | return ret; |
462 | } | 469 | } |
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index 485ab6e..a770dbb 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h | |||
@@ -1,115 +1,116 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | #ifndef ICALFORMAT_H | 20 | #ifndef ICALFORMAT_H |
21 | #define ICALFORMAT_H | 21 | #define ICALFORMAT_H |
22 | 22 | ||
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | 24 | ||
25 | #include "scheduler.h" | 25 | #include "scheduler.h" |
26 | 26 | ||
27 | #include "calformat.h" | 27 | #include "calformat.h" |
28 | 28 | ||
29 | namespace KCal { | 29 | namespace KCal { |
30 | 30 | ||
31 | class ICalFormatImpl; | 31 | class ICalFormatImpl; |
32 | 32 | ||
33 | /** | 33 | /** |
34 | This class implements the iCalendar format. It provides methods for | 34 | This class implements the iCalendar format. It provides methods for |
35 | loading/saving/converting iCalendar format data into the internal KOrganizer | 35 | loading/saving/converting iCalendar format data into the internal KOrganizer |
36 | representation as Calendar and Events. | 36 | representation as Calendar and Events. |
37 | 37 | ||
38 | @short iCalendar format implementation | 38 | @short iCalendar format implementation |
39 | */ | 39 | */ |
40 | class ICalFormat : public CalFormat { | 40 | class ICalFormat : public CalFormat { |
41 | public: | 41 | public: |
42 | /** Create new iCalendar format. */ | 42 | /** Create new iCalendar format. */ |
43 | ICalFormat( ); | 43 | ICalFormat( bool pe = true); |
44 | virtual ~ICalFormat(); | 44 | virtual ~ICalFormat(); |
45 | 45 | ||
46 | /** | 46 | /** |
47 | Loads a calendar on disk in iCalendar format into calendar. | 47 | Loads a calendar on disk in iCalendar format into calendar. |
48 | Returns true if successful, else returns false. Provides more error | 48 | Returns true if successful, else returns false. Provides more error |
49 | information by exception(). | 49 | information by exception(). |
50 | @param calendar Calendar object to be filled. | 50 | @param calendar Calendar object to be filled. |
51 | @param fileName The name of the calendar file on disk. | 51 | @param fileName The name of the calendar file on disk. |
52 | */ | 52 | */ |
53 | bool load( Calendar *, const QString &fileName ); | 53 | bool load( Calendar *, const QString &fileName ); |
54 | /** | 54 | /** |
55 | Writes out the calendar to disk in iCalendar format. Returns true if | 55 | Writes out the calendar to disk in iCalendar format. Returns true if |
56 | successful and false on error. | 56 | successful and false on error. |
57 | 57 | ||
58 | @param calendar The Calendar object to be written. | 58 | @param calendar The Calendar object to be written. |
59 | @param fileName The name of the calendar file on disk. | 59 | @param fileName The name of the calendar file on disk. |
60 | */ | 60 | */ |
61 | bool save( Calendar *, const QString &fileName ); | 61 | bool save( Calendar *, const QString &fileName ); |
62 | 62 | ||
63 | /** | 63 | /** |
64 | Parse string and populate calendar with that information. | 64 | Parse string and populate calendar with that information. |
65 | */ | 65 | */ |
66 | bool fromString( Calendar *, const QString & ); | 66 | bool fromString( Calendar *, const QString & ); |
67 | /** | 67 | /** |
68 | Parse string and return first ical component. | 68 | Parse string and return first ical component. |
69 | */ | 69 | */ |
70 | Incidence *fromString( const QString & ); | 70 | Incidence *fromString( const QString & ); |
71 | /** | 71 | /** |
72 | Return calendar information as string. | 72 | Return calendar information as string. |
73 | */ | 73 | */ |
74 | QString toString( Calendar * ); | 74 | QString toString( Calendar * ); |
75 | /** | 75 | /** |
76 | Return incidence as full iCalendar formatted text. | 76 | Return incidence as full iCalendar formatted text. |
77 | */ | 77 | */ |
78 | QString toICalString( Incidence * ); | 78 | QString toICalString( Incidence * ); |
79 | /** | 79 | /** |
80 | Return incidence as iCalendar formatted text. | 80 | Return incidence as iCalendar formatted text. |
81 | */ | 81 | */ |
82 | QString toString( Incidence * ); | 82 | QString toString( Incidence * ); |
83 | /** | 83 | /** |
84 | Return recurrence as iCalendar formatted text. | 84 | Return recurrence as iCalendar formatted text. |
85 | */ | 85 | */ |
86 | QString toString( Recurrence * ); | 86 | QString toString( Recurrence * ); |
87 | /** | 87 | /** |
88 | Parse string and fill recurrence object with | 88 | Parse string and fill recurrence object with |
89 | that information | 89 | that information |
90 | */ | 90 | */ |
91 | //bool fromString ( Recurrence *, const QString& ); | 91 | //bool fromString ( Recurrence *, const QString& ); |
92 | 92 | ||
93 | /** Create a scheduling message for event \a e using method \m */ | 93 | /** Create a scheduling message for event \a e using method \m */ |
94 | QString createScheduleMessage(IncidenceBase *e,Scheduler::Method m); | 94 | QString createScheduleMessage(IncidenceBase *e,Scheduler::Method m); |
95 | /** Parse scheduling message provided as string \s */ | 95 | /** Parse scheduling message provided as string \s */ |
96 | ScheduleMessage *parseScheduleMessage( Calendar *, const QString &s); | 96 | ScheduleMessage *parseScheduleMessage( Calendar *, const QString &s); |
97 | 97 | ||
98 | /** Set id of used time zone and whether this time zone is UTC or not. */ | 98 | /** Set id of used time zone and whether this time zone is UTC or not. */ |
99 | void setTimeZone( const QString &id, bool utc ); | 99 | void setTimeZone( const QString &id, bool utc ); |
100 | QString timeZoneId() const; | 100 | QString timeZoneId() const; |
101 | int timeOffset(); | 101 | int timeOffset(); |
102 | const char * tzString(); | 102 | const char * tzString(); |
103 | bool utc() const; | 103 | bool utc() const; |
104 | 104 | ||
105 | private: | 105 | private: |
106 | bool mProcessEvents; | ||
106 | ICalFormatImpl *mImpl; | 107 | ICalFormatImpl *mImpl; |
107 | QString mTimeZoneId; | 108 | QString mTimeZoneId; |
108 | QCString mTzString; | 109 | QCString mTzString; |
109 | int tzOffsetMin; | 110 | int tzOffsetMin; |
110 | bool mUtc; | 111 | bool mUtc; |
111 | }; | 112 | }; |
112 | 113 | ||
113 | } | 114 | } |
114 | 115 | ||
115 | #endif | 116 | #endif |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 4ada2d8..7bf756a 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -1,426 +1,427 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <kglobal.h> | 21 | #include <kglobal.h> |
22 | #include <kglobalsettings.h> | 22 | #include <kglobalsettings.h> |
23 | #include <klocale.h> | 23 | #include <klocale.h> |
24 | #include <kdebug.h> | 24 | #include <kdebug.h> |
25 | #include <qregexp.h> | 25 | #include <qregexp.h> |
26 | #include <qfileinfo.h> | 26 | #include <qfileinfo.h> |
27 | 27 | ||
28 | #include "calendarlocal.h" | 28 | #include "calendarlocal.h" |
29 | #include "icalformat.h" | 29 | #include "icalformat.h" |
30 | #include "todo.h" | 30 | #include "todo.h" |
31 | 31 | ||
32 | using namespace KCal; | 32 | using namespace KCal; |
33 | 33 | ||
34 | Todo::Todo(): QObject(), Incidence() | 34 | Todo::Todo(): QObject(), Incidence() |
35 | { | 35 | { |
36 | // mStatus = TENTATIVE; | 36 | // mStatus = TENTATIVE; |
37 | 37 | ||
38 | mHasDueDate = false; | 38 | mHasDueDate = false; |
39 | setHasStartDate( false ); | 39 | setHasStartDate( false ); |
40 | mCompleted = getEvenTime(QDateTime::currentDateTime()); | 40 | mCompleted = getEvenTime(QDateTime::currentDateTime()); |
41 | mHasCompletedDate = false; | 41 | mHasCompletedDate = false; |
42 | mPercentComplete = 0; | 42 | mPercentComplete = 0; |
43 | mRunning = false; | 43 | mRunning = false; |
44 | mRunSaveTimer = 0; | 44 | mRunSaveTimer = 0; |
45 | } | 45 | } |
46 | 46 | ||
47 | Todo::Todo(const Todo &t) : QObject(),Incidence(t) | 47 | Todo::Todo(const Todo &t) : QObject(),Incidence(t) |
48 | { | 48 | { |
49 | mDtDue = t.mDtDue; | 49 | mDtDue = t.mDtDue; |
50 | mHasDueDate = t.mHasDueDate; | 50 | mHasDueDate = t.mHasDueDate; |
51 | mCompleted = t.mCompleted; | 51 | mCompleted = t.mCompleted; |
52 | mHasCompletedDate = t.mHasCompletedDate; | 52 | mHasCompletedDate = t.mHasCompletedDate; |
53 | mPercentComplete = t.mPercentComplete; | 53 | mPercentComplete = t.mPercentComplete; |
54 | mRunning = false; | 54 | mRunning = false; |
55 | mRunSaveTimer = 0; | 55 | mRunSaveTimer = 0; |
56 | } | 56 | } |
57 | 57 | ||
58 | Todo::~Todo() | 58 | Todo::~Todo() |
59 | { | 59 | { |
60 | setRunning( false ); | 60 | setRunning( false ); |
61 | //qDebug("Todo::~Todo() "); | 61 | //qDebug("Todo::~Todo() "); |
62 | } | 62 | } |
63 | 63 | ||
64 | void Todo::setRunningFalse( QString s ) | 64 | void Todo::setRunningFalse( QString s ) |
65 | { | 65 | { |
66 | if ( ! mRunning ) | 66 | if ( ! mRunning ) |
67 | return; | 67 | return; |
68 | mRunning = false; | 68 | mRunning = false; |
69 | mRunSaveTimer->stop(); | 69 | if ( mRunSaveTimer ) |
70 | mRunSaveTimer->stop(); | ||
70 | saveRunningInfoToFile( s ); | 71 | saveRunningInfoToFile( s ); |
71 | } | 72 | } |
72 | void Todo::stopRunning() | 73 | void Todo::stopRunning() |
73 | { | 74 | { |
74 | if ( !mRunning ) | 75 | if ( !mRunning ) |
75 | return; | 76 | return; |
76 | if ( mRunSaveTimer ) | 77 | if ( mRunSaveTimer ) |
77 | mRunSaveTimer->stop(); | 78 | mRunSaveTimer->stop(); |
78 | mRunning = false; | 79 | mRunning = false; |
79 | } | 80 | } |
80 | void Todo::setRunning( bool run ) | 81 | void Todo::setRunning( bool run ) |
81 | { | 82 | { |
82 | if ( run == mRunning ) | 83 | if ( run == mRunning ) |
83 | return; | 84 | return; |
84 | //qDebug("Todo::setRunning %d ", run); | 85 | //qDebug("Todo::setRunning %d ", run); |
85 | if ( !mRunSaveTimer ) { | 86 | if ( !mRunSaveTimer ) { |
86 | mRunSaveTimer = new QTimer ( this ); | 87 | mRunSaveTimer = new QTimer ( this ); |
87 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); | 88 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); |
88 | } | 89 | } |
89 | mRunning = run; | 90 | mRunning = run; |
90 | if ( mRunning ) { | 91 | if ( mRunning ) { |
91 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min | 92 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min |
92 | mRunStart = QDateTime::currentDateTime(); | 93 | mRunStart = QDateTime::currentDateTime(); |
93 | } else { | 94 | } else { |
94 | mRunSaveTimer->stop(); | 95 | mRunSaveTimer->stop(); |
95 | saveRunningInfoToFile(); | 96 | saveRunningInfoToFile(); |
96 | } | 97 | } |
97 | } | 98 | } |
98 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) | 99 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) |
99 | { | 100 | { |
100 | if ( !mRunning) return; | 101 | if ( !mRunning) return; |
101 | mRunning = false; | 102 | mRunning = false; |
102 | mRunStart = start; | 103 | mRunStart = start; |
103 | mRunEnd = end; | 104 | mRunEnd = end; |
104 | saveRunningInfoToFile( comment ); | 105 | saveRunningInfoToFile( comment ); |
105 | } | 106 | } |
106 | void Todo::saveRunningInfoToFile() | 107 | void Todo::saveRunningInfoToFile() |
107 | { | 108 | { |
108 | mRunEnd = QDateTime::currentDateTime(); | 109 | mRunEnd = QDateTime::currentDateTime(); |
109 | saveRunningInfoToFile( QString::null ); | 110 | saveRunningInfoToFile( QString::null ); |
110 | } | 111 | } |
111 | void Todo::saveRunningInfoToFile( QString comment ) | 112 | void Todo::saveRunningInfoToFile( QString comment ) |
112 | { | 113 | { |
113 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 114 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
114 | if ( mRunStart.secsTo ( mRunEnd) < 15 ) { | 115 | if ( mRunStart.secsTo ( mRunEnd) < 15 ) { |
115 | qDebug("Running time < 15 seconds. Skipped. "); | 116 | qDebug("Running time < 15 seconds. Skipped. "); |
116 | return; | 117 | return; |
117 | } | 118 | } |
118 | QString dir = KGlobalSettings::timeTrackerDir(); | 119 | QString dir = KGlobalSettings::timeTrackerDir(); |
119 | //qDebug("%s ", dir.latin1()); | 120 | //qDebug("%s ", dir.latin1()); |
120 | QString file = "%1%2%3-%4%5%6-"; | 121 | QString file = "%1%2%3-%4%5%6-"; |
121 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); | 122 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); |
122 | file.replace ( QRegExp (" "), "0" ); | 123 | file.replace ( QRegExp (" "), "0" ); |
123 | file += uid(); | 124 | file += uid(); |
124 | //qDebug("File %s ",file.latin1() ); | 125 | //qDebug("File %s ",file.latin1() ); |
125 | CalendarLocal cal; | 126 | CalendarLocal cal; |
126 | cal.setLocalTime(); | 127 | cal.setLocalTime(); |
127 | Todo * to = (Todo*) clone(); | 128 | Todo * to = (Todo*) clone(); |
128 | to->setFloats( false ); | 129 | to->setFloats( false ); |
129 | to->setDtStart( mRunStart ); | 130 | to->setDtStart( mRunStart ); |
130 | to->setHasStartDate( true ); | 131 | to->setHasStartDate( true ); |
131 | to->setDtDue( mRunEnd ); | 132 | to->setDtDue( mRunEnd ); |
132 | to->setHasDueDate( true ); | 133 | to->setHasDueDate( true ); |
133 | to->setUid( file ); | 134 | to->setUid( file ); |
134 | if ( !comment.isEmpty() ) { | 135 | if ( !comment.isEmpty() ) { |
135 | QString des = to->description(); | 136 | QString des = to->description(); |
136 | if ( des.isEmpty () ) | 137 | if ( des.isEmpty () ) |
137 | to->setDescription( "TT-Note: " + comment ); | 138 | to->setDescription( "TT-Note: " + comment ); |
138 | else | 139 | else |
139 | to->setDescription( "TT-Note: " + comment +"\n" + des ); | 140 | to->setDescription( "TT-Note: " + comment +"\n" + des ); |
140 | } | 141 | } |
141 | cal.addIncidence( to ); | 142 | cal.addIncidence( to ); |
142 | ICalFormat format; | 143 | ICalFormat format( false ); |
143 | file = dir +"/" +file +".ics"; | 144 | file = dir +"/" +file +".ics"; |
144 | format.save( &cal, file ); | 145 | format.save( &cal, file ); |
145 | saveParents(); | 146 | saveParents(); |
146 | 147 | ||
147 | } | 148 | } |
148 | void Todo::saveParents() | 149 | void Todo::saveParents() |
149 | { | 150 | { |
150 | if (!relatedTo() ) | 151 | if (!relatedTo() ) |
151 | return; | 152 | return; |
152 | Incidence * inc = relatedTo(); | 153 | Incidence * inc = relatedTo(); |
153 | if ( inc->typeID() != todoID ) | 154 | if ( inc->typeID() != todoID ) |
154 | return; | 155 | return; |
155 | Todo* to = (Todo*)inc; | 156 | Todo* to = (Todo*)inc; |
156 | bool saveTodo = false; | 157 | bool saveTodo = false; |
157 | QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics"; | 158 | QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics"; |
158 | QFileInfo fi ( file ); | 159 | QFileInfo fi ( file ); |
159 | if ( fi.exists() ) { | 160 | if ( fi.exists() ) { |
160 | if ( fi.lastModified () < to->lastModified ()) | 161 | if ( fi.lastModified () < to->lastModified ()) |
161 | saveTodo = true; | 162 | saveTodo = true; |
162 | } else { | 163 | } else { |
163 | saveTodo = true; | 164 | saveTodo = true; |
164 | } | 165 | } |
165 | if ( saveTodo ) { | 166 | if ( saveTodo ) { |
166 | CalendarLocal cal; | 167 | CalendarLocal cal; |
167 | cal.setLocalTime(); | 168 | cal.setLocalTime(); |
168 | Todo * par = (Todo *) to->clone(); | 169 | Todo * par = (Todo *) to->clone(); |
169 | cal.addIncidence( par ); | 170 | cal.addIncidence( par ); |
170 | ICalFormat format; | 171 | ICalFormat format( false ); |
171 | format.save( &cal, file ); | 172 | format.save( &cal, file ); |
172 | } | 173 | } |
173 | to->saveParents(); | 174 | to->saveParents(); |
174 | } | 175 | } |
175 | 176 | ||
176 | int Todo::runTime() | 177 | int Todo::runTime() |
177 | { | 178 | { |
178 | if ( !mRunning ) | 179 | if ( !mRunning ) |
179 | return 0; | 180 | return 0; |
180 | return mRunStart.secsTo( QDateTime::currentDateTime() ); | 181 | return mRunStart.secsTo( QDateTime::currentDateTime() ); |
181 | } | 182 | } |
182 | bool Todo::hasRunningSub() | 183 | bool Todo::hasRunningSub() |
183 | { | 184 | { |
184 | if ( mRunning ) | 185 | if ( mRunning ) |
185 | return true; | 186 | return true; |
186 | Incidence *aTodo; | 187 | Incidence *aTodo; |
187 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { | 188 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { |
188 | if ( ((Todo*)aTodo)->hasRunningSub() ) | 189 | if ( ((Todo*)aTodo)->hasRunningSub() ) |
189 | return true; | 190 | return true; |
190 | } | 191 | } |
191 | return false; | 192 | return false; |
192 | } | 193 | } |
193 | Incidence *Todo::clone() | 194 | Incidence *Todo::clone() |
194 | { | 195 | { |
195 | return new Todo(*this); | 196 | return new Todo(*this); |
196 | } | 197 | } |
197 | 198 | ||
198 | bool Todo::contains ( Todo* from ) | 199 | bool Todo::contains ( Todo* from ) |
199 | { | 200 | { |
200 | 201 | ||
201 | if ( !from->summary().isEmpty() ) | 202 | if ( !from->summary().isEmpty() ) |
202 | if ( !summary().startsWith( from->summary() )) | 203 | if ( !summary().startsWith( from->summary() )) |
203 | return false; | 204 | return false; |
204 | if ( from->hasStartDate() ) { | 205 | if ( from->hasStartDate() ) { |
205 | if ( !hasStartDate() ) | 206 | if ( !hasStartDate() ) |
206 | return false; | 207 | return false; |
207 | if ( from->dtStart() != dtStart()) | 208 | if ( from->dtStart() != dtStart()) |
208 | return false; | 209 | return false; |
209 | } | 210 | } |
210 | if ( from->hasDueDate() ){ | 211 | if ( from->hasDueDate() ){ |
211 | if ( !hasDueDate() ) | 212 | if ( !hasDueDate() ) |
212 | return false; | 213 | return false; |
213 | if ( from->dtDue() != dtDue()) | 214 | if ( from->dtDue() != dtDue()) |
214 | return false; | 215 | return false; |
215 | } | 216 | } |
216 | if ( !from->location().isEmpty() ) | 217 | if ( !from->location().isEmpty() ) |
217 | if ( !location().startsWith( from->location() ) ) | 218 | if ( !location().startsWith( from->location() ) ) |
218 | return false; | 219 | return false; |
219 | if ( !from->description().isEmpty() ) | 220 | if ( !from->description().isEmpty() ) |
220 | if ( !description().startsWith( from->description() )) | 221 | if ( !description().startsWith( from->description() )) |
221 | return false; | 222 | return false; |
222 | if ( from->alarms().count() ) { | 223 | if ( from->alarms().count() ) { |
223 | Alarm *a = from->alarms().first(); | 224 | Alarm *a = from->alarms().first(); |
224 | if ( a->enabled() ){ | 225 | if ( a->enabled() ){ |
225 | if ( !alarms().count() ) | 226 | if ( !alarms().count() ) |
226 | return false; | 227 | return false; |
227 | Alarm *b = alarms().first(); | 228 | Alarm *b = alarms().first(); |
228 | if( ! b->enabled() ) | 229 | if( ! b->enabled() ) |
229 | return false; | 230 | return false; |
230 | if ( ! (a->offset() == b->offset() )) | 231 | if ( ! (a->offset() == b->offset() )) |
231 | return false; | 232 | return false; |
232 | } | 233 | } |
233 | } | 234 | } |
234 | 235 | ||
235 | QStringList cat = categories(); | 236 | QStringList cat = categories(); |
236 | QStringList catFrom = from->categories(); | 237 | QStringList catFrom = from->categories(); |
237 | QString nCat; | 238 | QString nCat; |
238 | unsigned int iii; | 239 | unsigned int iii; |
239 | for ( iii = 0; iii < catFrom.count();++iii ) { | 240 | for ( iii = 0; iii < catFrom.count();++iii ) { |
240 | nCat = catFrom[iii]; | 241 | nCat = catFrom[iii]; |
241 | if ( !nCat.isEmpty() ) | 242 | if ( !nCat.isEmpty() ) |
242 | if ( !cat.contains( nCat )) { | 243 | if ( !cat.contains( nCat )) { |
243 | return false; | 244 | return false; |
244 | } | 245 | } |
245 | } | 246 | } |
246 | if ( from->isCompleted() ) { | 247 | if ( from->isCompleted() ) { |
247 | if ( !isCompleted() ) | 248 | if ( !isCompleted() ) |
248 | return false; | 249 | return false; |
249 | } | 250 | } |
250 | if( priority() != from->priority() ) | 251 | if( priority() != from->priority() ) |
251 | return false; | 252 | return false; |
252 | 253 | ||
253 | 254 | ||
254 | return true; | 255 | return true; |
255 | 256 | ||
256 | } | 257 | } |
257 | bool KCal::operator==( const Todo& t1, const Todo& t2 ) | 258 | bool KCal::operator==( const Todo& t1, const Todo& t2 ) |
258 | { | 259 | { |
259 | 260 | ||
260 | bool ret = operator==( (const Incidence&)t1, (const Incidence&)t2 ); | 261 | bool ret = operator==( (const Incidence&)t1, (const Incidence&)t2 ); |
261 | if ( ! ret ) | 262 | if ( ! ret ) |
262 | return false; | 263 | return false; |
263 | if ( t1.hasDueDate() == t2.hasDueDate() ) { | 264 | if ( t1.hasDueDate() == t2.hasDueDate() ) { |
264 | if ( t1.hasDueDate() ) { | 265 | if ( t1.hasDueDate() ) { |
265 | if ( t1.doesFloat() == t2.doesFloat() ) { | 266 | if ( t1.doesFloat() == t2.doesFloat() ) { |
266 | if ( t1.doesFloat() ) { | 267 | if ( t1.doesFloat() ) { |
267 | if ( t1.dtDue().date() != t2.dtDue().date() ) | 268 | if ( t1.dtDue().date() != t2.dtDue().date() ) |
268 | return false; | 269 | return false; |
269 | } else | 270 | } else |
270 | if ( t1.dtDue() != t2.dtDue() ) | 271 | if ( t1.dtDue() != t2.dtDue() ) |
271 | return false; | 272 | return false; |
272 | } else | 273 | } else |
273 | return false;// float != | 274 | return false;// float != |
274 | } | 275 | } |
275 | 276 | ||
276 | } else | 277 | } else |
277 | return false; | 278 | return false; |
278 | if ( t1.percentComplete() != t2.percentComplete() ) | 279 | if ( t1.percentComplete() != t2.percentComplete() ) |
279 | return false; | 280 | return false; |
280 | if ( t1.isCompleted() ) { | 281 | if ( t1.isCompleted() ) { |
281 | if ( t1.hasCompletedDate() == t2.hasCompletedDate() ) { | 282 | if ( t1.hasCompletedDate() == t2.hasCompletedDate() ) { |
282 | if ( t1.hasCompletedDate() ) { | 283 | if ( t1.hasCompletedDate() ) { |
283 | if ( t1.completed() != t2.completed() ) | 284 | if ( t1.completed() != t2.completed() ) |
284 | return false; | 285 | return false; |
285 | } | 286 | } |
286 | 287 | ||
287 | } else | 288 | } else |
288 | return false; | 289 | return false; |
289 | } | 290 | } |
290 | return true; | 291 | return true; |
291 | 292 | ||
292 | } | 293 | } |
293 | 294 | ||
294 | void Todo::setDtDue(const QDateTime &dtDue) | 295 | void Todo::setDtDue(const QDateTime &dtDue) |
295 | { | 296 | { |
296 | //int diffsecs = mDtDue.secsTo(dtDue); | 297 | //int diffsecs = mDtDue.secsTo(dtDue); |
297 | 298 | ||
298 | /*if (mReadOnly) return; | 299 | /*if (mReadOnly) return; |
299 | const QPtrList<Alarm>& alarms = alarms(); | 300 | const QPtrList<Alarm>& alarms = alarms(); |
300 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) { | 301 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) { |
301 | if (alarm->enabled()) { | 302 | if (alarm->enabled()) { |
302 | alarm->setTime(alarm->time().addSecs(diffsecs)); | 303 | alarm->setTime(alarm->time().addSecs(diffsecs)); |
303 | } | 304 | } |
304 | }*/ | 305 | }*/ |
305 | mDtDue = getEvenTime(dtDue); | 306 | mDtDue = getEvenTime(dtDue); |
306 | 307 | ||
307 | //kdDebug(5800) << "setDtDue says date is " << mDtDue.toString() << endl; | 308 | //kdDebug(5800) << "setDtDue says date is " << mDtDue.toString() << endl; |
308 | 309 | ||
309 | /*const QPtrList<Alarm>& alarms = alarms(); | 310 | /*const QPtrList<Alarm>& alarms = alarms(); |
310 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) | 311 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) |
311 | alarm->setAlarmStart(mDtDue);*/ | 312 | alarm->setAlarmStart(mDtDue);*/ |
312 | updated(); | 313 | updated(); |
313 | } | 314 | } |
314 | 315 | ||
315 | QDateTime Todo::dtDue() const | 316 | QDateTime Todo::dtDue() const |
316 | { | 317 | { |
317 | return mDtDue; | 318 | return mDtDue; |
318 | } | 319 | } |
319 | 320 | ||
320 | QString Todo::dtDueTimeStr() const | 321 | QString Todo::dtDueTimeStr() const |
321 | { | 322 | { |
322 | return KGlobal::locale()->formatTime(mDtDue.time()); | 323 | return KGlobal::locale()->formatTime(mDtDue.time()); |
323 | } | 324 | } |
324 | 325 | ||
325 | QString Todo::dtDueDateStr(bool shortfmt) const | 326 | QString Todo::dtDueDateStr(bool shortfmt) const |
326 | { | 327 | { |
327 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); | 328 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); |
328 | } | 329 | } |
329 | 330 | ||
330 | QString Todo::dtDueStr(bool shortfmt) const | 331 | QString Todo::dtDueStr(bool shortfmt) const |
331 | { | 332 | { |
332 | if ( doesFloat() ) | 333 | if ( doesFloat() ) |
333 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); | 334 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); |
334 | return KGlobal::locale()->formatDateTime(mDtDue, shortfmt); | 335 | return KGlobal::locale()->formatDateTime(mDtDue, shortfmt); |
335 | } | 336 | } |
336 | // retval 0 : no found | 337 | // retval 0 : no found |
337 | // 1 : due for date found | 338 | // 1 : due for date found |
338 | // 2 : overdue for date found | 339 | // 2 : overdue for date found |
339 | int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos ) | 340 | int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos ) |
340 | { | 341 | { |
341 | int retval = 0; | 342 | int retval = 0; |
342 | if ( isCompleted() ) | 343 | if ( isCompleted() ) |
343 | return 0; | 344 | return 0; |
344 | if ( hasDueDate() ) { | 345 | if ( hasDueDate() ) { |
345 | if ( dtDue().date() < date ) | 346 | if ( dtDue().date() < date ) |
346 | return 2; | 347 | return 2; |
347 | // we do not return, because we may find an overdue sub todo | 348 | // we do not return, because we may find an overdue sub todo |
348 | if ( dtDue().date() == date ) | 349 | if ( dtDue().date() == date ) |
349 | retval = 1; | 350 | retval = 1; |
350 | } | 351 | } |
351 | if ( checkSubtodos ) { | 352 | if ( checkSubtodos ) { |
352 | Incidence *aTodo; | 353 | Incidence *aTodo; |
353 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { | 354 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { |
354 | int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos ); | 355 | int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos ); |
355 | if ( ret == 2 ) | 356 | if ( ret == 2 ) |
356 | return 2; | 357 | return 2; |
357 | if ( ret == 1) | 358 | if ( ret == 1) |
358 | retval = 1; | 359 | retval = 1; |
359 | } | 360 | } |
360 | } | 361 | } |
361 | return retval; | 362 | return retval; |
362 | } | 363 | } |
363 | int Todo::hasDueSubTodo( bool checkSubtodos ) //= true | 364 | int Todo::hasDueSubTodo( bool checkSubtodos ) //= true |
364 | { | 365 | { |
365 | return hasDueSubTodoForDate(QDate::currentDate(), checkSubtodos ); | 366 | return hasDueSubTodoForDate(QDate::currentDate(), checkSubtodos ); |
366 | } | 367 | } |
367 | bool Todo::hasDueDate() const | 368 | bool Todo::hasDueDate() const |
368 | { | 369 | { |
369 | return mHasDueDate; | 370 | return mHasDueDate; |
370 | } | 371 | } |
371 | 372 | ||
372 | void Todo::setHasDueDate(bool f) | 373 | void Todo::setHasDueDate(bool f) |
373 | { | 374 | { |
374 | if (mReadOnly) return; | 375 | if (mReadOnly) return; |
375 | mHasDueDate = f; | 376 | mHasDueDate = f; |
376 | updated(); | 377 | updated(); |
377 | } | 378 | } |
378 | 379 | ||
379 | 380 | ||
380 | #if 0 | 381 | #if 0 |
381 | void Todo::setStatus(const QString &statStr) | 382 | void Todo::setStatus(const QString &statStr) |
382 | { | 383 | { |
383 | if (mReadOnly) return; | 384 | if (mReadOnly) return; |
384 | QString ss(statStr.upper()); | 385 | QString ss(statStr.upper()); |
385 | 386 | ||
386 | if (ss == "X-ACTION") | 387 | if (ss == "X-ACTION") |
387 | mStatus = NEEDS_ACTION; | 388 | mStatus = NEEDS_ACTION; |
388 | else if (ss == "NEEDS ACTION") | 389 | else if (ss == "NEEDS ACTION") |
389 | mStatus = NEEDS_ACTION; | 390 | mStatus = NEEDS_ACTION; |
390 | else if (ss == "ACCEPTED") | 391 | else if (ss == "ACCEPTED") |
391 | mStatus = ACCEPTED; | 392 | mStatus = ACCEPTED; |
392 | else if (ss == "SENT") | 393 | else if (ss == "SENT") |
393 | mStatus = SENT; | 394 | mStatus = SENT; |
394 | else if (ss == "TENTATIVE") | 395 | else if (ss == "TENTATIVE") |
395 | mStatus = TENTATIVE; | 396 | mStatus = TENTATIVE; |
396 | else if (ss == "CONFIRMED") | 397 | else if (ss == "CONFIRMED") |
397 | mStatus = CONFIRMED; | 398 | mStatus = CONFIRMED; |
398 | else if (ss == "DECLINED") | 399 | else if (ss == "DECLINED") |
399 | mStatus = DECLINED; | 400 | mStatus = DECLINED; |
400 | else if (ss == "COMPLETED") | 401 | else if (ss == "COMPLETED") |
401 | mStatus = COMPLETED; | 402 | mStatus = COMPLETED; |
402 | else if (ss == "DELEGATED") | 403 | else if (ss == "DELEGATED") |
403 | mStatus = DELEGATED; | 404 | mStatus = DELEGATED; |
404 | 405 | ||
405 | updated(); | 406 | updated(); |
406 | } | 407 | } |
407 | 408 | ||
408 | void Todo::setStatus(int status) | 409 | void Todo::setStatus(int status) |
409 | { | 410 | { |
410 | if (mReadOnly) return; | 411 | if (mReadOnly) return; |
411 | mStatus = status; | 412 | mStatus = status; |
412 | updated(); | 413 | updated(); |
413 | } | 414 | } |
414 | 415 | ||
415 | int Todo::status() const | 416 | int Todo::status() const |
416 | { | 417 | { |
417 | return mStatus; | 418 | return mStatus; |
418 | } | 419 | } |
419 | 420 | ||
420 | QString Todo::statusStr() const | 421 | QString Todo::statusStr() const |
421 | { | 422 | { |
422 | switch(mStatus) { | 423 | switch(mStatus) { |
423 | case NEEDS_ACTION: | 424 | case NEEDS_ACTION: |
424 | return QString("NEEDS ACTION"); | 425 | return QString("NEEDS ACTION"); |
425 | break; | 426 | break; |
426 | case ACCEPTED: | 427 | case ACCEPTED: |