| -rw-r--r-- | korganizer/mainwindow.cpp | 67 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 4 | ||||
| -rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 13 |
3 files changed, 71 insertions, 13 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6ddced0..ae03a09 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -646,2 +646,4 @@ void MainWindow::initActions() connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); + + mWeekBgColor = iconToolBar->backgroundColor(); @@ -670,2 +672,12 @@ void MainWindow::initActions() 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 ) ) ); + } @@ -780,11 +792,3 @@ void MainWindow::initActions() 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 )) ; - } + //******************** @@ -1965,3 +1969,47 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) } +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() @@ -2313,2 +2361,3 @@ void MainWindow::printCal() #include <kdatetbl.h> + void MainWindow::weekAction() diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 79fb305..7c16aeb 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -96,2 +96,3 @@ class MainWindow : public QMainWindow void fillFilterMenu(); + void fillFilterMenuTB(); void selectFilter( int ); @@ -138,2 +139,3 @@ class MainWindow : public QMainWindow QPopupMenu *selectFilterMenu; + QPopupMenu *selectFilterMenuTB; QPopupMenu *configureAgendaMenu, *syncMenu; @@ -158,3 +160,3 @@ class MainWindow : public QMainWindow QAction *mToggleAllday; - + QAction *actionFilterMenuTB; diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index bbed38d..5cd845e 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp @@ -145,6 +145,13 @@ void KDEPIMConfigWidget::saveStoreSettings() if ( !mStoreUrl->url().isEmpty() ) { - KConfig cfg ( QDir::homeDirPath() + "/.microkdehome" ); + QString path = QDir::homeDirPath(); + QString url = mStoreUrl->url(); +#ifdef DESKTOP_VERSION + if ( url.startsWith( "LOCAL:" ) ) { + path = qApp->applicationDirPath () ; + } +#endif + KConfig cfg ( path + "/.microkdehome" ); cfg.setGroup("Global"); - cfg.writeEntry( "MICROKDEHOME", mStoreUrl->url() ); - qDebug("cfg.writeEntry( MICROKDEHOME, mStoreUrl->url() ); "); + cfg.writeEntry( "MICROKDEHOME", url ); + qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1()); cfg.sync(); |