fixxx

3 files changed, 46 insertions, 8 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8e9add3..d43712f 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -600,24 +600,40 @@ void KOAgendaView::resizeEvent( QResizeEvent* e )
     mUpcomingWidth = e->size().width() ;
     if ( mBlockUpdating || uc ) {
         mBlockUpdating = false;
         //mAgenda->setMinimumSize(800 , 600 );
         //qDebug("mAgenda->resize+++++++++++++++ ");
         updateConfig();
         //qDebug("KOAgendaView::Updating now possible ");
     } else 
         createDayLabels();
     //qDebug("resizeEvent end "); 
    
 }
+void KOAgendaView::slotDaylabelClicked()
+{
+    QString cap = ((QPushButton*) sender() )->caption();
+    
+    QDate firstDate = mSelectedDates.first();
+    if ( cap == "0" )
+        emit showDateView( 6, firstDate );
+    else if ( cap != "last" ) {
+        if ( mSelectedDates.count() == 1)
+            emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) );
+        else
+            emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) );
+    }
+    else
+        showDateView( 10, firstDate.addDays(1 ) );
+}
 void KOAgendaView::createDayLabels()
 {
 
     if ( mBlockUpdating || globalFlagBlockLabel == 1) {
         // qDebug(" KOAgendaView::createDayLabels() blocked ");
         return;
 
     }
     int newHight;
 
     // ### Before deleting and recreating we could check if mSelectedDates changed...
     // It would remove some flickering and gain speed (since this is called by
@@ -661,56 +677,66 @@ void KOAgendaView::createDayLabels()
         maxLen = 2;
     }
     //qDebug("Max len %d ", dayTest.length() );
 
     QFontMetrics tempF( dlf );
     newHight = tempF.height();
     mDayLabels->setFont( dlf );
     // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
     // mLayoutDayLabels->addSpacing(mTimeLabels->width());
     //mLayoutDayLabels->addSpacing( 2 );
     // QFont lFont = dlf;
     bool appendLabels = false;
-    QLabel *dayLabel;
+    QPushButton *dayLabel;
     dayLabel = mDayLabelsList.first();
     if ( !dayLabel  ) {
         appendLabels = true;
-        dayLabel = new QLabel(mDayLabels);
+        dayLabel = new QPushButton(mDayLabels);
+        dayLabel->setFlat( true );
+        connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
+        dayLabel->setFocusPolicy(NoFocus);
         mDayLabelsList.append( dayLabel );
         mLayoutDayLabels->addWidget(dayLabel);
     }
     dayLabel->setFixedWidth( mTimeLabels->width()+2  ); 
     dayLabel->setFont( dlf );
-    dayLabel->setAlignment(QLabel::AlignHCenter);
+    dayLabel->setCaption("0");
+    //dayLabel->setAlignment(QLabel::AlignHCenter);
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
     dayLabel->show();
     DateList::ConstIterator dit;
     bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
+    int counter = 0;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
+        ++counter;
         QDate date = *dit;
         // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
         if (  ! appendLabels ) {
             dayLabel = mDayLabelsList.next();
             if (  !dayLabel  )
                 appendLabels = true;
         }
         if ( appendLabels ) {
-            dayLabel = new QLabel(mDayLabels);
+            dayLabel = new QPushButton(mDayLabels);
+            dayLabel->setFlat( true );
+            connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
+            dayLabel->setFocusPolicy(NoFocus);
             mDayLabelsList.append( dayLabel );
             mLayoutDayLabels->addWidget(dayLabel);
         }
         dayLabel->setMinimumWidth( 1 );
         dayLabel->setMaximumWidth( 2048 );
         dayLabel->setFont( dlf );
         dayLabel->show();
+        dayLabel->setCaption(QString::number( counter ));
         QString str;
         int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
         QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
         switch ( maxLen ) {
         case 2:
             str = QString::number( date.day() );
             break;
 
         case 3:
             str =  dayName.left( 1 )  +QString::number( date.day());
 
             break;
@@ -737,25 +763,25 @@ void KOAgendaView::createDayLabels()
                 addString = i18n("Tomorrow");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
                 addString = i18n("Yesterday");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
                 addString = i18n("Day before yesterday");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
                 addString = i18n("Day after tomorrow");
             if ( !addString.isEmpty() ) {
                 str = addString+", " + str;
             }
         }
         dayLabel->setText(str);
-        dayLabel->setAlignment(QLabel::AlignHCenter);
+        //dayLabel->setAlignment(QLabel::AlignHCenter);
         if (date == QDate::currentDate()) {
             QFont bFont = dlf;
             bFont.setBold( true );
             dayLabel->setFont(bFont);
         }
         //dayLayout->addWidget(dayLabel);
 
 #ifndef KORG_NOPLUGINS
         CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
         CalendarDecoration *it;
         for(it = cds.first(); it; it = cds.next()) {
             QString text = it->shortText( date );
@@ -772,35 +798,39 @@ void KOAgendaView::createDayLabels()
                 //      wid->setHeight(20);
                 dayLayout->addWidget(wid);
             }
         }
 #endif
     }
     if (  ! appendLabels ) {
         dayLabel = mDayLabelsList.next();
         if (  !dayLabel  )
             appendLabels = true;
     }
     if ( appendLabels ) {
-        dayLabel = new QLabel(mDayLabels);
+        dayLabel = new QPushButton(mDayLabels);
+        dayLabel->setFlat( true );
+        connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
+        dayLabel->setFocusPolicy(NoFocus);
         mDayLabelsList.append( dayLabel );
         mLayoutDayLabels->addWidget(dayLabel);
     }
     //dayLabel->hide();//test only
 
     int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
     if ( offset < 0 ) offset = 0;
     //qDebug("mLayoutDayLabels->addSpacing %d  ", mAgenda->verticalScrollBar()->width()+offset+2  );
-    dayLabel->setText("");//QString::number ( mSelectedDates.first().month() ) );
+    dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
     dayLabel->show();
+    dayLabel->setCaption("last");
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
     //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
     if ( !appendLabels ) {
         dayLabel = mDayLabelsList.next();
         while (  dayLabel  ) {
             //qDebug("!dayLabel %d",dayLabel );
             dayLabel->hide();
             dayLabel = mDayLabelsList.next();
         }
     }
     //mDayLabelsFrame->show();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 7774fbe..fd0a7af 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -198,24 +198,25 @@ class KOAgendaView : public KOEventView {
     /** Fill agenda using the current set value for the start date */
     void fillAgenda();
 
     /** Create labels for the selected dates. */
     void createDayLabels();
 
     /**
       Set the masks on the agenda widgets indicating, which days are holidays.
     */
     void setHolidayMasks();
 
   protected slots:
+    void slotDaylabelClicked();
     /** Update event belonging to agenda item */
     void updateEventDates(KOAgendaItem *item, int mode = -1);
   //void updateMovedTodo();
 
     void updateEventIndicatorTop(int newY);
     void updateEventIndicatorBottom(int newY);
     
     /** Updates data for selected timespan */    
     void newTimeSpanSelected(int gxStart, int gyStart, int gxEnd, int gyEnd);
     /** Updates data for selected timespan for all day event*/    
     void newTimeSpanSelectedAllDay(int gxStart, int gyStart, int gxEnd, int gyEnd);
 
@@ -243,20 +244,20 @@ class KOAgendaView : public KOEventView {
     KOEventPopupMenu *mAllDayAgendaPopup;
 
     EventIndicator *mEventIndicatorTop;
     EventIndicator *mEventIndicatorBottom;
 
     QMemArray<int> mMinY;
     QMemArray<int> mMaxY;
 
     QMemArray<bool> mHolidayMask;
     
     QPixmap mExpandedPixmap;
     QPixmap mNotExpandedPixmap;
-    QPtrList<QLabel> mDayLabelsList;
+    QPtrList<QPushButton> mDayLabelsList;
     QDateTime mTimeSpanBegin;
     QDateTime mTimeSpanEnd;
     bool mTimeSpanInAllDay;
     void keyPressEvent ( QKeyEvent * e ); 
 };
 
 #endif  // KOAGENDAVIEW_H
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index db23882..30f5fb1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -102,48 +102,55 @@ void KOViewManager::readSettings(KConfig *config)
 void KOViewManager::showDateView( int view, QDate date)
 {
 
     //qDebug("date %d %s", view, date.toString().latin1());
 #if 0
     mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next Week"),4 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Two Weeks"),5 );   
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Month"),6 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #endif
     if ( view == 3 ) {
+        //mCurrentAgendaView = 1 ;
         mMainView->showDay( date );
     } else if (view == 4 ) {
+        mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
     } else if (view == 5 ) {
+        mCurrentAgendaView = 14 ;
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
         mMainView->dateNavigator()->blockSignals( true );
         showMonthView();
         mMainView->dateNavigator()->selectMonthByDate( date );
         mMainView->dateNavigator()->blockSignals( false );
         mMainView->dateNavigator()->selectDate( date );
     } else if (view == 7 ) {
         mMainView->dateNavigator()->selectDate( date );
         showJournalView();
     } else if (view == 8 ) {
         globalFlagBlockAgenda = 1;
         if ( mCurrentAgendaView != 3 )
             mCurrentAgendaView = -1;
         showAgendaView(KOPrefs::instance()->mFullViewMonth);
         globalFlagBlockAgenda = 2;
         mMainView->dateNavigator()->selectDates( date ,
                                                  KOPrefs::instance()->mNextXDays );
         mFlagShowNextxDays = true;
         mCurrentAgendaView = 3 ;
+    } if (view == 9) {
+        showWeekView();
+    } else if (view == 10) {
+        mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() );
     }
 
 #if 0
   dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
     dateNavigator()->blockSignals( false );
     mViewManager->showDayView();
 #endif
 
 }