author | zautrix <zautrix> | 2005-03-28 11:59:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-28 11:59:41 (UTC) |
commit | 314908d5d9139af7711c6e425260363bb014afce (patch) (side-by-side diff) | |
tree | 8b4a72042d6f2e158c64b6b1cbfb7ef002d2fd61 /korganizer | |
parent | 9ff0641f33e63cc88e96d0066dba43b4699ca489 (diff) | |
download | kdepimpi-314908d5d9139af7711c6e425260363bb014afce.zip kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.gz kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.bz2 |
toolbar fix
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 70 |
3 files changed, 42 insertions, 30 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 2168094..1e68a44 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -88,12 +88,13 @@ KOPrefs::KOPrefs() : addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); addItemBool("ShowIconNextDays",&mShowIconNextDays,true); addItemBool("ShowIconNext",&mShowIconNext,true); addItemBool("ShowIconJournal",&mShowIconJournal,true); addItemBool("ShowIconStretch",&mShowIconStretch,true); addItemBool("ShowIconFilter",&mShowIconFilter,false); + addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); addItemInt("LastLoadedLanguage",&mOldLanguage,0); addItemBool("AskForQuit",&mAskForQuit,false); #ifndef DESKTOP_VERSION addItemBool("ShowFullMenu",&mShowFullMenu,false); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 8dfdf69..fbce6ea 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -183,12 +183,13 @@ class KOPrefs : public KPimPrefs bool mShowIconWhatsThis; bool mShowIconWeekNum; bool mShowIconNextDays; bool mShowIconNext; bool mShowIconJournal; bool mShowIconFilter; + bool mShowIconOnetoolbar; bool mShowIconStretch; bool mToolBarHor; bool mToolBarUp; bool mToolBarHorV; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c6ae868..a4e0834 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -191,42 +191,45 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); } else { filterToolBar = 0; filterMenubar = 0; filterPopupMenu = 0; } - - if ( p->mToolBarHorV ) { - if ( p->mToolBarUpV ) - tbd = Bottom; - else - tbd = Top; - } - else { - if ( p->mToolBarUpV ) - tbd = Right; - else - tbd = Left; - } - viewToolBar = new QPEToolBar( this ); - addToolBar (viewToolBar , tbd ); - if ( p->mToolBarHorN ) { - if ( p->mToolBarUpN ) - tbd = Bottom; - else - tbd = Top; - } - else { - if ( p->mToolBarUpN ) - tbd = Right; - else - tbd = Left; + if ( p->mShowIconOnetoolbar ) { + viewToolBar = iconToolBar ; + navigatorToolBar = iconToolBar ; + } else { + if ( p->mToolBarHorV ) { + if ( p->mToolBarUpV ) + tbd = Bottom; + else + tbd = Top; + } + else { + if ( p->mToolBarUpV ) + tbd = Right; + else + tbd = Left; + } + viewToolBar = new QPEToolBar( this ); + addToolBar (viewToolBar , tbd ); + if ( p->mToolBarHorN ) { + if ( p->mToolBarUpN ) + tbd = Bottom; + else + tbd = Top; + } + else { + if ( p->mToolBarUpN ) + tbd = Right; + else + tbd = Left; + } + navigatorToolBar = new QPEToolBar( this ); + addToolBar (navigatorToolBar , tbd ); } - navigatorToolBar = new QPEToolBar( this ); - addToolBar (navigatorToolBar , tbd ); - mCalendarModifiedFlag = false; QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); splash->setAlignment ( AlignCenter ); @@ -690,12 +693,13 @@ void MainWindow::initActions() connect( action, SIGNAL( activated() ), mView, SLOT( undo_delete() ) ); actionMenu->insertSeparator(); icon = loadPixmap( pathString + "newevent" ); configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); + configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); configureToolBarMenu->insertSeparator(); configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); configureToolBarMenu->insertSeparator(); configureToolBarMenu->insertItem(i18n("Week Number"), 400); configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); @@ -1190,12 +1194,14 @@ void MainWindow::initActions() viewToolBar->setVerticalStretchable (true ); navigatorToolBar->setVerticalStretchable (true ); configureToolBarMenu->setItemChecked( 5, true ); } if (p-> mShowIconFilter) configureToolBarMenu->setItemChecked( 7, true ); + if (p-> mShowIconOnetoolbar) + configureToolBarMenu->setItemChecked( 6, true ); if ( filterMenubar ) connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); configureAgenda( p->mHourSize ); @@ -1951,14 +1957,17 @@ void MainWindow::selectFilter( int fil ) if ( fil == 0 ) { mView->editFilters( ); } else if ( fil == 1 ){ if ( mView->filterView()->filtersEnabled() ) mView->toggleFilerEnabled( ); } else { - if ( !mView->filterView()->filtersEnabled() ) + if ( !mView->filterView()->filtersEnabled() ) { + mView->filterView()->blockSignals( true ); mView->toggleFilerEnabled( ); + mView->filterView()->blockSignals( false ); + } mView->selectFilter( fil-2 ); } } void MainWindow::updateFilterToolbar() { if ( filterMenubar ) { @@ -1980,12 +1989,13 @@ void MainWindow::selectFilterPopup( int fil ) void MainWindow::configureToolBar( int item ) { configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); KOPrefs *p = KOPrefs::instance(); p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); + p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); |