added gammu

3 files changed, 39 insertions, 8 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 689618d..a7f7010 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -38,96 +38,97 @@
 #include <qcursor.h>
 #include <qmessagebox.h>
 #include <qprogressbar.h>
 #include <qmultilineedit.h>
 #include <qtimer.h>
 #include <qwidgetstack.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qgroupbox.h>
 #include <qfile.h>
 #include <qdir.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
 #endif
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kconfig.h>
 
 #include <libkdepim/ksyncprefsdialog.h>
 #include <krun.h>
 #include <kdirwatch.h>
 #include <libkdepim/kdatepicker.h>
 #include <libkdepim/ksyncprofile.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/vcalformat.h>
 #include <libkcal/scheduler.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/journal.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/attendee.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/freebusy.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/qtopiaformat.h>
 #include "../kalarmd/alarmdialog.h"
 
 #ifndef DESKTOP_VERSION
 #include <libkcal/sharpformat.h>
 #endif
+#include <libkcal/phoneformat.h>
 #ifndef KORG_NOMAIL
 #include "komailclient.h"
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koeventeditor.h"
 #include "kotodoeditor.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "publishdialog.h"
 #include "kofilterview.h"
 #include "koglobals.h"
 #include "koviewmanager.h"
 #include "koagendaview.h"
 #include "kodialogmanager.h"
 #include "outgoingdialog.h"
 #include "incomingdialog.h"
 #include "statusdialog.h"
 #include "kdatenavigator.h"
 #include "kotodoview.h"
 #include "datenavigator.h"
 #include "resourceview.h"
 #include "navigatorbar.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
 
 #include "calendarview.h"
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h> 
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
 
 
@@ -1130,160 +1131,183 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); 
     if ( KOPrefs::instance()->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
     }
     qDebug( mes );
     mCalendar->checkAlarmForIncidence( 0, true );
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
 {
     mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
 {
     mCurrentSyncName= s;
 }
 bool CalendarView::syncCalendar(QString filename, int mode)
 {
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     FileStorage* storage = new FileStorage( calendar );
     bool syncOK = false;
     storage->setFileName( filename );
     // qDebug("loading ... ");
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 void CalendarView::syncPhone()
 {
-    qDebug("CalendarView::syncPhone() ");
+    syncExternal( 1 );
 }
-void CalendarView::syncSharp()
+void CalendarView::syncExternal( int mode  )
 {
-#ifndef DESKTOP_VERSION
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
     //mCurrentSyncDevice = "sharp-DTM";
     if ( KOPrefs::instance()->mAskForPreferences )
         edit_sync_options(); 
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
-    SharpFormat sharpFormat;
-    if ( sharpFormat.load( calendar, mCalendar ) ) {
+    boo loadSuccess = false;
+    PhoneFormat* phoneFormat = 0;
+#ifndef DESKTOP_VERSION
+    SharpFormat* sharpFormat = 0;
+    if ( mode == 0 ) { // sharp
+        sharpFormat = new SharpFormat () ;
+        loadSuccess = sharpFormat->load( calendar, mCalendar ); 
+
+    } else 
+#endif
+        if ( mode == 1 ) { // phone 
+        phoneFormat = new PhoneFormat ();
+        loadSuccess = phoneFormat->load( calendar, mCalendar ); 
+        
+    } else 
+        return;
+    if ( loadSuccess ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( KOPrefs::instance()->mWriteBackFile )
             {
                 QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
                 /* obsolete
                 while ( inc ) {
                     inc->setZaurusStat( inc->revision () );
                     inc =  iL.next();
                 }
                 */
-                // pending: clean last sync event description
-                sharpFormat.save(calendar);
+#ifndef DESKTOP_VERSION
+                if ( sharpFormat )
+                    sharpFormat->save(calendar);
+#endif
+                if ( phoneFormat )
+                    phoneFormat->save(calendar);
                 iL = calendar->rawIncidences(); 
                 inc = iL.first();
                 Incidence* loc;
                 while ( inc ) {
                     if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
                             loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                             loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                         }
                     }
                     inc =  iL.next();
                 }
                 Incidence* lse = getLastSyncEvent();
                 if ( lse ) {
                     lse->setReadOnly( false );
                     lse->setDescription( "" );
                     lse->setReadOnly( true );
                 }
             }
         }
         setModified( true );
     } else {
         QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
     delete calendar;
     updateView();
     return ;//syncOK;
-#endif
+
+}
+void CalendarView::syncSharp()
+{
+    syncExternal( 0 );
+
 }
 
 
 #include <kabc/stdaddressbook.h>
 bool CalendarView::importBday()
 {
     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!") );
     qApp->processEvents();
     count = 0;
     int addCount = 0;
     KCal::Attendee* a = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         if ( ! bar.isVisible() )
             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;
         }
     }
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
     return true;
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index b2838db..a3315ad 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -381,96 +381,97 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void toggleFilter();
     void showFilter(bool visible);
     void updateFilter();
     void filterEdited();
     void selectFilter( int );
     KOFilterView *filterView();
 
     void showIntro();
 
     /** Move the curdatepient view date to today */
     void goToday();
 
     /** Move to the next date(s) in the current view */
     void goNext();
   
     /** Move to the previous date(s) in the current view */
     void goPrevious();
   /** Move to the next date(s) in the current view */
     void goNextMonth();
   
     /** Move to the previous date(s) in the current view */
     void goPreviousMonth();
 
     void toggleExpand();
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
     void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
     void lookForIncomingMessages();
    /** Look for new messages in the outbox */
     void lookForOutgoingMessages();
 
     void processMainViewSelection( Incidence * );
     void processTodoListSelection( Incidence * );
     
     void processIncidenceSelection( Incidence * );
 
     void purgeCompleted();
     bool removeCompletedSubTodos( Todo* );
     void slotCalendarChanged();
     bool importBday();
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncSharp( );
     void syncPhone( );
+    void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker( ) ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
   protected slots:
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified();
     void confSync();
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     bool checkFileChanged(QString fn);
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete();
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
     AlarmDialog * mAlarmDialog;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 062c95f..cce182a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -955,96 +955,102 @@ void MainWindow::multiSync( bool askforPrefs  )
         setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
     else
         setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 void MainWindow::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
         confSync();
 
         return;
     } 
     if ( action == 1 ) { 
         multiSync( true );
         return;
     } 
 
     if (mBlockSaveFlag)
         return;
     mBlockSaveFlag = true;
     mCurrentSyncProfile = action - 1000 ;
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
     KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
     KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
     KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
 
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
             if ( syncWithFile( temp->getRemoteFileName( ), false ) ) 
                 KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
         } else {
+            if (  temp->getIsPhoneSync() ) {
+                KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
+                KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
+                KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
+                syncPhone();
+            } else
             syncRemote( temp );
 
         }
     }
     delete temp;
     mBlockSaveFlag = false;
 }
 void MainWindow::setDefaultPreferences()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
     lay->addWidget( &tb ); 
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #endif
     dia.exec();
 }
 void MainWindow::displayFile( QString fn, QString cap )
 {
  QString fileName =  resourcePath() + fn;
  QString text; 
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         return ;
         
     } 
     QTextStream ts( &file );