summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/allday.pngbin279 -> 657 bytes
-rw-r--r--bin/kdepim/korganizer/navi.pngbin518 -> 667 bytes
-rw-r--r--korganizer/koprefs.cpp10
-rw-r--r--korganizer/koprefs.h4
-rw-r--r--korganizer/mainwindow.cpp30
5 files changed, 44 insertions, 0 deletions
diff --git a/bin/kdepim/korganizer/allday.png b/bin/kdepim/korganizer/allday.png
index 735eae2..41cefd5 100644
--- a/bin/kdepim/korganizer/allday.png
+++ b/bin/kdepim/korganizer/allday.png
Binary files differ
diff --git a/bin/kdepim/korganizer/navi.png b/bin/kdepim/korganizer/navi.png
index 9cb0fab..93c6aaa 100644
--- a/bin/kdepim/korganizer/navi.png
+++ b/bin/kdepim/korganizer/navi.png
Binary files differ
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 1e68a44..97ab4e8 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -89,12 +89,22 @@ KOPrefs::KOPrefs() :
addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
addItemBool("ShowIconNext",&mShowIconNext,true);
addItemBool("ShowIconJournal",&mShowIconJournal,true);
addItemBool("ShowIconStretch",&mShowIconStretch,true);
addItemBool("ShowIconFilter",&mShowIconFilter,false);
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);
addItemBool("AskForQuit",&mAskForQuit,false);
#ifndef DESKTOP_VERSION
addItemBool("ShowFullMenu",&mShowFullMenu,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index fbce6ea..3a07348 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -184,12 +184,16 @@ class KOPrefs : public KPimPrefs
bool mShowIconWeekNum;
bool mShowIconNextDays;
bool mShowIconNext;
bool mShowIconJournal;
bool mShowIconFilter;
bool mShowIconOnetoolbar;
+ bool mShowIconNavigator;
+ bool mShowIconAllday;
+ bool mShowIconFilterview;
+ bool mShowIconToggleFull;
bool mShowIconStretch;
bool mToolBarHor;
bool mToolBarUp;
bool mToolBarHorV;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e52968..8a4c7eb 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -722,25 +722,39 @@ void MainWindow::initActions()
QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
today_action->addTo( viewMenu );
connect( today_action, SIGNAL( activated() ),
mView, SLOT( goToday() ) );
viewMenu->insertSeparator();
+ // ***********************
+ 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 );
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleDateNavigatorWidget() ) );
mToggleNav = action ;
icon = loadPixmap( pathString + "filter" );
+ configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 );
action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleFilter() ) );
mToggleFilter = action;
icon = loadPixmap( pathString + "allday" );
+ configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleAllDaySize() ) );
mToggleAllday = action;
@@ -758,12 +772,18 @@ void MainWindow::initActions()
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( showDatePicker() ) );
action->addTo( iconToolBar );
viewMenu->insertSeparator();
+ if ( p-> mShowIconToggleFull )
+ FSaction->addTo( iconToolBar );
+ if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
+ if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar );
+ if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
+
icon = loadPixmap( pathString + "whatsnext" );
configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
whatsnext_action->addTo( viewMenu );
connect( whatsnext_action, SIGNAL( activated() ),
@@ -1149,12 +1169,18 @@ void MainWindow::initActions()
action->addTo( navigatorToolBar );
}
configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
+
+ 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)
configureToolBarMenu->setItemChecked( 10, true );
if (p->mShowIconNewTodo )
configureToolBarMenu->setItemChecked( 20, true );
if (p-> mShowIconSearch)
configureToolBarMenu->setItemChecked( 120, true );
@@ -2015,12 +2041,16 @@ void MainWindow::configureToolBar( int 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->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
+ p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
+ p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
+ p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );