summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/mainwindow.cpp70
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() :
88 addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); 88 addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
89 addItemBool("ShowIconNextDays",&mShowIconNextDays,true); 89 addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
90 addItemBool("ShowIconNext",&mShowIconNext,true); 90 addItemBool("ShowIconNext",&mShowIconNext,true);
91 addItemBool("ShowIconJournal",&mShowIconJournal,true); 91 addItemBool("ShowIconJournal",&mShowIconJournal,true);
92 addItemBool("ShowIconStretch",&mShowIconStretch,true); 92 addItemBool("ShowIconStretch",&mShowIconStretch,true);
93 addItemBool("ShowIconFilter",&mShowIconFilter,false); 93 addItemBool("ShowIconFilter",&mShowIconFilter,false);
94 addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true);
94 addItemInt("LastLoadedLanguage",&mOldLanguage,0); 95 addItemInt("LastLoadedLanguage",&mOldLanguage,0);
95 96
96 addItemBool("AskForQuit",&mAskForQuit,false); 97 addItemBool("AskForQuit",&mAskForQuit,false);
97 98
98#ifndef DESKTOP_VERSION 99#ifndef DESKTOP_VERSION
99 addItemBool("ShowFullMenu",&mShowFullMenu,false); 100 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
183 bool mShowIconWhatsThis; 183 bool mShowIconWhatsThis;
184 bool mShowIconWeekNum; 184 bool mShowIconWeekNum;
185 bool mShowIconNextDays; 185 bool mShowIconNextDays;
186 bool mShowIconNext; 186 bool mShowIconNext;
187 bool mShowIconJournal; 187 bool mShowIconJournal;
188 bool mShowIconFilter; 188 bool mShowIconFilter;
189 bool mShowIconOnetoolbar;
189 190
190 bool mShowIconStretch; 191 bool mShowIconStretch;
191 192
192 bool mToolBarHor; 193 bool mToolBarHor;
193 bool mToolBarUp; 194 bool mToolBarUp;
194 bool mToolBarHorV; 195 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) :
191 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); 191 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
192 } else { 192 } else {
193 filterToolBar = 0; 193 filterToolBar = 0;
194 filterMenubar = 0; 194 filterMenubar = 0;
195 filterPopupMenu = 0; 195 filterPopupMenu = 0;
196 } 196 }
197 197 if ( p->mShowIconOnetoolbar ) {
198 if ( p->mToolBarHorV ) { 198 viewToolBar = iconToolBar ;
199 if ( p->mToolBarUpV ) 199 navigatorToolBar = iconToolBar ;
200 tbd = Bottom; 200 } else {
201 else 201 if ( p->mToolBarHorV ) {
202 tbd = Top; 202 if ( p->mToolBarUpV )
203 } 203 tbd = Bottom;
204 else { 204 else
205 if ( p->mToolBarUpV ) 205 tbd = Top;
206 tbd = Right; 206 }
207 else 207 else {
208 tbd = Left; 208 if ( p->mToolBarUpV )
209 } 209 tbd = Right;
210 viewToolBar = new QPEToolBar( this ); 210 else
211 addToolBar (viewToolBar , tbd ); 211 tbd = Left;
212 if ( p->mToolBarHorN ) { 212 }
213 if ( p->mToolBarUpN ) 213 viewToolBar = new QPEToolBar( this );
214 tbd = Bottom; 214 addToolBar (viewToolBar , tbd );
215 else 215 if ( p->mToolBarHorN ) {
216 tbd = Top; 216 if ( p->mToolBarUpN )
217 } 217 tbd = Bottom;
218 else { 218 else
219 if ( p->mToolBarUpN ) 219 tbd = Top;
220 tbd = Right; 220 }
221 else 221 else {
222 tbd = Left; 222 if ( p->mToolBarUpN )
223 tbd = Right;
224 else
225 tbd = Left;
226 }
227 navigatorToolBar = new QPEToolBar( this );
228 addToolBar (navigatorToolBar , tbd );
223 } 229 }
224 navigatorToolBar = new QPEToolBar( this );
225 addToolBar (navigatorToolBar , tbd );
226
227 230
228 231
229 232
230 mCalendarModifiedFlag = false; 233 mCalendarModifiedFlag = false;
231 QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); 234 QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
232 splash->setAlignment ( AlignCenter ); 235 splash->setAlignment ( AlignCenter );
@@ -690,12 +693,13 @@ void MainWindow::initActions()
690 connect( action, SIGNAL( activated() ), 693 connect( action, SIGNAL( activated() ),
691 mView, SLOT( undo_delete() ) ); 694 mView, SLOT( undo_delete() ) );
692 actionMenu->insertSeparator(); 695 actionMenu->insertSeparator();
693 696
694 icon = loadPixmap( pathString + "newevent" ); 697 icon = loadPixmap( pathString + "newevent" );
695 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 698 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
699 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
696 configureToolBarMenu->insertSeparator(); 700 configureToolBarMenu->insertSeparator();
697 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 701 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
698 configureToolBarMenu->insertSeparator(); 702 configureToolBarMenu->insertSeparator();
699 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 703 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
700 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 704 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
701 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 705 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
@@ -1190,12 +1194,14 @@ void MainWindow::initActions()
1190 viewToolBar->setVerticalStretchable (true ); 1194 viewToolBar->setVerticalStretchable (true );
1191 navigatorToolBar->setVerticalStretchable (true ); 1195 navigatorToolBar->setVerticalStretchable (true );
1192 configureToolBarMenu->setItemChecked( 5, true ); 1196 configureToolBarMenu->setItemChecked( 5, true );
1193 } 1197 }
1194 if (p-> mShowIconFilter) 1198 if (p-> mShowIconFilter)
1195 configureToolBarMenu->setItemChecked( 7, true ); 1199 configureToolBarMenu->setItemChecked( 7, true );
1200 if (p-> mShowIconOnetoolbar)
1201 configureToolBarMenu->setItemChecked( 6, true );
1196 1202
1197 1203
1198 if ( filterMenubar ) 1204 if ( filterMenubar )
1199 connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); 1205 connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
1200 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); 1206 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) );
1201 configureAgenda( p->mHourSize ); 1207 configureAgenda( p->mHourSize );
@@ -1951,14 +1957,17 @@ void MainWindow::selectFilter( int fil )
1951 if ( fil == 0 ) { 1957 if ( fil == 0 ) {
1952 mView->editFilters( ); 1958 mView->editFilters( );
1953 } else if ( fil == 1 ){ 1959 } else if ( fil == 1 ){
1954 if ( mView->filterView()->filtersEnabled() ) 1960 if ( mView->filterView()->filtersEnabled() )
1955 mView->toggleFilerEnabled( ); 1961 mView->toggleFilerEnabled( );
1956 } else { 1962 } else {
1957 if ( !mView->filterView()->filtersEnabled() ) 1963 if ( !mView->filterView()->filtersEnabled() ) {
1964 mView->filterView()->blockSignals( true );
1958 mView->toggleFilerEnabled( ); 1965 mView->toggleFilerEnabled( );
1966 mView->filterView()->blockSignals( false );
1967 }
1959 mView->selectFilter( fil-2 ); 1968 mView->selectFilter( fil-2 );
1960 } 1969 }
1961} 1970}
1962void MainWindow::updateFilterToolbar() 1971void MainWindow::updateFilterToolbar()
1963{ 1972{
1964 if ( filterMenubar ) { 1973 if ( filterMenubar ) {
@@ -1980,12 +1989,13 @@ void MainWindow::selectFilterPopup( int fil )
1980void MainWindow::configureToolBar( int item ) 1989void MainWindow::configureToolBar( int item )
1981{ 1990{
1982 1991
1983 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 1992 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
1984 KOPrefs *p = KOPrefs::instance(); 1993 KOPrefs *p = KOPrefs::instance();
1985 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 1994 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
1995 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
1986 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); 1996 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
1987 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 1997 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
1988 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 1998 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
1989 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 1999 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
1990 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2000 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
1991 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2001 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );