| -rw-r--r-- | korganizer/koprefs.cpp | 10 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 4 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 30 |
3 files changed, 44 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 1e68a44..97ab4e8 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -94,2 +94,12 @@ KOPrefs::KOPrefs() : addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); + + bool addIcons = false; +#ifdef DESKTOP_VERSION + addIcons = true; +#endif + addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons); + addItemBool("ShowIconAllday",&mShowIconAllday,addIcons); + addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons); + addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons); + addItemInt("LastLoadedLanguage",&mOldLanguage,0); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index fbce6ea..3a07348 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -189,2 +189,6 @@ class KOPrefs : public KPimPrefs bool mShowIconOnetoolbar; + bool mShowIconNavigator; + bool mShowIconAllday; + bool mShowIconFilterview; + bool mShowIconToggleFull; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8e52968..8a4c7eb 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -727,3 +727,15 @@ void MainWindow::initActions() + // *********************** + if ( KOPrefs::instance()->mVerticalScreen ) { + icon = SmallIcon( "1updownarrow" ); + } else { + icon = SmallIcon("1leftrightarrow" ); + } + configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); + QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); + FSaction->addTo( viewMenu ); + connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); + icon = loadPixmap( pathString + "navi" ); + configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); @@ -734,2 +746,3 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "filter" ); + configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 ); action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); @@ -740,2 +753,3 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "allday" ); + configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); @@ -763,2 +777,8 @@ void MainWindow::initActions() + if ( p-> mShowIconToggleFull ) + FSaction->addTo( iconToolBar ); + if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); + if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar ); + if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); + @@ -1154,2 +1174,8 @@ void MainWindow::initActions() + + if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true); + if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true); + if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true); + if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true); + if (p-> mShowIconNewEvent) @@ -2020,2 +2046,6 @@ void MainWindow::configureToolBar( int item ) p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); + p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); + p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); + p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); + p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); |