summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-06 16:21:57 (UTC)
committer zautrix <zautrix>2005-02-06 16:21:57 (UTC)
commit5fd7b1cc63dc52c15e0666e023cea60700e9fdcf (patch) (unidiff)
treeb0bf4d7d3054679970e2ff672e50149d1089bcb1
parent38898c49275bf27fb8c2df96d145f2a5abb62331 (diff)
downloadkdepimpi-5fd7b1cc63dc52c15e0666e023cea60700e9fdcf.zip
kdepimpi-5fd7b1cc63dc52c15e0666e023cea60700e9fdcf.tar.gz
kdepimpi-5fd7b1cc63dc52c15e0666e023cea60700e9fdcf.tar.bz2
fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koprefs.cpp33
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/mainwindow.cpp8
3 files changed, 29 insertions, 14 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 9366c11..8f37793 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -336,6 +336,14 @@ void KOPrefs::setTimeZoneIdDefault()
336 ; 336 ;
337} 337}
338 338
339void KOPrefs::setAllDefaults()
340{
341 setCategoryDefaults();
342 mEventSummaryUser = getDefaultList() ;
343 mTodoSummaryUser = getDefaultList() ;
344 mLocationDefaults = getLocationDefaultList();
345}
346
339void KOPrefs::setCategoryDefaults() 347void KOPrefs::setCategoryDefaults()
340{ 348{
341 mCustomCategories.clear(); 349 mCustomCategories.clear();
@@ -346,7 +354,18 @@ void KOPrefs::setCategoryDefaults()
346 setCategoryColor(*it,mDefaultCategoryColor); 354 setCategoryColor(*it,mDefaultCategoryColor);
347 } 355 }
348} 356}
357QStringList KOPrefs::getLocationDefaultList()
358{
359 QStringList retval ;
360 retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach")
361 << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room")
362 << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten")
363 << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
364 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
349 365
366 retval.sort();
367 return retval;
368}
350QStringList KOPrefs::getDefaultList() 369QStringList KOPrefs::getDefaultList()
351{ 370{
352 QStringList retval ; 371 QStringList retval ;
@@ -359,7 +378,7 @@ QStringList KOPrefs::getDefaultList()
359 << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") 378 << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
360 << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; 379 << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ;
361 retval.sort(); 380 retval.sort();
362 //qDebug("cat %s ", retval.join("-").latin1()); 381 qDebug("cat %s ", retval.join("-").latin1());
363 return retval; 382 return retval;
364} 383}
365 384
@@ -367,20 +386,12 @@ void KOPrefs::usrReadConfig()
367{ 386{
368 config()->setGroup("General"); 387 config()->setGroup("General");
369 388
389 //qDebug("KOPrefs::usrReadConfig() ");
370 mCustomCategories = config()->readListEntry("Custom Categories"); 390 mCustomCategories = config()->readListEntry("Custom Categories");
371 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
372 mLocationDefaults.clear();
373 mEventSummaryUser.clear();
374 mTodoSummaryUser.clear();
375 }
376 mOldLoadedLanguage = mOldLanguage ; 391 mOldLoadedLanguage = mOldLanguage ;
377 mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; 392 mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
378 if (mLocationDefaults.isEmpty()) { 393 if (mLocationDefaults.isEmpty()) {
379 mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 394 mLocationDefaults = getLocationDefaultList();
380 << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten")
381 << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
382 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
383 mLocationDefaults.sort();
384 } 395 }
385 396
386 if (mEventSummaryUser.isEmpty()) { 397 if (mEventSummaryUser.isEmpty()) {
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index dddcdca..fa69d52 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -57,6 +57,7 @@ class KOPrefs : public KPimPrefs
57 /** Write preferences to config file */ 57 /** Write preferences to config file */
58 void usrWriteConfig(); 58 void usrWriteConfig();
59 void setCategoryDefaults(); 59 void setCategoryDefaults();
60 void setAllDefaults();
60 61
61 protected: 62 protected:
62 void setTimeZoneIdDefault(); 63 void setTimeZoneIdDefault();
@@ -71,6 +72,7 @@ class KOPrefs : public KPimPrefs
71 72
72 static KOPrefs *mInstance; 73 static KOPrefs *mInstance;
73 QStringList getDefaultList(); 74 QStringList getDefaultList();
75 QStringList getLocationDefaultList();
74 public: 76 public:
75 // preferences data 77 // preferences data
76 KConfig* getConfig(); 78 KConfig* getConfig();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 1c74307..348dd5e 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -132,6 +132,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
132 QMainWindow( parent, name ) 132 QMainWindow( parent, name )
133{ 133{
134 134
135
135#ifdef DESKTOP_VERSION 136#ifdef DESKTOP_VERSION
136 setFont( QFont("Arial"), 14 ); 137 setFont( QFont("Arial"), 14 );
137#endif 138#endif
@@ -143,9 +144,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
143 setIcon(SmallIcon( "ko24" ) ); 144 setIcon(SmallIcon( "ko24" ) );
144 mBlockAtStartup = true; 145 mBlockAtStartup = true;
145 mFlagKeyPressed = false; 146 mFlagKeyPressed = false;
146 setCaption("KOrganizer/Pi");
147 KPimGlobalPrefs::instance()->setGlobalConfig();
148 KOPrefs *p = KOPrefs::instance(); 147 KOPrefs *p = KOPrefs::instance();
148 KPimGlobalPrefs::instance()->setGlobalConfig();
149 if ( p->mHourSize > 18 ) 149 if ( p->mHourSize > 18 )
150 p->mHourSize = 18; 150 p->mHourSize = 18;
151 QMainWindow::ToolBarDock tbd; 151 QMainWindow::ToolBarDock tbd;
@@ -168,12 +168,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
168 addToolBar (iconToolBar , tbd ); 168 addToolBar (iconToolBar , tbd );
169 mCalendarModifiedFlag = false; 169 mCalendarModifiedFlag = false;
170 170
171 setCaption("KOrganizer/Pi");
171 QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); 172 QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
172 splash->setAlignment ( AlignCenter ); 173 splash->setAlignment ( AlignCenter );
173 setCentralWidget( splash ); 174 setCentralWidget( splash );
174#ifndef DESKTOP_VERSION 175#ifndef DESKTOP_VERSION
175 showMaximized(); 176 showMaximized();
176#endif 177#endif
178
177 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); 179 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ());
178 setDefaultPreferences(); 180 setDefaultPreferences();
179 mCalendar = new CalendarLocal(); 181 mCalendar = new CalendarLocal();
@@ -231,7 +233,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
231 qDebug("KO: Calendar loading time: %d ms",msNeeded ); 233 qDebug("KO: Calendar loading time: %d ms",msNeeded );
232 234
233 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { 235 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
234 KOPrefs::instance()->setCategoryDefaults(); 236 KOPrefs::instance()->setAllDefaults();
235 int count = mView->addCategories(); 237 int count = mView->addCategories();
236 } 238 }
237 processIncidenceSelection( 0 ); 239 processIncidenceSelection( 0 );