author | zautrix <zautrix> | 2005-02-06 01:23:43 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-06 01:23:43 (UTC) |
commit | 118f5aab05c9ace5612d5c4fd69e7c5a59bed67b (patch) (side-by-side diff) | |
tree | e097f3fecb6e2ae692b91ac29e58e6d5a51154c8 /korganizer | |
parent | 659f07aa44f44aebb74c83e7319021cfeb87f275 (diff) | |
download | kdepimpi-118f5aab05c9ace5612d5c4fd69e7c5a59bed67b.zip kdepimpi-118f5aab05c9ace5612d5c4fd69e7c5a59bed67b.tar.gz kdepimpi-118f5aab05c9ace5612d5c4fd69e7c5a59bed67b.tar.bz2 |
better week choose
-rw-r--r-- | korganizer/koagendaview.cpp | 72 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 62 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 7 | ||||
-rw-r--r-- | korganizer/navigatorbar.cpp | 39 |
5 files changed, 71 insertions, 110 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 36c66ea..0d36946 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -424,38 +424,9 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); mExpandButton->setFocusPolicy(NoFocus); mAllDayAgenda = new KOAgenda(1,mAllDayFrame); mAllDayAgenda->setFocusPolicy(NoFocus); - QVBox *dummyAllDayRight = new QVBox(mAllDayFrame); - - mDummyAllDayRightL = new QLabel ( dummyAllDayRight ); - QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight); - new QLabel ( dummyAllDayRight ); - mDummyAllDayRightL->setSizePolicy( QSizePolicy( QSizePolicy::Minimum,QSizePolicy::Fixed ) ); - dummyAllDayRightB->setFlat( true ); - dummyAllDayRightB->setFocusPolicy(NoFocus); - dummyAllDayRightB->setFixedHeight( (dummyAllDayRightB->sizeHint().height()/4)*3 ); - - QPopupMenu * wpo = new QPopupMenu (this); - QPopupMenu * all = new QPopupMenu (this); - //wpo->insertItem( i18n("W#"), 0 ); - int first = 1; - int i; - for ( i = 1; i < 50; ++i ) { - if ( !(i%10) ) { - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); - first = i; - wpo = new QPopupMenu (this); - } - wpo->insertItem( QString::number(i), i ); - } - for ( i = 50; i < 53; ++i ) { - wpo->insertItem( QString::number(i), i); - } - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - dummyAllDayRightB->setPopup( all ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); + QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); // Create event context menu for all day agenda mAllDayAgendaPopup = eventPopup(); connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), @@ -586,22 +557,9 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : SLOT( addToCalSlot(Incidence * , Incidence *) ) ); // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); - QFont dlf = KOPrefs::instance()->mTimeLabelsFont; - QFontMetrics fm ( dlf ); - QString dayTest = "30"; - int wid = fm.width( dayTest ); - int maxWid = dummyAllDayRight->width()-2; - int fontPoint = dlf.pointSize(); - while ( wid > maxWid ) { - --fontPoint; - dlf.setPointSize( fontPoint ); - QFontMetrics f( dlf ); - wid = f.width( dayTest ); - } - mDummyAllDayRightL->setFont( dlf ); - mDummyAllDayRightL->setAlignment( AlignHCenter ); + } void KOAgendaView::toggleAllDay() { @@ -1107,34 +1065,8 @@ void KOAgendaView::fillAgenda() // clearView(); //qDebug("fillAgenda()++++ "); globalFlagBlockAgendaItemPaint = 1; - int weekNum = 0; - QDate seda = mSelectedDates.first(); - QDate d = QDate ( seda.year(), 1,1); - seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday - if ( seda.addDays(6).year() != seda.year() ) { - if ( seda.year() != d.year() ) { - if ( d.dayOfWeek() > 4 ) - d = QDate ( seda.year(), 1,1); - else - weekNum = 1; - } else { - QDate dd( seda.year()+1, 1,1); - if ( dd.dayOfWeek() <= 4 ) - weekNum = 1; - } - } - if ( weekNum == 0 ){ - int dow = d.dayOfWeek(); - if ( dow <= 4 ) - d = d.addDays( 1-dow ); - else // 5,6,7 - d = d.addDays( 8-dow ); - // we have the first week of the year.we are on monday - weekNum = d.daysTo( seda ) / 7 +1; - } - mDummyAllDayRightL->setText( QString::number( weekNum) ); mAllDayAgenda->changeColumns(mSelectedDates.count()); mAgenda->changeColumns(mSelectedDates.count()); qApp->processEvents(); mEventIndicatorTop->changeColumns(mSelectedDates.count()); diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index ba9bc93..4a058ce 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -215,9 +215,8 @@ class KOAgendaView : public KOEventView { void incidenceChanged(Incidence * , int ); // void cloneIncidenceSignal(Incidence *); protected: - QLabel * mDummyAllDayRightL; KOAgendaButton* getNewDaylabel(); bool mBlockUpdating; int mUpcomingWidth; /** Fill agenda beginning with date startDate */ diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9e32c18..1c74307 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -283,9 +283,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : #endif #ifndef DESKTOP_VERSION infrared = 0; #endif - + updateWeek( mView->startDate() ); + connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), + SLOT( updateWeekNum( const KCal::DateList & ) ) ); mBRdisabled = false; //toggleBeamReceive(); } MainWindow::~MainWindow() @@ -553,8 +555,32 @@ void MainWindow::initActions() } connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); + menuBarWeek = new QPEMenuBar( iconToolBar ); + QPopupMenu * wpo = new QPopupMenu (this); + QPopupMenu * all = new QPopupMenu (this); + //wpo->insertItem( i18n("W#"), 0 ); + int first = 1; + int i; + for ( i = 1; i < 50; ++i ) { + if ( !(i%10) ) { + all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); + connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); + first = i; + wpo = new QPopupMenu (this); + } + wpo->insertItem( QString::number(i), i ); + } + for ( i = 50; i < 53; ++i ) { + wpo->insertItem( QString::number(i), i); + } + all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); + connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); + menuBarWeek->insertItem( "00",all,1); + menuBarWeek->setMaximumSize( menuBarWeek->sizeHint( )); + + connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); // ****************** QAction *action; QIconSet icon; // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); @@ -1315,11 +1341,45 @@ QString MainWindow::syncFileName() #else return QString( "/tmp/synccalendar.ics" ); #endif } +void MainWindow::updateWeek(QDate seda) +{ + int weekNum = 0; + QDate d = QDate ( seda.year(), 1,1); + seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday + if ( seda.addDays(6).year() != seda.year() ) { + if ( seda.year() != d.year() ) { + if ( d.dayOfWeek() > 4 ) + d = QDate ( seda.year(), 1,1); + else + weekNum = 1; + } else { + QDate dd( seda.year()+1, 1,1); + if ( dd.dayOfWeek() <= 4 ) + weekNum = 1; + } + } + if ( weekNum == 0 ){ + int dow = d.dayOfWeek(); + if ( dow <= 4 ) + d = d.addDays( 1-dow ); + else // 5,6,7 + d = d.addDays( 8-dow ); + // we have the first week of the year.we are on monday + weekNum = d.daysTo( seda ) / 7 +1; + } + //qDebug("weeknum %s ", QString::number( weekNum).latin1()); + menuBarWeek-> changeItem(1, QString::number( weekNum) ); +} +void MainWindow::updateWeekNum(const DateList &selectedDates) +{ + updateWeek( selectedDates.first() ); +} void MainWindow::processIncidenceSelection( Incidence *incidence ) { + if ( !incidence ) { enableIncidenceActions( false ); mNewSubTodoAction->setEnabled( false ); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 8dd55ac..076ab94 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -22,8 +22,9 @@ class KSyncProfile; #define QPEToolBar QToolBar #define QPEMenuBar QMenuBar #endif class QPEToolBar; +class QPEMenuBar; namespace KCal { class CalendarLocal; @@ -41,8 +42,10 @@ class MainWindow : public QMainWindow static QString defaultFileName(); static QString syncFileName(); static QString resourcePath(); public slots: + void updateWeekNum(const KCal::DateList &); + void updateWeek(QDate); virtual void showMaximized (); void configureAgenda( int ); void recieve( const QCString& msg, const QByteArray& data ); protected slots: @@ -83,9 +86,10 @@ class MainWindow : public QMainWindow void selectFilter( int ); void exportToPhone( int ); void toggleBeamReceive(); void disableBR(bool); - + signals: + void selectWeek ( int ); private slots: void showConfigureAgenda(); void getFile( bool ); void syncFileRequest(); @@ -115,8 +119,9 @@ class MainWindow : public QMainWindow QPopupMenu *configureAgendaMenu, *syncMenu; CalendarLocal *mCalendar; CalendarView *mView; QAction *mNewSubTodoAction; + QPEMenuBar *menuBarWeek; QAction *mShowAction; QAction *mEditAction; QAction *mDeleteAction; diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 24de01f..657f98d 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -71,10 +71,9 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam bool isDesktop = false; #else bool isDesktop = true; #endif - bool insertWeek = (QString ( name ) == QString("useBigPixmaps")) ; - if ( insertWeek && QApplication::desktop()->width() > 320 ) + if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 ) isDesktop = true; // Create backward navigation buttons mPrevYear = new QPushButton( mCtrlFrame ); mPrevYear->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow" ) ); @@ -88,15 +87,8 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam mNextMonth = new QPushButton( mCtrlFrame ); mNextMonth->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") ); 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") ); QToolTip::add( mNextYear, i18n("Next Year") ); mSelectMonth = new QPushButton( mCtrlFrame ); @@ -110,11 +102,9 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam mNextMonth->setFlat( true); mNextYear->setFlat( true); mSelectMonth->setFlat( true); mPrevYear->setFlat( true); - mPrevMonth->setFlat( true); - if ( insertWeek ) - selWeek->setFlat( true); + mPrevMonth->setFlat( true); } mSelectMonth->setFont( tfont ); // Set minimum width to width of widest month name label int i; @@ -134,31 +124,8 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam size += 6; maxwidth+= 6; } - if ( insertWeek ) { - QPopupMenu * wpo = new QPopupMenu (this); - QPopupMenu * all = new QPopupMenu (this); - //wpo->insertItem( i18n("W#"), 0 ); - int first = 1; - for ( i = 1; i < 50; ++i ) { - if ( !(i%10) ) { - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); - first = i; - wpo = new QPopupMenu (this); - } - wpo->insertItem( QString::number(i), i ); - } - for ( i = 50; i < 53; ++i ) { - wpo->insertItem( QString::number(i), i); - } - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - selWeek->setPopup( all ); - selWeek->setFixedWidth( (size/5)*4 ); - selWeek->setFixedHeight( size ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); - } mSelectMonth->setFixedWidth( maxwidth ); mSelectMonth->setFixedHeight( size ); mPrevYear->setFixedHeight( size ); mPrevMonth->setFixedHeight( size ); @@ -175,10 +142,8 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam // ctrlLayout->addSpacing( 1 ); // ctrlLayout->addStretch( 1 ); ctrlLayout->addWidget( mNextMonth, 3 ); ctrlLayout->addWidget( mNextYear, 3 ); - if ( insertWeek ) - ctrlLayout->addWidget( selWeek ); connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) ); connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) ); |