sync

1 files changed, 8 insertions, 0 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 31ef338..9147af3 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -411,236 +411,244 @@ QStringList KOPrefs::getDefaultList()
            << i18n("Family")  << i18n("Favorites") << i18n("Fishing") << i18n("Gifts")  
            << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts")  
                      << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") 
            << i18n("PHB") << i18n("Phone Calls")   << i18n("Shopping")
             << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") 
            << i18n("Vacation")  ;
     retval.sort();
     //qDebug("cat %s ", retval.join("-").latin1());
     return retval; 
 }
 // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting")  << i18n("Recurring") << i18n("Personal Travel")  << i18n("Speach")   << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<<  i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent")  << i18n("Cinema") 
 void KOPrefs::usrReadConfig()
 {
     config()->setGroup("General");
     
     //qDebug("KOPrefs::usrReadConfig() ");
     mCustomCategories = config()->readListEntry("Custom Categories");
     mOldLoadedLanguage = mOldLanguage ;
     mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     if (mLocationDefaults.isEmpty()) {
         mLocationDefaults  = getLocationDefaultList();
     }
        
     if (mEventSummaryUser.isEmpty()) {
         mEventSummaryUser  = getDefaultList() ;
     }
     if (mTodoSummaryUser.isEmpty()) {
         mTodoSummaryUser  = getDefaultList() ;
     }
   
     if (mCustomCategories.isEmpty()) setCategoryDefaults();
 
     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));
    
     }
     KConfig fc (locateLocal("config","kopicalendarrc"));
     fc.setGroup("CC");
     int numCals = fc.readNumEntry("NumberCalendars",0 );
     mNextAvailableCalendar = 1;
     if ( numCals == 0 ) {
         KopiCalendarFile *kkf = getNewCalendar();
         kkf->isStandard = true;
         kkf->mName = i18n("Standard");
         kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
     } 
     while ( mNextAvailableCalendar  <= numCals ) {
         //qDebug("Read cal #%d ",  mNextAvailableCalendar );
         QString prefix = "Cal_" +QString::number( mNextAvailableCalendar );
         KopiCalendarFile *kkf = getNewCalendar();
         kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false );
         kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true);
         kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false );
         kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true);
         kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
         kkf->mName =  fc.readEntry( prefix+"_Name", "Calendar");
         kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) );
         kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) );
         kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor);
         if ( kkf->mCalNumber == 1 ) {
             kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
         }
         //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() );
         if ( kkf->mName == i18n("Birthdays") ) {
             kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); 
         }
         if ( kkf->isRelative )
             kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName );
     }
 
     KPimPrefs::usrReadConfig();
 }
 
 KopiCalendarFile * KOPrefs::getCalendar( int num )
 {
     return mDefCalColors[num-1];
 }
 
 KopiCalendarFile * KOPrefs::getNewCalendar()
 {
     KopiCalendarFile * kkf = new KopiCalendarFile();
     kkf->mCalNumber = mNextAvailableCalendar;
     mDefCalColors.resize( mNextAvailableCalendar );
     mDefCalColors[mNextAvailableCalendar-1] = kkf;
     ++mNextAvailableCalendar;
     kkf->mDefaultColor = mEventColor;
     kkf->mName = i18n("New Calendar");
     mCalendars.append( kkf );
     return kkf;
 }
 void  KOPrefs::deleteCalendar( int num )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( kkf->mCalNumber == num ) {
             qDebug("KOPrefs::deleteCalendar %d ", num );
             mCalendars.remove( kkf );
             delete kkf;
             return;
         }
         kkf = mCalendars.next();
     }
 }
 int KOPrefs::getCalendarID( const QString & name )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( name == kkf->mName)
             return  kkf->mCalNumber;
         kkf = mCalendars.next();
     }
     return 1;
 }
 int KOPrefs::getFuzzyCalendarID( const QString & name )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( name.lower() == kkf->mName.lower())
             return  kkf->mCalNumber;
         kkf = mCalendars.next();
     }
+    QString name2 = name;
+    name2.replace (QRegExp ("_")," " );
+    kkf = mCalendars.first();
+    while ( kkf ) {
+        if ( name2.lower() == kkf->mName.lower())
+            return  kkf->mCalNumber;
+        kkf = mCalendars.next();
+    }
     return 0;
 }
 QString KOPrefs::calName( int calNum) const
 {
     return (mDefCalColors[calNum-1])->mName;
 }
 QColor  KOPrefs::defaultColor( int calNum ) const
 {
     if ( calNum == 1 ) return mEventColor;
     return (mDefCalColors[calNum-1])->mDefaultColor;
 }
 void KOPrefs::usrWriteConfig()
 {
   config()->setGroup("General");
   config()->writeEntry("Custom Categories",mCustomCategories); 
   
   config()->setGroup("Personal Settings");
   config()->writeEntry("user_name",mName);
   config()->writeEntry("user_email",mEmail);
 
   config()->setGroup("Category Colors");
   QDictIterator<QColor> it(mCategoryColors);
   while (it.current()) {
     config()->writeEntry(it.currentKey(),*(it.current()));
     ++it;
   } 
   KConfig fc (locateLocal("config","kopicalendarrc")); 
   fc.setGroup("CC");
   fc.deleteGroup( "CC");
   fc.setGroup("CC");
   fc.writeEntry("NumberCalendars",mCalendars.count());
     int numCal = 1;
     int writeCal = 0;
     while ( numCal < mNextAvailableCalendar  ) {
         KopiCalendarFile * kkf = mCalendars.first();
         while ( kkf ) {
             //qDebug("cal num %d %d ", kkf->mCalNumber, numCal);
             if ( kkf->mCalNumber == numCal ) {
                 ++writeCal;
                 //qDebug("Write calendar %d %d ", numCal , writeCal);
                 QString prefix = "Cal_" + QString::number( writeCal );
                 fc.writeEntry( prefix+"_isStandard", kkf->isStandard );
                 fc.writeEntry( prefix+"_isEnabled", kkf->isEnabled );
                 fc.writeEntry( prefix+"_isAlarmEnabled", kkf->isAlarmEnabled );
                 fc.writeEntry( prefix+"_isReadOnly", kkf->isReadOnly );
                 fc.writeEntry( prefix+"_isRelative", kkf->isRelative );
                 fc.writeEntry( prefix+"_Name", kkf->mName);
                 fc.writeEntry( prefix+"_FileName", kkf->mFileName);
                 fc.writeEntry( prefix+"_SavedFileName", kkf->mSavedFileName);
                 fc.writeEntry( prefix+"_Color",kkf->mDefaultColor);
             }
             kkf = mCalendars.next();
         }
         ++numCal;
     }
     fc.sync();
   KPimPrefs::usrWriteConfig();
 }
 
 void KOPrefs::setCategoryColor(QString cat,const QColor & color)
 {
   mCategoryColors.replace(cat,new QColor(color));
 }
 
 QColor *KOPrefs::categoryColor(QString cat)
 {
   QColor *color = 0;
 
   if (!cat.isEmpty()) color = mCategoryColors[cat];
 
   if (color) return color;
   else return &mDefaultCategoryColor;
 }
 
 void KOPrefs::setFullName(const QString &name)
 {
   mName = name;
 }
 
 void KOPrefs::setEmail(const QString &email)
 {
     //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() );
   mEmail = email;
 }
 
 QString KOPrefs::fullName()
 {
   if (mEmailControlCenter) {
     KEMailSettings settings;
     return settings.getSetting(KEMailSettings::RealName);
   } else {
     return mName;
   }
 }
 
 QString KOPrefs::email()
 {
   if (mEmailControlCenter) {
     KEMailSettings settings;
     return settings.getSetting(KEMailSettings::EmailAddress);
   } else {
     return mEmail;
   }
 }
 KConfig* KOPrefs::getConfig()
 {
     return config();
 }