11 files changed, 50 insertions, 8 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 03bc03b..cd37aac 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -2,2 +2,14 @@ Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.2.8 ************
+
+
+I forgot what I fixed...
+
+Some minor fixes in KA/Pi and KO/Pi.
+
+KA/Pi uses popup menu now for quick category selection in contact edit dialog.
+
+In the Pi-syc mode of KO/Pi it is now possible to define specific resources which can be synced with the remote pi-sync server.
+This feature must be considered as unstable - it still needs some more testing.
+
 ********** VERSION 2.2.7 ************
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 3448dcc..e03dafb 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -831,2 +831,4 @@
 { "Other Phone","Sonst. Telefon" },

+{ "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },

+{ "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },

 { "","" },

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 767e243..2dec521 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -938,3 +938,2 @@
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
-{ "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Gerät (Handy)" },
@@ -1573,2 +1572,8 @@
 { "<br>The calendar contains<br><b>%1 events<br>%2 todos<br>%3 journals</b>","<br>Der Kalender enthält<br><b>%1 Termine<br>%2 Todos<br>%3 Journale</b>" },
+{ "Enable alarm in resource settings","Schalte Alarm in Resourcenansicht wieder an" },
+{ "The alarm for this calendar\nis currently disabled!\nEnable it in resource settings.","Der Alarm für diesen Kalender\nist abgeschaltet.\nSchalten Sie ihn in der\nResourcenansicht ggf. an." },
+{ "Alarm disabled warning","Nichtaktiver Alarm" },
+{ "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
+{ "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
+{ "","" },
 { "","" },
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 92e5a0f..21f220c 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -145,3 +145,2 @@ void KOEditorGeneral::slotSetFocusOn()
 {
-    mNextFocus;
     if ( mNextFocus == 1 ) {
@@ -357,3 +356,3 @@ void KOEditorGeneral::pickAlarmProgram()
 
-QString KOEditorGeneral::getFittingPath( const QString  s ) 
+QString KOEditorGeneral::getFittingPath( const QString & s ) 
 {
@@ -622,3 +621,5 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
     }
-    event->setCalID( getCalendarID() );
+    int id  = getCalendarID();
+    event->setCalID( id );
+    event->setAlarmEnabled( KOPrefs::instance()->getCalendar( id )->isAlarmEnabled );
 }
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index d8b15af..b10a5d4 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -118,3 +118,3 @@ class KOEditorGeneral : public QObject
     QPopupMenu * mCatPopup;
-    QString getFittingPath( const QString ) ;
+    QString getFittingPath( const QString &) ;
     QString mAlarmSound;
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 9ede543..3e87197 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -27,2 +27,3 @@
 #include <qhbox.h>
+#include <qtimer.h>
 #include <qdir.h>
@@ -251,2 +252,5 @@ bool KOEventEditor::processInput( bool emitTime )
     emit eventAdded(event);
+    if ( event->isAlarmEnabled () && !event->alarmEnabled () ) {
+        QTimer::singleShot( 0, this, SLOT ( alarmWarning() ) );
+    }
   }
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 02b54da..607e549 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -406,2 +406,6 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         //addTag("p",s);
+        if ( !(event->alarmEnabled() ) ) {
+            addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
+
+        }
     }
@@ -523,2 +527,6 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         }
+        if ( !(event->alarmEnabled() ) ) {
+            addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
+
+        }
     }
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9bc0302..236f6f9 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -92,2 +92,7 @@ void KOIncidenceEditor::setupAttendeesTab()
 
+void KOIncidenceEditor::alarmWarning()
+{
+    KMessageBox::information( 0, i18n("The alarm for this calendar\nis currently disabled!\nEnable it in resource settings."), i18n("Alarm disabled warning"));
+
+}
 
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index bfd6cc6..2e4bbf8 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -67,3 +67,4 @@ class KOIncidenceEditor : public KDialogBase
 
-  protected slots:
+  protected slots: 
+    void alarmWarning();
     void slotApply();
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 682f83b..20a35d2 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -29,2 +29,3 @@
 #include <qhbox.h>
+#include <qtimer.h>
 #include <qdir.h>
@@ -261,2 +262,5 @@ bool KOTodoEditor::processInput( bool emitTime )
     emit todoAdded(todo);
+    if ( todo->isAlarmEnabled () && !todo->alarmEnabled () ) {
+        QTimer::singleShot( 0, this, SLOT ( alarmWarning() ) );
+    }
   }
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 1f9afcb..b097277 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -243,5 +243,5 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mIsLocal = new QRadioButton ( i18n("Local file"), gr );
-   mIsPi = new QRadioButton ( i18n("Pi-Sync - all resources ( direct Kx/Pi to Kx/Pi sync )"), gr );
+   mIsPi = new QRadioButton ( i18n("Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
-   mIsPiSpecific = new QRadioButton ( i18n("Pi-Sync - selected resources ( direct Kx/Pi to Kx/Pi sync )"), gr );
+   mIsPiSpecific = new QRadioButton ( i18n("Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPiSpecific, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );