author | zautrix <zautrix> | 2005-01-26 04:09:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-26 04:09:44 (UTC) |
commit | c3e40c9baa61009469022a87e9cd068734899bcc (patch) (unidiff) | |
tree | 11f0f33d939fd17f613381fec4cf8c454b9847b4 /korganizer | |
parent | 76b0e73d8752448058e2fa3ad065f0219b9ffad8 (diff) | |
download | kdepimpi-c3e40c9baa61009469022a87e9cd068734899bcc.zip kdepimpi-c3e40c9baa61009469022a87e9cd068734899bcc.tar.gz kdepimpi-c3e40c9baa61009469022a87e9cd068734899bcc.tar.bz2 |
monthview fix
-rw-r--r-- | korganizer/komonthview.cpp | 8 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index b819eec..437debe 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -52,47 +52,48 @@ | |||
52 | #include <libkcal/kincidenceformatter.h> | 52 | #include <libkcal/kincidenceformatter.h> |
53 | 53 | ||
54 | #include "komonthview.h" | 54 | #include "komonthview.h" |
55 | 55 | ||
56 | #define PIXMAP_SIZE 5 | 56 | #define PIXMAP_SIZE 5 |
57 | #ifdef DESKTOP_VERSION | 57 | #ifdef DESKTOP_VERSION |
58 | QToolTipGroup *MonthViewCell::mToolTipGroup = 0; | 58 | QToolTipGroup *MonthViewCell::mToolTipGroup = 0; |
59 | #endif | 59 | #endif |
60 | class KNOWhatsThis :public QWhatsThis | 60 | class KNOWhatsThis :public QWhatsThis |
61 | { | 61 | { |
62 | public: | 62 | public: |
63 | KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { }; | 63 | KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { }; |
64 | //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); }; | ||
64 | 65 | ||
65 | protected: | 66 | protected: |
66 | virtual QString text( const QPoint& p) | 67 | virtual QString text( const QPoint& p) |
67 | { | 68 | { |
68 | return _wid->getWhatsThisText(p) ; | 69 | return _wid->getWhatsThisText(p) ; |
69 | }; | 70 | }; |
70 | private: | 71 | private: |
71 | KNoScrollListBox* _wid; | 72 | KNoScrollListBox* _wid; |
72 | 73 | ||
73 | }; | 74 | }; |
74 | 75 | ||
75 | 76 | ||
76 | KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) | 77 | KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) |
77 | : QListBox(parent, name, WRepaintNoErase) | 78 | : QListBox(parent, name, WRepaintNoErase) |
78 | { | 79 | { |
79 | #ifndef DESKTOP_VERSION | 80 | #ifndef DESKTOP_VERSION |
80 | QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); | 81 | QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); |
81 | #endif | 82 | #endif |
82 | mWT = new KNOWhatsThis(this); | 83 | mWT = new KNOWhatsThis(this); |
83 | } | 84 | } |
84 | KNoScrollListBox::~KNoScrollListBox() | 85 | KNoScrollListBox::~KNoScrollListBox() |
85 | { | 86 | { |
86 | delete mWT; | 87 | |
87 | } | 88 | } |
88 | QString KNoScrollListBox::getWhatsThisText(QPoint p) | 89 | QString KNoScrollListBox::getWhatsThisText(QPoint p) |
89 | { | 90 | { |
90 | QListBoxItem* item = itemAt ( p ); | 91 | QListBoxItem* item = itemAt ( p ); |
91 | if ( ! item ) { | 92 | if ( ! item ) { |
92 | return i18n("Click in the cell\nto add an event!"); | 93 | return i18n("Click in the cell\nto add an event!"); |
93 | } | 94 | } |
94 | return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence()); | 95 | return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence()); |
95 | } | 96 | } |
96 | void KNoScrollListBox::keyPressEvent(QKeyEvent *e) | 97 | void KNoScrollListBox::keyPressEvent(QKeyEvent *e) |
97 | { | 98 | { |
98 | 99 | ||
@@ -650,27 +651,29 @@ void MonthViewCell::deselect() | |||
650 | enableScrollBars( false ); | 651 | enableScrollBars( false ); |
651 | // updateCell(); | 652 | // updateCell(); |
652 | } | 653 | } |
653 | void MonthViewCell::select() | 654 | void MonthViewCell::select() |
654 | { | 655 | { |
655 | ;// updateCell(); | 656 | ;// updateCell(); |
656 | } | 657 | } |
657 | 658 | ||
658 | void MonthViewCell::resizeEvent ( QResizeEvent * ) | 659 | void MonthViewCell::resizeEvent ( QResizeEvent * ) |
659 | { | 660 | { |
660 | if ( !mMonthView->isUpdatePossible() ) | 661 | if ( !mMonthView->isUpdatePossible() ) |
661 | return; | 662 | return; |
663 | #ifndef DESKTOP_VERSION | ||
662 | if ( !isVisible() ){ | 664 | if ( !isVisible() ){ |
663 | return; | 665 | return; |
664 | } | 666 | } |
667 | #endif | ||
665 | int size = height() - mLabel->height(); | 668 | int size = height() - mLabel->height(); |
666 | if ( size > 0 ) | 669 | if ( size > 0 ) |
667 | mItemList->verticalScrollBar()->setMaximumHeight( size ); | 670 | mItemList->verticalScrollBar()->setMaximumHeight( size ); |
668 | size = width() - mLabel->width(); | 671 | size = width() - mLabel->width(); |
669 | if ( size > 0 ) | 672 | if ( size > 0 ) |
670 | mItemList->horizontalScrollBar()->setMaximumWidth( size ); | 673 | mItemList->horizontalScrollBar()->setMaximumWidth( size ); |
671 | mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() ); | 674 | mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() ); |
672 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 675 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
673 | } | 676 | } |
674 | 677 | ||
675 | void MonthViewCell::defaultAction( QListBoxItem *item ) | 678 | void MonthViewCell::defaultAction( QListBoxItem *item ) |
676 | { | 679 | { |
@@ -728,25 +731,26 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
728 | 731 | ||
729 | 732 | ||
730 | // ******************************************************************************* | 733 | // ******************************************************************************* |
731 | // ******************************************************************************* | 734 | // ******************************************************************************* |
732 | // ******************************************************************************* | 735 | // ******************************************************************************* |
733 | 736 | ||
734 | 737 | ||
735 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 738 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
736 | : KOEventView( calendar, parent, name ), | 739 | : KOEventView( calendar, parent, name ), |
737 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 740 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
738 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 741 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
739 | { | 742 | { |
740 | updatePossible = false; | 743 | |
744 | updatePossible = false; | ||
741 | mCells.setAutoDelete( true ); | 745 | mCells.setAutoDelete( true ); |
742 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | 746 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; |
743 | // mDayLayout = new QGridLayout( this ); | 747 | // mDayLayout = new QGridLayout( this ); |
744 | // create the day of the week labels (Sun, Mon, etc) and add them to | 748 | // create the day of the week labels (Sun, Mon, etc) and add them to |
745 | // the layout. | 749 | // the layout. |
746 | mDayLabels.resize( mDaysPerWeek ); | 750 | mDayLabels.resize( mDaysPerWeek ); |
747 | QFont bfont = font(); | 751 | QFont bfont = font(); |
748 | if ( QApplication::desktop()->width() < 650 ) { | 752 | if ( QApplication::desktop()->width() < 650 ) { |
749 | bfont.setPointSize( bfont.pointSize() - 2 ); | 753 | bfont.setPointSize( bfont.pointSize() - 2 ); |
750 | } | 754 | } |
751 | bfont.setBold( true ); | 755 | bfont.setBold( true ); |
752 | int i; | 756 | int i; |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index dbbe832..ddd9cf8 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -219,25 +219,25 @@ KOPrefs::KOPrefs() : | |||
219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
220 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); | 220 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); |
221 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); | 221 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); |
222 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); | 222 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); |
223 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); | 223 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); |
224 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); | 224 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); |
225 | addItemBool("Enable ToolTips",&mEnableToolTips,false); | 225 | addItemBool("Enable ToolTips",&mEnableToolTips,false); |
226 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); | 226 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); |
227 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); | 227 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); |
228 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); | 228 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); |
229 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); | 229 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); |
230 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); | 230 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); |
231 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,true); | 231 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); |
232 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); | 232 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); |
233 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); | 233 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); |
234 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); | 234 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); |
235 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; | 235 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; |
236 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); | 236 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); |
237 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); | 237 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); |
238 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); | 238 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); |
239 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); | 239 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); |
240 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); | 240 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); |
241 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); | 241 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); |
242 | addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); | 242 | addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); |
243 | addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); | 243 | addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); |