fixes

3 files changed, 15 insertions, 4 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 5420822..2820ca2 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -547,8 +547,11 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         }
         break;
 
     case QEvent::MouseButtonDblClick:
+        blockMoving = false;
+        leftMouseDown = false;
+        rightMouseDown = false;
         if (object == viewport()) {
             selectItem(0);
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 496f125..4ee5292 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -224,15 +224,17 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
 
 void KOEditorGeneral::pickAlarmSound()
 {
 
+    qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
     //QString prefix = mAlarmSound;
     if (!mAlarmSoundButton->isOn()) {
         //mAlarmSound = "";
         QToolTip::remove(mAlarmSoundButton);
         QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
         mAlarmProgramButton->setOn(true);
         mAlarmSoundButton->setOn(false);
+        pickAlarmProgram();
     } else {
         QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
                                                       i18n("*.wav|Wav Files"), 0));
         if (!fileName.isEmpty()) {
@@ -251,9 +253,9 @@ void KOEditorGeneral::pickAlarmSound()
    
     if (mAlarmProgramButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
 }
 
 void KOEditorGeneral::pickAlarmProgram()
 {
@@ -262,10 +264,11 @@ void KOEditorGeneral::pickAlarmProgram()
         QToolTip::remove(mAlarmProgramButton);
         QToolTip::add(mAlarmProgramButton, i18n("No program set"));
         mAlarmProgramButton->setOn(false);
         mAlarmSoundButton->setOn(true);
+        pickAlarmSound();
     } else {
-        QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ")  , 0));
+        QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ")  , 0));
         if (!fileName.isEmpty()) {
             mAlarmProgram = fileName;
             QToolTip::remove(mAlarmProgramButton);
             QString dispStr = i18n("Running '%1'").arg(fileName);
@@ -279,9 +282,9 @@ void KOEditorGeneral::pickAlarmProgram()
     }
     if (mAlarmProgramButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
 }
 
 
 QString KOEditorGeneral::getFittingPath( const QString  s ) 
@@ -316,9 +319,11 @@ void KOEditorGeneral::enableAlarmEdit(bool enable)
         if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
             ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
     }
     else {
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item"));
+        ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
+           //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
+
 
     }
     mAlarmTimeEdit->setEnabled(enable);
     mAlarmSoundButton->setEnabled(enable);
@@ -362,8 +367,9 @@ void KOEditorGeneral::setDefaults(bool allDay)
 #if 0
     mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName());
 #endif
 
+    mAlarmMessage = i18n("Edit new item");
     enableAlarmEdit( !allDay );
 
     // TODO: Implement a KPrefsComboItem to solve this in a clean way.
     int alarmTime;
@@ -393,8 +399,9 @@ void KOEditorGeneral::setSecrecy( int num )
 }
 void KOEditorGeneral::readIncidence(Incidence *event)
 {
 
+    mAlarmMessage = i18n("Edit") +" "+event->summary();
     mAlarmIncrCombo->setCurrentItem(0);
     mSummaryEdit->setEditText(event->summary());
     mLocationEdit->setEditText(event->location());
     mDescriptionEdit->setText(event->description());
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index de8edaf..f4728c7 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -107,7 +107,8 @@ class KOEditorGeneral : public QObject
   private:
     QString getFittingPath( const QString ) ;
     QString mAlarmSound;
     QString mAlarmProgram;
+    QString mAlarmMessage;
 };
 
 #endif