fixes in kopi

2 files changed, 101 insertions, 42 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2e6b5c8..460bbdc 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,50 +1,52 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
+#include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
+#include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
@@ -1125,54 +1127,49 @@ 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 );
     text = ts.read();
     file.close();
     displayText( text, cap);
 }
 void MainWindow::features()
 {
 
     displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
 }
 
 void MainWindow::usertrans()
 {
 
     displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
 }
-#if 0
-#include <libkcal/vcalformat.h>
-#include <libkcal/event.h>
-#include <libkcal/todo.h>
-#include <libkcal/incidence.h>
-#endif
+
 void MainWindow::synchowto()
 {
 #if 0
     QPtrList<Incidence> er = mCalendar->rawIncidences();
     Incidence* inR = er.first();
     VCalFormat vf;
     QString strout;
     while ( inR ) {
         if ( inR->type() == "Todo" )
             strout = vf.todoToString( (Todo *)  inR );
         if ( inR->type() == "Event" )
             strout = vf.eventToString( (Event *)  inR );
         qDebug("incidence: \n%s\n ente\n\n",strout.latin1() );
         inR =  er.next();
     }
 #endif
     displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") );
 }
 void  MainWindow::faq()
 {
     displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
 
 }
 void  MainWindow::whatsNew()
@@ -1407,49 +1404,48 @@ void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarUp = iconToolBar->x() > width()/2 ||
         iconToolBar->y() > height()/2;
     mView->writeSettings();
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mBlockSaveFlag )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
-#include <qfileinfo.h>
 void MainWindow::save()
 {
     if ( mBlockSaveFlag )
         return;
     bool store = mBlockSaveFlag;
     mBlockSaveFlag = true;
     if ( mView->checkFileVersion( defaultFileName()) ) {
 
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
         mView->saveCalendar( defaultFileName() );
 
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         mView->watchSavedFile();
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));
     mCalendarModifiedFlag = false;
     mBlockSaveFlag = store;
@@ -1845,49 +1841,48 @@ void MainWindow::exportVCalendar()
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
         if ( mView->exportVCalendar( fn ) ) {
             KOPrefs::instance()->mLastVcalFile = fn;
             if ( fn.length() > 20 )
                 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
-#include <qpushbutton.h>
 QString  MainWindow::getPassword( )
 {
     QString retfile = "";
     QDialog dia ( this, "input-dialog", true );
     QLineEdit lab ( &dia );
     lab.setEchoMode( QLineEdit::Password );
     QVBoxLayout lay( &dia );
     lay.setMargin(7);
     lay.setSpacing(7);
     lay.addWidget( &lab);
     dia.setFixedSize( 230,50 );
     dia.setCaption( i18n("Enter password") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     int res = dia.exec();
     if ( res )
         retfile = lab.text();
     dia.hide();
     qApp->processEvents();
     return retfile;
 
 }
@@ -1980,51 +1975,84 @@ void MainWindow::sendFile(QSocket* socket)
     qDebug("file sent ");
 } 
 void MainWindow::getFile(QSocket* socket)
 {
     setCaption( i18n("Receiving synced file...") );
    
     QString fileName = defaultFileName();
     QFile file( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         setCaption( i18n("Error open file") );
         delete mSyncActionDialog;
         mSyncActionDialog = 0;
         qDebug("error open cal file ");
         return ;
                     
     } 
 
     mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     bool first = true; 
     while ( socket->canReadLine () || first ) {
         first = false;
         while ( socket->canReadLine () ) {
+            qDebug("avail  %d ", socket->bytesAvailable ()  );
             ts <<   socket->readLine ();
         }
+        QTime ti;
+        ti.start();
+        while ( ti.elapsed () < 5000  && !socket->canReadLine () ) {
+            qDebug("waiting1a %d %d ",ti.elapsed (), socket->bytesAvailable ()  );
+            //qApp->processEvents();
+            qDebug("waiting1b %d ",ti.elapsed () ); 
+            if ( !socket->canReadLine () ) {
+                qDebug("waiting1c %d ",ti.elapsed () );
+                usleep( 100000);
+            }
+                //socket->waitForMore ( 100 );
+        }
+        ts <<   socket->readLine ();
+#if 0
+#ifdef DESKTOP_VERSION
         socket->waitForMore ( 5000 );
+#else
+        // socket->waitForMore ( 5000 );
+        // seems to be broken in qt2
+        bool stop = false;
+        QTime ti;
+        ti.start();
+        while ( ti.elapsed < 5000 && !stop ) {
+            qApp->processEvents();
+            if ( socket->canReadLine () )
+                stop = true ; 
+            else {
+                usleep( 100000    );
+                
+            }
+        }
+#endif
+#endif
     }
     setCaption( i18n("File received - reloading calendar...") );
     file.close();  
     socket->close();
     mView->watchSavedFile();
     mView->openCalendar( defaultFileName() );
     setCaption( i18n("Easy-Pi-Sync successful!") );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 
 
 } 
 void MainWindow::endConnect()
 {
     setCaption( i18n("No file received - syncing successful") );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void MainWindow::performQuick()
 {
     setCaption( i18n("Please input connection settings") );
     QString retfile = "";
     QDialog dia ( this, "input-dialog", true );
     QLineEdit lab ( &dia );
@@ -2088,50 +2116,58 @@ void MainWindow::readFileFromSocket()
     qDebug("MainWindow::readFileFromSocket() "); 
 QString fileName;
 #ifdef _WIN32_
     fileName = defaultFileName() +"sync";
 #else
     fileName = "/tmp/kopitempfile.ics";
 #endif
     QFile file( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         setCaption( i18n("Error: Cannot open temp file for write.") );
         qDebug("Error open calender file for writing: %s",fileName.latin1() );
         return ;
     } 
     
     //QTextStream os2( mCommandSocket );
     //os2.setEncoding( QTextStream::UnicodeUTF8 );
 
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") ); 
     bool first = true; 
     while ( mCommandSocket->canReadLine () || first) {
         first = false;
         while ( mCommandSocket->canReadLine () ) {
             ts <<   mCommandSocket->readLine ();
+        } 
+        QTime ti;
+        ti.start();
+        while ( ti.elapsed () < 5000  && !mCommandSocket->canReadLine () ) {
+            qApp->processEvents();
+            qDebug("waiting2 %d ",ti.elapsed () );
+            if ( !mCommandSocket->canReadLine () )
+                mCommandSocket->waitForMore ( 100 );
         }
-        mCommandSocket->waitForMore ( 5000 );
+        //mCommandSocket->waitForMore ( 5000 );
     }
     file.close();  
     mCommandSocket->close();
     //delete mCommandSocket;
     setCaption( i18n("Remote file saved to temp file.") );
     //mCommandSocket = 0;
     mCurrentSyncProfile = 2 ; // last file
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     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()->mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     
     setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
@@ -2431,24 +2467,75 @@ void MainWindow::syncSharp()
     if ( mCalendarModifiedFlag )
         save();
     mView->syncSharp();
     slotModifiedChanged( true );
 
 }
 void MainWindow::syncPhone()
 {
     if ( mCalendarModifiedFlag )
         save();
     mView->syncPhone();
     slotModifiedChanged( true );
 
 }
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
+
+
+
+KServerSocket:: KServerSocket ( Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ){;};
+
+void KServerSocket::newConnection ( int socket ) 
+{
+    qDebug("KServerSocket:New connection %d ", socket); 
+    QSocket* s = new QSocket( this );
+    connect( s, SIGNAL(readyRead()), this, SLOT(readClient()) );
+    connect( s, SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
+    s->setSocket( socket );
+}
+
+void KServerSocket::discardClient()
+{
+    qDebug(" KServerSocket::discardClient()");
+    QSocket* socket = (QSocket*)sender();
+    delete socket;
+    //emit endConnect();
+}
+void KServerSocket::readClient()
+{
+    qDebug("KServerSocket readClient()");
+    QSocket* socket = (QSocket*)sender();
+    if ( socket->canReadLine() ) {
+        QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), socket->readLine() );
+        qDebug("KServerSocket socket->canReadLine()");
+        if ( tokens[0] == "GET" ) {
+            emit sendFile( socket );
+        } 
+        if ( tokens[0] == "PUT" ) {
+            emit getFile( socket );
+        } 
+        if ( tokens[0] == "STOP" ) {
+            emit endConnect();
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 5985d56..7b4fd27 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -6,87 +6,59 @@
 #include <qdict.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
 #include "simplealarmclient.h"
 
 class QAction;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
 #define QPEToolBar QToolBar
 #define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
 #include <qserversocket.h> 
 #include <qsocket.h>
 #include <qnetworkprotocol.h>
 
 class KServerSocket : public QServerSocket
 {
     Q_OBJECT
 
 public:
-    KServerSocket ( Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ) :
-        QServerSocket( port, backlog, parent, name ){;};
-    void newConnection ( int socket ) 
-    {
-        qDebug("KServerSocket:New connection %d ", socket); 
-        QSocket* s = new QSocket( this );
-        connect( s, SIGNAL(readyRead()), this, SLOT(readClient()) );
-        connect( s, SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
-        s->setSocket( socket );
-    }
+    KServerSocket ( Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
+
+    void newConnection ( int socket ) ;
    
 signals:
     void sendFile(QSocket*); 
     void getFile(QSocket*); 
     void endConnect();
 private slots:
-  void discardClient()
-    {
-        QSocket* socket = (QSocket*)sender();
-        delete socket;
-        //emit endConnect();
-    }
- void readClient()
-    {
-        qDebug("readClient() ");
-        QSocket* socket = (QSocket*)sender();
-        if ( socket->canReadLine() ) {
-            QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), socket->readLine() );
-            if ( tokens[0] == "GET" ) {
-                emit sendFile( socket );
-            } 
-            if ( tokens[0] == "PUT" ) {
-                emit getFile( socket );
-            } 
-            if ( tokens[0] == "STOP" ) {
-                emit endConnect();
-            }
-        }
-    }
+    void discardClient();
+    void readClient();
 };
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
     static  QString defaultFileName();
     static QString resourcePath();
     protected slots:  
     void setCaptionToDates();
     int ringSync();