-rw-r--r-- | korganizer/koprefs.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefs.h | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 134 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 | ||||
-rw-r--r-- | libkcal/phoneformat.cpp | 68 | ||||
-rw-r--r-- | libkcal/phoneformat.h | 2 |
6 files changed, 188 insertions, 26 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index c28da9a..716a125 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -1,175 +1,181 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program 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 | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #ifndef _WIN32_ | 25 | #ifndef _WIN32_ |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #endif | 27 | #endif |
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
30 | #include <qtextcodec.h> | 30 | #include <qtextcodec.h> |
31 | #include <qstring.h> | 31 | #include <qstring.h> |
32 | #include <qregexp.h> | 32 | #include <qregexp.h> |
33 | #include <qfont.h> | 33 | #include <qfont.h> |
34 | #include <qcolor.h> | 34 | #include <qcolor.h> |
35 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | #include <kglobal.h> | 38 | #include <kglobal.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <kemailsettings.h> | 42 | #include <kemailsettings.h> |
43 | #include <kstaticdeleter.h> | 43 | #include <kstaticdeleter.h> |
44 | #include <libkdepim/kpimglobalprefs.h> | 44 | #include <libkdepim/kpimglobalprefs.h> |
45 | 45 | ||
46 | #include "koprefs.h" | 46 | #include "koprefs.h" |
47 | #include "mainwindow.h" | 47 | #include "mainwindow.h" |
48 | 48 | ||
49 | const char *germanwords[][2] = { | 49 | const char *germanwords[][2] = { |
50 | #include "wordsgerman.h" | 50 | #include "wordsgerman.h" |
51 | "", "" | 51 | "", "" |
52 | }; | 52 | }; |
53 | 53 | ||
54 | KOPrefs *KOPrefs::mInstance = 0; | 54 | KOPrefs *KOPrefs::mInstance = 0; |
55 | static KStaticDeleter<KOPrefs> insd; | 55 | static KStaticDeleter<KOPrefs> insd; |
56 | 56 | ||
57 | KOPrefs::KOPrefs() : | 57 | KOPrefs::KOPrefs() : |
58 | KPimPrefs("korganizerrc") | 58 | KPimPrefs("korganizerrc") |
59 | { | 59 | { |
60 | mCategoryColors.setAutoDelete(true); | 60 | mCategoryColors.setAutoDelete(true); |
61 | mLocaleDict = 0; | 61 | mLocaleDict = 0; |
62 | fillMailDefaults(); | 62 | fillMailDefaults(); |
63 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); | 63 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); |
64 | QColor defaultHolidayColor = QColor(255,0,0); | 64 | QColor defaultHolidayColor = QColor(255,0,0); |
65 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); | 65 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); |
66 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); | 66 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); |
67 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); | 67 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); |
68 | QColor defaultTodoDueTodayColor = QColor(255,220,100); | 68 | QColor defaultTodoDueTodayColor = QColor(255,220,100); |
69 | QColor defaultTodoOverdueColor = QColor(255,153,125); | 69 | QColor defaultTodoOverdueColor = QColor(255,153,125); |
70 | 70 | ||
71 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); | 71 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); |
72 | mDefaultViewFont = QFont("helvetica",10); | 72 | mDefaultViewFont = QFont("helvetica",10); |
73 | mDefaultMonthViewFont = QFont("helvetica",8); | 73 | mDefaultMonthViewFont = QFont("helvetica",8); |
74 | mMarcusBainsFont= QFont("helvetica",10); | 74 | mMarcusBainsFont= QFont("helvetica",10); |
75 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); | 75 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); |
76 | mEditBoxFont = QFont("helvetica",12); | 76 | mEditBoxFont = QFont("helvetica",12); |
77 | mJornalViewFont = QFont("helvetica",12); | 77 | mJornalViewFont = QFont("helvetica",12); |
78 | 78 | ||
79 | KPrefs::setCurrentGroup("General"); | 79 | KPrefs::setCurrentGroup("General"); |
80 | |||
81 | |||
82 | addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); | ||
83 | addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); | ||
84 | addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); | ||
85 | |||
80 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 86 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
81 | 87 | ||
82 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); | 88 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); |
83 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); | 89 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); |
84 | addItemBool("ShowIconSearch",&mShowIconSearch,true); | 90 | addItemBool("ShowIconSearch",&mShowIconSearch,true); |
85 | addItemBool("ShowIconList",&mShowIconList,true); | 91 | addItemBool("ShowIconList",&mShowIconList,true); |
86 | addItemBool("ShowIconDay1",&mShowIconDay1,true); | 92 | addItemBool("ShowIconDay1",&mShowIconDay1,true); |
87 | addItemBool("ShowIconDay5",&mShowIconDay5,true); | 93 | addItemBool("ShowIconDay5",&mShowIconDay5,true); |
88 | addItemBool("ShowIconDay7",&mShowIconDay7,true); | 94 | addItemBool("ShowIconDay7",&mShowIconDay7,true); |
89 | addItemBool("ShowIconMonth",&mShowIconMonth,true); | 95 | addItemBool("ShowIconMonth",&mShowIconMonth,true); |
90 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); | 96 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); |
91 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); | 97 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); |
92 | addItemBool("ShowIconBack",&mShowIconBack,true); | 98 | addItemBool("ShowIconBack",&mShowIconBack,true); |
93 | addItemBool("ShowIconToday",&mShowIconToday,true); | 99 | addItemBool("ShowIconToday",&mShowIconToday,true); |
94 | addItemBool("ShowIconForward",&mShowIconForward,true); | 100 | addItemBool("ShowIconForward",&mShowIconForward,true); |
95 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); | 101 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); |
96 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); | 102 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); |
97 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); | 103 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); |
98 | addItemBool("ShowIconNext",&mShowIconNext,true); | 104 | addItemBool("ShowIconNext",&mShowIconNext,true); |
99 | addItemBool("ShowIconJournal",&mShowIconJournal,true); | 105 | addItemBool("ShowIconJournal",&mShowIconJournal,true); |
100 | addItemBool("ShowIconStretch",&mShowIconStretch,true); | 106 | addItemBool("ShowIconStretch",&mShowIconStretch,true); |
101 | addItemBool("LanguageChanged",&mLanguageChanged,false); | 107 | addItemBool("LanguageChanged",&mLanguageChanged,false); |
102 | 108 | ||
103 | addItemBool("AskForQuit",&mAskForQuit,false); | 109 | addItemBool("AskForQuit",&mAskForQuit,false); |
104 | 110 | ||
105 | #ifndef DESKTOP_VERSION | 111 | #ifndef DESKTOP_VERSION |
106 | addItemBool("ShowFullMenu",&mShowFullMenu,false); | 112 | addItemBool("ShowFullMenu",&mShowFullMenu,false); |
107 | #else | 113 | #else |
108 | addItemBool("ShowFullMenu",&mShowFullMenu,true); | 114 | addItemBool("ShowFullMenu",&mShowFullMenu,true); |
109 | #endif | 115 | #endif |
110 | addItemBool("ToolBarHor",&mToolBarHor, true ); | 116 | addItemBool("ToolBarHor",&mToolBarHor, true ); |
111 | addItemBool("ToolBarUp",&mToolBarUp, false ); | 117 | addItemBool("ToolBarUp",&mToolBarUp, false ); |
112 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); | 118 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); |
113 | addItemInt("Whats Next Days",&mWhatsNextDays,3); | 119 | addItemInt("Whats Next Days",&mWhatsNextDays,3); |
114 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); | 120 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); |
115 | 121 | ||
116 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); | 122 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); |
117 | addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); | 123 | addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); |
118 | addItemInt("AllDay Size",&mAllDaySize,28); | 124 | addItemInt("AllDay Size",&mAllDaySize,28); |
119 | QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; | 125 | QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; |
120 | addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); | 126 | addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); |
121 | 127 | ||
122 | addItemStringList("LocationDefaults",&mLocationDefaults ); | 128 | addItemStringList("LocationDefaults",&mLocationDefaults ); |
123 | addItemStringList("EventSummary User",&mEventSummaryUser); | 129 | addItemStringList("EventSummary User",&mEventSummaryUser); |
124 | addItemStringList("TodoSummary User",&mTodoSummaryUser); | 130 | addItemStringList("TodoSummary User",&mTodoSummaryUser); |
125 | 131 | ||
126 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 132 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
127 | addItemBool("Enable Project View",&mEnableProjectView,false); | 133 | addItemBool("Enable Project View",&mEnableProjectView,false); |
128 | addItemBool("Auto Save",&mAutoSave,false); | 134 | addItemBool("Auto Save",&mAutoSave,false); |
129 | addItemInt("Auto Save Interval",&mAutoSaveInterval,3); | 135 | addItemInt("Auto Save Interval",&mAutoSaveInterval,3); |
130 | addItemBool("Confirm Deletes",&mConfirm,true); | 136 | addItemBool("Confirm Deletes",&mConfirm,true); |
131 | addItemString("Archive File",&mArchiveFile); | 137 | addItemString("Archive File",&mArchiveFile); |
132 | addItemString("Html Export File",&mHtmlExportFile, | 138 | addItemString("Html Export File",&mHtmlExportFile, |
133 | QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); | 139 | QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); |
134 | addItemBool("Html With Save",&mHtmlWithSave,false); | 140 | addItemBool("Html With Save",&mHtmlWithSave,false); |
135 | 141 | ||
136 | KPrefs::setCurrentGroup("Personal Settings"); | 142 | KPrefs::setCurrentGroup("Personal Settings"); |
137 | 143 | ||
138 | addItemInt("Mail Client",&mMailClient,MailClientKMail); | 144 | addItemInt("Mail Client",&mMailClient,MailClientKMail); |
139 | addItemBool("Use Control Center Email",&mEmailControlCenter,false); | 145 | addItemBool("Use Control Center Email",&mEmailControlCenter,false); |
140 | addItemBool("Bcc",&mBcc,false); | 146 | addItemBool("Bcc",&mBcc,false); |
141 | 147 | ||
142 | KPrefs::setCurrentGroup("Time & Date"); | 148 | KPrefs::setCurrentGroup("Time & Date"); |
143 | 149 | ||
144 | // addItemString("Time Zone",&mTimeZone,"+0100"); | 150 | // addItemString("Time Zone",&mTimeZone,"+0100"); |
145 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | 151 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); |
146 | // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60); | 152 | // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60); |
147 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 153 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
148 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 154 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
149 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 155 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
150 | 156 | ||
151 | 157 | ||
152 | addItemInt("Default Start Time",&mStartTime,10); | 158 | addItemInt("Default Start Time",&mStartTime,10); |
153 | addItemInt("Default Duration",&mDefaultDuration,2); | 159 | addItemInt("Default Duration",&mDefaultDuration,2); |
154 | addItemInt("Default Alarm Time",&mAlarmTime,3); | 160 | addItemInt("Default Alarm Time",&mAlarmTime,3); |
155 | addItemInt("Daylight Savings",&mDaylightSavings,0); | 161 | addItemInt("Daylight Savings",&mDaylightSavings,0); |
156 | KPrefs::setCurrentGroup("AlarmSettings"); | 162 | KPrefs::setCurrentGroup("AlarmSettings"); |
157 | addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); | 163 | addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); |
158 | addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); | 164 | addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); |
159 | addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); | 165 | addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); |
160 | addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); | 166 | addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); |
161 | 167 | ||
162 | 168 | ||
163 | KPrefs::setCurrentGroup("Calendar"); | 169 | KPrefs::setCurrentGroup("Calendar"); |
164 | 170 | ||
165 | addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); | 171 | addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); |
166 | 172 | ||
167 | KPrefs::setCurrentGroup("Fonts"); | 173 | KPrefs::setCurrentGroup("Fonts"); |
168 | // qDebug(" KPrefs::setCurrentGroup(Fonts); "); | 174 | // qDebug(" KPrefs::setCurrentGroup(Fonts); "); |
169 | addItemFont("TimeBar Font",&mTimeBarFont); | 175 | addItemFont("TimeBar Font",&mTimeBarFont); |
170 | addItemFont("MonthView Font",&mMonthViewFont); | 176 | addItemFont("MonthView Font",&mMonthViewFont); |
171 | addItemFont("AgendaView Font",&mAgendaViewFont); | 177 | addItemFont("AgendaView Font",&mAgendaViewFont); |
172 | addItemFont("MarcusBains Font",&mMarcusBainsFont); | 178 | addItemFont("MarcusBains Font",&mMarcusBainsFont); |
173 | addItemFont("TimeLabels Font",&mTimeLabelsFont); | 179 | addItemFont("TimeLabels Font",&mTimeLabelsFont); |
174 | addItemFont("TodoView Font",&mTodoViewFont); | 180 | addItemFont("TodoView Font",&mTodoViewFont); |
175 | addItemFont("ListView Font",&mListViewFont); | 181 | addItemFont("ListView Font",&mListViewFont); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index d9ac851..a1ba8b3 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -117,192 +117,195 @@ class KOPrefs : public KPimPrefs | |||
117 | QFont mTodoViewFont; | 117 | QFont mTodoViewFont; |
118 | QFont mListViewFont; | 118 | QFont mListViewFont; |
119 | QFont mDateNavigatorFont; | 119 | QFont mDateNavigatorFont; |
120 | QFont mEditBoxFont; | 120 | QFont mEditBoxFont; |
121 | QFont mJornalViewFont; | 121 | QFont mJornalViewFont; |
122 | QFont mWhatsNextFont; | 122 | QFont mWhatsNextFont; |
123 | QFont mEventViewFont; | 123 | QFont mEventViewFont; |
124 | 124 | ||
125 | 125 | ||
126 | 126 | ||
127 | 127 | ||
128 | QColor mHolidayColor; | 128 | QColor mHolidayColor; |
129 | QColor mHighlightColor; | 129 | QColor mHighlightColor; |
130 | QColor mEventColor; | 130 | QColor mEventColor; |
131 | QColor mAgendaBgColor; | 131 | QColor mAgendaBgColor; |
132 | QColor mWorkingHoursColor; | 132 | QColor mWorkingHoursColor; |
133 | QColor mTodoDueTodayColor; | 133 | QColor mTodoDueTodayColor; |
134 | QColor mTodoOverdueColor; | 134 | QColor mTodoOverdueColor; |
135 | QColor mMonthViewEvenColor; | 135 | QColor mMonthViewEvenColor; |
136 | QColor mMonthViewOddColor; | 136 | QColor mMonthViewOddColor; |
137 | QColor mMonthViewHolidayColor; | 137 | QColor mMonthViewHolidayColor; |
138 | bool mMonthViewUsesDayColors; | 138 | bool mMonthViewUsesDayColors; |
139 | bool mMonthViewSatSunTog; | 139 | bool mMonthViewSatSunTog; |
140 | QColor mAppColor1; | 140 | QColor mAppColor1; |
141 | QColor mAppColor2; | 141 | QColor mAppColor2; |
142 | bool mUseAppColors; | 142 | bool mUseAppColors; |
143 | 143 | ||
144 | int mDayBegins; | 144 | int mDayBegins; |
145 | int mHourSize; | 145 | int mHourSize; |
146 | int mAllDaySize; | 146 | int mAllDaySize; |
147 | bool mShowFullMenu; | 147 | bool mShowFullMenu; |
148 | bool mDailyRecur; | 148 | bool mDailyRecur; |
149 | bool mWeeklyRecur; | 149 | bool mWeeklyRecur; |
150 | bool mMonthDailyRecur; | 150 | bool mMonthDailyRecur; |
151 | bool mMonthWeeklyRecur; | 151 | bool mMonthWeeklyRecur; |
152 | bool mMonthShowIcons; | 152 | bool mMonthShowIcons; |
153 | bool mMonthShowShort; | 153 | bool mMonthShowShort; |
154 | bool mEnableToolTips; | 154 | bool mEnableToolTips; |
155 | bool mEnableMonthScroll; | 155 | bool mEnableMonthScroll; |
156 | bool mFullViewMonth; | 156 | bool mFullViewMonth; |
157 | bool mMonthViewUsesCategoryColor; | 157 | bool mMonthViewUsesCategoryColor; |
158 | bool mFullViewTodo; | 158 | bool mFullViewTodo; |
159 | bool mShowCompletedTodo; | 159 | bool mShowCompletedTodo; |
160 | bool mMarcusBainsEnabled; | 160 | bool mMarcusBainsEnabled; |
161 | int mNextXDays; | 161 | int mNextXDays; |
162 | int mWhatsNextDays; | 162 | int mWhatsNextDays; |
163 | int mWhatsNextPrios; | 163 | int mWhatsNextPrios; |
164 | bool mEnableQuickTodo; | 164 | bool mEnableQuickTodo; |
165 | bool mLanguageChanged; | 165 | bool mLanguageChanged; |
166 | 166 | ||
167 | bool mCompactDialogs; | 167 | bool mCompactDialogs; |
168 | bool mVerticalScreen; | 168 | bool mVerticalScreen; |
169 | 169 | ||
170 | bool mShowIconNewTodo; | 170 | bool mShowIconNewTodo; |
171 | bool mShowIconNewEvent; | 171 | bool mShowIconNewEvent; |
172 | bool mShowIconSearch; | 172 | bool mShowIconSearch; |
173 | bool mShowIconList; | 173 | bool mShowIconList; |
174 | bool mShowIconDay1; | 174 | bool mShowIconDay1; |
175 | bool mShowIconDay5; | 175 | bool mShowIconDay5; |
176 | bool mShowIconDay7; | 176 | bool mShowIconDay7; |
177 | bool mShowIconMonth; | 177 | bool mShowIconMonth; |
178 | bool mShowIconTodoview; | 178 | bool mShowIconTodoview; |
179 | bool mShowIconBackFast; | 179 | bool mShowIconBackFast; |
180 | bool mShowIconBack; | 180 | bool mShowIconBack; |
181 | bool mShowIconToday; | 181 | bool mShowIconToday; |
182 | bool mShowIconForward; | 182 | bool mShowIconForward; |
183 | bool mShowIconForwardFast; | 183 | bool mShowIconForwardFast; |
184 | bool mShowIconWhatsThis; | 184 | bool mShowIconWhatsThis; |
185 | bool mShowIconNextDays; | 185 | bool mShowIconNextDays; |
186 | bool mShowIconNext; | 186 | bool mShowIconNext; |
187 | bool mShowIconJournal; | 187 | bool mShowIconJournal; |
188 | 188 | ||
189 | bool mShowIconStretch; | 189 | bool mShowIconStretch; |
190 | 190 | ||
191 | bool mToolBarHor; | 191 | bool mToolBarHor; |
192 | bool mToolBarUp; | 192 | bool mToolBarUp; |
193 | bool mToolBarMiniIcons; | 193 | bool mToolBarMiniIcons; |
194 | 194 | ||
195 | bool mAskForQuit; | 195 | bool mAskForQuit; |
196 | bool mUsePassWd; | 196 | bool mUsePassWd; |
197 | bool mWriteBackFile; | 197 | bool mWriteBackFile; |
198 | int mWriteBackInFuture; | 198 | int mWriteBackInFuture; |
199 | bool mAskForPreferences; | 199 | bool mAskForPreferences; |
200 | bool mShowSyncSummary; | 200 | bool mShowSyncSummary; |
201 | bool mShowSyncEvents; | 201 | bool mShowSyncEvents; |
202 | bool mShowTodoInAgenda; | 202 | bool mShowTodoInAgenda; |
203 | bool mWriteBackExistingOnly; | 203 | bool mWriteBackExistingOnly; |
204 | 204 | ||
205 | QString mRemoteIP; | 205 | QString mRemoteIP; |
206 | QString mRemoteUser; | 206 | QString mRemoteUser; |
207 | QString mRemotePassWd; | 207 | QString mRemotePassWd; |
208 | QString mRemoteFile; | 208 | QString mRemoteFile; |
209 | QString mLocalTempFile; | 209 | QString mLocalTempFile; |
210 | QString mPhoneDevice; | 210 | QString mPhoneDevice; |
211 | QString mPhoneConnection; | 211 | QString mPhoneConnection; |
212 | QString mPhoneModel; | 212 | QString mPhoneModel; |
213 | QString mEx2PhoneDevice; | ||
214 | QString mEx2PhoneConnection; | ||
215 | QString mEx2PhoneModel; | ||
213 | 216 | ||
214 | int mLastSyncTime; | 217 | int mLastSyncTime; |
215 | int mSyncAlgoPrefs; | 218 | int mSyncAlgoPrefs; |
216 | int mRingSyncAlgoPrefs; | 219 | int mRingSyncAlgoPrefs; |
217 | QStringList mSyncProfileNames; | 220 | QStringList mSyncProfileNames; |
218 | QStringList mExternSyncProfiles; | 221 | QStringList mExternSyncProfiles; |
219 | QString mLocalMachineName; | 222 | QString mLocalMachineName; |
220 | void setCategoryColor(QString cat,const QColor & color); | 223 | void setCategoryColor(QString cat,const QColor & color); |
221 | QColor *categoryColor(QString cat); | 224 | QColor *categoryColor(QString cat); |
222 | 225 | ||
223 | QString mArchiveFile; | 226 | QString mArchiveFile; |
224 | QString mHtmlExportFile; | 227 | QString mHtmlExportFile; |
225 | bool mHtmlWithSave; | 228 | bool mHtmlWithSave; |
226 | 229 | ||
227 | QStringList mSelectedPlugins; | 230 | QStringList mSelectedPlugins; |
228 | 231 | ||
229 | QString mLastImportFile; | 232 | QString mLastImportFile; |
230 | QString mLastVcalFile; | 233 | QString mLastVcalFile; |
231 | QString mLastSaveFile; | 234 | QString mLastSaveFile; |
232 | QString mLastLoadFile; | 235 | QString mLastLoadFile; |
233 | QString mLastSyncedLocalFile; | 236 | QString mLastSyncedLocalFile; |
234 | 237 | ||
235 | 238 | ||
236 | QString mDefaultAlarmFile; | 239 | QString mDefaultAlarmFile; |
237 | int mIMIPScheduler; | 240 | int mIMIPScheduler; |
238 | int mIMIPSend; | 241 | int mIMIPSend; |
239 | QStringList mAdditionalMails; | 242 | QStringList mAdditionalMails; |
240 | int mIMIPAutoRefresh; | 243 | int mIMIPAutoRefresh; |
241 | int mIMIPAutoInsertReply; | 244 | int mIMIPAutoInsertReply; |
242 | int mIMIPAutoInsertRequest; | 245 | int mIMIPAutoInsertRequest; |
243 | int mIMIPAutoFreeBusy; | 246 | int mIMIPAutoFreeBusy; |
244 | int mIMIPAutoFreeBusyReply; | 247 | int mIMIPAutoFreeBusyReply; |
245 | 248 | ||
246 | QStringList mTodoTemplates; | 249 | QStringList mTodoTemplates; |
247 | QStringList mEventTemplates; | 250 | QStringList mEventTemplates; |
248 | 251 | ||
249 | int mDestination; | 252 | int mDestination; |
250 | 253 | ||
251 | 254 | ||
252 | bool mEditOnDoubleClick; | 255 | bool mEditOnDoubleClick; |
253 | bool mViewChangeHoldFullscreen; | 256 | bool mViewChangeHoldFullscreen; |
254 | bool mViewChangeHoldNonFullscreen; | 257 | bool mViewChangeHoldNonFullscreen; |
255 | bool mCenterOnCurrentTime; | 258 | bool mCenterOnCurrentTime; |
256 | bool mSetTimeToDayStartAt; | 259 | bool mSetTimeToDayStartAt; |
257 | bool mHighlightCurrentDay; | 260 | bool mHighlightCurrentDay; |
258 | bool mUseHighlightLightColor; | 261 | bool mUseHighlightLightColor; |
259 | bool mListViewMonthTimespan; | 262 | bool mListViewMonthTimespan; |
260 | bool mWNViewShowsParents; | 263 | bool mWNViewShowsParents; |
261 | bool mWNViewShowLocation; | 264 | bool mWNViewShowLocation; |
262 | bool mTodoViewShowsPercentage; | 265 | bool mTodoViewShowsPercentage; |
263 | bool mTodoViewUsesCatColors; | 266 | bool mTodoViewUsesCatColors; |
264 | bool mTodoViewUsesSmallFont; | 267 | bool mTodoViewUsesSmallFont; |
265 | bool mTodoViewUsesForegroundColor; | 268 | bool mTodoViewUsesForegroundColor; |
266 | bool mMonthViewUsesForegroundColor; | 269 | bool mMonthViewUsesForegroundColor; |
267 | 270 | ||
268 | bool mHightlightDateTimeEdit; | 271 | bool mHightlightDateTimeEdit; |
269 | bool mShortDateInViewer; | 272 | bool mShortDateInViewer; |
270 | 273 | ||
271 | QStringList mLocationDefaults; | 274 | QStringList mLocationDefaults; |
272 | QStringList mEventSummaryUser; | 275 | QStringList mEventSummaryUser; |
273 | QStringList mTodoSummaryUser; | 276 | QStringList mTodoSummaryUser; |
274 | 277 | ||
275 | bool mUseInternalAlarmNotification; | 278 | bool mUseInternalAlarmNotification; |
276 | int mAlarmPlayBeeps; | 279 | int mAlarmPlayBeeps; |
277 | int mAlarmSuspendTime; | 280 | int mAlarmSuspendTime; |
278 | int mAlarmSuspendCount; | 281 | int mAlarmSuspendCount; |
279 | int mAlarmBeepInterval; | 282 | int mAlarmBeepInterval; |
280 | 283 | ||
281 | QString mPassiveSyncPort; | 284 | QString mPassiveSyncPort; |
282 | QString mPassiveSyncPw; | 285 | QString mPassiveSyncPw; |
283 | QString mActiveSyncPort; | 286 | QString mActiveSyncPort; |
284 | QString mActiveSyncIP; | 287 | QString mActiveSyncIP; |
285 | 288 | ||
286 | 289 | ||
287 | //US I copied the following settings into KPimGlobalPrefs | 290 | //US I copied the following settings into KPimGlobalPrefs |
288 | // that allows us later to easily remove the settings from here. | 291 | // that allows us later to easily remove the settings from here. |
289 | int mPreferredDate; | 292 | int mPreferredDate; |
290 | QString mUserDateFormatLong; | 293 | QString mUserDateFormatLong; |
291 | QString mUserDateFormatShort; | 294 | QString mUserDateFormatShort; |
292 | int mPreferredLanguage; | 295 | int mPreferredLanguage; |
293 | int mPreferredTime; | 296 | int mPreferredTime; |
294 | bool mWeekStartsOnSunday; | 297 | bool mWeekStartsOnSunday; |
295 | QString mTimeZoneId; | 298 | QString mTimeZoneId; |
296 | bool mUseDaylightsaving; | 299 | bool mUseDaylightsaving; |
297 | int mDaylightsavingStart; | 300 | int mDaylightsavingStart; |
298 | int mDaylightsavingEnd; | 301 | int mDaylightsavingEnd; |
299 | 302 | ||
300 | 303 | ||
301 | private: | 304 | private: |
302 | QDict<QColor> mCategoryColors; | 305 | QDict<QColor> mCategoryColors; |
303 | QColor mDefaultCategoryColor; | 306 | QColor mDefaultCategoryColor; |
304 | 307 | ||
305 | QFont mDefaultTimeBarFont; | 308 | QFont mDefaultTimeBarFont; |
306 | QFont mDefaultViewFont; | 309 | QFont mDefaultViewFont; |
307 | QFont mDefaultMonthViewFont; | 310 | QFont mDefaultMonthViewFont; |
308 | 311 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index de94b8c..ef73a78 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1,164 +1,216 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | 2 | ||
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qpopupmenu.h> | 4 | #include <qpopupmenu.h> |
5 | #include <qpainter.h> | 5 | #include <qpainter.h> |
6 | #include <qwhatsthis.h> | 6 | #include <qwhatsthis.h> |
7 | #include <qpushbutton.h> | 7 | #include <qpushbutton.h> |
8 | #include <qmessagebox.h> | 8 | #include <qmessagebox.h> |
9 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
10 | #include <qtextcodec.h> | 10 | #include <qtextcodec.h> |
11 | #include <qfile.h> | 11 | #include <qfile.h> |
12 | #include <qdir.h> | 12 | #include <qdir.h> |
13 | #include <qapp.h> | 13 | #include <qapp.h> |
14 | #include <qfileinfo.h> | 14 | #include <qfileinfo.h> |
15 | #include <qlabel.h> | 15 | #include <qlabel.h> |
16 | #include <qspinbox.h> | ||
17 | #include <qcheckbox.h> | ||
16 | #include <qmap.h> | 18 | #include <qmap.h> |
17 | #include <qwmatrix.h> | 19 | #include <qwmatrix.h> |
18 | #include <qtextbrowser.h> | 20 | #include <qtextbrowser.h> |
19 | #include <qtextstream.h> | 21 | #include <qtextstream.h> |
20 | #ifndef DESKTOP_VERSION | 22 | #ifndef DESKTOP_VERSION |
21 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
22 | #include <qpe/qpemenubar.h> | 24 | #include <qpe/qpemenubar.h> |
23 | #include <qpe/qpetoolbar.h> | 25 | #include <qpe/qpetoolbar.h> |
24 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
25 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
26 | #include <qtopia/alarmserver.h> | 28 | #include <qtopia/alarmserver.h> |
27 | #include <qtopia/qcopenvelope_qws.h> | 29 | #include <qtopia/qcopenvelope_qws.h> |
28 | #include <unistd.h> // for sleep | 30 | #include <unistd.h> // for sleep |
29 | #else | 31 | #else |
30 | #include <qmenubar.h> | 32 | #include <qmenubar.h> |
31 | #include <qtoolbar.h> | 33 | #include <qtoolbar.h> |
32 | #include <qapplication.h> | 34 | #include <qapplication.h> |
33 | //#include <resource.h> | 35 | //#include <resource.h> |
34 | 36 | ||
35 | #endif | 37 | #endif |
36 | #include <libkcal/calendarlocal.h> | 38 | #include <libkcal/calendarlocal.h> |
37 | #include <libkcal/todo.h> | 39 | #include <libkcal/todo.h> |
40 | #include <libkcal/phoneformat.h> | ||
38 | #include <libkdepim/ksyncprofile.h> | 41 | #include <libkdepim/ksyncprofile.h> |
39 | #include <libkcal/kincidenceformatter.h> | 42 | #include <libkcal/kincidenceformatter.h> |
40 | #include <libkdepim/kpimglobalprefs.h> | 43 | #include <libkdepim/kpimglobalprefs.h> |
41 | 44 | ||
42 | #include "calendarview.h" | 45 | #include "calendarview.h" |
43 | #include "koviewmanager.h" | 46 | #include "koviewmanager.h" |
44 | #include "datenavigator.h" | 47 | #include "datenavigator.h" |
45 | #include "koagendaview.h" | 48 | #include "koagendaview.h" |
46 | #include "koagenda.h" | 49 | #include "koagenda.h" |
47 | #include "kodialogmanager.h" | 50 | #include "kodialogmanager.h" |
48 | #include "kdialogbase.h" | 51 | #include "kdialogbase.h" |
49 | #include "kapplication.h" | 52 | #include "kapplication.h" |
50 | #include "kofilterview.h" | 53 | #include "kofilterview.h" |
51 | #include "kstandarddirs.h" | 54 | #include "kstandarddirs.h" |
52 | #include "koprefs.h" | 55 | #include "koprefs.h" |
53 | #include "kfiledialog.h" | 56 | #include "kfiledialog.h" |
54 | #include "koglobals.h" | 57 | #include "koglobals.h" |
55 | #include "kglobal.h" | 58 | #include "kglobal.h" |
56 | #include "klocale.h" | 59 | #include "klocale.h" |
57 | #include "kconfig.h" | 60 | #include "kconfig.h" |
58 | #include "simplealarmclient.h" | 61 | #include "simplealarmclient.h" |
59 | #include "externalapphandler.h" | 62 | #include "externalapphandler.h" |
60 | 63 | ||
61 | using namespace KCal; | 64 | using namespace KCal; |
62 | #ifndef _WIN32_ | 65 | #ifndef _WIN32_ |
63 | #include <unistd.h> | 66 | #include <unistd.h> |
64 | #else | 67 | #else |
65 | #include "koimportoldialog.h" | 68 | #include "koimportoldialog.h" |
66 | #endif | 69 | #endif |
67 | #include "mainwindow.h" | 70 | #include "mainwindow.h" |
68 | 71 | ||
72 | class KOex2phonePrefs : public QDialog | ||
73 | { | ||
74 | public: | ||
75 | KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) : | ||
76 | QDialog( parent, name, true ) | ||
77 | { | ||
78 | setCaption( i18n("Export to phone options") ); | ||
79 | QVBoxLayout* lay = new QVBoxLayout( this ); | ||
80 | lay->setSpacing( 3 ); | ||
81 | lay->setMargin( 3 ); | ||
82 | |||
83 | lay->addWidget(new QLabel( i18n("Please read phone sync howto to\nknow more about the connection settings."), this ) ); | ||
84 | QHBox* temphb; | ||
85 | temphb = new QHBox( this ); | ||
86 | new QLabel( i18n("I/O device: "), temphb ); | ||
87 | mPhoneDevice = new QLineEdit( temphb); | ||
88 | lay->addWidget( temphb ); | ||
89 | temphb = new QHBox( this ); | ||
90 | new QLabel( i18n("Connection: "), temphb ); | ||
91 | mPhoneConnection = new QLineEdit( temphb); | ||
92 | lay->addWidget( temphb ); | ||
93 | temphb = new QHBox( this ); | ||
94 | new QLabel( i18n("Model(opt.): "), temphb ); | ||
95 | mPhoneModel = new QLineEdit( temphb); | ||
96 | lay->addWidget( temphb ); | ||
97 | mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this ); | ||
98 | mWriteBackFuture->setChecked( true ); | ||
99 | lay->addWidget( mWriteBackFuture ); | ||
100 | temphb = new QHBox( this ); | ||
101 | new QLabel( i18n("Max. weeks in future: ") , temphb ); | ||
102 | mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); | ||
103 | mWriteBackFutureWeeks->setValue( 8 ); | ||
104 | lay->addWidget( temphb ); | ||
105 | QPushButton * ok = new QPushButton( i18n("Export!"), this ); | ||
106 | lay->addWidget( ok ); | ||
107 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | ||
108 | lay->addWidget( cancel ); | ||
109 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | ||
110 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | ||
111 | resize( 220, 220 ); | ||
112 | |||
113 | } | ||
114 | |||
115 | public: | ||
116 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; | ||
117 | QCheckBox* mWriteBackFuture; | ||
118 | QSpinBox* mWriteBackFutureWeeks; | ||
119 | }; | ||
120 | |||
69 | int globalFlagBlockStartup; | 121 | int globalFlagBlockStartup; |
70 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 122 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
71 | QMainWindow( parent, name ) | 123 | QMainWindow( parent, name ) |
72 | { | 124 | { |
73 | mPassWordPiSync = "abc"; | 125 | mPassWordPiSync = "abc"; |
74 | #ifdef DESKTOP_VERSION | 126 | #ifdef DESKTOP_VERSION |
75 | setFont( QFont("Arial"), 14 ); | 127 | setFont( QFont("Arial"), 14 ); |
76 | #endif | 128 | #endif |
77 | mSyncActionDialog = 0; | 129 | mSyncActionDialog = 0; |
78 | mServerSocket = 0; | 130 | mServerSocket = 0; |
79 | mClosed = false; | 131 | mClosed = false; |
80 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 132 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
81 | QString confFile = locateLocal("config","korganizerrc"); | 133 | QString confFile = locateLocal("config","korganizerrc"); |
82 | QFileInfo finf ( confFile ); | 134 | QFileInfo finf ( confFile ); |
83 | bool showWarning = !finf.exists(); | 135 | bool showWarning = !finf.exists(); |
84 | setIcon(SmallIcon( "ko24" ) ); | 136 | setIcon(SmallIcon( "ko24" ) ); |
85 | mBlockAtStartup = true; | 137 | mBlockAtStartup = true; |
86 | mFlagKeyPressed = false; | 138 | mFlagKeyPressed = false; |
87 | setCaption("KOrganizer/Pi"); | 139 | setCaption("KOrganizer/Pi"); |
88 | KOPrefs *p = KOPrefs::instance(); | 140 | KOPrefs *p = KOPrefs::instance(); |
89 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 141 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
90 | // if ( QApplication::desktop()->height() > 480 ) { | 142 | // if ( QApplication::desktop()->height() > 480 ) { |
91 | // if ( p->mHourSize == 4 ) | 143 | // if ( p->mHourSize == 4 ) |
92 | // p->mHourSize = 6; | 144 | // p->mHourSize = 6; |
93 | // } | 145 | // } |
94 | if ( p->mHourSize > 18 ) | 146 | if ( p->mHourSize > 18 ) |
95 | p->mHourSize = 18; | 147 | p->mHourSize = 18; |
96 | QMainWindow::ToolBarDock tbd; | 148 | QMainWindow::ToolBarDock tbd; |
97 | if ( p->mToolBarHor ) { | 149 | if ( p->mToolBarHor ) { |
98 | if ( p->mToolBarUp ) | 150 | if ( p->mToolBarUp ) |
99 | tbd = Bottom; | 151 | tbd = Bottom; |
100 | else | 152 | else |
101 | tbd = Top; | 153 | tbd = Top; |
102 | } | 154 | } |
103 | else { | 155 | else { |
104 | if ( p->mToolBarUp ) | 156 | if ( p->mToolBarUp ) |
105 | tbd = Right; | 157 | tbd = Right; |
106 | else | 158 | else |
107 | tbd = Left; | 159 | tbd = Left; |
108 | } | 160 | } |
109 | if ( KOPrefs::instance()->mUseAppColors ) | 161 | if ( KOPrefs::instance()->mUseAppColors ) |
110 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 162 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
111 | globalFlagBlockStartup = 1; | 163 | globalFlagBlockStartup = 1; |
112 | iconToolBar = new QPEToolBar( this ); | 164 | iconToolBar = new QPEToolBar( this ); |
113 | addToolBar (iconToolBar , tbd ); | 165 | addToolBar (iconToolBar , tbd ); |
114 | mBlockSaveFlag = false; | 166 | mBlockSaveFlag = false; |
115 | mCalendarModifiedFlag = false; | 167 | mCalendarModifiedFlag = false; |
116 | 168 | ||
117 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 169 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
118 | splash->setAlignment ( AlignCenter ); | 170 | splash->setAlignment ( AlignCenter ); |
119 | setCentralWidget( splash ); | 171 | setCentralWidget( splash ); |
120 | #ifndef DESKTOP_VERSION | 172 | #ifndef DESKTOP_VERSION |
121 | showMaximized(); | 173 | showMaximized(); |
122 | #endif | 174 | #endif |
123 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 175 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
124 | setDefaultPreferences(); | 176 | setDefaultPreferences(); |
125 | mCalendar = new CalendarLocal(); | 177 | mCalendar = new CalendarLocal(); |
126 | mView = new CalendarView( mCalendar, this,"mCalendar " ); | 178 | mView = new CalendarView( mCalendar, this,"mCalendar " ); |
127 | mView->hide(); | 179 | mView->hide(); |
128 | //mView->resize(splash->size() ); | 180 | //mView->resize(splash->size() ); |
129 | initActions(); | 181 | initActions(); |
130 | #ifndef DESKTOP_VERSION | 182 | #ifndef DESKTOP_VERSION |
131 | iconToolBar->show(); | 183 | iconToolBar->show(); |
132 | qApp->processEvents(); | 184 | qApp->processEvents(); |
133 | #endif | 185 | #endif |
134 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); | 186 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); |
135 | int vh = height() ; | 187 | int vh = height() ; |
136 | int vw = width(); | 188 | int vw = width(); |
137 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); | 189 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); |
138 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 190 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
139 | vh -= iconToolBar->height(); | 191 | vh -= iconToolBar->height(); |
140 | } else { | 192 | } else { |
141 | vw -= iconToolBar->height(); | 193 | vw -= iconToolBar->height(); |
142 | } | 194 | } |
143 | //mView->setMaximumSize( splash->size() ); | 195 | //mView->setMaximumSize( splash->size() ); |
144 | //mView->resize( splash->size() ); | 196 | //mView->resize( splash->size() ); |
145 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 197 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
146 | mView->readSettings(); | 198 | mView->readSettings(); |
147 | bool newFile = false; | 199 | bool newFile = false; |
148 | if( !QFile::exists( defaultFileName() ) ) { | 200 | if( !QFile::exists( defaultFileName() ) ) { |
149 | QFileInfo finfo ( defaultFileName() ); | 201 | QFileInfo finfo ( defaultFileName() ); |
150 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 202 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
151 | qDebug("oldfile %s ", oldFile.latin1()); | 203 | qDebug("oldfile %s ", oldFile.latin1()); |
152 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 204 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
153 | finfo.setFile( oldFile ); | 205 | finfo.setFile( oldFile ); |
154 | if (finfo.exists() ) { | 206 | if (finfo.exists() ) { |
155 | KMessageBox::information( this, message); | 207 | KMessageBox::information( this, message); |
156 | mView->openCalendar( oldFile ); | 208 | mView->openCalendar( oldFile ); |
157 | qApp->processEvents(); | 209 | qApp->processEvents(); |
158 | } else { | 210 | } else { |
159 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 211 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
160 | finfo.setFile( oldFile ); | 212 | finfo.setFile( oldFile ); |
161 | if (finfo.exists() ) { | 213 | if (finfo.exists() ) { |
162 | KMessageBox::information( this, message); | 214 | KMessageBox::information( this, message); |
163 | mView->openCalendar( oldFile ); | 215 | mView->openCalendar( oldFile ); |
164 | qApp->processEvents(); | 216 | qApp->processEvents(); |
@@ -560,192 +612,201 @@ void MainWindow::initActions() | |||
560 | #endif | 612 | #endif |
561 | 613 | ||
562 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, | 614 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, |
563 | this ); | 615 | this ); |
564 | mNewSubTodoAction->addTo( actionMenu ); | 616 | mNewSubTodoAction->addTo( actionMenu ); |
565 | connect( mNewSubTodoAction, SIGNAL( activated() ), | 617 | connect( mNewSubTodoAction, SIGNAL( activated() ), |
566 | mView, SLOT( newSubTodo() ) ); | 618 | mView, SLOT( newSubTodo() ) ); |
567 | 619 | ||
568 | actionMenu->insertSeparator(); | 620 | actionMenu->insertSeparator(); |
569 | 621 | ||
570 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 622 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); |
571 | mShowAction->addTo( actionMenu ); | 623 | mShowAction->addTo( actionMenu ); |
572 | connect( mShowAction, SIGNAL( activated() ), | 624 | connect( mShowAction, SIGNAL( activated() ), |
573 | mView, SLOT( showIncidence() ) ); | 625 | mView, SLOT( showIncidence() ) ); |
574 | 626 | ||
575 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 627 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); |
576 | mEditAction->addTo( actionMenu ); | 628 | mEditAction->addTo( actionMenu ); |
577 | connect( mEditAction, SIGNAL( activated() ), | 629 | connect( mEditAction, SIGNAL( activated() ), |
578 | mView, SLOT( editIncidence() ) ); | 630 | mView, SLOT( editIncidence() ) ); |
579 | 631 | ||
580 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | 632 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); |
581 | mDeleteAction->addTo( actionMenu ); | 633 | mDeleteAction->addTo( actionMenu ); |
582 | connect( mDeleteAction, SIGNAL( activated() ), | 634 | connect( mDeleteAction, SIGNAL( activated() ), |
583 | mView, SLOT( deleteIncidence() ) ); | 635 | mView, SLOT( deleteIncidence() ) ); |
584 | 636 | ||
585 | actionMenu->insertSeparator(); | 637 | actionMenu->insertSeparator(); |
586 | 638 | ||
587 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, | 639 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, |
588 | this ); | 640 | this ); |
589 | action->addTo( actionMenu ); | 641 | action->addTo( actionMenu ); |
590 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); | 642 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); |
591 | 643 | ||
592 | icon = loadPixmap( pathString + "search" ); | 644 | icon = loadPixmap( pathString + "search" ); |
593 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 645 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); |
594 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); | 646 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); |
595 | search_action->addTo( actionMenu ); | 647 | search_action->addTo( actionMenu ); |
596 | connect( search_action, SIGNAL( activated() ), | 648 | connect( search_action, SIGNAL( activated() ), |
597 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 649 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
598 | 650 | ||
599 | icon = loadPixmap( pathString + "today" ); | 651 | icon = loadPixmap( pathString + "today" ); |
600 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 652 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
601 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | 653 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); |
602 | today_action->addTo( actionMenu ); | 654 | today_action->addTo( actionMenu ); |
603 | connect( today_action, SIGNAL( activated() ), | 655 | connect( today_action, SIGNAL( activated() ), |
604 | mView, SLOT( goToday() ) ); | 656 | mView, SLOT( goToday() ) ); |
605 | 657 | ||
606 | if ( KOPrefs::instance()->mShowFullMenu ) { | 658 | if ( KOPrefs::instance()->mShowFullMenu ) { |
607 | actionMenu->insertSeparator(); | 659 | actionMenu->insertSeparator(); |
608 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 660 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
609 | 661 | ||
610 | } | 662 | } |
611 | // actionMenu->insertSeparator(); | 663 | // actionMenu->insertSeparator(); |
612 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 664 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
613 | this ); | 665 | this ); |
614 | action->addTo( importMenu ); | 666 | action->addTo( importMenu ); |
615 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 667 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
616 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 668 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
617 | this ); | 669 | this ); |
618 | action->addTo( importMenu ); | 670 | action->addTo( importMenu ); |
619 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 671 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
620 | importMenu->insertSeparator(); | 672 | importMenu->insertSeparator(); |
621 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 673 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
622 | this ); | 674 | this ); |
623 | action->addTo( importMenu ); | 675 | action->addTo( importMenu ); |
624 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 676 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
625 | #ifndef DESKTOP_VERSION | 677 | #ifndef DESKTOP_VERSION |
626 | importMenu->insertSeparator(); | 678 | importMenu->insertSeparator(); |
627 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 679 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
628 | this ); | 680 | this ); |
629 | action->addTo( importMenu ); | 681 | action->addTo( importMenu ); |
630 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 682 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
631 | #else | 683 | #else |
632 | #ifdef _WIN32_ | 684 | #ifdef _WIN32_ |
633 | importMenu->insertSeparator(); | 685 | importMenu->insertSeparator(); |
634 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 686 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
635 | this ); | 687 | this ); |
636 | action->addTo( importMenu ); | 688 | action->addTo( importMenu ); |
637 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 689 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
638 | #endif | 690 | #endif |
639 | #endif | 691 | #endif |
640 | 692 | ||
641 | importMenu->insertSeparator(); | 693 | importMenu->insertSeparator(); |
642 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 694 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
643 | this ); | 695 | this ); |
644 | action->addTo( importMenu ); | 696 | action->addTo( importMenu ); |
645 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); | 697 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); |
646 | 698 | ||
647 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, | 699 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, |
648 | this ); | 700 | this ); |
649 | action->addTo( importMenu ); | 701 | action->addTo( importMenu ); |
650 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 702 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
651 | 703 | ||
652 | importMenu->insertSeparator(); | 704 | importMenu->insertSeparator(); |
653 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 705 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
654 | this ); | 706 | this ); |
655 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 707 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); |
708 | |||
709 | |||
710 | //LR | ||
711 | QPopupMenu *ex2phone = new QPopupMenu( this ); | ||
712 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | ||
713 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | ||
714 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | ||
715 | importMenu->insertItem( i18n("Export to phone"), ex2phone ); | ||
716 | |||
656 | importMenu->insertSeparator(); | 717 | importMenu->insertSeparator(); |
657 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 718 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
658 | this ); | 719 | this ); |
659 | action->addTo( importMenu ); | 720 | action->addTo( importMenu ); |
660 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 721 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
661 | #ifndef DESKTOP_VERSION | 722 | #ifndef DESKTOP_VERSION |
662 | importMenu->insertSeparator(); | 723 | importMenu->insertSeparator(); |
663 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 724 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
664 | this ); | 725 | this ); |
665 | action->addTo( importMenu ); | 726 | action->addTo( importMenu ); |
666 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 727 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
667 | 728 | ||
668 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 729 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
669 | this ); | 730 | this ); |
670 | action->addTo( importMenu ); | 731 | action->addTo( importMenu ); |
671 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 732 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
672 | #else | 733 | #else |
673 | importMenu->insertSeparator(); | 734 | importMenu->insertSeparator(); |
674 | icon = loadPixmap( pathString + "print" ); | 735 | icon = loadPixmap( pathString + "print" ); |
675 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 736 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
676 | action->addTo( importMenu ); | 737 | action->addTo( importMenu ); |
677 | connect( action, SIGNAL( activated() ), | 738 | connect( action, SIGNAL( activated() ), |
678 | this, SLOT( printCal() ) ); | 739 | this, SLOT( printCal() ) ); |
679 | 740 | ||
680 | icon = loadPixmap( pathString + "print" ); | 741 | icon = loadPixmap( pathString + "print" ); |
681 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 742 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
682 | action->addTo( importMenu ); | 743 | action->addTo( importMenu ); |
683 | connect( action, SIGNAL( activated() ), | 744 | connect( action, SIGNAL( activated() ), |
684 | this, SLOT( printSel() ) ); | 745 | this, SLOT( printSel() ) ); |
685 | #endif | 746 | #endif |
686 | importMenu->insertSeparator(); | 747 | importMenu->insertSeparator(); |
687 | action = new QAction( "beam all", i18n("Save"), 0, | 748 | action = new QAction( "beam all", i18n("Save"), 0, |
688 | this ); | 749 | this ); |
689 | action->addTo( importMenu ); | 750 | action->addTo( importMenu ); |
690 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 751 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
691 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 752 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
692 | this ); | 753 | this ); |
693 | action->addTo( importMenu ); | 754 | action->addTo( importMenu ); |
694 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 755 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
695 | 756 | ||
696 | //menuBar->insertItem( "Configure",configureMenu ); | 757 | //menuBar->insertItem( "Configure",configureMenu ); |
697 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 758 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
698 | icon = loadPixmap( "korganizer/korganizer" ); | 759 | icon = loadPixmap( "korganizer/korganizer" ); |
699 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 760 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
700 | action->addTo( helpMenu ); | 761 | action->addTo( helpMenu ); |
701 | connect( action, SIGNAL( activated() ), | 762 | connect( action, SIGNAL( activated() ), |
702 | SLOT( keyBindings() ) ); | 763 | SLOT( keyBindings() ) ); |
703 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 764 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
704 | action->addTo( helpMenu ); | 765 | action->addTo( helpMenu ); |
705 | connect( action, SIGNAL( activated() ), | 766 | connect( action, SIGNAL( activated() ), |
706 | SLOT( features() ) ); | 767 | SLOT( features() ) ); |
707 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 768 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
708 | action->addTo( helpMenu ); | 769 | action->addTo( helpMenu ); |
709 | connect( action, SIGNAL( activated() ), | 770 | connect( action, SIGNAL( activated() ), |
710 | SLOT( aboutAutoSaving() ) ); | 771 | SLOT( aboutAutoSaving() ) ); |
711 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 772 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
712 | action->addTo( helpMenu ); | 773 | action->addTo( helpMenu ); |
713 | connect( action, SIGNAL( activated() ), | 774 | connect( action, SIGNAL( activated() ), |
714 | SLOT( aboutKnownBugs() ) ); | 775 | SLOT( aboutKnownBugs() ) ); |
715 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 776 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
716 | action->addTo( helpMenu ); | 777 | action->addTo( helpMenu ); |
717 | connect( action, SIGNAL( activated() ), | 778 | connect( action, SIGNAL( activated() ), |
718 | SLOT( usertrans() ) ); | 779 | SLOT( usertrans() ) ); |
719 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 780 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
720 | action->addTo( helpMenu ); | 781 | action->addTo( helpMenu ); |
721 | connect( action, SIGNAL( activated() ), | 782 | connect( action, SIGNAL( activated() ), |
722 | SLOT( synchowto() ) ); | 783 | SLOT( synchowto() ) ); |
723 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 784 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
724 | action->addTo( helpMenu ); | 785 | action->addTo( helpMenu ); |
725 | connect( action, SIGNAL( activated() ), | 786 | connect( action, SIGNAL( activated() ), |
726 | SLOT( whatsNew() ) ); | 787 | SLOT( whatsNew() ) ); |
727 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 788 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
728 | action->addTo( helpMenu ); | 789 | action->addTo( helpMenu ); |
729 | connect( action, SIGNAL( activated() ), | 790 | connect( action, SIGNAL( activated() ), |
730 | SLOT( faq() ) ); | 791 | SLOT( faq() ) ); |
731 | 792 | ||
732 | 793 | ||
733 | action = new QAction( "about", i18n("About..."), 0, this ); | 794 | action = new QAction( "about", i18n("About..."), 0, this ); |
734 | action->addTo( helpMenu ); | 795 | action->addTo( helpMenu ); |
735 | connect( action, SIGNAL( activated() ), | 796 | connect( action, SIGNAL( activated() ), |
736 | SLOT( about() ) ); | 797 | SLOT( about() ) ); |
737 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 798 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
738 | action->addTo( helpMenu ); | 799 | action->addTo( helpMenu ); |
739 | connect( action, SIGNAL( activated() ), | 800 | connect( action, SIGNAL( activated() ), |
740 | SLOT( licence() ) ); | 801 | SLOT( licence() ) ); |
741 | //menuBar->insertSeparator(); | 802 | //menuBar->insertSeparator(); |
742 | 803 | ||
743 | // ****************************************************** | 804 | // ****************************************************** |
744 | // menubar icons | 805 | // menubar icons |
745 | 806 | ||
746 | 807 | ||
747 | iconToolBar->setHorizontalStretchable (true ); | 808 | iconToolBar->setHorizontalStretchable (true ); |
748 | //menuBar->insertItem( iconToolBar ); | 809 | //menuBar->insertItem( iconToolBar ); |
749 | //xdays_action | 810 | //xdays_action |
750 | if (p-> mShowIconNewEvent) | 811 | if (p-> mShowIconNewEvent) |
751 | ne_action->addTo( iconToolBar ); | 812 | ne_action->addTo( iconToolBar ); |
@@ -994,199 +1055,272 @@ void MainWindow::multiSync( bool askforPrefs ) | |||
994 | KOPrefs::instance()->mRingSyncAlgoPrefs = KOPrefs::instance()->mSyncAlgoPrefs; | 1055 | KOPrefs::instance()->mRingSyncAlgoPrefs = KOPrefs::instance()->mSyncAlgoPrefs; |
995 | } | 1056 | } |
996 | setCaption(i18n("Multiple sync started.") ); | 1057 | setCaption(i18n("Multiple sync started.") ); |
997 | qApp->processEvents(); | 1058 | qApp->processEvents(); |
998 | int num = ringSync() ; | 1059 | int num = ringSync() ; |
999 | if ( num > 1 ) | 1060 | if ( num > 1 ) |
1000 | ringSync(); | 1061 | ringSync(); |
1001 | mBlockSaveFlag = false; | 1062 | mBlockSaveFlag = false; |
1002 | if ( num ) | 1063 | if ( num ) |
1003 | save(); | 1064 | save(); |
1004 | if ( num ) | 1065 | if ( num ) |
1005 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); | 1066 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); |
1006 | else | 1067 | else |
1007 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 1068 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
1008 | return; | 1069 | return; |
1009 | } | 1070 | } |
1010 | void MainWindow::slotSyncMenu( int action ) | 1071 | void MainWindow::slotSyncMenu( int action ) |
1011 | { | 1072 | { |
1012 | qDebug("syncaction %d ", action); | 1073 | qDebug("syncaction %d ", action); |
1013 | if ( action == 0 ) { | 1074 | if ( action == 0 ) { |
1014 | 1075 | ||
1015 | // seems to be a Qt2 event handling bug | 1076 | // seems to be a Qt2 event handling bug |
1016 | // syncmenu.clear causes a segfault at first time | 1077 | // syncmenu.clear causes a segfault at first time |
1017 | // when we call it after the main event loop, it is ok | 1078 | // when we call it after the main event loop, it is ok |
1018 | // same behaviour when calling OM/Pi via QCOP for the first time | 1079 | // same behaviour when calling OM/Pi via QCOP for the first time |
1019 | QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); | 1080 | QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); |
1020 | //confSync(); | 1081 | //confSync(); |
1021 | 1082 | ||
1022 | return; | 1083 | return; |
1023 | } | 1084 | } |
1024 | if ( action == 1 ) { | 1085 | if ( action == 1 ) { |
1025 | multiSync( true ); | 1086 | multiSync( true ); |
1026 | return; | 1087 | return; |
1027 | } | 1088 | } |
1028 | if ( action == 2 ) { | 1089 | if ( action == 2 ) { |
1029 | enableQuick(); | 1090 | enableQuick(); |
1030 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | 1091 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); |
1031 | return; | 1092 | return; |
1032 | } | 1093 | } |
1033 | if ( action == 3 ) { | 1094 | if ( action == 3 ) { |
1034 | delete mServerSocket; | 1095 | delete mServerSocket; |
1035 | mServerSocket = 0; | 1096 | mServerSocket = 0; |
1036 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | 1097 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); |
1037 | return; | 1098 | return; |
1038 | } | 1099 | } |
1039 | 1100 | ||
1040 | if (mBlockSaveFlag) | 1101 | if (mBlockSaveFlag) |
1041 | return; | 1102 | return; |
1042 | mBlockSaveFlag = true; | 1103 | mBlockSaveFlag = true; |
1043 | mCurrentSyncProfile = action - 1000 ; | 1104 | mCurrentSyncProfile = action - 1000 ; |
1044 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); | 1105 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); |
1045 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); | 1106 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); |
1046 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 1107 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
1047 | KSyncProfile* temp = new KSyncProfile (); | 1108 | KSyncProfile* temp = new KSyncProfile (); |
1048 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 1109 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
1049 | temp->readConfig(&config); | 1110 | temp->readConfig(&config); |
1050 | KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); | 1111 | KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); |
1051 | KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); | 1112 | KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); |
1052 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); | 1113 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); |
1053 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); | 1114 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); |
1054 | KOPrefs::instance()->mWriteBackInFuture = 0; | 1115 | KOPrefs::instance()->mWriteBackInFuture = 0; |
1055 | if ( temp->getWriteBackFuture() ) | 1116 | if ( temp->getWriteBackFuture() ) |
1056 | KOPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 1117 | KOPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
1057 | KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); | 1118 | KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); |
1058 | if ( action == 1000 ) { | 1119 | if ( action == 1000 ) { |
1059 | syncSharp(); | 1120 | syncSharp(); |
1060 | 1121 | ||
1061 | } else if ( action == 1001 ) { | 1122 | } else if ( action == 1001 ) { |
1062 | syncLocalFile(); | 1123 | syncLocalFile(); |
1063 | 1124 | ||
1064 | } else if ( action == 1002 ) { | 1125 | } else if ( action == 1002 ) { |
1065 | quickSyncLocalFile(); | 1126 | quickSyncLocalFile(); |
1066 | 1127 | ||
1067 | } else if ( action >= 1003 ) { | 1128 | } else if ( action >= 1003 ) { |
1068 | if ( temp->getIsLocalFileSync() ) { | 1129 | if ( temp->getIsLocalFileSync() ) { |
1069 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 1130 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
1070 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); | 1131 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); |
1071 | } else { | 1132 | } else { |
1072 | if ( temp->getIsPhoneSync() ) { | 1133 | if ( temp->getIsPhoneSync() ) { |
1073 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | 1134 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; |
1074 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | 1135 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); |
1075 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | 1136 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); |
1076 | syncPhone(); | 1137 | syncPhone(); |
1077 | } else if ( temp->getIsPiSync() ) { | 1138 | } else if ( temp->getIsPiSync() ) { |
1078 | mPassWordPiSync = temp->getRemotePw(); | 1139 | mPassWordPiSync = temp->getRemotePw(); |
1079 | KOPrefs::instance()->mActiveSyncPort = temp->getRemotePort(); | 1140 | KOPrefs::instance()->mActiveSyncPort = temp->getRemotePort(); |
1080 | KOPrefs::instance()->mActiveSyncIP = temp->getRemoteIP(); | 1141 | KOPrefs::instance()->mActiveSyncIP = temp->getRemoteIP(); |
1081 | syncPi(); | 1142 | syncPi(); |
1082 | } else | 1143 | } else |
1083 | syncRemote( temp ); | 1144 | syncRemote( temp ); |
1084 | 1145 | ||
1085 | } | 1146 | } |
1086 | } | 1147 | } |
1087 | delete temp; | 1148 | delete temp; |
1088 | mBlockSaveFlag = false; | 1149 | mBlockSaveFlag = false; |
1089 | } | 1150 | } |
1151 | void MainWindow::exportToPhone( int mode ) | ||
1152 | { | ||
1153 | |||
1154 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | ||
1155 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | ||
1156 | KOex2phonePrefs ex2phone; | ||
1157 | ex2phone.mPhoneConnection->setText( KOPrefs::instance()->mEx2PhoneConnection ); | ||
1158 | ex2phone.mPhoneDevice->setText( KOPrefs::instance()->mEx2PhoneDevice ); | ||
1159 | ex2phone.mPhoneModel->setText( KOPrefs::instance()->mEx2PhoneModel ); | ||
1160 | |||
1161 | if ( !ex2phone.exec() ) { | ||
1162 | return; | ||
1163 | } | ||
1164 | KOPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | ||
1165 | KOPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | ||
1166 | KOPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | ||
1167 | |||
1168 | int inFuture = 0; | ||
1169 | if ( ex2phone.mWriteBackFuture->isChecked() ) | ||
1170 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); | ||
1171 | QPtrList<Incidence> delSel; | ||
1172 | if ( mode == 1 ) | ||
1173 | delSel = mCalendar->rawIncidences(); | ||
1174 | if ( mode == 2 ) | ||
1175 | delSel = mCalendar->incidences(); | ||
1176 | CalendarLocal* cal = new CalendarLocal(); | ||
1177 | cal->setLocalTime(); | ||
1178 | Incidence *incidence = delSel.first(); | ||
1179 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | ||
1180 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); | ||
1181 | while ( incidence ) { | ||
1182 | if ( incidence->type() != "journal" ) { | ||
1183 | bool add = true; | ||
1184 | if ( inFuture ) { | ||
1185 | QDateTime dt; | ||
1186 | if ( incidence->type() == "Todo" ) { | ||
1187 | Todo * t = (Todo*)incidence; | ||
1188 | if ( t->hasDueDate() ) | ||
1189 | dt = t->dtDue(); | ||
1190 | else | ||
1191 | dt = cur.addSecs( 62 ); | ||
1192 | } | ||
1193 | else { | ||
1194 | bool ok; | ||
1195 | dt = incidence->getNextOccurence( cur, &ok ); | ||
1196 | if ( !ok ) | ||
1197 | dt = cur.addSecs( -62 ); | ||
1198 | } | ||
1199 | if ( dt < cur || dt > end ) { | ||
1200 | add = false; | ||
1201 | } | ||
1202 | } | ||
1203 | if ( add ) { | ||
1204 | Incidence *in = incidence->clone(); | ||
1205 | cal->addIncidence( in ); | ||
1206 | } | ||
1207 | } | ||
1208 | incidence = delSel.next(); | ||
1209 | } | ||
1210 | PhoneFormat::writeConfig( KOPrefs::instance()->mEx2PhoneDevice, | ||
1211 | KOPrefs::instance()->mEx2PhoneConnection, | ||
1212 | KOPrefs::instance()->mEx2PhoneModel ); | ||
1213 | |||
1214 | setCaption( i18n("Writing to phone...")); | ||
1215 | if ( PhoneFormat::writeToPhone( cal ) ) | ||
1216 | setCaption( i18n("Export to phone successful!")); | ||
1217 | else | ||
1218 | setCaption( i18n("Error exporting to phone!")); | ||
1219 | delete cal; | ||
1220 | } | ||
1221 | |||
1222 | |||
1090 | void MainWindow::setDefaultPreferences() | 1223 | void MainWindow::setDefaultPreferences() |
1091 | { | 1224 | { |
1092 | KOPrefs *p = KOPrefs::instance(); | 1225 | KOPrefs *p = KOPrefs::instance(); |
1093 | 1226 | ||
1094 | p->mCompactDialogs = true; | 1227 | p->mCompactDialogs = true; |
1095 | p->mConfirm = true; | 1228 | p->mConfirm = true; |
1096 | // p->mEnableQuickTodo = false; | 1229 | // p->mEnableQuickTodo = false; |
1230 | |||
1097 | } | 1231 | } |
1098 | 1232 | ||
1099 | QString MainWindow::resourcePath() | 1233 | QString MainWindow::resourcePath() |
1100 | { | 1234 | { |
1101 | return KGlobal::iconLoader()->iconPath(); | 1235 | return KGlobal::iconLoader()->iconPath(); |
1102 | } | 1236 | } |
1103 | 1237 | ||
1104 | void MainWindow::displayText( QString text ,QString cap ) | 1238 | void MainWindow::displayText( QString text ,QString cap ) |
1105 | { | 1239 | { |
1106 | QDialog dia( this, "name", true ); ; | 1240 | QDialog dia( this, "name", true ); ; |
1107 | dia.setCaption( cap ); | 1241 | dia.setCaption( cap ); |
1108 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 1242 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
1109 | lay->setSpacing( 3 ); | 1243 | lay->setSpacing( 3 ); |
1110 | lay->setMargin( 3 ); | 1244 | lay->setMargin( 3 ); |
1111 | QTextBrowser tb ( &dia ); | 1245 | QTextBrowser tb ( &dia ); |
1112 | lay->addWidget( &tb ); | 1246 | lay->addWidget( &tb ); |
1113 | tb.setText( text ); | 1247 | tb.setText( text ); |
1114 | #ifdef DESKTOP_VERSION | 1248 | #ifdef DESKTOP_VERSION |
1115 | dia.resize( 640, 480); | 1249 | dia.resize( 640, 480); |
1116 | #else | 1250 | #else |
1117 | dia.showMaximized(); | 1251 | dia.showMaximized(); |
1118 | #endif | 1252 | #endif |
1119 | dia.exec(); | 1253 | dia.exec(); |
1120 | } | 1254 | } |
1121 | void MainWindow::displayFile( QString fn, QString cap ) | 1255 | void MainWindow::displayFile( QString fn, QString cap ) |
1122 | { | 1256 | { |
1123 | QString fileName = resourcePath() + fn; | 1257 | QString fileName = resourcePath() + fn; |
1124 | QString text; | 1258 | QString text; |
1125 | QFile file( fileName ); | 1259 | QFile file( fileName ); |
1126 | if (!file.open( IO_ReadOnly ) ) { | 1260 | if (!file.open( IO_ReadOnly ) ) { |
1127 | return ; | 1261 | return ; |
1128 | 1262 | ||
1129 | } | 1263 | } |
1130 | QTextStream ts( &file ); | 1264 | QTextStream ts( &file ); |
1131 | text = ts.read(); | 1265 | text = ts.read(); |
1132 | file.close(); | 1266 | file.close(); |
1133 | displayText( text, cap); | 1267 | displayText( text, cap); |
1134 | } | 1268 | } |
1135 | void MainWindow::features() | 1269 | void MainWindow::features() |
1136 | { | 1270 | { |
1137 | 1271 | ||
1138 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); | 1272 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); |
1139 | } | 1273 | } |
1140 | 1274 | ||
1141 | void MainWindow::usertrans() | 1275 | void MainWindow::usertrans() |
1142 | { | 1276 | { |
1143 | 1277 | ||
1144 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); | 1278 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); |
1145 | } | 1279 | } |
1146 | 1280 | ||
1147 | void MainWindow::synchowto() | 1281 | void MainWindow::synchowto() |
1148 | { | 1282 | { |
1149 | #if 0 | 1283 | #if 0 |
1150 | QPtrList<Incidence> er = mCalendar->rawIncidences(); | 1284 | QPtrList<Incidence> er = mCalendar->rawIncidences(); |
1151 | Incidence* inR = er.first(); | 1285 | Incidence* inR = er.first(); |
1152 | VCalFormat vf; | 1286 | VCalFormat vf; |
1153 | QString strout; | 1287 | QString strout; |
1154 | while ( inR ) { | 1288 | while ( inR ) { |
1155 | if ( inR->type() == "Todo" ) | 1289 | if ( inR->type() == "Todo" ) |
1156 | strout = vf.todoToString( (Todo *) inR ); | 1290 | strout = vf.todoToString( (Todo *) inR ); |
1157 | if ( inR->type() == "Event" ) | 1291 | if ( inR->type() == "Event" ) |
1158 | strout = vf.eventToString( (Event *) inR ); | 1292 | strout = vf.eventToString( (Event *) inR ); |
1159 | qDebug("incidence: \n%s\n ente\n\n",strout.latin1() ); | 1293 | qDebug("incidence: \n%s\n ente\n\n",strout.latin1() ); |
1160 | inR = er.next(); | 1294 | inR = er.next(); |
1161 | } | 1295 | } |
1162 | #endif | 1296 | #endif |
1163 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); | 1297 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); |
1164 | } | 1298 | } |
1165 | void MainWindow::faq() | 1299 | void MainWindow::faq() |
1166 | { | 1300 | { |
1167 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); | 1301 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); |
1168 | 1302 | ||
1169 | } | 1303 | } |
1170 | void MainWindow::whatsNew() | 1304 | void MainWindow::whatsNew() |
1171 | { | 1305 | { |
1172 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); | 1306 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); |
1173 | 1307 | ||
1174 | } | 1308 | } |
1175 | void MainWindow::licence() | 1309 | void MainWindow::licence() |
1176 | { | 1310 | { |
1177 | KApplication::showLicence(); | 1311 | KApplication::showLicence(); |
1178 | 1312 | ||
1179 | } | 1313 | } |
1180 | void MainWindow::about() | 1314 | void MainWindow::about() |
1181 | { | 1315 | { |
1182 | QString version; | 1316 | QString version; |
1183 | #include <../version> | 1317 | #include <../version> |
1184 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1318 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1185 | i18n("KOrganizer/Platform-independent\n") + | 1319 | i18n("KOrganizer/Platform-independent\n") + |
1186 | "(KO/Pi) " + version + " - " + | 1320 | "(KO/Pi) " + version + " - " + |
1187 | 1321 | ||
1188 | #ifdef DESKTOP_VERSION | 1322 | #ifdef DESKTOP_VERSION |
1189 | i18n("Desktop Edition\n") + | 1323 | i18n("Desktop Edition\n") + |
1190 | #else | 1324 | #else |
1191 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + | 1325 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + |
1192 | #endif | 1326 | #endif |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 7b24b88..74c7f45 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -51,159 +51,160 @@ private slots: | |||
51 | void send_file(); | 51 | void send_file(); |
52 | void get_file(); | 52 | void get_file(); |
53 | void end_connect(); | 53 | void end_connect(); |
54 | QDialog* mSyncActionDialog; | 54 | QDialog* mSyncActionDialog; |
55 | QSocket* mSocket; | 55 | QSocket* mSocket; |
56 | QString mPassWord; | 56 | QString mPassWord; |
57 | QString mFileName; | 57 | QString mFileName; |
58 | QTime piTime; | 58 | QTime piTime; |
59 | QString piFileString; | 59 | QString piFileString; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | class KCommandSocket : public QObject | 62 | class KCommandSocket : public QObject |
63 | { | 63 | { |
64 | Q_OBJECT | 64 | Q_OBJECT |
65 | public: | 65 | public: |
66 | enum state { successR, errorR, successW, errorW, quiet }; | 66 | enum state { successR, errorR, successW, errorW, quiet }; |
67 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); | 67 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); |
68 | void readFile( QString ); | 68 | void readFile( QString ); |
69 | void writeFile( QString ); | 69 | void writeFile( QString ); |
70 | void sendStop(); | 70 | void sendStop(); |
71 | 71 | ||
72 | 72 | ||
73 | signals: | 73 | signals: |
74 | void commandFinished( KCommandSocket*, int ); | 74 | void commandFinished( KCommandSocket*, int ); |
75 | private slots: | 75 | private slots: |
76 | void startReadFileFromSocket(); | 76 | void startReadFileFromSocket(); |
77 | void readFileFromSocket(); | 77 | void readFileFromSocket(); |
78 | void deleteSocket(); | 78 | void deleteSocket(); |
79 | void writeFileToSocket(); | 79 | void writeFileToSocket(); |
80 | private : | 80 | private : |
81 | QSocket* mSocket; | 81 | QSocket* mSocket; |
82 | QString mPassWord; | 82 | QString mPassWord; |
83 | Q_UINT16 mPort; | 83 | Q_UINT16 mPort; |
84 | QString mHost; | 84 | QString mHost; |
85 | QString mFileName; | 85 | QString mFileName; |
86 | QTimer* mTimerSocket; | 86 | QTimer* mTimerSocket; |
87 | int mRetVal; | 87 | int mRetVal; |
88 | QTime mTime; | 88 | QTime mTime; |
89 | QString mFileString; | 89 | QString mFileString; |
90 | bool mFirst; | 90 | bool mFirst; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | namespace KCal { | 93 | namespace KCal { |
94 | class CalendarLocal; | 94 | class CalendarLocal; |
95 | } | 95 | } |
96 | 96 | ||
97 | using namespace KCal; | 97 | using namespace KCal; |
98 | 98 | ||
99 | class MainWindow : public QMainWindow | 99 | class MainWindow : public QMainWindow |
100 | { | 100 | { |
101 | Q_OBJECT | 101 | Q_OBJECT |
102 | public: | 102 | public: |
103 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 103 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
104 | ~MainWindow(); | 104 | ~MainWindow(); |
105 | public slots: | 105 | public slots: |
106 | virtual void showMaximized (); | 106 | virtual void showMaximized (); |
107 | void configureAgenda( int ); | 107 | void configureAgenda( int ); |
108 | void recieve( const QCString& msg, const QByteArray& data ); | 108 | void recieve( const QCString& msg, const QByteArray& data ); |
109 | static QString defaultFileName(); | 109 | static QString defaultFileName(); |
110 | static QString syncFileName(); | 110 | static QString syncFileName(); |
111 | static QString resourcePath(); | 111 | static QString resourcePath(); |
112 | protected slots: | 112 | protected slots: |
113 | void setCaptionToDates(); | 113 | void setCaptionToDates(); |
114 | int ringSync(); | 114 | int ringSync(); |
115 | void multiSync( bool askforPrefs = false ); | 115 | void multiSync( bool askforPrefs = false ); |
116 | void about(); | 116 | void about(); |
117 | void licence(); | 117 | void licence(); |
118 | void faq(); | 118 | void faq(); |
119 | void usertrans(); | 119 | void usertrans(); |
120 | void features(); | 120 | void features(); |
121 | void synchowto(); | 121 | void synchowto(); |
122 | void whatsNew(); | 122 | void whatsNew(); |
123 | void keyBindings(); | 123 | void keyBindings(); |
124 | void aboutAutoSaving();; | 124 | void aboutAutoSaving();; |
125 | void aboutKnownBugs(); | 125 | void aboutKnownBugs(); |
126 | 126 | ||
127 | void processIncidenceSelection( Incidence * ); | 127 | void processIncidenceSelection( Incidence * ); |
128 | 128 | ||
129 | void importQtopia(); | 129 | void importQtopia(); |
130 | void importBday(); | 130 | void importBday(); |
131 | void importOL(); | 131 | void importOL(); |
132 | void importIcal(); | 132 | void importIcal(); |
133 | void importFile( QString, bool ); | 133 | void importFile( QString, bool ); |
134 | void quickImportIcal(); | 134 | void quickImportIcal(); |
135 | 135 | ||
136 | void slotModifiedChanged( bool ); | 136 | void slotModifiedChanged( bool ); |
137 | 137 | ||
138 | void save(); | 138 | void save(); |
139 | void configureToolBar( int ); | 139 | void configureToolBar( int ); |
140 | void printSel(); | 140 | void printSel(); |
141 | void printCal(); | 141 | void printCal(); |
142 | void saveCalendar(); | 142 | void saveCalendar(); |
143 | void loadCalendar(); | 143 | void loadCalendar(); |
144 | void exportVCalendar(); | 144 | void exportVCalendar(); |
145 | void fillFilterMenu(); | 145 | void fillFilterMenu(); |
146 | void selectFilter( int ); | 146 | void selectFilter( int ); |
147 | void exportToPhone( int ); | ||
147 | 148 | ||
148 | void slotSyncMenu( int ); | 149 | void slotSyncMenu( int ); |
149 | void confSync(); | 150 | void confSync(); |
150 | void syncSharp(); | 151 | void syncSharp(); |
151 | void syncPhone(); | 152 | void syncPhone(); |
152 | void syncPi(); | 153 | void syncPi(); |
153 | void syncLocalFile(); | 154 | void syncLocalFile(); |
154 | bool syncWithFile( QString, bool ); | 155 | bool syncWithFile( QString, bool ); |
155 | void quickSyncLocalFile(); | 156 | void quickSyncLocalFile(); |
156 | 157 | ||
157 | 158 | ||
158 | protected: | 159 | protected: |
159 | void displayText( QString, QString); | 160 | void displayText( QString, QString); |
160 | void displayFile( QString, QString); | 161 | void displayFile( QString, QString); |
161 | 162 | ||
162 | void enableIncidenceActions( bool ); | 163 | void enableIncidenceActions( bool ); |
163 | 164 | ||
164 | private slots: | 165 | private slots: |
165 | QSocket* piSocket; | 166 | QSocket* piSocket; |
166 | QString piFileString; | 167 | QString piFileString; |
167 | QTime piTime; | 168 | QTime piTime; |
168 | void deleteCommandSocket(KCommandSocket* s, int state ); | 169 | void deleteCommandSocket(KCommandSocket* s, int state ); |
169 | void fillSyncMenu(); | 170 | void fillSyncMenu(); |
170 | void getFile( bool ); | 171 | void getFile( bool ); |
171 | void readFileFromSocket(); | 172 | void readFileFromSocket(); |
172 | private: | 173 | private: |
173 | //QTimer* mTimerCommandSocket; | 174 | //QTimer* mTimerCommandSocket; |
174 | QString mPassWordPiSync; | 175 | QString mPassWordPiSync; |
175 | KServerSocket * mServerSocket; | 176 | KServerSocket * mServerSocket; |
176 | bool mClosed; | 177 | bool mClosed; |
177 | void saveOnClose(); | 178 | void saveOnClose(); |
178 | int mCurrentSyncProfile; | 179 | int mCurrentSyncProfile; |
179 | void enableQuick(); | 180 | void enableQuick(); |
180 | void syncRemote( KSyncProfile* , bool ask = true); | 181 | void syncRemote( KSyncProfile* , bool ask = true); |
181 | bool mFlagKeyPressed; | 182 | bool mFlagKeyPressed; |
182 | bool mBlockAtStartup; | 183 | bool mBlockAtStartup; |
183 | QPEToolBar *iconToolBar; | 184 | QPEToolBar *iconToolBar; |
184 | void initActions(); | 185 | void initActions(); |
185 | void setDefaultPreferences(); | 186 | void setDefaultPreferences(); |
186 | void keyPressEvent ( QKeyEvent * ) ; | 187 | void keyPressEvent ( QKeyEvent * ) ; |
187 | void keyReleaseEvent ( QKeyEvent * ) ; | 188 | void keyReleaseEvent ( QKeyEvent * ) ; |
188 | QPopupMenu *configureToolBarMenu; | 189 | QPopupMenu *configureToolBarMenu; |
189 | QPopupMenu *selectFilterMenu; | 190 | QPopupMenu *selectFilterMenu; |
190 | QPopupMenu *configureAgendaMenu, *syncMenu; | 191 | QPopupMenu *configureAgendaMenu, *syncMenu; |
191 | CalendarLocal *mCalendar; | 192 | CalendarLocal *mCalendar; |
192 | CalendarView *mView; | 193 | CalendarView *mView; |
193 | QString getPassword(); | 194 | QString getPassword(); |
194 | QAction *mNewSubTodoAction; | 195 | QAction *mNewSubTodoAction; |
195 | 196 | ||
196 | QAction *mShowAction; | 197 | QAction *mShowAction; |
197 | QAction *mEditAction; | 198 | QAction *mEditAction; |
198 | QAction *mDeleteAction; | 199 | QAction *mDeleteAction; |
199 | void closeEvent( QCloseEvent* ce ); | 200 | void closeEvent( QCloseEvent* ce ); |
200 | SimpleAlarmClient mAlarmClient; | 201 | SimpleAlarmClient mAlarmClient; |
201 | QTimer mSaveTimer; | 202 | QTimer mSaveTimer; |
202 | bool mBlockSaveFlag; | 203 | bool mBlockSaveFlag; |
203 | bool mCalendarModifiedFlag; | 204 | bool mCalendarModifiedFlag; |
204 | QPixmap loadPixmap( QString ); | 205 | QPixmap loadPixmap( QString ); |
205 | QDialog * mSyncActionDialog; | 206 | QDialog * mSyncActionDialog; |
206 | }; | 207 | }; |
207 | 208 | ||
208 | 209 | ||
209 | #endif | 210 | #endif |
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 29c1ae6..b2a62b1 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp | |||
@@ -1,278 +1,286 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | 3 | ||
4 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> | 4 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <qdatetime.h> | 22 | #include <qdatetime.h> |
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <qptrlist.h> | 25 | #include <qptrlist.h> |
26 | #include <qregexp.h> | 26 | #include <qregexp.h> |
27 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
28 | #include <qclipboard.h> | 28 | #include <qclipboard.h> |
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qtextcodec.h> | 31 | #include <qtextcodec.h> |
32 | #include <qdir.h> | 32 | #include <qdir.h> |
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | 34 | ||
35 | #include <kdebug.h> | 35 | #include <kdebug.h> |
36 | #include <klocale.h> | 36 | #include <klocale.h> |
37 | #include <kglobal.h> | 37 | #include <kglobal.h> |
38 | #include <kmessagebox.h> | 38 | #include <kmessagebox.h> |
39 | 39 | ||
40 | #include "calendar.h" | 40 | #include "calendar.h" |
41 | #include "alarm.h" | 41 | #include "alarm.h" |
42 | #include "recurrence.h" | 42 | #include "recurrence.h" |
43 | #include "calendarlocal.h" | 43 | #include "calendarlocal.h" |
44 | 44 | ||
45 | #include "phoneformat.h" | 45 | #include "phoneformat.h" |
46 | #include "syncdefines.h" | 46 | #include "syncdefines.h" |
47 | 47 | ||
48 | using namespace KCal; | 48 | using namespace KCal; |
49 | class PhoneParser : public QObject | 49 | class PhoneParser : public QObject |
50 | { | 50 | { |
51 | public: | 51 | public: |
52 | PhoneParser( ) { | 52 | PhoneParser( ) { |
53 | ; | 53 | ; |
54 | } | 54 | } |
55 | 55 | ||
56 | static QString dtToString( const QDateTime& dti, bool useTZ = false ) | 56 | static QString dtToString( const QDateTime& dti, bool useTZ = false ) |
57 | { | 57 | { |
58 | QString datestr; | 58 | QString datestr; |
59 | QString timestr; | 59 | QString timestr; |
60 | int offset = KGlobal::locale()->localTimeOffset( dti ); | 60 | int offset = KGlobal::locale()->localTimeOffset( dti ); |
61 | QDateTime dt; | 61 | QDateTime dt; |
62 | if (useTZ) | 62 | if (useTZ) |
63 | dt = dti.addSecs ( -(offset*60)); | 63 | dt = dti.addSecs ( -(offset*60)); |
64 | else | 64 | else |
65 | dt = dti; | 65 | dt = dti; |
66 | if(dt.date().isValid()){ | 66 | if(dt.date().isValid()){ |
67 | const QDate& date = dt.date(); | 67 | const QDate& date = dt.date(); |
68 | datestr.sprintf("%04d%02d%02d", | 68 | datestr.sprintf("%04d%02d%02d", |
69 | date.year(), date.month(), date.day()); | 69 | date.year(), date.month(), date.day()); |
70 | } | 70 | } |
71 | if(dt.time().isValid()){ | 71 | if(dt.time().isValid()){ |
72 | const QTime& time = dt.time(); | 72 | const QTime& time = dt.time(); |
73 | timestr.sprintf("T%02d%02d%02d", | 73 | timestr.sprintf("T%02d%02d%02d", |
74 | time.hour(), time.minute(), time.second()); | 74 | time.hour(), time.minute(), time.second()); |
75 | } | 75 | } |
76 | return datestr + timestr; | 76 | return datestr + timestr; |
77 | } | 77 | } |
78 | 78 | ||
79 | 79 | ||
80 | }; | 80 | }; |
81 | 81 | ||
82 | 82 | ||
83 | 83 | ||
84 | PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model ) | 84 | PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model ) |
85 | { | 85 | { |
86 | mProfileName = profileName; | 86 | mProfileName = profileName; |
87 | 87 | writeConfig( device, connection, model ); | |
88 | } | ||
89 | |||
90 | PhoneFormat::~PhoneFormat() | ||
91 | { | ||
92 | } | ||
93 | void PhoneFormat::writeConfig( QString device, QString connection, QString model ) | ||
94 | { | ||
95 | #ifdef _WIN32_ | ||
96 | QString fileName = qApp->applicationDirPath () +"\\gammurc"; | ||
97 | #else | ||
88 | QString fileName = QDir::homeDirPath() +"/.gammurc"; | 98 | QString fileName = QDir::homeDirPath() +"/.gammurc"; |
99 | #endif | ||
89 | //qDebug("save %d ", load ); | 100 | //qDebug("save %d ", load ); |
90 | QString content; | 101 | QString content; |
91 | bool write = false; | 102 | bool write = false; |
92 | bool addPort = true, addConnection = true, addModel = true; | 103 | bool addPort = true, addConnection = true, addModel = true; |
93 | QFile file( fileName ); | 104 | QFile file( fileName ); |
94 | if ( QFile::exists( fileName) ) { | 105 | if ( QFile::exists( fileName) ) { |
95 | if (!file.open( IO_ReadOnly ) ) { | 106 | if (!file.open( IO_ReadOnly ) ) { |
96 | qDebug("Error: cannot open %s ", fileName.latin1() ); | 107 | qDebug("Error: cannot open %s ", fileName.latin1() ); |
97 | return; | 108 | return; |
98 | } | 109 | } |
99 | QString line; | 110 | QString line; |
100 | while ( file.readLine( line, 1024 ) > 0 ) { | 111 | while ( file.readLine( line, 1024 ) > 0 ) { |
101 | //qDebug("*%s* ", line.latin1() ); | 112 | //qDebug("*%s* ", line.latin1() ); |
102 | if ( line.left(7 ) == "[gammu]" ) { | 113 | if ( line.left(7 ) == "[gammu]" ) { |
103 | ; | 114 | ; |
104 | } else | 115 | } else |
105 | if ( line.left(4 ) == "port" ) { | 116 | if ( line.left(4 ) == "port" ) { |
106 | if ( line == "port = " + device+"\n" ) { | 117 | if ( line == "port = " + device+"\n" ) { |
107 | content += line ; | 118 | content += line ; |
108 | addPort = false; | 119 | addPort = false; |
109 | //qDebug("port found" ); | 120 | //qDebug("port found" ); |
110 | } | 121 | } |
111 | 122 | ||
112 | } else if ( line.left(5 ) == "model" ) { | 123 | } else if ( line.left(5 ) == "model" ) { |
113 | if ( line == "model = " + model +"\n") { | 124 | if ( line == "model = " + model +"\n") { |
114 | content += line ; | 125 | content += line ; |
115 | addModel = false; | 126 | addModel = false; |
116 | //qDebug("model found" ); | 127 | //qDebug("model found" ); |
117 | } | 128 | } |
118 | 129 | ||
119 | } else if ( line.left( 10 ) == "connection" ) { | 130 | } else if ( line.left( 10 ) == "connection" ) { |
120 | if ( line == "connection = " + connection +"\n") { | 131 | if ( line == "connection = " + connection +"\n") { |
121 | addConnection = false; | 132 | addConnection = false; |
122 | content += line ; | 133 | content += line ; |
123 | //qDebug("con found" ); | 134 | //qDebug("con found" ); |
124 | } | 135 | } |
125 | 136 | ||
126 | } else { | 137 | } else { |
127 | content += line ; | 138 | content += line ; |
128 | } | 139 | } |
129 | } | 140 | } |
130 | file.close(); | 141 | file.close(); |
131 | } else { | 142 | } else { |
132 | if ( ! connection.isEmpty() ) { | 143 | if ( ! connection.isEmpty() ) { |
133 | addConnection = true; | 144 | addConnection = true; |
134 | } | 145 | } |
135 | if ( ! device.isEmpty() ) { | 146 | if ( ! device.isEmpty() ) { |
136 | addPort = true; | 147 | addPort = true; |
137 | 148 | ||
138 | } | 149 | } |
139 | if ( ! model.isEmpty() ) { | 150 | if ( ! model.isEmpty() ) { |
140 | addModel = true; | 151 | addModel = true; |
141 | } | 152 | } |
142 | } | 153 | } |
143 | 154 | ||
144 | if ( addConnection ) { | 155 | if ( addConnection ) { |
145 | if ( ! write ) | 156 | if ( ! write ) |
146 | content += "[gammu]\n"; | 157 | content += "[gammu]\n"; |
147 | write = true; | 158 | write = true; |
148 | content += "connection = "; | 159 | content += "connection = "; |
149 | content += connection; | 160 | content += connection; |
150 | content += "\n"; | 161 | content += "\n"; |
151 | } | 162 | } |
152 | if ( addPort ) { | 163 | if ( addPort ) { |
153 | if ( ! write ) | 164 | if ( ! write ) |
154 | content += "[gammu]\n"; | 165 | content += "[gammu]\n"; |
155 | write = true; | 166 | write = true; |
156 | content += "port = "; | 167 | content += "port = "; |
157 | content += device; | 168 | content += device; |
158 | content += "\n"; | 169 | content += "\n"; |
159 | 170 | ||
160 | } | 171 | } |
161 | if ( addModel ) { | 172 | if ( addModel ) { |
162 | if ( ! write ) | 173 | if ( ! write ) |
163 | content += "[gammu]\n"; | 174 | content += "[gammu]\n"; |
164 | write = true; | 175 | write = true; |
165 | content += "model = "; | 176 | content += "model = "; |
166 | content += model; | 177 | content += model; |
167 | content += "\n"; | 178 | content += "\n"; |
168 | } | 179 | } |
169 | if ( write ) { | 180 | if ( write ) { |
170 | if (!file.open( IO_WriteOnly ) ) { | 181 | if (!file.open( IO_WriteOnly ) ) { |
171 | qDebug("Error: cannot write file %s ", fileName.latin1() ); | 182 | qDebug("Error: cannot write file %s ", fileName.latin1() ); |
172 | return; | 183 | return; |
173 | } | 184 | } |
174 | qDebug("Writing file %s ", fileName.latin1() ); | 185 | qDebug("Writing file %s ", fileName.latin1() ); |
175 | QTextStream ts( &file ); | 186 | QTextStream ts( &file ); |
176 | ts << content ; | 187 | ts << content ; |
177 | file.close(); | 188 | file.close(); |
178 | } | 189 | } |
179 | } | ||
180 | 190 | ||
181 | PhoneFormat::~PhoneFormat() | ||
182 | { | ||
183 | } | 191 | } |
184 | #if 0 | 192 | #if 0 |
185 | int PhoneFormat::initDevice(GSM_StateMachine *s) | 193 | int PhoneFormat::initDevice(GSM_StateMachine *s) |
186 | { | 194 | { |
187 | GSM_ReadConfig(NULL, &s->Config[0], 0); | 195 | GSM_ReadConfig(NULL, &s->Config[0], 0); |
188 | s->ConfigNum = 1; | 196 | s->ConfigNum = 1; |
189 | GSM_Config *cfg = &s->Config[0]; | 197 | GSM_Config *cfg = &s->Config[0]; |
190 | if ( ! mConnection.isEmpty() ) { | 198 | if ( ! mConnection.isEmpty() ) { |
191 | cfg->Connection = strdup(mConnection.latin1()); | 199 | cfg->Connection = strdup(mConnection.latin1()); |
192 | cfg->DefaultConnection = false; | 200 | cfg->DefaultConnection = false; |
193 | qDebug("Connection set %s ", cfg->Connection ); | 201 | qDebug("Connection set %s ", cfg->Connection ); |
194 | 202 | ||
195 | } | 203 | } |
196 | if ( ! mDevice.isEmpty() ) { | 204 | if ( ! mDevice.isEmpty() ) { |
197 | cfg->Device = strdup(mDevice.latin1()); | 205 | cfg->Device = strdup(mDevice.latin1()); |
198 | cfg->DefaultDevice = false; | 206 | cfg->DefaultDevice = false; |
199 | qDebug("Device set %s ", cfg->Device); | 207 | qDebug("Device set %s ", cfg->Device); |
200 | 208 | ||
201 | } | 209 | } |
202 | if ( ! mModel.isEmpty() ) { | 210 | if ( ! mModel.isEmpty() ) { |
203 | strcpy(cfg->Model,mModel.latin1() ); | 211 | strcpy(cfg->Model,mModel.latin1() ); |
204 | cfg->DefaultModel = false; | 212 | cfg->DefaultModel = false; |
205 | qDebug("Model set %s ",cfg->Model ); | 213 | qDebug("Model set %s ",cfg->Model ); |
206 | } | 214 | } |
207 | int error=GSM_InitConnection(s,3); | 215 | int error=GSM_InitConnection(s,3); |
208 | return error; | 216 | return error; |
209 | } | 217 | } |
210 | #endif | 218 | #endif |
211 | ulong PhoneFormat::getCsumTodo( Todo* todo ) | 219 | ulong PhoneFormat::getCsumTodo( Todo* todo ) |
212 | { | 220 | { |
213 | QStringList attList; | 221 | QStringList attList; |
214 | if ( todo->hasDueDate() ) | 222 | if ( todo->hasDueDate() ) |
215 | attList << PhoneParser::dtToString ( todo->dtDue() ); | 223 | attList << PhoneParser::dtToString ( todo->dtDue() ); |
216 | attList << todo->summary(); | 224 | attList << todo->summary(); |
217 | QString completedString = "no"; | 225 | QString completedString = "no"; |
218 | if ( todo->isCompleted() ) | 226 | if ( todo->isCompleted() ) |
219 | completedString = "yes"; | 227 | completedString = "yes"; |
220 | attList << completedString; | 228 | attList << completedString; |
221 | int prio = todo->priority(); | 229 | int prio = todo->priority(); |
222 | if( prio == 2 ) prio = 1; | 230 | if( prio == 2 ) prio = 1; |
223 | if (prio == 4 ) prio = 5 ; | 231 | if (prio == 4 ) prio = 5 ; |
224 | attList << QString::number( prio ); | 232 | attList << QString::number( prio ); |
225 | QString alarmString = "na"; | 233 | QString alarmString = "na"; |
226 | Alarm *alarm; | 234 | Alarm *alarm; |
227 | if ( todo->alarms().count() > 0 ) { | 235 | if ( todo->alarms().count() > 0 ) { |
228 | alarm = todo->alarms().first(); | 236 | alarm = todo->alarms().first(); |
229 | if ( alarm->enabled() ) { | 237 | if ( alarm->enabled() ) { |
230 | alarmString = QString::number(alarm->offset() ); | 238 | alarmString = QString::number(alarm->offset() ); |
231 | } | 239 | } |
232 | } | 240 | } |
233 | attList << alarmString; | 241 | attList << alarmString; |
234 | attList << todo->categoriesStr(); | 242 | attList << todo->categoriesStr(); |
235 | attList << todo->secrecyStr(); | 243 | attList << todo->secrecyStr(); |
236 | return PhoneFormat::getCsum(attList ); | 244 | return PhoneFormat::getCsum(attList ); |
237 | 245 | ||
238 | } | 246 | } |
239 | ulong PhoneFormat::getCsumEvent( Event* event ) | 247 | ulong PhoneFormat::getCsumEvent( Event* event ) |
240 | { | 248 | { |
241 | QStringList attList; | 249 | QStringList attList; |
242 | attList << PhoneParser::dtToString ( event->dtStart() ); | 250 | attList << PhoneParser::dtToString ( event->dtStart() ); |
243 | attList << PhoneParser::dtToString ( event->dtEnd() ); | 251 | attList << PhoneParser::dtToString ( event->dtEnd() ); |
244 | attList << event->summary(); | 252 | attList << event->summary(); |
245 | attList << event->location(); | 253 | attList << event->location(); |
246 | QString alarmString = "na"; | 254 | QString alarmString = "na"; |
247 | Alarm *alarm; | 255 | Alarm *alarm; |
248 | if ( event->alarms().count() > 0 ) { | 256 | if ( event->alarms().count() > 0 ) { |
249 | alarm = event->alarms().first(); | 257 | alarm = event->alarms().first(); |
250 | if ( alarm->enabled() ) { | 258 | if ( alarm->enabled() ) { |
251 | alarmString = QString::number( alarm->offset() ); | 259 | alarmString = QString::number( alarm->offset() ); |
252 | } | 260 | } |
253 | } | 261 | } |
254 | attList << alarmString; | 262 | attList << alarmString; |
255 | Recurrence* rec = event->recurrence(); | 263 | Recurrence* rec = event->recurrence(); |
256 | QStringList list; | 264 | QStringList list; |
257 | bool writeEndDate = false; | 265 | bool writeEndDate = false; |
258 | switch ( rec->doesRecur() ) | 266 | switch ( rec->doesRecur() ) |
259 | { | 267 | { |
260 | case Recurrence::rDaily: // 0 | 268 | case Recurrence::rDaily: // 0 |
261 | list.append( "0" ); | 269 | list.append( "0" ); |
262 | list.append( QString::number( rec->frequency() ));//12 | 270 | list.append( QString::number( rec->frequency() ));//12 |
263 | list.append( "0" ); | 271 | list.append( "0" ); |
264 | list.append( "0" ); | 272 | list.append( "0" ); |
265 | writeEndDate = true; | 273 | writeEndDate = true; |
266 | break; | 274 | break; |
267 | case Recurrence::rWeekly:// 1 | 275 | case Recurrence::rWeekly:// 1 |
268 | list.append( "1" ); | 276 | list.append( "1" ); |
269 | list.append( QString::number( rec->frequency()) );//12 | 277 | list.append( QString::number( rec->frequency()) );//12 |
270 | list.append( "0" ); | 278 | list.append( "0" ); |
271 | { | 279 | { |
272 | int days = 0; | 280 | int days = 0; |
273 | QBitArray weekDays = rec->days(); | 281 | QBitArray weekDays = rec->days(); |
274 | int i; | 282 | int i; |
275 | for( i = 1; i <= 7; ++i ) { | 283 | for( i = 1; i <= 7; ++i ) { |
276 | if ( weekDays[i-1] ) { | 284 | if ( weekDays[i-1] ) { |
277 | days += 1 << (i-1); | 285 | days += 1 << (i-1); |
278 | } | 286 | } |
@@ -476,255 +484,263 @@ void PhoneFormat::copyEvent( Event* to, Event* from ) | |||
476 | to->clearAlarms(); | 484 | to->clearAlarms(); |
477 | Alarm *a = from->alarms().first(); | 485 | Alarm *a = from->alarms().first(); |
478 | Alarm *b = to->newAlarm( ); | 486 | Alarm *b = to->newAlarm( ); |
479 | b->setEnabled( a->enabled() ); | 487 | b->setEnabled( a->enabled() ); |
480 | if ( a->hasStartOffset() ) { | 488 | if ( a->hasStartOffset() ) { |
481 | b->setStartOffset( a->startOffset() ); | 489 | b->setStartOffset( a->startOffset() ); |
482 | } | 490 | } |
483 | if ( a->hasTime() ) | 491 | if ( a->hasTime() ) |
484 | b->setTime( a->time() ); | 492 | b->setTime( a->time() ); |
485 | 493 | ||
486 | } | 494 | } |
487 | QStringList cat = to->categories(); | 495 | QStringList cat = to->categories(); |
488 | QStringList catFrom = from->categories(); | 496 | QStringList catFrom = from->categories(); |
489 | QString nCat; | 497 | QString nCat; |
490 | int iii; | 498 | int iii; |
491 | for ( iii = 0; iii < catFrom.count();++iii ) { | 499 | for ( iii = 0; iii < catFrom.count();++iii ) { |
492 | nCat = catFrom[iii]; | 500 | nCat = catFrom[iii]; |
493 | if ( !nCat.isEmpty() ) | 501 | if ( !nCat.isEmpty() ) |
494 | if ( !cat.contains( nCat )) { | 502 | if ( !cat.contains( nCat )) { |
495 | cat << nCat; | 503 | cat << nCat; |
496 | } | 504 | } |
497 | } | 505 | } |
498 | to->setCategories( cat ); | 506 | to->setCategories( cat ); |
499 | Recurrence * r = new Recurrence( *from->recurrence(),to); | 507 | Recurrence * r = new Recurrence( *from->recurrence(),to); |
500 | to->setRecurrence( r ) ; | 508 | to->setRecurrence( r ) ; |
501 | 509 | ||
502 | 510 | ||
503 | } | 511 | } |
504 | void PhoneFormat::copyTodo( Todo* to, Todo* from ) | 512 | void PhoneFormat::copyTodo( Todo* to, Todo* from ) |
505 | { | 513 | { |
506 | if ( from->dtStart().isValid() ) | 514 | if ( from->dtStart().isValid() ) |
507 | to->setDtStart( from->dtStart() ); | 515 | to->setDtStart( from->dtStart() ); |
508 | if ( from->dtDue().isValid() ) | 516 | if ( from->dtDue().isValid() ) |
509 | to->setDtDue( from->dtDue() ); | 517 | to->setDtDue( from->dtDue() ); |
510 | if ( !from->location().isEmpty() ) | 518 | if ( !from->location().isEmpty() ) |
511 | to->setLocation( from->location() ); | 519 | to->setLocation( from->location() ); |
512 | if ( !from->description().isEmpty() ) | 520 | if ( !from->description().isEmpty() ) |
513 | to->setDescription( from->description() ); | 521 | to->setDescription( from->description() ); |
514 | if ( !from->summary().isEmpty() ) | 522 | if ( !from->summary().isEmpty() ) |
515 | to->setSummary( from->summary() ); | 523 | to->setSummary( from->summary() ); |
516 | 524 | ||
517 | if ( from->alarms().count() ) { | 525 | if ( from->alarms().count() ) { |
518 | to->clearAlarms(); | 526 | to->clearAlarms(); |
519 | Alarm *a = from->alarms().first(); | 527 | Alarm *a = from->alarms().first(); |
520 | Alarm *b = to->newAlarm( ); | 528 | Alarm *b = to->newAlarm( ); |
521 | b->setEnabled( a->enabled() ); | 529 | b->setEnabled( a->enabled() ); |
522 | if ( a->hasStartOffset() ) | 530 | if ( a->hasStartOffset() ) |
523 | b->setStartOffset( a->startOffset() ); | 531 | b->setStartOffset( a->startOffset() ); |
524 | if ( a->hasTime() ) | 532 | if ( a->hasTime() ) |
525 | b->setTime( a->time() ); | 533 | b->setTime( a->time() ); |
526 | } | 534 | } |
527 | 535 | ||
528 | QStringList cat = to->categories(); | 536 | QStringList cat = to->categories(); |
529 | QStringList catFrom = from->categories(); | 537 | QStringList catFrom = from->categories(); |
530 | QString nCat; | 538 | QString nCat; |
531 | int iii; | 539 | int iii; |
532 | for ( iii = 0; iii < catFrom.count();++iii ) { | 540 | for ( iii = 0; iii < catFrom.count();++iii ) { |
533 | nCat = catFrom[iii]; | 541 | nCat = catFrom[iii]; |
534 | if ( !nCat.isEmpty() ) | 542 | if ( !nCat.isEmpty() ) |
535 | if ( !cat.contains( nCat )) { | 543 | if ( !cat.contains( nCat )) { |
536 | cat << nCat; | 544 | cat << nCat; |
537 | } | 545 | } |
538 | } | 546 | } |
539 | to->setCategories( cat ); | 547 | to->setCategories( cat ); |
540 | if ( from->isCompleted() ) { | 548 | if ( from->isCompleted() ) { |
541 | to->setCompleted( true ); | 549 | to->setCompleted( true ); |
542 | if( from->completed().isValid() ) | 550 | if( from->completed().isValid() ) |
543 | to->setCompleted( from->completed() ); | 551 | to->setCompleted( from->completed() ); |
544 | } else { | 552 | } else { |
545 | // set percentcomplete only, if to->isCompleted() | 553 | // set percentcomplete only, if to->isCompleted() |
546 | if ( to->isCompleted() ) | 554 | if ( to->isCompleted() ) |
547 | to->setPercentComplete(from->percentComplete()); | 555 | to->setPercentComplete(from->percentComplete()); |
548 | } | 556 | } |
549 | if( to->priority() == 2 && from->priority() == 1 ) | 557 | if( to->priority() == 2 && from->priority() == 1 ) |
550 | ; //skip | 558 | ; //skip |
551 | else if (to->priority() == 4 && from->priority() == 5 ) | 559 | else if (to->priority() == 4 && from->priority() == 5 ) |
552 | ; | 560 | ; |
553 | else | 561 | else |
554 | to->setPriority(from->priority()); | 562 | to->setPriority(from->priority()); |
555 | 563 | ||
556 | } | 564 | } |
557 | #include <qcstring.h> | 565 | #include <qcstring.h> |
558 | 566 | ||
559 | void PhoneFormat::afterSave( Incidence* inc) | 567 | void PhoneFormat::afterSave( Incidence* inc) |
560 | { | 568 | { |
561 | uint csum; | 569 | uint csum; |
562 | inc->removeID( mProfileName ); | 570 | inc->removeID( mProfileName ); |
563 | if ( inc->type() == "Event") | 571 | if ( inc->type() == "Event") |
564 | csum = PhoneFormat::getCsumEvent( (Event*) inc ); | 572 | csum = PhoneFormat::getCsumEvent( (Event*) inc ); |
565 | else | 573 | else |
566 | csum = PhoneFormat::getCsumTodo( (Todo*) inc ); | 574 | csum = PhoneFormat::getCsumTodo( (Todo*) inc ); |
567 | inc->setCsum( mProfileName, QString::number( csum )); | 575 | inc->setCsum( mProfileName, QString::number( csum )); |
568 | 576 | ||
569 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 577 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
570 | 578 | ||
571 | } | 579 | } |
580 | |||
581 | bool PhoneFormat::writeToPhone( Calendar * calendar) | ||
582 | { | ||
583 | #ifdef _WIN32_ | ||
584 | QString fileName = locateLocal("tmp", "tempfile.vcs"); | ||
585 | #else | ||
586 | QString fileName = "/tmp/kdepimtemp.vcs"; | ||
587 | #endif | ||
588 | |||
589 | VCalFormat vfsave; | ||
590 | vfsave.setLocalTime ( true ); | ||
591 | if ( ! vfsave.save( calendar, fileName ) ) | ||
592 | return false; | ||
593 | // 4 call kammu | ||
594 | #ifdef DESKTOP_VERSION | ||
595 | QString command ="./kammu --restore " + fileName ; | ||
596 | #else | ||
597 | QString command ="kammu --restore " + fileName ; | ||
598 | #endif | ||
599 | int ret; | ||
600 | while ( (ret = system ( command.latin1())) != 0 ) { | ||
601 | qDebug("Error S::command returned %d. asking users", ret); | ||
602 | int retval = KMessageBox::warningContinueCancel(0, | ||
603 | i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone access"),i18n("Retry"),i18n("Cancel")); | ||
604 | if ( retval != KMessageBox::Continue ) | ||
605 | return false; | ||
606 | } | ||
607 | return true; | ||
608 | } | ||
572 | bool PhoneFormat::save( Calendar *calendar) | 609 | bool PhoneFormat::save( Calendar *calendar) |
573 | { | 610 | { |
574 | QLabel status ( i18n(" Opening device ..."), 0 ); | 611 | QLabel status ( i18n(" Opening device ..."), 0 ); |
575 | int w = status.sizeHint().width()+20 ; | 612 | int w = status.sizeHint().width()+20 ; |
576 | if ( w < 200 ) w = 230; | 613 | if ( w < 200 ) w = 230; |
577 | int h = status.sizeHint().height()+20 ; | 614 | int h = status.sizeHint().height()+20 ; |
578 | int dw = QApplication::desktop()->width(); | 615 | int dw = QApplication::desktop()->width(); |
579 | int dh = QApplication::desktop()->height(); | 616 | int dh = QApplication::desktop()->height(); |
580 | status.setCaption(i18n("Writing to phone...") ); | 617 | status.setCaption(i18n("Writing to phone...") ); |
581 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 618 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
582 | status.show(); | 619 | status.show(); |
583 | status.raise(); | 620 | status.raise(); |
584 | qApp->processEvents(); | 621 | qApp->processEvents(); |
585 | QString message; | 622 | QString message; |
586 | #ifdef _WIN32_ | ||
587 | QString fileName = locateLocal("tmp", "tempfile.vcs"); | ||
588 | #else | ||
589 | QString fileName = "/tmp/kdepimtemp.vcs"; | ||
590 | #endif | ||
591 | 623 | ||
592 | // 1 remove events which should be deleted | 624 | // 1 remove events which should be deleted |
593 | QPtrList<Event> er = calendar->rawEvents(); | 625 | QPtrList<Event> er = calendar->rawEvents(); |
594 | Event* ev = er.first(); | 626 | Event* ev = er.first(); |
595 | while ( ev ) { | 627 | while ( ev ) { |
596 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { | 628 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { |
597 | calendar->deleteEvent( ev ); | 629 | calendar->deleteEvent( ev ); |
598 | } else { | 630 | } else { |
599 | 631 | ||
600 | } | 632 | } |
601 | ev = er.next(); | 633 | ev = er.next(); |
602 | } | 634 | } |
603 | // 2 remove todos which should be deleted | 635 | // 2 remove todos which should be deleted |
604 | QPtrList<Todo> tl = calendar->rawTodos(); | 636 | QPtrList<Todo> tl = calendar->rawTodos(); |
605 | Todo* to = tl.first(); | 637 | Todo* to = tl.first(); |
606 | while ( to ) { | 638 | while ( to ) { |
607 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { | 639 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { |
608 | calendar->deleteTodo( to ); | 640 | calendar->deleteTodo( to ); |
609 | } else { | 641 | } else { |
610 | if ( to->isCompleted()) { | 642 | if ( to->isCompleted()) { |
611 | calendar->deleteTodo( to ); | 643 | calendar->deleteTodo( to ); |
612 | } | 644 | } |
613 | } | 645 | } |
614 | to = tl.next(); | 646 | to = tl.next(); |
615 | } | 647 | } |
616 | // 3 save file | 648 | // 3 save file |
617 | VCalFormat vfsave; | 649 | if ( !writeToPhone( calendar ) ) |
618 | vfsave.setLocalTime ( true ); | ||
619 | if ( ! vfsave.save( calendar, fileName ) ) | ||
620 | return false; | 650 | return false; |
621 | // 4 call kammu | ||
622 | #ifdef DESKTOP_VERSION | ||
623 | QString command ="./kammu --restore " + fileName ; | ||
624 | #else | ||
625 | QString command ="kammu --restore " + fileName ; | ||
626 | #endif | ||
627 | int ret; | ||
628 | while ( (ret = system ( command.latin1())) != 0 ) { | ||
629 | qDebug("Error S::command returned %d. asking users", ret); | ||
630 | int retval = KMessageBox::warningContinueCancel(0, | ||
631 | i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel")); | ||
632 | if ( retval != KMessageBox::Continue ) | ||
633 | return false; | ||
634 | } | ||
635 | 651 | ||
636 | // 5 reread data | 652 | // 5 reread data |
637 | message = i18n(" Rereading all data ... "); | 653 | message = i18n(" Rereading all data ... "); |
638 | status.setText ( message ); | 654 | status.setText ( message ); |
639 | qApp->processEvents(); | 655 | qApp->processEvents(); |
640 | CalendarLocal* calendarTemp = new CalendarLocal(); | 656 | CalendarLocal* calendarTemp = new CalendarLocal(); |
641 | calendarTemp->setTimeZoneId( calendar->timeZoneId()); | 657 | calendarTemp->setTimeZoneId( calendar->timeZoneId()); |
642 | if ( ! load( calendarTemp,calendar) ){ | 658 | if ( ! load( calendarTemp,calendar) ){ |
643 | qDebug("error reloading calendar "); | 659 | qDebug("error reloading calendar "); |
644 | delete calendarTemp; | 660 | delete calendarTemp; |
645 | return false; | 661 | return false; |
646 | } | 662 | } |
647 | // 6 compare data | 663 | // 6 compare data |
648 | 664 | ||
649 | //algo 6 compare event | 665 | //algo 6 compare event |
650 | er = calendar->rawEvents(); | 666 | er = calendar->rawEvents(); |
651 | ev = er.first(); | 667 | ev = er.first(); |
652 | message = i18n(" Comparing event # "); | 668 | message = i18n(" Comparing event # "); |
653 | QPtrList<Event> er1 = calendarTemp->rawEvents(); | 669 | QPtrList<Event> er1 = calendarTemp->rawEvents(); |
654 | Event* ev1; | 670 | Event* ev1; |
655 | int procCount = 0; | 671 | int procCount = 0; |
656 | while ( ev ) { | 672 | while ( ev ) { |
657 | //qDebug("event new ID %s",ev->summary().latin1()); | 673 | //qDebug("event new ID %s",ev->summary().latin1()); |
658 | status.setText ( message + QString::number ( ++procCount ) ); | 674 | status.setText ( message + QString::number ( ++procCount ) ); |
659 | qApp->processEvents(); | 675 | qApp->processEvents(); |
660 | uint csum; | 676 | uint csum; |
661 | csum = PhoneFormat::getCsumEvent( ev ); | 677 | csum = PhoneFormat::getCsumEvent( ev ); |
662 | QString cSum = QString::number( csum ); | 678 | QString cSum = QString::number( csum ); |
663 | //ev->setCsum( mProfileName, cSum ); | 679 | //ev->setCsum( mProfileName, cSum ); |
664 | //qDebug("Event cSum %s ", cSum.latin1()); | 680 | //qDebug("Event cSum %s ", cSum.latin1()); |
665 | ev1 = er1.first(); | 681 | ev1 = er1.first(); |
666 | while ( ev1 ) { | 682 | while ( ev1 ) { |
667 | if ( ev1->getCsum( mProfileName ) == cSum ) { | 683 | if ( ev1->getCsum( mProfileName ) == cSum ) { |
668 | er1.remove( ev1 ); | 684 | er1.remove( ev1 ); |
669 | afterSave( ev ); | 685 | afterSave( ev ); |
670 | ev->setID(mProfileName, ev1->getID(mProfileName) ); | 686 | ev->setID(mProfileName, ev1->getID(mProfileName) ); |
671 | //qDebug("Event found on phone for %s ", ev->summary().latin1()); | 687 | //qDebug("Event found on phone for %s ", ev->summary().latin1()); |
672 | 688 | ||
673 | break; | 689 | break; |
674 | } | 690 | } |
675 | ev1 = er1.next(); | 691 | ev1 = er1.next(); |
676 | } | 692 | } |
677 | if ( ! ev1 ) { | 693 | if ( ! ev1 ) { |
678 | // ev->removeID(mProfileName); | 694 | // ev->removeID(mProfileName); |
679 | qDebug("ERROR: No event found on phone for %s ", ev->summary().latin1()); | 695 | qDebug("ERROR: No event found on phone for %s ", ev->summary().latin1()); |
680 | } | 696 | } |
681 | 697 | ||
682 | 698 | ||
683 | ev = er.next(); | 699 | ev = er.next(); |
684 | } | 700 | } |
685 | //algo 6 compare todo | 701 | //algo 6 compare todo |
686 | tl = calendar->rawTodos(); | 702 | tl = calendar->rawTodos(); |
687 | to = tl.first(); | 703 | to = tl.first(); |
688 | procCount = 0; | 704 | procCount = 0; |
689 | QPtrList<Todo> tl1 = calendarTemp->rawTodos(); | 705 | QPtrList<Todo> tl1 = calendarTemp->rawTodos(); |
690 | Todo* to1 ; | 706 | Todo* to1 ; |
691 | message = i18n(" Comparing todo # "); | 707 | message = i18n(" Comparing todo # "); |
692 | while ( to ) { | 708 | while ( to ) { |
693 | status.setText ( message + QString::number ( ++procCount ) ); | 709 | status.setText ( message + QString::number ( ++procCount ) ); |
694 | qApp->processEvents(); | 710 | qApp->processEvents(); |
695 | uint csum; | 711 | uint csum; |
696 | csum = PhoneFormat::getCsumTodo( to ); | 712 | csum = PhoneFormat::getCsumTodo( to ); |
697 | QString cSum = QString::number( csum ); | 713 | QString cSum = QString::number( csum ); |
698 | //to->setCsum( mProfileName, cSum ); | 714 | //to->setCsum( mProfileName, cSum ); |
699 | //qDebug("Todo cSum %s ", cSum.latin1()); | 715 | //qDebug("Todo cSum %s ", cSum.latin1()); |
700 | Todo* to1 = tl1.first(); | 716 | Todo* to1 = tl1.first(); |
701 | while ( to1 ) { | 717 | while ( to1 ) { |
702 | if ( to1->getCsum( mProfileName ) == cSum ) { | 718 | if ( to1->getCsum( mProfileName ) == cSum ) { |
703 | tl1.remove( to1 ); | 719 | tl1.remove( to1 ); |
704 | afterSave( to ); | 720 | afterSave( to ); |
705 | to->setID(mProfileName, to1->getID(mProfileName) ); | 721 | to->setID(mProfileName, to1->getID(mProfileName) ); |
706 | break; | 722 | break; |
707 | } | 723 | } |
708 | to1 = tl1.next(); | 724 | to1 = tl1.next(); |
709 | } | 725 | } |
710 | if ( ! to1 ) { | 726 | if ( ! to1 ) { |
711 | //to->removeID(mProfileName); | 727 | //to->removeID(mProfileName); |
712 | qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1()); | 728 | qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1()); |
713 | } | 729 | } |
714 | 730 | ||
715 | to = tl.next(); | 731 | to = tl.next(); |
716 | } | 732 | } |
717 | delete calendarTemp; | 733 | delete calendarTemp; |
718 | return true; | 734 | return true; |
719 | 735 | ||
720 | 736 | ||
721 | 737 | ||
722 | } | 738 | } |
723 | 739 | ||
724 | 740 | ||
725 | QString PhoneFormat::toString( Calendar * ) | 741 | QString PhoneFormat::toString( Calendar * ) |
726 | { | 742 | { |
727 | return QString::null; | 743 | return QString::null; |
728 | } | 744 | } |
729 | bool PhoneFormat::fromString( Calendar *calendar, const QString & text) | 745 | bool PhoneFormat::fromString( Calendar *calendar, const QString & text) |
730 | { | 746 | { |
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h index 2d1ff79..61e8160 100644 --- a/libkcal/phoneformat.h +++ b/libkcal/phoneformat.h | |||
@@ -1,61 +1,63 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | 3 | ||
4 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | #ifndef PHONEFORMAT_H | 21 | #ifndef PHONEFORMAT_H |
22 | #define PHONEFORMAT_H | 22 | #define PHONEFORMAT_H |
23 | 23 | ||
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | 25 | ||
26 | #include "scheduler.h" | 26 | #include "scheduler.h" |
27 | 27 | ||
28 | #include "vcalformat.h" | 28 | #include "vcalformat.h" |
29 | #include "calformat.h" | 29 | #include "calformat.h" |
30 | 30 | ||
31 | namespace KCal { | 31 | namespace KCal { |
32 | 32 | ||
33 | /** | 33 | /** |
34 | This class implements the calendar format used by Phone. | 34 | This class implements the calendar format used by Phone. |
35 | */ | 35 | */ |
36 | class Event; | 36 | class Event; |
37 | class Todo; | 37 | class Todo; |
38 | class PhoneFormat : public QObject { | 38 | class PhoneFormat : public QObject { |
39 | public: | 39 | public: |
40 | /** Create new iCalendar format. */ | 40 | /** Create new iCalendar format. */ |
41 | PhoneFormat(QString profileName, QString device,QString connection, QString model); | 41 | PhoneFormat(QString profileName, QString device,QString connection, QString model); |
42 | virtual ~PhoneFormat(); | 42 | virtual ~PhoneFormat(); |
43 | 43 | ||
44 | bool load( Calendar * ,Calendar * ); | 44 | bool load( Calendar * ,Calendar * ); |
45 | bool save( Calendar * ); | 45 | bool save( Calendar * ); |
46 | bool fromString( Calendar *, const QString & ); | 46 | bool fromString( Calendar *, const QString & ); |
47 | QString toString( Calendar * ); | 47 | QString toString( Calendar * ); |
48 | static ulong getCsum( const QStringList & ); | 48 | static ulong getCsum( const QStringList & ); |
49 | static ulong getCsumTodo( Todo* to ); | 49 | static ulong getCsumTodo( Todo* to ); |
50 | static ulong getCsumEvent( Event* ev ); | 50 | static ulong getCsumEvent( Event* ev ); |
51 | static void writeConfig( QString device,QString connection, QString model ); | ||
52 | static bool writeToPhone( Calendar * ); | ||
51 | private: | 53 | private: |
52 | void copyEvent( Event* to, Event* from ); | 54 | void copyEvent( Event* to, Event* from ); |
53 | void copyTodo( Todo* to, Todo* from ); | 55 | void copyTodo( Todo* to, Todo* from ); |
54 | //int initDevice(GSM_StateMachine *s); | 56 | //int initDevice(GSM_StateMachine *s); |
55 | QString mProfileName; | 57 | QString mProfileName; |
56 | void afterSave( Incidence* ); | 58 | void afterSave( Incidence* ); |
57 | }; | 59 | }; |
58 | 60 | ||
59 | } | 61 | } |
60 | 62 | ||
61 | #endif | 63 | #endif |