-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2012e92..eac2f29 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3977,167 +3977,169 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
3977 | 3977 | ||
3978 | QDate date = selectedDates.first(); | 3978 | QDate date = selectedDates.first(); |
3979 | if ( ! date.isValid() ) { | 3979 | if ( ! date.isValid() ) { |
3980 | topLevelWidget()->setCaption(""); | 3980 | topLevelWidget()->setCaption(""); |
3981 | return; | 3981 | return; |
3982 | } | 3982 | } |
3983 | 3983 | ||
3984 | QString selDates; | 3984 | QString selDates; |
3985 | selDates = KGlobal::locale()->formatDate( date, true); | 3985 | selDates = KGlobal::locale()->formatDate( date, true); |
3986 | if (selectedDates.first() < selectedDates.last() ) | 3986 | if (selectedDates.first() < selectedDates.last() ) |
3987 | selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true); | 3987 | selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true); |
3988 | else { | 3988 | else { |
3989 | QString addString; | 3989 | QString addString; |
3990 | if ( date == QDateTime::currentDateTime().date() ) | 3990 | if ( date == QDateTime::currentDateTime().date() ) |
3991 | addString = i18n("Today"); | 3991 | addString = i18n("Today"); |
3992 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) | 3992 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) |
3993 | addString = i18n("Tomorrow"); | 3993 | addString = i18n("Tomorrow"); |
3994 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) | 3994 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) |
3995 | addString = i18n("Yesterday"); | 3995 | addString = i18n("Yesterday"); |
3996 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) | 3996 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) |
3997 | addString = i18n("Day before yesterday"); | 3997 | addString = i18n("Day before yesterday"); |
3998 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) | 3998 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) |
3999 | addString = i18n("Day after tomorrow"); | 3999 | addString = i18n("Day after tomorrow"); |
4000 | if ( !addString.isEmpty() ) { | 4000 | if ( !addString.isEmpty() ) { |
4001 | topLevelWidget()->setCaption( addString+", " + selDates ); | 4001 | topLevelWidget()->setCaption( addString+", " + selDates ); |
4002 | return; | 4002 | return; |
4003 | } | 4003 | } |
4004 | } | 4004 | } |
4005 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); | 4005 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); |
4006 | 4006 | ||
4007 | } | 4007 | } |
4008 | 4008 | ||
4009 | QPtrList<CalFilter> CalendarView::filters() | 4009 | QPtrList<CalFilter> CalendarView::filters() |
4010 | { | 4010 | { |
4011 | return mFilters; | 4011 | return mFilters; |
4012 | 4012 | ||
4013 | } | 4013 | } |
4014 | void CalendarView::editFilters() | 4014 | void CalendarView::editFilters() |
4015 | { | 4015 | { |
4016 | // kdDebug() << "CalendarView::editFilters()" << endl; | 4016 | // kdDebug() << "CalendarView::editFilters()" << endl; |
4017 | 4017 | ||
4018 | CalFilter *filter = mFilters.first(); | 4018 | CalFilter *filter = mFilters.first(); |
4019 | while(filter) { | 4019 | while(filter) { |
4020 | kdDebug() << " Filter: " << filter->name() << endl; | 4020 | kdDebug() << " Filter: " << filter->name() << endl; |
4021 | filter = mFilters.next(); | 4021 | filter = mFilters.next(); |
4022 | } | 4022 | } |
4023 | 4023 | ||
4024 | mDialogManager->showFilterEditDialog(&mFilters); | 4024 | mDialogManager->showFilterEditDialog(&mFilters); |
4025 | updateFilter(); | ||
4025 | } | 4026 | } |
4026 | void CalendarView::toggleFilter() | 4027 | void CalendarView::toggleFilter() |
4027 | { | 4028 | { |
4028 | showFilter(! mCalEditView->isVisible()); | 4029 | showFilter(! mCalEditView->isVisible()); |
4029 | } | 4030 | } |
4030 | 4031 | ||
4031 | KOFilterView *CalendarView::filterView() | 4032 | KOFilterView *CalendarView::filterView() |
4032 | { | 4033 | { |
4033 | return mFilterView; | 4034 | return mFilterView; |
4034 | } | 4035 | } |
4035 | void CalendarView::selectFilter( int fil ) | 4036 | void CalendarView::selectFilter( int fil ) |
4036 | { | 4037 | { |
4037 | mFilterView->setSelectedFilter( fil ); | 4038 | mFilterView->setSelectedFilter( fil ); |
4038 | } | 4039 | } |
4039 | void CalendarView::showFilter(bool visible) | 4040 | void CalendarView::showFilter(bool visible) |
4040 | { | 4041 | { |
4041 | #if 1 | 4042 | #if 1 |
4042 | if (visible) { | 4043 | if (visible) { |
4043 | mCalEditView->readConfig(); | 4044 | mCalEditView->readConfig(); |
4044 | mCalEditView->show(); | 4045 | mCalEditView->show(); |
4045 | QValueList<int> sizes; | 4046 | QValueList<int> sizes; |
4046 | sizes = mLeftFrame->sizes(); | 4047 | sizes = mLeftFrame->sizes(); |
4047 | if ( sizes.count() == 4 && sizes[3] < 20 ) { | 4048 | if ( sizes.count() == 4 && sizes[3] < 20 ) { |
4048 | sizes.clear(); | 4049 | sizes.clear(); |
4049 | sizes << 100; | 4050 | sizes << 100; |
4050 | sizes << 0; | 4051 | sizes << 0; |
4051 | sizes << 0; | 4052 | sizes << 0; |
4052 | sizes << 100; | 4053 | sizes << 100; |
4053 | mLeftFrame->setSizes(sizes); | 4054 | mLeftFrame->setSizes(sizes); |
4054 | } | 4055 | } |
4055 | #if 0 | 4056 | #if 0 |
4056 | sizes = mLeftFrame->sizes(); | 4057 | sizes = mLeftFrame->sizes(); |
4057 | int ccc = 0; | 4058 | int ccc = 0; |
4058 | while ( ccc < sizes.count()) { | 4059 | while ( ccc < sizes.count()) { |
4059 | qDebug("size %d %d ", ccc, sizes[ccc]); | 4060 | qDebug("size %d %d ", ccc, sizes[ccc]); |
4060 | ++ccc; | 4061 | ++ccc; |
4061 | } | 4062 | } |
4062 | #endif | 4063 | #endif |
4063 | 4064 | ||
4064 | } | 4065 | } |
4065 | else { | 4066 | else { |
4066 | mCalEditView->hide(); | 4067 | mCalEditView->hide(); |
4067 | } | 4068 | } |
4068 | #else | 4069 | #else |
4069 | if (visible) mFilterView->show(); | 4070 | if (visible) mFilterView->show(); |
4070 | else mFilterView->hide(); | 4071 | else mFilterView->hide(); |
4071 | #endif | 4072 | #endif |
4072 | } | 4073 | } |
4073 | void CalendarView::toggleFilerEnabled( ) | 4074 | void CalendarView::toggleFilerEnabled( ) |
4074 | { | 4075 | { |
4075 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 4076 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |
4076 | if ( !mFilterView->filtersEnabled() ) | 4077 | if ( !mFilterView->filtersEnabled() ) |
4077 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); | 4078 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); |
4078 | 4079 | ||
4079 | } | 4080 | } |
4080 | void CalendarView::updateFilter() | 4081 | void CalendarView::updateFilter() |
4081 | { | 4082 | { |
4082 | CalFilter *filter = mFilterView->selectedFilter(); | 4083 | CalFilter *filter = mFilterView->selectedFilter(); |
4083 | if (filter) { | 4084 | if (filter) { |
4084 | QString mess; | 4085 | QString mess; |
4085 | if (mFilterView->filtersEnabled()) { | 4086 | if (mFilterView->filtersEnabled()) { |
4086 | mess = i18n("Filter selected: ")+filter->name(); | 4087 | mess = i18n("Filter selected: ")+filter->name(); |
4087 | filter->setEnabled(true); | 4088 | filter->setEnabled(true); |
4088 | } | 4089 | } |
4089 | else filter->setEnabled(false); | 4090 | else filter->setEnabled(false); |
4090 | mCalendar->setFilter(filter); | 4091 | mCalendar->setFilter(filter); |
4091 | updateView(); | 4092 | updateView(); |
4092 | if ( !mess.isEmpty() ) | 4093 | if ( !mess.isEmpty() ) |
4093 | topLevelWidget()->setCaption( mess ); | 4094 | topLevelWidget()->setCaption( mess ); |
4094 | 4095 | ||
4095 | } | 4096 | } |
4097 | emit filtersUpdated(); | ||
4096 | } | 4098 | } |
4097 | 4099 | ||
4098 | void CalendarView::filterEdited() | 4100 | void CalendarView::filterEdited() |
4099 | { | 4101 | { |
4100 | mFilterView->updateFilters(); | 4102 | mFilterView->updateFilters(); |
4101 | updateFilter(); | 4103 | updateFilter(); |
4102 | writeSettings(); | 4104 | writeSettings(); |
4103 | } | 4105 | } |
4104 | 4106 | ||
4105 | 4107 | ||
4106 | void CalendarView::takeOverEvent() | 4108 | void CalendarView::takeOverEvent() |
4107 | { | 4109 | { |
4108 | Incidence *incidence = currentSelection(); | 4110 | Incidence *incidence = currentSelection(); |
4109 | 4111 | ||
4110 | if (!incidence) return; | 4112 | if (!incidence) return; |
4111 | 4113 | ||
4112 | incidence->setOrganizer(KOPrefs::instance()->email()); | 4114 | incidence->setOrganizer(KOPrefs::instance()->email()); |
4113 | incidence->recreate(); | 4115 | incidence->recreate(); |
4114 | incidence->setReadOnly(false); | 4116 | incidence->setReadOnly(false); |
4115 | 4117 | ||
4116 | updateView(); | 4118 | updateView(); |
4117 | } | 4119 | } |
4118 | 4120 | ||
4119 | void CalendarView::takeOverCalendar() | 4121 | void CalendarView::takeOverCalendar() |
4120 | { | 4122 | { |
4121 | // TODO: Create Calendar::allIncidences() function and use it here | 4123 | // TODO: Create Calendar::allIncidences() function and use it here |
4122 | 4124 | ||
4123 | clearAllViews(); | 4125 | clearAllViews(); |
4124 | QPtrList<Event> events = mCalendar->events(); | 4126 | QPtrList<Event> events = mCalendar->events(); |
4125 | for(uint i=0; i<events.count(); ++i) { | 4127 | for(uint i=0; i<events.count(); ++i) { |
4126 | events.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4128 | events.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4127 | events.at(i)->recreate(); | 4129 | events.at(i)->recreate(); |
4128 | events.at(i)->setReadOnly(false); | 4130 | events.at(i)->setReadOnly(false); |
4129 | } | 4131 | } |
4130 | 4132 | ||
4131 | QPtrList<Todo> todos = mCalendar->todos(); | 4133 | QPtrList<Todo> todos = mCalendar->todos(); |
4132 | for(uint i=0; i<todos.count(); ++i) { | 4134 | for(uint i=0; i<todos.count(); ++i) { |
4133 | todos.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4135 | todos.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4134 | todos.at(i)->recreate(); | 4136 | todos.at(i)->recreate(); |
4135 | todos.at(i)->setReadOnly(false); | 4137 | todos.at(i)->setReadOnly(false); |
4136 | } | 4138 | } |
4137 | 4139 | ||
4138 | QPtrList<Journal> journals = mCalendar->journals(); | 4140 | QPtrList<Journal> journals = mCalendar->journals(); |
4139 | for(uint i=0; i<journals.count(); ++i) { | 4141 | for(uint i=0; i<journals.count(); ++i) { |
4140 | journals.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4142 | journals.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4141 | journals.at(i)->recreate(); | 4143 | journals.at(i)->recreate(); |
4142 | journals.at(i)->setReadOnly(false); | 4144 | journals.at(i)->setReadOnly(false); |
4143 | } | 4145 | } |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index d836fee..be18e8f 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -149,96 +149,97 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
149 | * for notification to update their settings. */ | 149 | * for notification to update their settings. */ |
150 | void configChanged(); | 150 | void configChanged(); |
151 | /** emitted when the topwidget is closing down, so that any attached | 151 | /** emitted when the topwidget is closing down, so that any attached |
152 | child windows can also close. */ | 152 | child windows can also close. */ |
153 | void closingDown(); | 153 | void closingDown(); |
154 | /** emitted right before we die */ | 154 | /** emitted right before we die */ |
155 | void closed(QWidget *); | 155 | void closed(QWidget *); |
156 | 156 | ||
157 | /** Emitted when state of modified flag changes */ | 157 | /** Emitted when state of modified flag changes */ |
158 | void modifiedChanged(bool); | 158 | void modifiedChanged(bool); |
159 | void signalmodified(); | 159 | void signalmodified(); |
160 | 160 | ||
161 | /** Emitted when state of read-only flag changes */ | 161 | /** Emitted when state of read-only flag changes */ |
162 | void readOnlyChanged(bool); | 162 | void readOnlyChanged(bool); |
163 | 163 | ||
164 | /** Emitted when the unit of navigation changes */ | 164 | /** Emitted when the unit of navigation changes */ |
165 | void changeNavStringPrev(const QString &); | 165 | void changeNavStringPrev(const QString &); |
166 | void changeNavStringNext(const QString &); | 166 | void changeNavStringNext(const QString &); |
167 | 167 | ||
168 | /** Emitted when state of events selection has changed and user is organizer*/ | 168 | /** Emitted when state of events selection has changed and user is organizer*/ |
169 | void organizerEventsSelected(bool); | 169 | void organizerEventsSelected(bool); |
170 | /** Emitted when state of events selection has changed and user is attendee*/ | 170 | /** Emitted when state of events selection has changed and user is attendee*/ |
171 | void groupEventsSelected(bool); | 171 | void groupEventsSelected(bool); |
172 | /** | 172 | /** |
173 | Emitted when an incidence gets selected. If the selection is cleared the | 173 | Emitted when an incidence gets selected. If the selection is cleared the |
174 | signal is emitted with 0 as argument. | 174 | signal is emitted with 0 as argument. |
175 | */ | 175 | */ |
176 | void incidenceSelected( Incidence * ); | 176 | void incidenceSelected( Incidence * ); |
177 | /** Emitted, when a todoitem is selected or deselected. */ | 177 | /** Emitted, when a todoitem is selected or deselected. */ |
178 | void todoSelected( bool ); | 178 | void todoSelected( bool ); |
179 | 179 | ||
180 | /** | 180 | /** |
181 | Emitted, when clipboard content changes. Parameter indicates if paste | 181 | Emitted, when clipboard content changes. Parameter indicates if paste |
182 | is possible or not. | 182 | is possible or not. |
183 | */ | 183 | */ |
184 | void pasteEnabled(bool); | 184 | void pasteEnabled(bool); |
185 | 185 | ||
186 | /** Emitted, when the number of incoming messages has changed. */ | 186 | /** Emitted, when the number of incoming messages has changed. */ |
187 | void numIncomingChanged(int); | 187 | void numIncomingChanged(int); |
188 | 188 | ||
189 | /** Emitted, when the number of outgoing messages has changed. */ | 189 | /** Emitted, when the number of outgoing messages has changed. */ |
190 | void numOutgoingChanged(int); | 190 | void numOutgoingChanged(int); |
191 | 191 | ||
192 | /** Send status message, which can e.g. be displayed in the status bar. */ | 192 | /** Send status message, which can e.g. be displayed in the status bar. */ |
193 | void statusMessage(const QString &); | 193 | void statusMessage(const QString &); |
194 | 194 | ||
195 | void calendarViewExpanded( bool ); | 195 | void calendarViewExpanded( bool ); |
196 | void updateSearchDialog(); | 196 | void updateSearchDialog(); |
197 | void filtersUpdated(); | ||
197 | 198 | ||
198 | 199 | ||
199 | public slots: | 200 | public slots: |
200 | void checkAlarms(); | 201 | void checkAlarms(); |
201 | void slotprintSelInc(); | 202 | void slotprintSelInc(); |
202 | void showNextAlarms(); | 203 | void showNextAlarms(); |
203 | void showOpenError(); | 204 | void showOpenError(); |
204 | void watchSavedFile(); | 205 | void watchSavedFile(); |
205 | void recheckTimerAlarm(); | 206 | void recheckTimerAlarm(); |
206 | void checkNextTimerAlarm(); | 207 | void checkNextTimerAlarm(); |
207 | void addAlarm(const QDateTime &qdt, const QString ¬i ); | 208 | void addAlarm(const QDateTime &qdt, const QString ¬i ); |
208 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); | 209 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); |
209 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); | 210 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); |
210 | 211 | ||
211 | /** options dialog made a changed to the configuration. we catch this | 212 | /** options dialog made a changed to the configuration. we catch this |
212 | * and notify all widgets which need to update their configuration. */ | 213 | * and notify all widgets which need to update their configuration. */ |
213 | void updateConfig(); | 214 | void updateConfig(); |
214 | 215 | ||
215 | void insertBirthdays(const QString& uid, const QStringList& birthdayList, | 216 | void insertBirthdays(const QString& uid, const QStringList& birthdayList, |
216 | const QStringList& anniversaryList, const QStringList& realNameList, | 217 | const QStringList& anniversaryList, const QStringList& realNameList, |
217 | const QStringList& emailList, const QStringList& assembledNameList, | 218 | const QStringList& emailList, const QStringList& assembledNameList, |
218 | const QStringList& uidList); | 219 | const QStringList& uidList); |
219 | 220 | ||
220 | /** | 221 | /** |
221 | Load calendar from file \a filename. If \a merge is true, load | 222 | Load calendar from file \a filename. If \a merge is true, load |
222 | calendar into existing one, if it is false, clear calendar, before | 223 | calendar into existing one, if it is false, clear calendar, before |
223 | loading. Return true, if calendar could be successfully loaded. | 224 | loading. Return true, if calendar could be successfully loaded. |
224 | */ | 225 | */ |
225 | bool openCalendar(QString filename, bool merge=false); | 226 | bool openCalendar(QString filename, bool merge=false); |
226 | bool loadCalendars(); | 227 | bool loadCalendars(); |
227 | bool saveCalendars(); | 228 | bool saveCalendars(); |
228 | bool restoreCalendarSettings(); | 229 | bool restoreCalendarSettings(); |
229 | bool addCalendar( KopiCalendarFile * ); | 230 | bool addCalendar( KopiCalendarFile * ); |
230 | void addCalendarId( int id ); | 231 | void addCalendarId( int id ); |
231 | bool syncCalendar(QString filename,int mode = 0 ); | 232 | bool syncCalendar(QString filename,int mode = 0 ); |
232 | 233 | ||
233 | /** | 234 | /** |
234 | Save calendar data to file. Return true if calendar could be | 235 | Save calendar data to file. Return true if calendar could be |
235 | successfully saved. | 236 | successfully saved. |
236 | */ | 237 | */ |
237 | bool saveCalendar(QString filename); | 238 | bool saveCalendar(QString filename); |
238 | 239 | ||
239 | /** | 240 | /** |
240 | Close calendar. Clear calendar data and reset views to display an empty | 241 | Close calendar. Clear calendar data and reset views to display an empty |
241 | calendar. | 242 | calendar. |
242 | */ | 243 | */ |
243 | void closeCalendar(); | 244 | void closeCalendar(); |
244 | 245 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 472a978..13e186d 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1256,97 +1256,97 @@ void MainWindow::initActions() | |||
1256 | configureToolBarMenu->setItemChecked( 60, true ); | 1256 | configureToolBarMenu->setItemChecked( 60, true ); |
1257 | if (p-> mShowIconMonth) | 1257 | if (p-> mShowIconMonth) |
1258 | configureToolBarMenu->setItemChecked( 70, true ); | 1258 | configureToolBarMenu->setItemChecked( 70, true ); |
1259 | if (p-> mShowIconTodoview) | 1259 | if (p-> mShowIconTodoview) |
1260 | configureToolBarMenu->setItemChecked( 80, true ); | 1260 | configureToolBarMenu->setItemChecked( 80, true ); |
1261 | if (p-> mShowIconBackFast) | 1261 | if (p-> mShowIconBackFast) |
1262 | configureToolBarMenu->setItemChecked( 200, true ); | 1262 | configureToolBarMenu->setItemChecked( 200, true ); |
1263 | if (p-> mShowIconBack) | 1263 | if (p-> mShowIconBack) |
1264 | configureToolBarMenu->setItemChecked( 210, true ); | 1264 | configureToolBarMenu->setItemChecked( 210, true ); |
1265 | if (p-> mShowIconToday) | 1265 | if (p-> mShowIconToday) |
1266 | configureToolBarMenu->setItemChecked( 130, true ); | 1266 | configureToolBarMenu->setItemChecked( 130, true ); |
1267 | if (p-> mShowIconForward) | 1267 | if (p-> mShowIconForward) |
1268 | configureToolBarMenu->setItemChecked( 220, true ); | 1268 | configureToolBarMenu->setItemChecked( 220, true ); |
1269 | if (p-> mShowIconForwardFast) | 1269 | if (p-> mShowIconForwardFast) |
1270 | configureToolBarMenu->setItemChecked( 230, true ); | 1270 | configureToolBarMenu->setItemChecked( 230, true ); |
1271 | if (p-> mShowIconNextDays) | 1271 | if (p-> mShowIconNextDays) |
1272 | configureToolBarMenu->setItemChecked( 100, true ); | 1272 | configureToolBarMenu->setItemChecked( 100, true ); |
1273 | if (p-> mShowIconNext) | 1273 | if (p-> mShowIconNext) |
1274 | configureToolBarMenu->setItemChecked( 110, true ); | 1274 | configureToolBarMenu->setItemChecked( 110, true ); |
1275 | if (p-> mShowIconJournal) | 1275 | if (p-> mShowIconJournal) |
1276 | configureToolBarMenu->setItemChecked( 90, true ); | 1276 | configureToolBarMenu->setItemChecked( 90, true ); |
1277 | if (p-> mShowIconWhatsThis) | 1277 | if (p-> mShowIconWhatsThis) |
1278 | configureToolBarMenu->setItemChecked( 300, true ); | 1278 | configureToolBarMenu->setItemChecked( 300, true ); |
1279 | if (p-> mShowIconWeekNum) | 1279 | if (p-> mShowIconWeekNum) |
1280 | configureToolBarMenu->setItemChecked( 400, true ); | 1280 | configureToolBarMenu->setItemChecked( 400, true ); |
1281 | if (!p-> mShowIconStretch) { | 1281 | if (!p-> mShowIconStretch) { |
1282 | QLabel* dummy = new QLabel( iconToolBar ); | 1282 | QLabel* dummy = new QLabel( iconToolBar ); |
1283 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 1283 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
1284 | dummy->setMinimumWidth( 0 ); | 1284 | dummy->setMinimumWidth( 0 ); |
1285 | iconToolBar->setStretchableWidget ( dummy ) ; | 1285 | iconToolBar->setStretchableWidget ( dummy ) ; |
1286 | } | 1286 | } |
1287 | else { | 1287 | else { |
1288 | iconToolBar->setHorizontalStretchable (true ); | 1288 | iconToolBar->setHorizontalStretchable (true ); |
1289 | viewToolBar->setHorizontalStretchable (true ); | 1289 | viewToolBar->setHorizontalStretchable (true ); |
1290 | navigatorToolBar->setHorizontalStretchable (true ); | 1290 | navigatorToolBar->setHorizontalStretchable (true ); |
1291 | iconToolBar->setVerticalStretchable (true ); | 1291 | iconToolBar->setVerticalStretchable (true ); |
1292 | viewToolBar->setVerticalStretchable (true ); | 1292 | viewToolBar->setVerticalStretchable (true ); |
1293 | navigatorToolBar->setVerticalStretchable (true ); | 1293 | navigatorToolBar->setVerticalStretchable (true ); |
1294 | configureToolBarMenu->setItemChecked( 5, true ); | 1294 | configureToolBarMenu->setItemChecked( 5, true ); |
1295 | } | 1295 | } |
1296 | if (p-> mShowIconFilter) | 1296 | if (p-> mShowIconFilter) |
1297 | configureToolBarMenu->setItemChecked( 7, true ); | 1297 | configureToolBarMenu->setItemChecked( 7, true ); |
1298 | if (p-> mShowIconOnetoolbar) | 1298 | if (p-> mShowIconOnetoolbar) |
1299 | configureToolBarMenu->setItemChecked( 6, true ); | 1299 | configureToolBarMenu->setItemChecked( 6, true ); |
1300 | 1300 | ||
1301 | 1301 | ||
1302 | if ( filterMenubar ) { | 1302 | if ( filterMenubar ) { |
1303 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | 1303 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); |
1304 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); | 1304 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); |
1305 | } | 1305 | } |
1306 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1306 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1307 | configureAgenda( p->mHourSize ); | 1307 | configureAgenda( p->mHourSize ); |
1308 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1308 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | void MainWindow::exportToPhone( int mode ) | 1311 | void MainWindow::exportToPhone( int mode ) |
1312 | { | 1312 | { |
1313 | 1313 | ||
1314 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1314 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1315 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1315 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1316 | KOex2phonePrefs ex2phone; | 1316 | KOex2phonePrefs ex2phone; |
1317 | 1317 | ||
1318 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 1318 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
1319 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 1319 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
1320 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1320 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
1321 | if ( mode == 1 ) | 1321 | if ( mode == 1 ) |
1322 | ex2phone.setCaption(i18n("Export complete calendar")); | 1322 | ex2phone.setCaption(i18n("Export complete calendar")); |
1323 | if ( mode == 2 ) | 1323 | if ( mode == 2 ) |
1324 | ex2phone.setCaption(i18n("Export filtered calendar")); | 1324 | ex2phone.setCaption(i18n("Export filtered calendar")); |
1325 | 1325 | ||
1326 | if ( !ex2phone.exec() ) { | 1326 | if ( !ex2phone.exec() ) { |
1327 | return; | 1327 | return; |
1328 | } | 1328 | } |
1329 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 1329 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
1330 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 1330 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
1331 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 1331 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
1332 | 1332 | ||
1333 | int inFuture = 0; | 1333 | int inFuture = 0; |
1334 | if ( ex2phone.mWriteBackFuture->isChecked() ) | 1334 | if ( ex2phone.mWriteBackFuture->isChecked() ) |
1335 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); | 1335 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); |
1336 | QPtrList<Incidence> delSel; | 1336 | QPtrList<Incidence> delSel; |
1337 | if ( mode == 1 ) | 1337 | if ( mode == 1 ) |
1338 | delSel = mCalendar->rawIncidences(); | 1338 | delSel = mCalendar->rawIncidences(); |
1339 | if ( mode == 2 ) | 1339 | if ( mode == 2 ) |
1340 | delSel = mCalendar->incidences(); | 1340 | delSel = mCalendar->incidences(); |
1341 | CalendarLocal* cal = new CalendarLocal(); | 1341 | CalendarLocal* cal = new CalendarLocal(); |
1342 | cal->setLocalTime(); | 1342 | cal->setLocalTime(); |
1343 | Incidence *incidence = delSel.first(); | 1343 | Incidence *incidence = delSel.first(); |
1344 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | 1344 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); |
1345 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); | 1345 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); |
1346 | while ( incidence ) { | 1346 | while ( incidence ) { |
1347 | if ( incidence->typeID() != journalID ) { | 1347 | if ( incidence->typeID() != journalID ) { |
1348 | bool add = true; | 1348 | bool add = true; |
1349 | if ( inFuture ) { | 1349 | if ( inFuture ) { |
1350 | QDateTime dt; | 1350 | QDateTime dt; |
1351 | if ( incidence->typeID() == todoID ) { | 1351 | if ( incidence->typeID() == todoID ) { |
1352 | Todo * t = (Todo*)incidence; | 1352 | Todo * t = (Todo*)incidence; |