8 files changed, 43 insertions, 41 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 44e6bdf..593806b 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1475,6 +1475,6 @@
 { "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
-{ "","" },
-{ "","" },
+{ "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
+{ "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "","" },
 { "","" },
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 17d4afa..ddb125a 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -99,4 +99,9 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
 
   QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this);
+#ifdef DESKTOP_VERSION
+  fo = font();
+  fo.setPointSize( 12 );
+  labb->setFont ( fo );
+#endif
   labb->setAlignment(AlignCenter);
   //layout->addWidget ( labb );
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index fd026fa..70a1d2d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -784,5 +784,5 @@ void  CalendarView::startAlarm( QString mess , QString filename)
 
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
-    QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
+    QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) );
 
 }
@@ -927,10 +927,14 @@ void CalendarView::recheckTimerAlarm()
     mCalendar->checkAlarmForIncidence( 0, true );
 }
+#ifndef DESKTOP_VERSION
 void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
+#else
+void CalendarView::removeAlarm(const QDateTime &, const QString &  )
+#endif
 {
     //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
-        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() );
+        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() );
 #endif   
         return;
@@ -1211,5 +1215,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     QString uid;
     int take;
-    Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
@@ -2311,9 +2314,14 @@ void CalendarView::readSettings()
 }
 
-
+void CalendarView::checkSuspendAlarm()
+{
+    if ( mSuspendTimer->isActive() ) {
+        KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm"));
+    }
+}
 void CalendarView::writeSettings()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
-
+   
     KConfig *config = KOGlobals::config();
 
@@ -2795,6 +2803,5 @@ void CalendarView::removeCategories()
     QStringList newCatList;
     Incidence* inc = incList.first();
-    int i;
-    int count = 0;
+    uint i;
     while ( inc ) {
         newCatList.clear();
@@ -2816,5 +2823,5 @@ int CalendarView::addCategories()
     QStringList catIncList;
     Incidence* inc = incList.first();
-    int i;
+    uint i;
     int count = 0;
      while ( inc ) {
@@ -2946,13 +2953,15 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
     }
 }
+
+#ifndef DESKTOP_VERSION
 void  CalendarView::beamDone( Ir *ir )
 {
-#ifndef DESKTOP_VERSION
     delete ir;
-#endif
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
     topLevelWidget()->raise();
 }
-
+#else 
+void  CalendarView::beamDone( Ir *){;}
+#endif
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
@@ -4308,9 +4317,4 @@ Todo *CalendarView::selectedTodo()
 }
 
-void CalendarView::dialogClosing(Incidence *in)
-{
-    // mDialogList.remove(in);
-}
-
 void CalendarView::showIncidence()
 {
@@ -4433,8 +4437,5 @@ void CalendarView::purgeCompleted()
         QPtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
-        Todo *aTodo;//, *rTodo;
-        Incidence *rIncidence;
-        bool childDelete = false;
-        bool deletedOne = true;
+        Todo *aTodo;
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
@@ -4464,5 +4465,7 @@ void CalendarView::keyPressEvent ( QKeyEvent *e)
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
-    // mSyncManager = manager;
+   
+    if ( manager != mSyncManager)
+        qDebug("KO: Internal error-1. SyncManager mismatch ");
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("KO: SyncKDE request detected!");
@@ -4475,4 +4478,6 @@ bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
     //mSyncManager = manager;
+    if ( manager != mSyncManager)
+        qDebug("KO: Internal error-2. SyncManager mismatch ");
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 3323a98..c9e9870 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -138,4 +138,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
+    void checkSuspendAlarm();
 
   signals:
@@ -456,5 +457,4 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
-    void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 5455098..ea30fac 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -299,6 +299,4 @@ KOEventEditor *KODialogManager::getEventEditor()
   // connect(eventEditor,SIGNAL(editCategories()),
   //      mCategoryEditDialog,SLOT(show()));
-  connect(eventEditor,SIGNAL(dialogClose(Incidence*)),
-          mMainView,SLOT(dialogClosing(Incidence*)));
 
   //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject()));
@@ -325,6 +323,4 @@ KOTodoEditor *KODialogManager::getTodoEditor()
   connect(todoEditor,SIGNAL(todoDeleted()),
           mMainView,SLOT(todoDeleted()));
-  connect(todoEditor,SIGNAL(dialogClose(Incidence*)),
-          mMainView,SLOT(dialogClosing(Incidence*)));
   connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), 
            mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 517677c..e5e3704 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -440,5 +440,6 @@ void KOListView::populateCalPopup()
     while ( kkf ) {
         int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
-        mCalPopup->setItemEnabled( index, !kkf->isReadOnly );
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly )
+        mCalPopup->setItemEnabled( index, false );
         kkf = KOPrefs::instance()->mCalendars.next();
     }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b6ce7d5..b797d8c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -135,5 +135,5 @@ QPixmap* sgListViewCompletedPix[6];
 
 int globalFlagBlockStartup;
-MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
+MainWindow::MainWindow( QWidget *parent, const char *name ) :
     QMainWindow( parent, name )
 {
@@ -145,12 +145,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     sgListViewCompletedPix[4] = &listviewPix80;
     if ( sgListViewCompletedPix[5]->height() < 5 ) {
-        int size = 12;
+        //int size = 12;
         sgListViewCompletedPix[5]->resize( 11, 11 );
         sgListViewCompletedPix[5]->fill( Qt::white );
         QPainter p ( sgListViewCompletedPix[5] );
         p.drawRect( 0,0,11,11);
-        int half = size/2;
-        int heihei = size/2;
-        int x = 1;
         p.drawLine ( 2, 5, 4 , 7 ) ;
         p.drawLine ( 4 , 7 ,  8, 3) ;
@@ -345,5 +342,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
-        int count = mView->addCategories();
     }
     processIncidenceSelection( 0 );
@@ -1856,9 +1852,9 @@ void MainWindow::saveOnClose()
     }
 #endif
-    
     save();
     mView->writeSettings();
+    mView->checkSuspendAlarm();
 }
-void MainWindow::slotModifiedChanged( bool changed )
+void MainWindow::slotModifiedChanged( bool )
 {
     if ( mBlockAtStartup )
@@ -1904,5 +1900,5 @@ void MainWindow::backupAllFiles()
         while ( cal ) {
             if ( !cal->mErrorOnLoad ) {
-                int retval =  KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
+                KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
             }
             cal = calendars.next();
@@ -2409,8 +2405,7 @@ void MainWindow::importFile( QString  fn, bool quick )
     info.setFile( fn );
     QString mess;
-    bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
-        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
+        QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            mess );
         return;
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 953774f..a948a52 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -37,5 +37,5 @@ class MainWindow : public QMainWindow
     Q_OBJECT
   public:
-    MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
+    MainWindow( QWidget *parent = 0, const char *name = 0 );
     ~MainWindow();
     bool beamReceiveEnabled();