layout fix

6 files changed, 65 insertions, 45 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index d1caff3..2290c53 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -76,6 +76,6 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 
-  connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
-  connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
-  connect( v, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
-  connect( v, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
+  connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) );
+  connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) );
+  connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) );
+  connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) );
 
@@ -83,6 +83,38 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 }
+void DateNavigatorContainer::slotgoNextYear()
+{
+    jumpMonth( 12 );
+    emit goNextYear();
+
+}
+void DateNavigatorContainer::slotgoPrevYear()
+{
+    jumpMonth( -12 );
+    emit goPrevYear();
+
+}
+void DateNavigatorContainer::slotgoPrevMonth()
+{
+    jumpMonth( -1 );
+    emit goPrevMonth();
+
+}
+void DateNavigatorContainer::slotgoNextMonth()
+{ 
+    jumpMonth( 1 );
+    emit goNextMonth();
+}
+void DateNavigatorContainer::jumpMonth( int month )
+{
 
+    QDate baseDate = mNavigatorView->baseDate();
+    computeMonthSelected( baseDate.month() + month, false );
+}
 void DateNavigatorContainer::slotMonthSelected( int month )
 {
-    //qDebug("slotMonthSelected %d ", month);
+    computeMonthSelected( month, true );
+}
+void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
+{
+ //qDebug("slotMonthSelected %d ", month);
     QDate baseDate = mNavigatorView->baseDate();
@@ -95,23 +127,2 @@ void DateNavigatorContainer::slotMonthSelected( int month )
     
-#if 0
-    mFirstSelectedDate = dateList.first() ;
-    mSelectedDateCount = dateList.count() ;
-
-  KDateNavigator *view = mExtraViews.at( 0 );
-    QDate date = view->baseDate();
-    
-    QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7);
-    //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
-    if ( lDate < curEnd  && date.addDays( -30 ) <  fDate) {
-        mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
-        mNavigatorView->dayMatrix()->repaint( false );
-        for( uint i = 0; i < mLastDisplayedDN; ++i ) {
-            KDateNavigator *n = mExtraViews.at( i );
-            if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
-                n->dayMatrix()->repaint( false );
-            }
-        }
-        return;
-    }
-#endif
     //qDebug("NEW BASE %s", newBase.toString().latin1());
@@ -123,5 +134,6 @@ void DateNavigatorContainer::slotMonthSelected( int month )
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
-    if ( selFirst >= first && selLast <= last ) {
+    if (  selFirst >= first && selLast <= last ) {
         setBaseDates();
-        updateDayMatrixDates();
+        if ( forceEmit ) 
+            updateDayMatrixDates();
     }
@@ -129,4 +141,6 @@ void DateNavigatorContainer::slotMonthSelected( int month )
         setBaseDates();
-        updateDayMatrixDates();
-        emit monthSelected( month );
+        if ( forceEmit ) 
+            updateDayMatrixDates();
+        if ( forceEmit ) 
+            emit monthSelected( month );
     }
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 9a64720..d2f397d 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -60,3 +60,7 @@ class DateNavigatorContainer: public QWidget
     void updateToday();
-    void slotMonthSelected( int month );
+    void slotMonthSelected( int month ); 
+    void slotgoNextMonth();
+    void slotgoPrevMonth();
+    void slotgoNextYear();
+    void slotgoPrevYear();
 
@@ -79,2 +83,4 @@ class DateNavigatorContainer: public QWidget
   protected:
+    void computeMonthSelected( int month , bool forceEmit );
+    void jumpMonth( int month );
     void resizeEvent( QResizeEvent * );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index d62402f..6438c9a 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -121,3 +121,3 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   mFontChanged = false;
-  resize ( mySizeHint );
+  resize ( 0,0 );
 }
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 82d1eab..b30ad75 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -507,3 +507,3 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         if ( rw <= 1  ) {
-            qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
+            //qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
             return;
@@ -514,3 +514,3 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         if ( rw <= 1 ) {
-            qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
+            //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
             return;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 40e8a99..74037e6 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -592,11 +592,3 @@ void KOPrefsDialog::setupViewsTab()
 
-  if ( QApplication::desktop()->width() > 640 ) {
-      
-      KPrefsDialogWidBool *enableToolTips =
-          addWidBool(i18n("Enable tooltips displaying summary of ev."),
-                     &(KOPrefs::instance()->mEnableToolTips),topFrame);
-      topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
-  
-  }
- 
+
  
@@ -663,2 +655,10 @@ void KOPrefsDialog::setupViewsTab()
 
+
+  KPrefsDialogWidBool *enableToolTips =
+      addWidBool(i18n("Enable tooltips displaying summary of ev."),
+                 &(KOPrefs::instance()->mEnableToolTips),topFrame);
+  topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
+
+  //  *********************************************************
+
   topFrame = addPage(i18n("Agenda View"),0,0);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bd9efc8..7faf675 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1002,2 +1002,4 @@ void MainWindow::initActions()
         search_action->addTo( iconToolBar  );
+    if (p-> mShowIconWhatsThis)
+        QWhatsThis::whatsThisButton (  iconToolBar );
     if (p-> mShowIconNext)
@@ -1108,4 +1110,2 @@ void MainWindow::initActions()
         configureToolBarMenu->setItemChecked( 5, true );
-    if (p-> mShowIconWhatsThis)
-        QWhatsThis::whatsThisButton (  iconToolBar );
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );