debug fixes

8 files changed, 50 insertions, 48 deletions

diff --git a/bin/kdepim/korganizer/allday.png b/bin/kdepim/korganizer/allday.png
new file mode 100644
index 0000000..735eae2
--- a/dev/null
+++ b/bin/kdepim/korganizer/allday.png
diff --git a/bin/kdepim/korganizer/icons16/allday.png b/bin/kdepim/korganizer/icons16/allday.png
new file mode 100644
index 0000000..426d250
--- a/dev/null
+++ b/bin/kdepim/korganizer/icons16/allday.png
diff --git a/bin/kdepim/korganizer/iconsmini/allday.png b/bin/kdepim/korganizer/iconsmini/allday.png
new file mode 100644
index 0000000..be9a2ba
--- a/dev/null
+++ b/bin/kdepim/korganizer/iconsmini/allday.png
diff --git a/bin/kdepim/korganizer/iconsmini/configure.png b/bin/kdepim/korganizer/iconsmini/configure.png
new file mode 100644
index 0000000..ad965e2
--- a/dev/null
+++ b/bin/kdepim/korganizer/iconsmini/configure.png
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 590cc82..ae0a068 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -428,5 +428,5 @@ KABCore::~KABCore()
 void KABCore::receive( const QCString& cmsg, const QByteArray& data )
 {
-    qDebug("KA: QCOP message received: %s ", cmsg.data()  );
+    //qDebug("KA: QCOP message received: %s ", cmsg.data()  );
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
@@ -443,5 +443,5 @@ void KABCore::toggleBeamReceive( )
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
-        qDebug("AB disable BeamReceive ");
+        qDebug("KA: AB disable BeamReceive ");
         delete infrared;
         infrared = 0;
@@ -449,5 +449,5 @@ void KABCore::toggleBeamReceive( )
         return;
     } 
-    qDebug("AB enable BeamReceive ");
+    qDebug("KA: AB enable BeamReceive ");
     mActionBR->setChecked(true);
 
@@ -569,5 +569,5 @@ void KABCore::saveSettings()
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
   KABPrefs::instance()->writeConfig();
-  qDebug("KABCore::saveSettings() ");
+  qDebug("KA: KABCore::saveSettings() ");
 }
 
@@ -907,5 +907,5 @@ void KABCore::writeToPhone( )
         message(i18n("Export to phone finished!"));
     else
-        qDebug(i18n("Error exporting to phone"));
+        qDebug(i18n("KA: Error exporting to phone"));
 }
 void KABCore::beamVCard()
@@ -978,5 +978,5 @@ void KABCore::beamVCard(const QStringList& uids)
       ir->send( fileName, description, "text/x-vCard" );
   } else {
-      qDebug("Error open temp  beam file ");
+      qDebug("KA: Error open temp  beam file ");
       return;
   }
@@ -2685,5 +2685,5 @@ KABC::Addressee KABCore::getLastSyncAddressee()
     lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
     if (lse.isEmpty()) {
-        qDebug("Creating new last-syncAddressee ");
+        qDebug("KA: Creating new last-syncAddressee ");
         lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
         QString sum = "";
@@ -2719,6 +2719,6 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
-        if ( remCh )
-            qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+        //if ( remCh )
+        //  qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
         //qDebug("cahnged rem %d loc %d",remCh, locCh  );
@@ -2857,12 +2857,12 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
             mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
-            qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
+            qDebug("KA: using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
         } else {
-            qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime ");
+            qDebug("KA: KSyncManager::mRequestedSyncEvent has invalid datatime ");
         }
     }
     QDateTime modifiedCalendar = mLastAddressbookSync;
     addresseeLSync = getLastSyncAddressee();
-    qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
+    qDebug("KA: Last Sync %s ", addresseeLSync.revision().toString().latin1());
     addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
     if ( !addresseeR.isEmpty() ) {
@@ -3126,5 +3126,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
-            qDebug("cancelled ");
+            qDebug("KA: WB cancelled ");
             return false;
         }
@@ -3148,5 +3148,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
     bool syncOK = false;
     if ( abLocal.load() ) {
-        qDebug("Sync:AB loaded %s,sync mode %d",filename.latin1(), mode );
+        qDebug("KA: Sync::AB loaded %s,sync mode %d",filename.latin1(), mode );
         bool external = false;
         bool isXML = false;
@@ -3158,5 +3158,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
             external = !manager->mIsKapiFile;
             if ( external ) {
-                qDebug("Sync:Setting vcf mode to external ");
+                qDebug("KA: Sync::Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                 AddressBook::Iterator it;  
@@ -3178,7 +3178,7 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
-                    qDebug("Sync:Saving remote AB ");
+                    qDebug("KA: Sync::Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
-                        qDebug("Error writing back AB to file ");
+                        qDebug("KA: sync::Error writing back AB to file ");
                     if (  external ) {
                         // afterwrite processing
@@ -3198,5 +3198,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
-    qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
+    qDebug("KA: AB:removeSyncInfo for profile %s ", syncProfile.latin1());
     mAddressBook->removeSyncInfo( syncProfile );
     setModified();
@@ -3218,5 +3218,5 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
     message(i18n("Loading DTM address data..."), false);
     if ( abLocal.load() ) {
-        qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
+        qDebug("KA: AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         message(i18n("Sync preprocessing..."),false);
@@ -3266,5 +3266,5 @@ bool KABCore::syncPhone()
      {
          abLocal.importFromFile( fileName );
-        qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
+        qDebug("KA: AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preparePhoneSync( mCurrentSyncDevice, true );
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 038da54..06454c2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -949,5 +949,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
             mLastCalendarSync = KSyncManager::mRequestedSyncEvent;
-            qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() );
+            qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() );
             } else {
             qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime ");
@@ -998,5 +998,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     }
     //qDebug("*************************** ");
-    qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
+    qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
@@ -1225,9 +1225,10 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
-    qDebug("********** %d %d ",  mGlobalSyncMode ==  SYNC_MODE_NORMAL, mSyncManager->syncWithDesktop()  );
+    qDebug("KO: Normal sync: %d ",mGlobalSyncMode ==  SYNC_MODE_NORMAL );
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal...
         remote->addEvent( eventRSync );
     else
         delete eventRSync;
+    qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() );
     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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); 
@@ -1243,5 +1244,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                  i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
-            qDebug("cancelled ");
+            qDebug("KO: WB cancelled ");
             return false;
         }
@@ -1441,5 +1442,5 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
                                    const QStringList& uidList)
 {
-  qDebug("CalendarView::insertBirthdays");
+    //qDebug("KO::CalendarView::insertBirthdays");
   if (uid == this->name())
   {
@@ -1448,5 +1449,5 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
     KCal::Attendee* a = 0;
 
-    qDebug("CalView 1 %i", count);
+    //qDebug("CalView 1 %i", count);
 
     QProgressBar bar(count,0 );
@@ -2510,5 +2511,5 @@ void CalendarView::showEventEditor()
     if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
-        qDebug("CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
+        qDebug("KO: CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
         delete mEventEditor;
         mEventEditor = mDialogManager->getEventEditor(); 
@@ -2525,5 +2526,5 @@ void CalendarView::showTodoEditor()
     if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
-        qDebug("CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
+        qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         delete mTodoEditor;  
         mTodoEditor = mDialogManager->getTodoEditor(); 
@@ -3858,5 +3859,5 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
     // mSyncManager = manager;
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
-        qDebug("SyncKDE request detected!");
+        qDebug("KO: SyncKDE request detected!");
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
@@ -3883,5 +3884,5 @@ void CalendarView::setSyncManager(KSyncManager* manager)
 void  CalendarView::removeSyncInfo( QString syncProfile) 
 {
-    qDebug("removeSyncInfo for profile %s ", syncProfile.latin1());
+    qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1());
     mCalendar->removeSyncInfo( syncProfile );
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 26ea1e2..877b6f2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -608,5 +608,6 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
-    action = new QAction( i18n("Toggle Allday"), i18n("Toggle Allday"), 0, this );
+    icon = loadPixmap( pathString + "allday" );
+    action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index f488a07..3adbf61 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -185,5 +185,5 @@ void KSyncManager::slotClearMenu( int action )
 void KSyncManager::slotSyncMenu( int action )
 {
-    qDebug("syncaction %d ", action);
+    qDebug("KSM::syncaction %d ", action);
     if ( action == 5000 )
         return;
@@ -293,5 +293,5 @@ void KSyncManager::slotSyncMenu( int action )
                     break;
                 default:
-                    qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+                    qDebug("KSM::slotSyncMenu: invalid apptype selected");
                     break;
               
@@ -441,5 +441,5 @@ void KSyncManager::syncLocalFile()
             break;
             default:
-            qDebug("KSyncManager::syncLocalFile: invalid apptype selected");
+            qDebug("KSM::syncLocalFile: invalid apptype selected");
             break;
               
@@ -450,5 +450,5 @@ void KSyncManager::syncLocalFile()
         return;
     if (  syncWithFile(  fn, false ) ) {
-        qDebug("syncLocalFile() successful ");
+        qDebug("KSM::syncLocalFile() successful ");
     }
 
@@ -499,5 +499,5 @@ void KSyncManager::quickSyncLocalFile()
     
     if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
-        qDebug("quick syncLocalFile() successful ");
+        qDebug("KSM::quick syncLocalFile() successful ");
       
     }
@@ -570,5 +570,5 @@ int KSyncManager::ringSync()
                 break;
             default:
-                qDebug("KSyncManager::ringSync: invalid apptype selected");
+                qDebug("KSM::ringSync: invalid apptype selected");
                 break;
               
@@ -620,5 +620,5 @@ int KSyncManager::ringSync()
                             break;
                         default:
-                            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+                            qDebug("KSM: invalid apptype selected");
                             break;
                         }
@@ -707,5 +707,5 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
             break;
         default:
-            qDebug("KSyncManager::syncRemote: invalid apptype selected");
+            qDebug("KSM::syncRemote: invalid apptype selected");
             break;
         }
@@ -727,5 +727,5 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     // 256: no such file or dir
     //
-    qDebug("Sync: Remote copy result(0 = okay): %d ",result );
+    qDebug("KSM::Sync: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
         unsigned int len = maxlen;
@@ -755,5 +755,5 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
             mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
             result = system ( postCommand );
-            qDebug("Sync:Writing back file result: %d ", result);
+            qDebug("KSM::Sync:Writing back file result: %d ", result);
             if ( result != 0 ) {
                 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
@@ -950,5 +950,5 @@ void KSyncManager::syncKDE()
             break;
         default:
-            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+            qDebug("KSM::slotSyncMenu: invalid apptype selected");
             break;
               
@@ -960,5 +960,5 @@ void KSyncManager::syncSharp()
 
     if ( ! syncExternalApplication("sharp") )
-        qDebug("ERROR sync sharp  ");
+        qDebug("KSM::ERROR sync sharp  ");
 }
 
@@ -974,5 +974,5 @@ bool KSyncManager::syncExternalApplication(QString  resource)
         }
 
-    qDebug("Sync extern %s", resource.latin1());
+    qDebug("KSM::Sync extern %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
@@ -1121,5 +1121,5 @@ void KServerSocket::newConnection ( int socket )
     // qDebug("KServerSocket:New connection %d ", socket); 
     if ( mSocket ) {
-        qDebug("KServerSocket::newConnection Socket deleted! ");
+        qDebug("KSS::newConnection Socket deleted! ");
         delete mSocket;
         mSocket = 0;
@@ -1145,5 +1145,5 @@ void KServerSocket::readClient()
         return;
     if ( mSocket == 0 ) {
-        qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
+        qDebug("ERROR::KSS::readClient(): mSocket == 0  ");
         return;
     }
@@ -1220,5 +1220,5 @@ void KServerSocket::send_file()
                         if ( secs > 300 ) {
                             if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
-                                qDebug("cancelled ");
+                                qDebug("KSS::Sync cancelled ,cs");
                                 return ;
                             }
@@ -1466,5 +1466,5 @@ void KCommandSocket::deleteSocket()
         mTimerSocket->stop();
         mRetVal = errorTO;
-        qDebug("Connection to remote host timed out");
+        qDebug("KCS::Connection to remote host timed out");
         if ( mSocket ) {
             mSocket->close();