summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.cpp8
-rw-r--r--korganizer/koprefs.cpp2
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
@@ -58,12 +58,13 @@
58 QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 58 QToolTipGroup *MonthViewCell::mToolTipGroup = 0;
59#endif 59#endif
60class KNOWhatsThis :public QWhatsThis 60class KNOWhatsThis :public QWhatsThis
61{ 61{
62public: 62public:
63 KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { }; 63 KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
64 //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); };
64 65
65protected: 66protected:
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 };
@@ -80,13 +81,13 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
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}
84KNoScrollListBox::~KNoScrollListBox() 85KNoScrollListBox::~KNoScrollListBox()
85{ 86{
86 delete mWT; 87
87} 88}
88QString KNoScrollListBox::getWhatsThisText(QPoint p) 89QString 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!");
@@ -656,15 +657,17 @@ void MonthViewCell::select()
656} 657}
657 658
658void MonthViewCell::resizeEvent ( QResizeEvent * ) 659void 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 );
@@ -734,13 +737,14 @@ void MonthViewCell::selection( QListBoxItem *item )
734 737
735KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) 738KOMonthView::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 );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index dbbe832..ddd9cf8 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -225,13 +225,13 @@ KOPrefs::KOPrefs() :
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);