-rw-r--r-- | korganizer/komonthview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 6ae4c6f..02d2585 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -880,98 +880,101 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
880 | for( row = 0; row < mNumWeeks; ++row ) { | 880 | for( row = 0; row < mNumWeeks; ++row ) { |
881 | for( col = 0; col < mDaysPerWeek; ++col ) { | 881 | for( col = 0; col < mDaysPerWeek; ++col ) { |
882 | MonthViewCell *cell = new MonthViewCell( this, mMonthView ); | 882 | MonthViewCell *cell = new MonthViewCell( this, mMonthView ); |
883 | mCells.insert( row * mDaysPerWeek + col, cell ); | 883 | mCells.insert( row * mDaysPerWeek + col, cell ); |
884 | 884 | ||
885 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 885 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
886 | SLOT( defaultAction( Incidence * ) ) ); | 886 | SLOT( defaultAction( Incidence * ) ) ); |
887 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 887 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
888 | SIGNAL( newEventSignal( QDateTime ) ) ); | 888 | SIGNAL( newEventSignal( QDateTime ) ) ); |
889 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 889 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
890 | SIGNAL( showDaySignal( QDate ) ) ); | 890 | SIGNAL( showDaySignal( QDate ) ) ); |
891 | } | 891 | } |
892 | } | 892 | } |
893 | mCellsW.resize( mDaysPerWeek ); | 893 | mCellsW.resize( mDaysPerWeek ); |
894 | for( col = 0; col < mDaysPerWeek; ++col ) { | 894 | for( col = 0; col < mDaysPerWeek; ++col ) { |
895 | MonthViewCell *cell = new MonthViewCell( this, mWeekView ); | 895 | MonthViewCell *cell = new MonthViewCell( this, mWeekView ); |
896 | mCellsW.insert( col, cell ); | 896 | mCellsW.insert( col, cell ); |
897 | 897 | ||
898 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 898 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
899 | SLOT( defaultAction( Incidence * ) ) ); | 899 | SLOT( defaultAction( Incidence * ) ) ); |
900 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 900 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
901 | SIGNAL( newEventSignal( QDateTime ) ) ); | 901 | SIGNAL( newEventSignal( QDateTime ) ) ); |
902 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 902 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
903 | SIGNAL( showDaySignal( QDate ) ) ); | 903 | SIGNAL( showDaySignal( QDate ) ) ); |
904 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); | 904 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); |
905 | } | 905 | } |
906 | 906 | ||
907 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); | 907 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); |
908 | mContextMenu = eventPopup(); | 908 | mContextMenu = eventPopup(); |
909 | // updateConfig(); //useless here... | 909 | // updateConfig(); //useless here... |
910 | // ... but we need mWidthLongDayLabel computed | 910 | // ... but we need mWidthLongDayLabel computed |
911 | QFontMetrics fontmetric(mDayLabels[0]->font()); | 911 | QFontMetrics fontmetric(mDayLabels[0]->font()); |
912 | mWidthLongDayLabel = 0; | 912 | mWidthLongDayLabel = 0; |
913 | for (int i = 0; i < 7; i++) { | 913 | for (int i = 0; i < 7; i++) { |
914 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 914 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
915 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 915 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
916 | } | 916 | } |
917 | 917 | ||
918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
919 | 919 | ||
920 | if ( mShowWeekView ) | 920 | if ( mShowWeekView ) |
921 | mWidStack->raiseWidget( mWeekView ); | 921 | mWidStack->raiseWidget( mWeekView ); |
922 | else | 922 | else |
923 | mWidStack->raiseWidget( mMonthView ); | 923 | mWidStack->raiseWidget( mMonthView ); |
924 | 924 | ||
925 | emit incidenceSelected( 0 ); | 925 | emit incidenceSelected( 0 ); |
926 | #ifndef DESKTOP_VERSION | 926 | #ifndef DESKTOP_VERSION |
927 | resize( QApplication::desktop()->size() ); | 927 | resize( QApplication::desktop()->size() ); |
928 | computeLayout(); | 928 | #else |
929 | resize(640, 480 ); | ||
929 | #endif | 930 | #endif |
931 | computeLayout(); | ||
932 | |||
930 | } | 933 | } |
931 | 934 | ||
932 | KOMonthView::~KOMonthView() | 935 | KOMonthView::~KOMonthView() |
933 | { | 936 | { |
934 | delete mContextMenu; | 937 | delete mContextMenu; |
935 | } | 938 | } |
936 | 939 | ||
937 | void KOMonthView::selectInternalWeekNum ( int n ) | 940 | void KOMonthView::selectInternalWeekNum ( int n ) |
938 | { | 941 | { |
939 | switchView(); | 942 | switchView(); |
940 | emit selectWeekNum ( n ); | 943 | emit selectWeekNum ( n ); |
941 | } | 944 | } |
942 | 945 | ||
943 | int KOMonthView::currentWeek() | 946 | int KOMonthView::currentWeek() |
944 | { | 947 | { |
945 | if ( mShowWeekView ) | 948 | if ( mShowWeekView ) |
946 | return mWeekLabelsW[0]->getWeekNum(); | 949 | return mWeekLabelsW[0]->getWeekNum(); |
947 | return mWeekLabels[0]->getWeekNum(); | 950 | return mWeekLabels[0]->getWeekNum(); |
948 | } | 951 | } |
949 | void KOMonthView::switchView() | 952 | void KOMonthView::switchView() |
950 | { | 953 | { |
951 | 954 | ||
952 | if ( selectedCell( ) ) | 955 | if ( selectedCell( ) ) |
953 | selectedCell()->deselect(); | 956 | selectedCell()->deselect(); |
954 | mShowWeekView = !mShowWeekView; | 957 | mShowWeekView = !mShowWeekView; |
955 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; | 958 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; |
956 | if ( clPending ) { | 959 | if ( clPending ) { |
957 | computeLayout(); | 960 | computeLayout(); |
958 | updateConfig(); | 961 | updateConfig(); |
959 | } | 962 | } |
960 | if ( mShowWeekView ) | 963 | if ( mShowWeekView ) |
961 | mWidStack->raiseWidget( mWeekView ); | 964 | mWidStack->raiseWidget( mWeekView ); |
962 | else | 965 | else |
963 | mWidStack->raiseWidget( mMonthView ); | 966 | mWidStack->raiseWidget( mMonthView ); |
964 | clPending = false; | 967 | clPending = false; |
965 | } | 968 | } |
966 | 969 | ||
967 | int KOMonthView::maxDatesHint() | 970 | int KOMonthView::maxDatesHint() |
968 | { | 971 | { |
969 | return mNumCells; | 972 | return mNumCells; |
970 | } | 973 | } |
971 | 974 | ||
972 | int KOMonthView::currentDateCount() | 975 | int KOMonthView::currentDateCount() |
973 | { | 976 | { |
974 | return mNumCells; | 977 | return mNumCells; |
975 | } | 978 | } |
976 | 979 | ||
977 | QPtrList<Incidence> KOMonthView::selectedIncidences() | 980 | QPtrList<Incidence> KOMonthView::selectedIncidences() |