commit

7 files changed, 28 insertions, 5 deletions

diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 92e5a0f..21f220c 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -130,33 +130,32 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
             --str;
             if ( QApplication::desktop()->width() < 320 )
                 --str;
         }
         headerLayout->setColStretch( 1, str);
         headerLayout->setColStretch( 2, 1);
     }
     
 }
 void KOEditorGeneral::setFocusOn( int i )
 {
     mNextFocus = i;
     QTimer::singleShot( 0, this, SLOT ( slotSetFocusOn() ));
 }
 void KOEditorGeneral::slotSetFocusOn()
 {
-    mNextFocus;
     if ( mNextFocus == 1 ) {
         mDescriptionEdit->setFocus();
         mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333);
     } 
     if ( mNextFocus == 2 ) {
         mSummaryEdit->setFocus();
     }
 }
 void KOEditorGeneral::editCategories()
 {
     // qDebug("KOEditorGeneral::editCategories() ");
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     connect(csd,SIGNAL(categoriesSelected(const QString &)), this ,SLOT(setCategories(const QString &)));
     //KOGlobals::fitDialogToScreen( csd );
     csd->setColorEnabled();
     csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) );
@@ -342,33 +341,33 @@ void KOEditorGeneral::pickAlarmProgram()
         mAlarmSoundButton->setOn(false);
         mAlarmProgramButton->setOn(true);
         QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
     }  else {
         mAlarmProgramButton->setOn(!oldState);
         mAlarmSoundButton->setOn(oldState);
     }
  
     if (mAlarmProgramButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
 
 }
 
 
-QString KOEditorGeneral::getFittingPath( const QString  s ) 
+QString KOEditorGeneral::getFittingPath( const QString & s ) 
 {
     int maxlen = 50;
     if ( QApplication::desktop()->width() < 640 ) {
         if ( QApplication::desktop()->width() < 320 )
             maxlen = 22;
         else
             maxlen = 35;
     }
     if ( s.length() > maxlen ) {
         return "..."+s.right(maxlen -3);
     }
     return s;
 }
 
 void KOEditorGeneral::enableAlarmEdit(bool enable)
 {
@@ -607,18 +606,20 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
             }
             else if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
                 alarm->setAudioAlarm(mAlarmSound);
             else
                 alarm->setType(Alarm::Invalid);
             //alarm->setAudioAlarm("default");
             // TODO: Deal with multiple alarms
             break; // For now, stop after the first alarm
         }
     } else {
         Alarm* alarm = event->alarms().first();
         if ( alarm ) {
             alarm->setEnabled(false);
             alarm->setType(Alarm::Invalid);
         }
     }
-    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
@@ -103,23 +103,23 @@ class KOEditorGeneral : public QObject
     QComboBox                  *mCalendarBox;
     QLabel                  *mAlarmBell;
     QCheckBox               *mAlarmButton;
     QSpinBox                *mAlarmTimeEdit;
     QPushButton             *mAlarmSoundButton;
     QPushButton             *mAlarmProgramButton;
     QComboBox               *mAlarmIncrCombo;
     KTextEdit               *mDescriptionEdit;
     QLabel                  *mOwnerLabel;
     QComboBox               *mSecrecyCombo;
     QCheckBox               *mCancelBox;
     QPushButton             *mCategoriesButton;
     QPushButton             *mCategoriesLabel;
      
   private:
     QPopupMenu * mCatPopup;
-    QString getFittingPath( const QString ) ;
+    QString getFittingPath( const QString &) ;
     QString mAlarmSound;
     QString mAlarmProgram;
     QString mAlarmMessage;
 };
 
 #endif
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 9ede543..3e87197 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -12,32 +12,33 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qhbox.h>
+#include <qtimer.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 #include <qapplication.h>
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
@@ -236,32 +237,35 @@ bool KOEventEditor::processInput( bool emitTime )
 
   writeEvent(event);
   if ( emitTime ) {
       globalFlagBlockAgenda = 1;
       emit showAgendaView( false );
       emit jumpToTime( event->dtStart().date() );
       globalFlagBlockAgenda = 2;
       
   }
   if (mEvent) {
     event->setRevision(event->revision()+1);
     emit eventChanged(event);
   } else {
     mCalendar->addEvent(event);
     mEvent = event;
     emit eventAdded(event);
+    if ( event->isAlarmEnabled () && !event->alarmEnabled () ) {
+        QTimer::singleShot( 0, this, SLOT ( alarmWarning() ) );
+    }
   }
  
   return true;
 }
 
 void KOEventEditor::deleteEvent()
 {
   kdDebug() << "Delete event" << endl;
 
   if (mEvent) {
     if (KOPrefs::instance()->mConfirm) {
       switch (msgItemDelete()) {
         case KMessageBox::Continue: // OK
           emit eventToBeDeleted(mEvent);
           emit dialogClose(mEvent);
           mCalendar->deleteEvent(mEvent);
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 02b54da..607e549 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -391,32 +391,36 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
 
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         if(wideScreen ){
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         }else{
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
         //addTag("p",s);
+        if ( !(event->alarmEnabled() ) ) {
+            addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
+
+        }
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
   
     formatCategories(event);
 
     formatAttendees(event);
   
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }else{
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }
 
@@ -508,32 +512,36 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         mMailSubject += i18n(" at ") + event->location();
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
         if ( wideScreen ) {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         } else {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
+        if ( !(event->alarmEnabled() ) ) {
+            addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
+
+        }
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
 
     formatCategories(event);
 
     formatAttendees(event);
     
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
 
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
 
         } else {
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9bc0302..236f6f9 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -77,32 +77,37 @@ KOIncidenceEditor::KOIncidenceEditor( const QString &caption,
 
 KOIncidenceEditor::~KOIncidenceEditor()
 {
     //delete mCategoryDialog;
 }
 
 void KOIncidenceEditor::setupAttendeesTab()
 {
   QFrame *topFrame = addPage(i18n("Attendees"));
 
   QBoxLayout *topLayout = new QVBoxLayout(topFrame);
 
   mDetails = new KOEditorDetails(spacingHint()-2,topFrame);
   topLayout->addWidget(mDetails);
 }
 
+void KOIncidenceEditor::alarmWarning()
+{
+    KMessageBox::information( 0, i18n("The alarm for this calendar\nis currently disabled!\nEnable it in resource settings."), i18n("Alarm disabled warning"));
+
+}
 
 void KOIncidenceEditor::slotApply()
 {
   processInput( false );
 }
 void KOIncidenceEditor::accept()
 {
     slotOk();
 }
 void KOIncidenceEditor::slotOk()
 {
   if ( processInput( false ) ) QDialog::accept();
 }
 
 void KOIncidenceEditor::updateCategoryConfig()
 {
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index bfd6cc6..2e4bbf8 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -52,33 +52,34 @@ class KOIncidenceEditor : public KDialogBase
     /** Initialize editor. This function creates the tab widgets. */
     virtual void init() = 0;
     void accept();
     virtual void setCategories( QString )= 0;
 
     virtual void reload() = 0;
 
   public slots:
     void updateCategoryConfig();
 
   signals:
     void editCategories();
     void showAgendaView( bool );
     void dialogClose( Incidence * );
     void jumpToTime( const QDate & );
 
-  protected slots:
+  protected slots: 
+    void alarmWarning();
     void slotApply();
     void slotOk();
     void slotCancel();
     void slotShowIncidence();
 
     virtual void slotLoadTemplate();
     virtual void slotSaveTemplate();
     
     virtual void saveTemplate( const QString & ) = 0;
 
   protected:
     void setupAttendeesTab();
 
     void createSaveTemplateDialog( SaveTemplateDialog::IncidenceType );
 
     QString loadTemplate( Calendar *cal, const QString &type,
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 682f83b..20a35d2 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -14,32 +14,33 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
+#include <qtimer.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <qapplication.h>
 #include <qtabwidget.h>
 
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/icalformat.h>
@@ -246,32 +247,35 @@ bool KOTodoEditor::processInput( bool emitTime )
 
   writeTodo(todo);
   if ( emitTime ) {
       globalFlagBlockAgenda = 1;
       emit showAgendaView( false );
       if ( todo->hasDueDate() )
           emit jumpToTime( todo->dtDue().date() );
       globalFlagBlockAgenda = 2;
   }
   if (mTodo) {
     todo->setRevision(todo->revision()+1);
     emit todoChanged(todo);
   } else {
     mCalendar->addTodo(todo);
     mTodo = todo;
     emit todoAdded(todo);
+    if ( todo->isAlarmEnabled () && !todo->alarmEnabled () ) {
+        QTimer::singleShot( 0, this, SLOT ( alarmWarning() ) );
+    }
   }
  
   return true;
 }
 
 void KOTodoEditor::deleteTodo()
 {
   if (mTodo) {
     if (KOPrefs::instance()->mConfirm) {
       switch (msgItemDelete()) {
         case KMessageBox::Continue: // OK
           emit todoToBeDeleted(mTodo);
           emit dialogClose(mTodo);
           mCalendar->deleteTodo(mTodo);
           emit todoDeleted();
           reject();