fixesss

6 files changed, 55 insertions, 11 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 08909ed..f179c58 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1594,32 +1594,37 @@ void CalendarView::syncExternal( int mode  )
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
     delete calendar;
     updateView();
     emit tempDisableBR(false);
     return ;//syncOK;
 
 }
 
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 
 #ifdef DESKTOP_VERSION
+    int curCal = mCalendar->defaultCalendar();
+    int bd = mCalEditView->getBirtdayID();
+    if ( bd == 0 )
+        return;
+    mCalendar->setDefaultCalendar( bd );
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Reading addressbook - close to abort!") );
@@ -1632,56 +1637,65 @@ bool CalendarView::importBday()
             return false;
         bar.setProgress( count++ );
         qApp->processEvents();
         //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() );
         if ( (*it).birthday().date().isValid() ){
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
             ++addCount;
         } 
         QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
         if ( anni.isValid() ){ 
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
             ++addCount;
         }
     }
+    mCalendar->setDefaultCalendar( curCal );
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 #else //DESKTOP_VERSION
 
   ExternalAppHandler::instance()->requestBirthdayListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertBirthdays
 
 #endif //DESKTOP_VERSION
 
 #endif //KORG_NOKABC
 
 
     return true;
 }
  
 // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI
 void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, 
                                    const QStringList& anniversaryList, const QStringList& realNameList,
                                    const QStringList& emailList, const QStringList& assembledNameList, 
                                    const QStringList& uidList)
 {
+  
     //qDebug("KO::CalendarView::insertBirthdays");
   if (uid == this->name())
-  {
+  {  
+      int curCal = mCalendar->defaultCalendar();
+    int bd = mCalEditView->getBirtdayID();
+    if ( bd == 0 )
+        return;
+    mCalendar->setDefaultCalendar( bd ); 
+
+
     int count = birthdayList.count();
     int addCount = 0;
     KCal::Attendee* a = 0;
 
     //qDebug("CalView 1 %i", count);
 
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("inserting birthdays - close to abort!") );
@@ -1718,32 +1732,33 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
 
             if ( birthday.isValid() ){
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  birthday, assembledName,  a, true ) )
                     ++addCount;
             } 
 
             if ( anniversary.isValid() ){ 
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  anniversary, assembledName,  a, false ) )
                     ++addCount;
             }
         }
 
+    mCalendar->setDefaultCalendar( curCal );
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 
   }
 
 }
 
 
 
 bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a,  bool birthday)
 {
     //qDebug("addAnni ");
     Event * ev = new Event();
     ev->setOrganizer(KOPrefs::instance()->email());
     if ( a ) {
         ev->addAttendee( a );
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index a8a3052..3cde103 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -341,77 +341,97 @@ void KOCalEditView::readConfig()
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 
 
 void KOCalEditView::defaultInfo()
 {
     KMessageBox::information( this,  i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
     QString name, file;
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
-         prefs.nameE->setText( name );
+        prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = "";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         }
     }
+    addCalendar ( name, file );
+}
+int KOCalEditView::addCalendar( QString name, QString file, bool ask )
+{
+  
     QFileInfo fi ( file );
     if (!fi.exists() ) {
-        if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( file ) )== KMessageBox::No )
-            return;
+        if ( ask )
+            if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( file ) )== KMessageBox::No )
+                return 0;
         QFile fileIn( file );
         if (!fileIn.open( IO_WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
-            return;
+            return 0;
         } 
         QTextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();       
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
     kkf->mFileName = file;
     emit calendarAdded( kkf->mCalNumber );
-    emit needsUpdate();
-    QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
+    if ( ask )
+        emit needsUpdate();
+    QTimer::singleShot( 0, this, SLOT ( readConfig() ) );   
+    return kkf->mCalNumber;
 }
+int KOCalEditView::getBirtdayID()
+{
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        if ( kkf->mName == i18n("Birthdays") )
+            return kkf->mCalNumber;
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+    QString file = locateLocal( "data", "korganizer/birthdays.ics" ); 
+    return addCalendar( i18n("Birthdays"), file, false );
+}
+
 void KOCalEditView::enableAll()
 {
     toggleList( mEnabledB );
 }
 void KOCalEditView::enableAlarm()
 {
     toggleList( mAlarmB );
 }
 void KOCalEditView::disableRO()
 {
     toggleList( mROB );
 }
 void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list )
 {
     bool dis = false;
     KOCalCheckButton* it = list.first();
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index b57a6e9..54fe2c5 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -195,33 +195,34 @@ class KOFilterView : public KOFilterView_base
     void setSelectedFilter( int );
 
   signals:
     void filterChanged();
     void editFilters();
 
   private:
     QPtrList<CalFilter> *mFilters;
 };
 
 class KOCalEditView : public QScrollView
 {
     Q_OBJECT
   public:
     KOCalEditView( QWidget* parent=0,const char* name=0);
     ~KOCalEditView();
-
+    int addCalendar( QString calName, QString fileName, bool ask = true );
+    int getBirtdayID();
     public slots:
     void addCal();
     void enableAll();
     void enableAlarm();
     void disableRO();
     void deleteAll();
     void selectStdCal(int,bool );
     void selectCal(int,bool );
     void selectCalAlarm(int,bool );
     void selectReadOnly(int,bool );
     void setColor(const QColor &,int) ;
     void deleteCal(int) ;
     void infoCal(int) ;
     void readConfig(); 
     void defaultInfo();
   signals:
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a4ea3d3..7ba7269 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -447,32 +447,36 @@ void KOPrefs::usrReadConfig()
         kkf->mFileName = 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->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true);
         kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
         kkf->mName =  fc.readEntry( prefix+"_Name", "Calendar");
         kkf->mFileName = fc.readEntry( prefix+"_FileName", 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" ); 
+        }
     }
 
     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;
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 2bf46b9..c9d1345 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -72,32 +72,33 @@ int main( int argc, char **argv )
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
       KGlobal::setAppName( "korganizer" );
       QString fileName ;
 #ifndef DESKTOP_VERSION
       fileName = getenv("QPEDIR");
       KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/");
 #else
       fileName  = qApp->applicationDirPath () + "/kdepim/korganizer/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer")));
 
       QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );
+      KPimGlobalPrefs::instance()->setGlobalConfig();
       MainWindow m;
 #ifndef DESKTOP_VERSION
      
       QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
       a.showMainWidget(&m );
 #else
       a.setMainWidget(&m );
       m.show();
       //m.resize( 800, 600 );
       QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
       if ( argc > 1 ) {
           QCString command = argv[1];
           if ( argc > 2 )
               command += argv[2];
           qApp->processEvents();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b9d8742..68233e8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -160,33 +160,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
             QPainter p ( sgListViewCompletedPix[iii] );
             p.drawRect( 0,0,11,11);
             if ( iii )
                 p.fillRect( 1,1,iii*2,9,Qt::gray );
         }
     }
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
-    KPimGlobalPrefs::instance()->setGlobalConfig();
+    //KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
@@ -1710,33 +1710,33 @@ void MainWindow::enableIncidenceActions( bool enabled )
     mCancelAction->setEnabled( enabled );
 }
 
 void MainWindow::importOL()
 { 
 #ifdef _OL_IMPORT_
       mView->clearAllViews();
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->calendar()->checkAlarmForIncidence( 0, true );
       mView->updateView();
 #endif
 }
 void MainWindow::importBday()
 {
-    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
+    int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }
 
 
 }
 void MainWindow::importQtopia()
 {
     //#ifndef DESKTOP_VERSION
     QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
 #ifdef DESKTOP_VERSION
     mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
@@ -2297,41 +2297,44 @@ void MainWindow::showConfigureAgenda( )
     int iii;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->setItemChecked( (iii+1)*2, false );
     }
     configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
 }
 void MainWindow::configureAgenda( int item )
 {
     if ( KOPrefs::instance()->mHourSize == item )
         return;
     KOPrefs::instance()->mHourSize=item;
     mView->viewManager()->agendaView()->updateConfig();
 }
 
 void  MainWindow::saveCalendar()
 {
-    
     QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
     if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
         bupDir = KGlobalSettings::backupDataDir();
     bupDir = KGlobal::formatMessage ( bupDir, 0 );
     QString bupHint;
     if ( !KPimGlobalPrefs::instance()->mBackupEnabled )
         bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)");
     if ( KMessageBox::warningContinueCancel( this,  i18n("This will <b>backup all calendar files</b> to the directory %1 %2").arg(bupDir).arg(bupHint),i18n("Information") ) != KMessageBox::Continue ) return;
+    bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled;
+    KPimGlobalPrefs::instance()->mBackupEnabled = false;
+    save();
+    KPimGlobalPrefs::instance()->mBackupEnabled = enabled;
     backupAllFiles();
 }
 void  MainWindow::loadCalendar()
 {
 
    
 #if 0
     QString fn = KOPrefs::instance()->mLastLoadFile;
     fn =  KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
 
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;