summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--korganizer/komonthview.h2
-rw-r--r--korganizer/koviewmanager.cpp1
3 files changed, 5 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3c757a1..7c81b3a 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,29 +1,32 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.9 ************ 3********** VERSION 2.0.9 ************
4 4
5Made month view icons for multiday events a bit nicer. 5Made month view icons for multiday events a bit nicer.
6Some minor fixes in KO/Pi
7(e.g. go to today did not work for new week view properly).
8
6 9
7********** VERSION 2.0.8 ************ 10********** VERSION 2.0.8 ************
8 11
9Fixed a problem in dependency info in the ipk files for the Zaurus. 12Fixed a problem in dependency info in the ipk files for the Zaurus.
10 13
11Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. 14Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar.
12 15
13Added a "go today" button to the datepicker. 16Added a "go today" button to the datepicker.
14 17
15Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) 18Added "created" and "last modified" to event/todo viewer (and What'sThis viewer)
16and made it configureable to show these values. 19and made it configureable to show these values.
17 20
18Fixed a problem for events (from external iCal files) that do have a duration but no end date. 21Fixed a problem for events (from external iCal files) that do have a duration but no end date.
19 22
20 23
21********** VERSION 2.0.7 ************ 24********** VERSION 2.0.7 ************
22 25
23Added global application font settings 26Added global application font settings
24(for all KDE-Pim/Pi apps) to the general settings. 27(for all KDE-Pim/Pi apps) to the general settings.
25 28
26Fixed a problem in OM/Pi when trying to login to some IMAP servers 29Fixed a problem in OM/Pi when trying to login to some IMAP servers
27(like the IMAP server of Apple: mail.mac.com ) 30(like the IMAP server of Apple: mail.mac.com )
28 31
29Added recurring todos to KO/Pi. 32Added recurring todos to KO/Pi.
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index b79a41f..f92a69a 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -205,49 +205,49 @@ class MonthViewCell : public QWidget
205}; 205};
206 206
207 207
208class KOMonthView: public KOEventView 208class KOMonthView: public KOEventView
209{ 209{
210 Q_OBJECT 210 Q_OBJECT
211 public: 211 public:
212 KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 ); 212 KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
213 ~KOMonthView(); 213 ~KOMonthView();
214 214
215 /** Returns maximum number of days supported by the komonthview */ 215 /** Returns maximum number of days supported by the komonthview */
216 virtual int maxDatesHint(); 216 virtual int maxDatesHint();
217 217
218 /** Returns number of currently shown dates. */ 218 /** Returns number of currently shown dates. */
219 virtual int currentDateCount(); 219 virtual int currentDateCount();
220 220
221 /** returns the currently selected events */ 221 /** returns the currently selected events */
222 virtual QPtrList<Incidence> selectedIncidences(); 222 virtual QPtrList<Incidence> selectedIncidences();
223 223
224 /** returns dates of the currently selected events */ 224 /** returns dates of the currently selected events */
225 virtual DateList selectedDates(); 225 virtual DateList selectedDates();
226 226
227 virtual void printPreview(CalPrinter *calPrinter, 227 virtual void printPreview(CalPrinter *calPrinter,
228 const QDate &, const QDate &); 228 const QDate &, const QDate &);
229 bool isMonthView() { return true; } 229 bool isMonthView() { return !mShowWeekView; }
230 bool isUpdatePossible() { return updatePossible; } 230 bool isUpdatePossible() { return updatePossible; }
231 231
232 MonthViewCell * selectedCell(); 232 MonthViewCell * selectedCell();
233 bool skipResize; 233 bool skipResize;
234 NavigatorBar* navigatorBar() { return mNavigatorBar ;} 234 NavigatorBar* navigatorBar() { return mNavigatorBar ;}
235 public slots: 235 public slots:
236 virtual void updateView(); 236 virtual void updateView();
237 virtual void updateConfig(); 237 virtual void updateConfig();
238 virtual void showDates(const QDate &start, const QDate &end); 238 virtual void showDates(const QDate &start, const QDate &end);
239 virtual void showEvents(QPtrList<Event> eventList); 239 virtual void showEvents(QPtrList<Event> eventList);
240 240
241 void changeEventDisplay(Event *, int); 241 void changeEventDisplay(Event *, int);
242 242
243 void clearSelection(); 243 void clearSelection();
244 244
245 void showContextMenu( Incidence * ); 245 void showContextMenu( Incidence * );
246 246
247 void setSelectedCell( MonthViewCell * ); 247 void setSelectedCell( MonthViewCell * );
248 void switchView(); 248 void switchView();
249 249
250 protected slots: 250 protected slots:
251 void selectInternalWeekNum ( int ); 251 void selectInternalWeekNum ( int );
252 void processSelectionChange(); 252 void processSelectionChange();
253 signals: 253 signals:
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index ac67b58..a9f5a41 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -536,48 +536,49 @@ if (!mMonthView) {
536 mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); 536 mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
537 connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), 537 connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
538 mMainView->dateNavigator(), SLOT( selectNextYear() ) ); 538 mMainView->dateNavigator(), SLOT( selectNextYear() ) );
539 connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), 539 connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
540 mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); 540 mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
541 connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), 541 connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
542 mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); 542 mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
543 connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), 543 connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ),
544 mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); 544 mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) );
545 connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), 545 connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ),
546 mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); 546 mMainView->dateNavigator(), SLOT( selectNextWeek() ) );
547 547
548 connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), 548 connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
549 mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); 549 mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
550 550
551 551
552 connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), 552 connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
553 mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); 553 mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
554 554
555 } 555 }
556} 556}
557void KOViewManager::showMonthViewWeek() 557void KOViewManager::showMonthViewWeek()
558{ 558{
559 createMonthView(); 559 createMonthView();
560 globalFlagBlockAgenda = 1;
560 bool full = true; 561 bool full = true;
561 if ( mCurrentView == mMonthView) 562 if ( mCurrentView == mMonthView)
562 full = mMainView->leftFrame()->isVisible(); 563 full = mMainView->leftFrame()->isVisible();
563 if ( !KOPrefs::instance()->mMonthViewWeek ) { 564 if ( !KOPrefs::instance()->mMonthViewWeek ) {
564 mMonthView->switchView(); 565 mMonthView->switchView();
565 if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) 566 if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
566 full = false; 567 full = false;
567 else 568 else
568 full = true; 569 full = true;
569 } 570 }
570 mMainView->dateNavigator()->selectWeek(); 571 mMainView->dateNavigator()->selectWeek();
571 showView(mMonthView, full ); 572 showView(mMonthView, full );
572} 573}
573 574
574void KOViewManager::showMonthView() 575void KOViewManager::showMonthView()
575 { 576 {
576 577
577 createMonthView(); 578 createMonthView();
578 globalFlagBlockAgenda = 1; 579 globalFlagBlockAgenda = 1;
579 //mFlagShowNextxDays = false; 580 //mFlagShowNextxDays = false;
580 bool full = true; 581 bool full = true;
581 if ( mCurrentView == mMonthView) 582 if ( mCurrentView == mMonthView)
582 full = mMainView->leftFrame()->isVisible(); 583 full = mMainView->leftFrame()->isVisible();
583 // if(mMonthView == mCurrentView) return; 584 // if(mMonthView == mCurrentView) return;