summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp65
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/mainwindow.cpp8
3 files changed, 45 insertions, 30 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 9366c11..8f37793 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -335,8 +335,16 @@ void KOPrefs::setTimeZoneIdDefault()
{
;
}
+void KOPrefs::setAllDefaults()
+{
+ setCategoryDefaults();
+ mEventSummaryUser = getDefaultList() ;
+ mTodoSummaryUser = getDefaultList() ;
+ mLocationDefaults = getLocationDefaultList();
+}
+
void KOPrefs::setCategoryDefaults()
{
mCustomCategories.clear();
mCustomCategories = getDefaultList();
@@ -345,9 +353,20 @@ void KOPrefs::setCategoryDefaults()
for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
setCategoryColor(*it,mDefaultCategoryColor);
}
}
+QStringList KOPrefs::getLocationDefaultList()
+{
+ QStringList retval ;
+ retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach")
+ << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room")
+ << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten")
+ << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
+ // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
+ retval.sort();
+ return retval;
+}
QStringList KOPrefs::getDefaultList()
{
QStringList retval ;
retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer")
@@ -358,54 +377,46 @@ QStringList KOPrefs::getDefaultList()
<< i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
<< i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
<< i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ;
retval.sort();
- //qDebug("cat %s ", retval.join("-").latin1());
+ qDebug("cat %s ", retval.join("-").latin1());
return retval;
}
void KOPrefs::usrReadConfig()
{
config()->setGroup("General");
+ //qDebug("KOPrefs::usrReadConfig() ");
mCustomCategories = config()->readListEntry("Custom Categories");
- if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
- mLocationDefaults.clear();
- mEventSummaryUser.clear();
- mTodoSummaryUser.clear();
- }
mOldLoadedLanguage = mOldLanguage ;
mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
- if (mLocationDefaults.isEmpty()) {
- mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach")
- << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten")
- << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
- // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
- mLocationDefaults.sort();
+ if (mLocationDefaults.isEmpty()) {
+ mLocationDefaults = getLocationDefaultList();
}
- if (mEventSummaryUser.isEmpty()) {
+ if (mEventSummaryUser.isEmpty()) {
mEventSummaryUser = getDefaultList() ;
}
- if (mTodoSummaryUser.isEmpty()) {
- mTodoSummaryUser = getDefaultList() ;
- }
+ if (mTodoSummaryUser.isEmpty()) {
+ mTodoSummaryUser = getDefaultList() ;
+ }
- if (mCustomCategories.isEmpty()) setCategoryDefaults();
+ if (mCustomCategories.isEmpty()) setCategoryDefaults();
- config()->setGroup("Personal Settings");
- mName = config()->readEntry("user_name","");
- mEmail = config()->readEntry("user_email","");
- fillMailDefaults();
+ config()->setGroup("Personal Settings");
+ mName = config()->readEntry("user_name","");
+ mEmail = config()->readEntry("user_email","");
+ fillMailDefaults();
- config()->setGroup("Category Colors");
- QStringList::Iterator it;
- for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
- setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
+ config()->setGroup("Category Colors");
+ QStringList::Iterator it;
+ for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
+ setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
- }
+ }
- KPimPrefs::usrReadConfig();
+ KPimPrefs::usrReadConfig();
}
void KOPrefs::usrWriteConfig()
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index dddcdca..fa69d52 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -56,8 +56,9 @@ class KOPrefs : public KPimPrefs
/** Write preferences to config file */
void usrWriteConfig();
void setCategoryDefaults();
+ void setAllDefaults();
protected:
void setTimeZoneIdDefault();
@@ -70,8 +71,9 @@ class KOPrefs : public KPimPrefs
KOPrefs();
static KOPrefs *mInstance;
QStringList getDefaultList();
+ QStringList getLocationDefaultList();
public:
// preferences data
KConfig* getConfig();
void setFullName(const QString &);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 1c74307..348dd5e 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -131,8 +131,9 @@ int globalFlagBlockStartup;
MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
QMainWindow( parent, name )
{
+
#ifdef DESKTOP_VERSION
setFont( QFont("Arial"), 14 );
#endif
mClosed = false;
@@ -142,11 +143,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
bool showWarning = !finf.exists();
setIcon(SmallIcon( "ko24" ) );
mBlockAtStartup = true;
mFlagKeyPressed = false;
- setCaption("KOrganizer/Pi");
- KPimGlobalPrefs::instance()->setGlobalConfig();
KOPrefs *p = KOPrefs::instance();
+ KPimGlobalPrefs::instance()->setGlobalConfig();
if ( p->mHourSize > 18 )
p->mHourSize = 18;
QMainWindow::ToolBarDock tbd;
if ( p->mToolBarHor ) {
@@ -167,14 +167,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
iconToolBar = new QPEToolBar( this );
addToolBar (iconToolBar , tbd );
mCalendarModifiedFlag = false;
+ setCaption("KOrganizer/Pi");
QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
splash->setAlignment ( AlignCenter );
setCentralWidget( splash );
#ifndef DESKTOP_VERSION
showMaximized();
#endif
+
//qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ());
setDefaultPreferences();
mCalendar = new CalendarLocal();
mView = new CalendarView( mCalendar, this,"mCalendar " );
@@ -230,9 +232,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
qDebug("KO: Calendar loading time: %d ms",msNeeded );
if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
- KOPrefs::instance()->setCategoryDefaults();
+ KOPrefs::instance()->setAllDefaults();
int count = mView->addCategories();
}
processIncidenceSelection( 0 );
connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),