fixed br for kopi

5 files changed, 75 insertions, 7 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 884c61a..0306e07 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1234,6 +1234,7 @@ void CalendarView::syncExternal( int mode  )
     bool syncOK = false;
     bool loadSuccess = false;
     PhoneFormat* phoneFormat = 0;
+    emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
     SharpFormat* sharpFormat = 0;
     if ( mode == 0 ) { // sharp
@@ -1249,8 +1250,10 @@ void CalendarView::syncExternal( int mode  )
                                          mSyncManager->mPhoneModel);
         loadSuccess = phoneFormat->load( calendar,mCalendar); 
         
-    } else 
+        } else {
+            emit tempDisableBR(false);
         return;
+        }
     if ( loadSuccess ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
@@ -1303,6 +1306,7 @@ void CalendarView::syncExternal( int mode  )
     }
     delete calendar;
     updateView();
+    emit tempDisableBR(false);
     return ;//syncOK;
 
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 1cd896d..2818ee9 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -117,6 +117,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Incidence *currentSelection();
 
   signals:
+    void tempDisableBR(bool);
     /** This todo has been modified */
     void todoModified(Todo *, int);
   
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 16186c0..c8a55d2 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -80,8 +80,7 @@ int main( int argc, char **argv )
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer")));
       MainWindow m;
 #ifndef DESKTOP_VERSION
-      QCopChannel* c1 = new QCopChannel("QPE/Application/datebook",&m, "channel" ) ;   
-      QObject::connect( c1, SIGNAL (received ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
+     
       QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
       a.showMainWidget(&m );
 #else
@@ -99,9 +98,6 @@ int main( int argc, char **argv )
           
       }
       a.exec();
-#ifndef DESKTOP_VERSION
-      delete c1;
-#endif
 
   }
   qDebug("KO: Bye! ");
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 02ca523..9e215b9 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -237,6 +237,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
              SLOT( slotModifiedChanged( bool ) ) );
 
 
+    connect( mView, SIGNAL( tempDisableBR(bool) ),
+             SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     mView->setModified( false );
     mBlockAtStartup = false;
@@ -273,7 +275,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
+#ifndef DESKTOP_VERSION
+    infrared = 0;
+#endif
   
+    mBRdisabled = false;
+    toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
@@ -281,8 +288,52 @@ MainWindow::~MainWindow()
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
+    if ( infrared )
+        delete infrared;
+
+
+}
+
+void MainWindow::disableBR(bool b)
+{
+    if ( b ) {
+        if ( infrared ) {
+            toggleBeamReceive();
+            mBRdisabled = true;
+        }
+    } else {
+        if ( mBRdisabled ) {
+            mBRdisabled = false;
+            toggleBeamReceive();
+        }
+    }
 
+}
+bool MainWindow::beamReceiveEnabled()
+{
+#ifndef DESKTOP_VERSION
+    return ( infrared != 0 );
+#endif
+    return false;
+}
 
+void MainWindow::toggleBeamReceive()
+{
+    if ( mBRdisabled  )
+        return;
+#ifndef DESKTOP_VERSION
+    if ( infrared ) {
+        qDebug("disable BeamReceive ");
+        delete infrared;
+        infrared = 0;
+        brAction->setOn(false);
+        return;
+    } 
+    qDebug("enable BeamReceive ");
+    brAction->setOn(true);
+    infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
+    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
+#endif
 }
 void MainWindow::showMaximized () 
 {
@@ -751,6 +802,12 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
 #ifndef DESKTOP_VERSION
     importMenu->insertSeparator();
+    brAction = new QAction( "beam toggle", i18n("Beam receice enabled"), 0,
+                          this );
+    brAction->addTo( importMenu ); 
+    brAction->setToggleAction (true ) ;
+    connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
+
     action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
     action->addTo( importMenu );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index e3383ed..0926313 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -11,7 +11,9 @@
 #include <libkcal/incidence.h>
 #include "simplealarmclient.h"
 #include <ksyncmanager.h>
-
+#ifndef DESKTOP_VERSION
+#include <qcopchannel_qws.h> 
+#endif
 class QAction;
 class CalendarView;
 class KSyncProfile;
@@ -35,6 +37,7 @@ class MainWindow : public QMainWindow
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
+    bool beamReceiveEnabled();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
@@ -76,6 +79,8 @@ class MainWindow : public QMainWindow
     void fillFilterMenu();
     void selectFilter( int );
     void exportToPhone( int );
+    void toggleBeamReceive();
+    void disableBR(bool);
 
     
   protected:
@@ -91,6 +96,11 @@ class MainWindow : public QMainWindow
     void getFile( bool );
     void syncFileRequest();
   private:
+    bool mBRdisabled;
+#ifndef DESKTOP_VERSION
+    QCopChannel* infrared;
+#endif
+    QAction* brAction;
     KSyncManager* mSyncManager;
     bool mClosed;
     void saveOnClose();