| -rw-r--r-- | korganizer/mainwindow.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 45775c5..94bc4c1 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -207,5 +207,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : if ( KOPrefs::instance()->mShowIconFilter ) #else - if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) + if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) ) #endif @@ -235,7 +235,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); #ifdef DESKTOP_VERSION - addTest = "AAABBBCCCx"; + addTest = "AAAAAABBBCCCx"; #else - addTest = "AAx"; + addTest = "AAAAAx"; #endif filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); @@ -838,5 +838,4 @@ void MainWindow::initActions() mView, SLOT( newEvent() ) ); icon = loadPixmap( pathString + "newtodo" ); - configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); nt_action->addTo( mCurrentItemMenu ); @@ -858,4 +857,6 @@ void MainWindow::initActions() configureToolBarMenu->insertItem(i18n("Week Number"), 400); configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); + icon = loadPixmap( pathString + "newtodo" ); + configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); @@ -1049,4 +1050,5 @@ void MainWindow::initActions() + icon = loadPixmap( pathString + "search" ); configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); @@ -2326,5 +2328,8 @@ void MainWindow::updateFilterToolbar() CalFilter *curfilter = mView->filterView()->selectedFilter(); if ( curfilter ) { - filterMenubar->changeItem( 0, curfilter->name() ); + QString name = curfilter->name(); + if ( name.length() > 12 ) + name = name.left(10)+"..."; + filterMenubar->changeItem( 0, name ); } } @@ -2663,4 +2668,5 @@ void MainWindow::resizeEvent( QResizeEvent* e) { #ifndef DESKTOP_VERSION + if ( filterToolBar ) { if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) { if (QApplication::desktop()->width() > QApplication::desktop()->height() ) @@ -2669,4 +2675,5 @@ void MainWindow::resizeEvent( QResizeEvent* e) filterToolBar->show(); } + } #endif QMainWindow::resizeEvent( e); |