| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 6 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/navigatorbar.cpp | 34 | ||||
| -rw-r--r-- | korganizer/navigatorbar.h | 2 |
5 files changed, 41 insertions, 10 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index be78057..e0380fa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -359,4 +359,6 @@ void CalendarView::init() connect( mNavigatorBar, SIGNAL( goNextMonth() ), mNavigator, SLOT( selectNextMonth() ) ); + connect( mNavigatorBar, SIGNAL( selectWeek( int ) ), + mNavigator, SLOT( selectWeek( int ) ) ); connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index aed9bae..c018dc7 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -438,6 +438,10 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : wpo->insertItem( i18n("W#"), 0 ); int i; - for ( i = 1; i < 54; i++ ) + for ( i = 1; i < 53; i++ ) wpo->insertItem( QString::number( i ),i ); + //Qt bug - we must add some empty fields... + for ( i = 53; i < 54; ++i ) { + wpo->insertItem( "", 52 ); + } dummyAllDayRightB->setPopup( wpo ); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ab96786..9c1e4c3 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -810,9 +810,4 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number")); int row, col; - QPopupMenu * wpo = new QPopupMenu (this); - wpo->insertItem( i18n("W#"), 0 ); - for ( i = 1; i < 54; i++ ) - wpo->insertItem( i18n("%1").arg(i), i ); - mWeekLabels[mNumWeeks]->setPopup( wpo ); mCells.resize( mNumCells ); for( row = 0; row < mNumWeeks; ++row ) { @@ -831,8 +826,8 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); mContextMenu = eventPopup(); // updateConfig(); //useless here + mWeekLabels[mNumWeeks]->setText( i18n("W")); emit incidenceSelected( 0 ); } diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index f339c67..2406bb5 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -29,4 +29,5 @@ #include <qframe.h> #include <qlabel.h> +#include <qpopupmenu.h> #include <qapplication.h> @@ -72,5 +73,6 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam bool isDesktop = true; #endif - if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 ) + bool insertWeek = (QString ( name ) == QString("useBigPixmaps")) ; + if ( insertWeek && QApplication::desktop()->width() > 320 ) isDesktop = true; // Create backward navigation buttons @@ -88,4 +90,11 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam QToolTip::add( mNextMonth, i18n("Next Month") ); + QPushButton * selWeek = 0; + if ( insertWeek ) { + selWeek = new QPushButton( mCtrlFrame ); + QToolTip::add( selWeek, i18n("Select Week") ); + selWeek->setFocusPolicy(NoFocus); + } + mNextYear = new QPushButton( mCtrlFrame ); mNextYear->setPixmap( SmallIcon( isDesktop ? "2rightarrowB": "2rightarrow") ); @@ -103,5 +112,7 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam mSelectMonth->setFlat( true); mPrevYear->setFlat( true); - mPrevMonth->setFlat( true); + mPrevMonth->setFlat( true); + if ( insertWeek ) + selWeek->setFlat( true); } mSelectMonth->setFont( tfont ); @@ -124,4 +135,20 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam maxwidth+= 6; } + + if ( insertWeek ) { + //shit : bug in Qt. after inserting 53 item, only 51 are shown... + QPopupMenu * wpo = new QPopupMenu (this); + wpo->insertItem( i18n("W#"), 0 ); + for ( i = 1; i < 53; ++i ) { + wpo->insertItem( QString::number(i), i ); + } + for ( i = 53; i < 54; ++i ) { + wpo->insertItem( "", 52 ); + } + selWeek->setPopup( wpo ); + selWeek->setFixedWidth( (size/4)*3 ); + selWeek->setFixedHeight( size ); + connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); + } mSelectMonth->setFixedWidth( maxwidth ); mSelectMonth->setFixedHeight( size ); @@ -142,4 +169,6 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam ctrlLayout->addWidget( mNextMonth, 3 ); ctrlLayout->addWidget( mNextYear, 3 ); + if ( insertWeek ) + ctrlLayout->addWidget( selWeek ); connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); @@ -153,4 +182,5 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam mNextYear->setFocusPolicy(NoFocus); mSelectMonth->setFocusPolicy(NoFocus); + } diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index 9c5c0cf..ee4c06d 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h @@ -50,5 +50,5 @@ class NavigatorBar: public QWidget void goPrevYear(); void monthSelected( int ); - + void selectWeek( int ); private: |