summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--korganizer/komonthview.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 9f34d38..4f8fcc7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,56 +1,58 @@
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.2 ************ 3********** VERSION 2.0.2 ************
4 4
5KO/Pi: 5KO/Pi:
6Fixed the layout problem of the day label buttons 6Fixed the layout problem of the day label buttons
7of the agenda view introduced in version 2.0.1. 7of the agenda view introduced in version 2.0.1.
8 8
9Added WhatsThis support for the todo view and the list view.
10
9Added a quite useful and quite hidden feature (to KO/Pi). 11Added a quite useful and quite hidden feature (to KO/Pi).
10Who does find it first? 12Who does find it first?
11Hint: You have to click somewhere in the views ... 13Hint: You have to click somewhere in the views ...
12 14
13 15
14********** VERSION 2.0.1 ************ 16********** VERSION 2.0.1 ************
15 17
16Oooops ... I forgot to test on the Zaurus 5500 ... 18Oooops ... I forgot to test on the Zaurus 5500 ...
17 19
18Fixed many problems of new (english) strings (and german translations) 20Fixed many problems of new (english) strings (and german translations)
19introduced in the latest versions, where the text was not fitting on the 21introduced in the latest versions, where the text was not fitting on the
20240x320 display of the Zaurus 5500. 22240x320 display of the Zaurus 5500.
21 23
22KO/Pi: 24KO/Pi:
23Added a popup menu ( press pen and hold to get popup ) to the agenda view 25Added a popup menu ( press pen and hold to get popup ) to the agenda view
24with many useful items (add event/todo, show next week, two weeks, month, journal). 26with many useful items (add event/todo, show next week, two weeks, month, journal).
25 27
26Added items to the todolist popup menu for: 28Added items to the todolist popup menu for:
27Display all opened, all closed or all todos flat. 29Display all opened, all closed or all todos flat.
28The "flat" view makes is possible to sort all todos after ,e.g., prio or date. 30The "flat" view makes is possible to sort all todos after ,e.g., prio or date.
29Made the reparenting of todos on the desktop possible via Drag&Drop. 31Made the reparenting of todos on the desktop possible via Drag&Drop.
30Fixed several bugs in setting the completed datetime for todos. 32Fixed several bugs in setting the completed datetime for todos.
31Added info about completed datetime of todos to the todo viewer. 33Added info about completed datetime of todos to the todo viewer.
32Now displaying a completed todo (with completed datetime set) in the agenda view 34Now displaying a completed todo (with completed datetime set) in the agenda view
33at the time of the completion. Such that now it is possible to see in the agenda view 35at the time of the completion. Such that now it is possible to see in the agenda view
34when what todo was completed. 36when what todo was completed.
35Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos. 37Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos.
36Now the behaviour is: 38Now the behaviour is:
37Setting a parent to complete sets all (sub)childs to complete. 39Setting a parent to complete sets all (sub)childs to complete.
38Setting a parent to uncomplete does not change the childs. 40Setting a parent to uncomplete does not change the childs.
39Setting a child to uncomplete sets all parent to uncomplete. 41Setting a child to uncomplete sets all parent to uncomplete.
40Setting a child to complete does not change the parents. 42Setting a child to complete does not change the parents.
41 43
42Smart updating and double buffering of the daymatrix. 44Smart updating and double buffering of the daymatrix.
43Showing holidays in the day matrix. 45Showing holidays in the day matrix.
44Many other small performance updates. 46Many other small performance updates.
45 47
46Made day labels in agenda clickable. By clicking a label, the day is displayed in single day mode. 48Made day labels in agenda clickable. By clicking a label, the day is displayed in single day mode.
47 49
48Now the translation file usertranslation.txt is supposed to be in utf8 format. 50Now the translation file usertranslation.txt is supposed to be in utf8 format.
49If you want to translate a language from western europe, just change the germantranslation.txt file. Please read the updated Usertranslation HowTo in KO/Pi Help menu. 51If you want to translate a language from western europe, just change the germantranslation.txt file. Please read the updated Usertranslation HowTo in KO/Pi Help menu.
50 52
51 53
52********** VERSION 2.0.0 ************ 54********** VERSION 2.0.0 ************
53 55
54Stable release 2.0.0! 56Stable release 2.0.0!
55 57
56KO/Pi: 58KO/Pi:
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 0ef5ae4..00b1e92 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -762,96 +762,97 @@ void MonthViewCell::selection( QListBoxItem *item )
762 762
763 763
764KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) 764KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
765 : KOEventView( calendar, parent, name ), 765 : KOEventView( calendar, parent, name ),
766 mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), 766 mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
767 mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) 767 mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
768{ 768{
769 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); 769 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
770 mShowWeekView = KOPrefs::instance()->mMonthViewWeek; 770 mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
771 if ( mShowWeekView ) 771 if ( mShowWeekView )
772 mWeekStartsMonday = true; 772 mWeekStartsMonday = true;
773 updatePossible = false; 773 updatePossible = false;
774 mCells.setAutoDelete( true ); 774 mCells.setAutoDelete( true );
775 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; 775 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
776 // mDayLayout = new QGridLayout( this ); 776 // mDayLayout = new QGridLayout( this );
777 // create the day of the week labels (Sun, Mon, etc) and add them to 777 // create the day of the week labels (Sun, Mon, etc) and add them to
778 // the layout. 778 // the layout.
779 mDayLabels.resize( mDaysPerWeek ); 779 mDayLabels.resize( mDaysPerWeek );
780 QFont bfont = font(); 780 QFont bfont = font();
781 if ( QApplication::desktop()->width() < 650 ) { 781 if ( QApplication::desktop()->width() < 650 ) {
782 bfont.setPointSize( bfont.pointSize() - 2 ); 782 bfont.setPointSize( bfont.pointSize() - 2 );
783 } 783 }
784 bfont.setBold( true ); 784 bfont.setBold( true );
785 int i; 785 int i;
786 786
787 for( i = 0; i < mDaysPerWeek; i++ ) { 787 for( i = 0; i < mDaysPerWeek; i++ ) {
788 QLabel *label = new QLabel( this ); 788 QLabel *label = new QLabel( this );
789 label->setFont(bfont); 789 label->setFont(bfont);
790 label->setFrameStyle(QFrame::Panel|QFrame::Raised); 790 label->setFrameStyle(QFrame::Panel|QFrame::Raised);
791 label->setLineWidth(1); 791 label->setLineWidth(1);
792 label->setAlignment(AlignCenter); 792 label->setAlignment(AlignCenter);
793 mDayLabels.insert( i, label ); 793 mDayLabels.insert( i, label );
794 } 794 }
795 795
796 bfont.setBold( false ); 796 bfont.setBold( false );
797 mWeekLabels.resize( mNumWeeks+1 ); 797 mWeekLabels.resize( mNumWeeks+1 );
798 for( i = 0; i < mNumWeeks+1; i++ ) { 798 for( i = 0; i < mNumWeeks+1; i++ ) {
799 KOWeekButton *label = new KOWeekButton( this ); 799 KOWeekButton *label = new KOWeekButton( this );
800 label->setFont(bfont); 800 label->setFont(bfont);
801 connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int )) ); 801 connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int )) );
802 label->setFlat(true); 802 label->setFlat(true);
803 QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view")); 803 QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view"));
804 //label->setFrameStyle(QFrame::Panel|QFrame::Raised); 804 //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
805 //label->setLineWidth(1); 805 //label->setLineWidth(1);
806 //label->setAlignment(AlignCenter); 806 //label->setAlignment(AlignCenter);
807 mWeekLabels.insert( i, label ); 807 mWeekLabels.insert( i, label );
808 } 808 }
809 mWeekLabels[mNumWeeks]->setText( i18n("W")); 809 mWeekLabels[mNumWeeks]->setText( i18n("W"));
810 QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nswitch to week mode view"));
810 int row, col; 811 int row, col;
811 mCells.resize( mNumCells ); 812 mCells.resize( mNumCells );
812 for( row = 0; row < mNumWeeks; ++row ) { 813 for( row = 0; row < mNumWeeks; ++row ) {
813 for( col = 0; col < mDaysPerWeek; ++col ) { 814 for( col = 0; col < mDaysPerWeek; ++col ) {
814 MonthViewCell *cell = new MonthViewCell( this ); 815 MonthViewCell *cell = new MonthViewCell( this );
815 mCells.insert( row * mDaysPerWeek + col, cell ); 816 mCells.insert( row * mDaysPerWeek + col, cell );
816 817
817 connect( cell, SIGNAL( defaultAction( Incidence * ) ), 818 connect( cell, SIGNAL( defaultAction( Incidence * ) ),
818 SLOT( defaultAction( Incidence * ) ) ); 819 SLOT( defaultAction( Incidence * ) ) );
819 connect( cell, SIGNAL( newEventSignal( QDateTime ) ), 820 connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
820 SIGNAL( newEventSignal( QDateTime ) ) ); 821 SIGNAL( newEventSignal( QDateTime ) ) );
821 connect( cell, SIGNAL( showDaySignal( QDate ) ), 822 connect( cell, SIGNAL( showDaySignal( QDate ) ),
822 SIGNAL( showDaySignal( QDate ) ) ); 823 SIGNAL( showDaySignal( QDate ) ) );
823 } 824 }
824 } 825 }
825 826
826 connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), 827 connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ),
827 SLOT( switchView() ) ); 828 SLOT( switchView() ) );
828 mContextMenu = eventPopup(); 829 mContextMenu = eventPopup();
829 // updateConfig(); //useless here 830 // updateConfig(); //useless here
830 831
831 emit incidenceSelected( 0 ); 832 emit incidenceSelected( 0 );
832} 833}
833 834
834KOMonthView::~KOMonthView() 835KOMonthView::~KOMonthView()
835{ 836{
836 delete mContextMenu; 837 delete mContextMenu;
837} 838}
838void KOMonthView::switchView() 839void KOMonthView::switchView()
839{ 840{
840 if ( selectedCell( ) ) 841 if ( selectedCell( ) )
841 selectedCell()->deselect(); 842 selectedCell()->deselect();
842 mShowWeekView = !mShowWeekView; 843 mShowWeekView = !mShowWeekView;
843 KOPrefs::instance()->mMonthViewWeek = mShowWeekView; 844 KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
844 emit showNavigator( !mShowWeekView ); 845 emit showNavigator( !mShowWeekView );
845 computeLayout(); 846 computeLayout();
846 updateConfig(); 847 updateConfig();
847} 848}
848 849
849int KOMonthView::maxDatesHint() 850int KOMonthView::maxDatesHint()
850{ 851{
851 return mNumCells; 852 return mNumCells;
852} 853}
853 854
854int KOMonthView::currentDateCount() 855int KOMonthView::currentDateCount()
855{ 856{
856 return mNumCells; 857 return mNumCells;
857} 858}