| -rw-r--r-- | korganizer/mainwindow.cpp | 67 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 4 |
2 files changed, 61 insertions, 10 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6ddced0..ae03a09 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -641,12 +641,14 @@ void MainWindow::initActions() menuBar->insertItem( i18n("Help"), helpMenu ); //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); menuBar1->setMaximumSize( menuBar1->sizeHint( )); } connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); + + mWeekBgColor = iconToolBar->backgroundColor(); mWeekPixmap.resize( pixWid , pixHei ); mWeekPixmap.fill( mWeekBgColor ); icon = mWeekPixmap; mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); if ( p-> mShowIconWeekNum ) @@ -665,12 +667,22 @@ void MainWindow::initActions() } connect( mWeekAction, SIGNAL( activated() ), this, SLOT( weekAction() ) ); connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); + if ( p->mShowIconFilterview ) { + icon = loadPixmap( pathString + "filter" ); + actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); + connect( actionFilterMenuTB, SIGNAL( activated() ), + this, SLOT( fillFilterMenuTB() ) ); + actionFilterMenuTB->addTo( iconToolBar ); + selectFilterMenuTB = new QPopupMenu( this ); + selectFilterMenuTB->setCheckable( true ); + connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); + } //#endif // ****************** QAction *action; // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); configureToolBarMenu->setCheckable( true ); @@ -775,21 +787,13 @@ void MainWindow::initActions() action->addTo( iconToolBar ); viewMenu->insertSeparator(); if ( p-> mShowIconToggleFull ) FSaction->addTo( iconToolBar ); if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); - if ( p->mShowIconFilterview ) { - icon = loadPixmap( pathString + "filter" ); - QPEMenuBar *menuBar111 = new QPEMenuBar( iconToolBar ); - menuBar111->insertItem( icon.pixmap(), selectFilterMenu); - int isi = 24; - if ( QApplication::desktop()->width() < 480 ) - isi = 18; - menuBar111->setFixedSize( QSize( isi, isi )) ; - } + //******************** if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); icon = loadPixmap( pathString + "whatsnext" ); configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); @@ -1960,13 +1964,57 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) } if ( showSelectedDates ) { ;// setCaptionToDates(); } } +void MainWindow::fillFilterMenuTB() +{ + selectFilterMenuTB->clear(); + selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 ); + selectFilterMenuTB->insertSeparator(); + selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 ); + + selectFilterMenuTB->insertSeparator(); + QPtrList<CalFilter> fili = mView->filters(); + CalFilter *curfilter = mView->filterView()->selectedFilter(); + CalFilter *filter = fili.first(); + int iii = 2; + bool checkitem = mView->filterView()->filtersEnabled(); + while(filter) { + selectFilterMenuTB->insertItem( filter->name(), iii ); + if ( filter == curfilter) + selectFilterMenuTB->setItemChecked( iii, checkitem ); + filter = fili.next(); + ++iii; + } + if ( !checkitem ) + selectFilterMenuTB->setItemChecked( 1, true ); + int x = 0; + int y = iconToolBar->height(); + int dX = 0; + int dY = 0; + if ( iconToolBar->orientation () == Qt:: Horizontal ) { + if ( iconToolBar->y() > height()/2 ) { + dY = selectFilterMenuTB->sizeHint().height()+8; + y = 0; + } + } else { + if ( iconToolBar->x() > width()/2 ) { // right side + x=0; + dX= selectFilterMenuTB->sizeHint().width()+8; + y = 0; + } else { + x= iconToolBar->width(); + y = 0; + } + } + //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); + selectFilterMenuTB->popup(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))); +} void MainWindow::fillFilterMenu() { selectFilterMenu->clear(); selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); selectFilterMenu->insertSeparator(); selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 ); @@ -2308,12 +2356,13 @@ void MainWindow::printCal() mView->print();//mCp->showDialog(); } #include "libkdepim/kdatepicker.h" #include <kdatetbl.h> + void MainWindow::weekAction() { int month; KPopupFrame* popup = new KPopupFrame(this); KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); // ----- diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 79fb305..7c16aeb 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -91,12 +91,13 @@ class MainWindow : public QMainWindow void printSel(); void printCal(); void saveCalendar(); void loadCalendar(); void exportVCalendar(); void fillFilterMenu(); + void fillFilterMenuTB(); void selectFilter( int ); void fillFilterMenuPopup(); void selectFilterPopup( int ); void exportToPhone( int ); void toggleBeamReceive(); void disableBR(bool); @@ -133,12 +134,13 @@ class MainWindow : public QMainWindow void initActions(); void setDefaultPreferences(); void keyPressEvent ( QKeyEvent * ) ; void keyReleaseEvent ( QKeyEvent * ) ; QPopupMenu *configureToolBarMenu; QPopupMenu *selectFilterMenu; + QPopupMenu *selectFilterMenuTB; QPopupMenu *configureAgendaMenu, *syncMenu; CalendarLocal *mCalendar; CalendarView *mView; QAction *mNewSubTodoAction; QAction *mWeekAction; QFont mWeekFont; @@ -153,13 +155,13 @@ class MainWindow : public QMainWindow QAction *mBeamAction; QAction *mCancelAction; QAction *mToggleNav; QAction *mToggleFilter; QAction *mToggleAllday; - + QAction *actionFilterMenuTB; void closeEvent( QCloseEvent* ce ); SimpleAlarmClient mAlarmClient; QTimer mSaveTimer; //bool mBlockSaveFlag; bool mCalendarModifiedFlag; |