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
@@ -429,3 +429,3 @@ 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)" ) {
@@ -444,3 +444,3 @@ void KABCore::toggleBeamReceive( )
     if ( infrared ) {
-        qDebug("AB disable BeamReceive ");
+        qDebug("KA: AB disable BeamReceive ");
         delete infrared;
@@ -450,3 +450,3 @@ void KABCore::toggleBeamReceive( )
     } 
-    qDebug("AB enable BeamReceive ");
+    qDebug("KA: AB enable BeamReceive ");
     mActionBR->setChecked(true);
@@ -570,3 +570,3 @@ void KABCore::saveSettings()
   KABPrefs::instance()->writeConfig();
-  qDebug("KABCore::saveSettings() ");
+  qDebug("KA: KABCore::saveSettings() ");
 }
@@ -908,3 +908,3 @@ void KABCore::writeToPhone( )
     else
-        qDebug(i18n("Error exporting to phone"));
+        qDebug(i18n("KA: Error exporting to phone"));
 }
@@ -979,3 +979,3 @@ void KABCore::beamVCard(const QStringList& uids)
   } else {
-      qDebug("Error open temp  beam file ");
+      qDebug("KA: Error open temp  beam file ");
       return;
@@ -2686,3 +2686,3 @@ KABC::Addressee KABCore::getLastSyncAddressee()
     if (lse.isEmpty()) {
-        qDebug("Creating new last-syncAddressee ");
+        qDebug("KA: Creating new last-syncAddressee ");
         lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
@@ -2720,4 +2720,4 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         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 );
@@ -2858,5 +2858,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             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 ");
         }
@@ -2865,3 +2865,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     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 );
@@ -3127,3 +3127,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
-            qDebug("cancelled ");
+            qDebug("KA: WB cancelled ");
             return false;
@@ -3149,3 +3149,3 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
     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;
@@ -3159,3 +3159,3 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
             if ( external ) {
-                qDebug("Sync:Setting vcf mode to external ");
+                qDebug("KA: Sync::Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
@@ -3179,5 +3179,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
                         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 ) {
@@ -3199,3 +3199,3 @@ 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 );
@@ -3219,3 +3219,3 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
     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;
@@ -3267,3 +3267,3 @@ 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;
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 038da54..06454c2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -950,3 +950,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             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 {
@@ -999,3 +999,3 @@ 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(); 
@@ -1226,3 +1226,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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...
@@ -1231,2 +1231,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         delete eventRSync;
+    qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() );
     QString mes;
@@ -1244,3 +1245,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                                  i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
-            qDebug("cancelled ");
+            qDebug("KO: WB cancelled ");
             return false;
@@ -1442,3 +1443,3 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
 {
-  qDebug("CalendarView::insertBirthdays");
+    //qDebug("KO::CalendarView::insertBirthdays");
   if (uid == this->name())
@@ -1449,3 +1450,3 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
 
-    qDebug("CalView 1 %i", count);
+    //qDebug("CalView 1 %i", count);
 
@@ -2511,3 +2512,3 @@ void CalendarView::showEventEditor()
         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;
@@ -2526,3 +2527,3 @@ void CalendarView::showTodoEditor()
         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;  
@@ -3859,3 +3860,3 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
-        qDebug("SyncKDE request detected!");
+        qDebug("KO: SyncKDE request detected!");
     }
@@ -3884,3 +3885,3 @@ 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
@@ -609,3 +609,4 @@ void MainWindow::initActions()
              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 );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index f488a07..3adbf61 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -186,3 +186,3 @@ void KSyncManager::slotSyncMenu( int action )
 {
-    qDebug("syncaction %d ", action);
+    qDebug("KSM::syncaction %d ", action);
     if ( action == 5000 )
@@ -294,3 +294,3 @@ void KSyncManager::slotSyncMenu( int action )
                 default:
-                    qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+                    qDebug("KSM::slotSyncMenu: invalid apptype selected");
                     break;
@@ -442,3 +442,3 @@ void KSyncManager::syncLocalFile()
             default:
-            qDebug("KSyncManager::syncLocalFile: invalid apptype selected");
+            qDebug("KSM::syncLocalFile: invalid apptype selected");
             break;
@@ -451,3 +451,3 @@ void KSyncManager::syncLocalFile()
     if (  syncWithFile(  fn, false ) ) {
-        qDebug("syncLocalFile() successful ");
+        qDebug("KSM::syncLocalFile() successful ");
     }
@@ -500,3 +500,3 @@ void KSyncManager::quickSyncLocalFile()
     if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
-        qDebug("quick syncLocalFile() successful ");
+        qDebug("KSM::quick syncLocalFile() successful ");
       
@@ -571,3 +571,3 @@ int KSyncManager::ringSync()
             default:
-                qDebug("KSyncManager::ringSync: invalid apptype selected");
+                qDebug("KSM::ringSync: invalid apptype selected");
                 break;
@@ -621,3 +621,3 @@ int KSyncManager::ringSync()
                         default:
-                            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+                            qDebug("KSM: invalid apptype selected");
                             break;
@@ -708,3 +708,3 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
         default:
-            qDebug("KSyncManager::syncRemote: invalid apptype selected");
+            qDebug("KSM::syncRemote: invalid apptype selected");
             break;
@@ -728,3 +728,3 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     //
-    qDebug("Sync: Remote copy result(0 = okay): %d ",result );
+    qDebug("KSM::Sync: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
@@ -756,3 +756,3 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
             result = system ( postCommand );
-            qDebug("Sync:Writing back file result: %d ", result);
+            qDebug("KSM::Sync:Writing back file result: %d ", result);
             if ( result != 0 ) {
@@ -951,3 +951,3 @@ void KSyncManager::syncKDE()
         default:
-            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+            qDebug("KSM::slotSyncMenu: invalid apptype selected");
             break;
@@ -961,3 +961,3 @@ void KSyncManager::syncSharp()
     if ( ! syncExternalApplication("sharp") )
-        qDebug("ERROR sync sharp  ");
+        qDebug("KSM::ERROR sync sharp  ");
 }
@@ -975,3 +975,3 @@ bool KSyncManager::syncExternalApplication(QString  resource)
 
-    qDebug("Sync extern %s", resource.latin1());
+    qDebug("KSM::Sync extern %s", resource.latin1());
 
@@ -1122,3 +1122,3 @@ void KServerSocket::newConnection ( int socket )
     if ( mSocket ) {
-        qDebug("KServerSocket::newConnection Socket deleted! ");
+        qDebug("KSS::newConnection Socket deleted! ");
         delete mSocket;
@@ -1146,3 +1146,3 @@ void KServerSocket::readClient()
     if ( mSocket == 0 ) {
-        qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
+        qDebug("ERROR::KSS::readClient(): mSocket == 0  ");
         return;
@@ -1221,3 +1221,3 @@ void KServerSocket::send_file()
                             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 ;
@@ -1467,3 +1467,3 @@ void KCommandSocket::deleteSocket()
         mRetVal = errorTO;
-        qDebug("Connection to remote host timed out");
+        qDebug("KCS::Connection to remote host timed out");
         if ( mSocket ) {