| -rw-r--r-- | korganizer/koagendaview.cpp | 18 | ||||
| -rw-r--r-- | korganizer/koagendaview.h | 1 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 11 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 2 |
4 files changed, 27 insertions, 5 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index d4ff77a..aed9bae 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -425,7 +425,23 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : mExpandButton->setFocusPolicy(NoFocus); mAllDayAgenda = new KOAgenda(1,mAllDayFrame); mAllDayAgenda->setFocusPolicy(NoFocus); - QWidget *dummyAllDayRight = new QWidget(mAllDayFrame); + QVBox *dummyAllDayRight = new QVBox(mAllDayFrame); + + QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight); + QLabel * dummyAllDayRightL = new QLabel ( dummyAllDayRight ); + + dummyAllDayRightB->setFlat( true ); + dummyAllDayRightB->setFocusPolicy(NoFocus); + // dummyAllDayRightB->setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); + //dummyAllDayRightB->setFixedHeight( dummyAllDayRightB->sizeHint().height()/2 ); + QPopupMenu * wpo = new QPopupMenu (this); + wpo->insertItem( i18n("W#"), 0 ); + int i; + for ( i = 1; i < 54; i++ ) + wpo->insertItem( QString::number( i ),i ); + dummyAllDayRightB->setPopup( wpo ); + + connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); // Create event context menu for all day agenda mAllDayAgendaPopup = eventPopup(); diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index e9e85cc..4a058ce 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -210,6 +210,7 @@ class KOAgendaView : public KOEventView { void showDateView( int, QDate ); void newTodoSignal( QDateTime ,bool ); void toggleExpand(); + void selectWeekNum( int ); void todoMoved( Todo *, int ); void incidenceChanged(Incidence * , int ); // void cloneIncidenceSignal(Incidence *); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index f2cfb75..ab96786 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -909,8 +909,9 @@ void KOMonthView::updateConfig() mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); - if ( mShowWeekView ) + if ( mShowWeekView ) { mWeekStartsMonday = true; + } QFontMetrics fontmetric(mDayLabels[0]->font()); mWidthLongDayLabel = 0; @@ -920,11 +921,13 @@ void KOMonthView::updateConfig() } bool temp = mShowSatSunComp ; mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; - if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) - computeLayout(); + if ( ! mShowWeekView ) { + if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) + computeLayout(); + } updateDayLabels(); //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); - int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; + //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; //resizeEvent( 0 ); for (uint i = 0; i < mCells.count(); ++i) { mCells[i]->updateConfig(); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ca3de59..a74c5fe 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -407,6 +407,8 @@ void KOViewManager::showAgendaView( bool fullScreen ) mMainView, SLOT ( moveIncidence( Incidence * ) ) ); connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), mMainView, SLOT ( beamIncidence( Incidence * ) ) ); + connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), + mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); mAgendaView->readSettings(); mAgendaView->updateConfig(); } |