summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-25 15:07:31 (UTC)
committer zautrix <zautrix>2005-03-25 15:07:31 (UTC)
commit3326831dbf6f962e97a978781361db5198f6a035 (patch) (side-by-side diff)
tree9bf6e78ba06b0db2e321ee8f8b95e66b66cca852
parent5a0130ffdbf03fa5b881f856b41d081e91e1958b (diff)
downloadkdepimpi-3326831dbf6f962e97a978781361db5198f6a035.zip
kdepimpi-3326831dbf6f962e97a978781361db5198f6a035.tar.gz
kdepimpi-3326831dbf6f962e97a978781361db5198f6a035.tar.bz2
layout fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--korganizer/datenavigatorcontainer.cpp40
-rw-r--r--korganizer/datenavigatorcontainer.h2
-rw-r--r--korganizer/kdatenavigator.cpp3
4 files changed, 32 insertions, 15 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9a4e719..6ed6a1c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1918,7 +1918,6 @@ void CalendarView::readSettings()
sizes << resetval;
}
mMainFrame->setSizes(sizes);
-
if ( dateCount == 5 ) mNavigator->selectWorkWeek();
else if ( dateCount == 7 ) mNavigator->selectWeek();
else mNavigator->selectDates( dateCount );
@@ -1926,6 +1925,7 @@ void CalendarView::readSettings()
updateConfig();
globalFlagBlockAgenda = 2;
mViewManager->readSettings( config );
+ QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
}
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 2290c53..11dc592 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -40,10 +40,11 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
: QWidget( parent, name ), mCalendar( 0 ),
mHorizontalCount( 1 ), mVerticalCount( 1 )
{
+ mResizeEnabled = false;
mExtraViews.setAutoDelete( true );
mNavigatorView = new KDateNavigator( this, name );
-
+ mNavigatorView->hide();
connectNavigatorView( mNavigatorView );
//setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) );
mLastDisplayedDN = 0;
@@ -218,17 +219,10 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
mExtraViews.append( n );
n->setCalendar( mCalendar );
connectNavigatorView( n );
- n->show();
- }
- int iii = 0;
- while ( iii < ( mExtraViews.count() ) ) {
- if ( iii < count-1 )
- mExtraViews.at( iii )->show();
- else
- mExtraViews.at( iii )->hide();
- ++iii;
+ // n->show();
}
+
setBaseDates();
if ( fontchange ) {
//mNavigatorView->changeFont( fo );
@@ -266,6 +260,16 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
view->setGeometry( x * twidth,
y * theight, twidth, theight );
}
+ int iii = 0;
+ int ccc = mHorizontalCount * mVerticalCount;
+ mNavigatorView->show();
+ while ( iii < ( mExtraViews.count() ) ) {
+ if ( iii < ccc-1 )
+ mExtraViews.at( iii )->show();
+ else
+ mExtraViews.at( iii )->hide();
+ ++iii;
+ }
}
QDate last = lastAvailableDate();
@@ -393,14 +397,24 @@ void DateNavigatorContainer::setBaseDates()
n->setBaseDate( baseDate, doRepaint );
}
}
-
+void DateNavigatorContainer::setResizeEnabled()
+{
+ mResizeEnabled = true;
+ //qDebug("DateNavigatorContainer::setResizeEnabled ");
+ checkUpdateDayMatrixDates();
+}
void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
{
-
+ //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height());
//qDebug("COUNT %d ", mExtraViews.count());
-
+ if ( ! mResizeEnabled ) {
+ //qDebug("NOT ResizeEnabled");
+ return;
+ }
+ else
mUpdateTimer->start( 250 );
+
//updateDayMatrixDates();
}
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index d2f397d..ac9745d 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -63,6 +63,7 @@ class DateNavigatorContainer: public QWidget
void slotgoPrevMonth();
void slotgoNextYear();
void slotgoPrevYear();
+ void setResizeEnabled();
signals:
void datesSelected( const KCal::DateList & );
@@ -89,6 +90,7 @@ class DateNavigatorContainer: public QWidget
void connectNavigatorView( KDateNavigator *v );
private:
+ bool mResizeEnabled;
QTimer* mUpdateTimer;
int mLastDisplayedDN;
QDate mFirstSelectedDate;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 0cb767f..5eccfd6 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -119,7 +119,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
mySizeHint = sizeHintTwoButtons();
myFullSizeHint = sizeHintTwoButtons( 4 );
mFontChanged = false;
- resize ( 3,3 );
+ //resize ( 3,3 );
}
void KDateNavigator::changeFont ( QFont fo )
@@ -371,6 +371,7 @@ void KDateNavigator::updateConfig()
void KDateNavigator::setShowWeekNums(bool enabled)
{
+ qDebug("KDateNavigator::setShowWeekNums***************************** ");
m_bShowWeekNums = enabled;
for(int i=0; i<6; i++) {
if(enabled)