| -rw-r--r-- | korganizer/koagenda.cpp | 3 | ||||
| -rw-r--r-- | korganizer/koeditorgeneral.cpp | 15 | ||||
| -rw-r--r-- | korganizer/koeditorgeneral.h | 1 |
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 @@ -550,2 +550,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) case QEvent::MouseButtonDblClick: + blockMoving = false; + leftMouseDown = false; + rightMouseDown = false; if (object == viewport()) { diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 496f125..4ee5292 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -227,2 +227,3 @@ void KOEditorGeneral::pickAlarmSound() + qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); //QString prefix = mAlarmSound; @@ -234,2 +235,3 @@ void KOEditorGeneral::pickAlarmSound() mAlarmSoundButton->setOn(false); + pickAlarmProgram(); } else { @@ -254,3 +256,3 @@ void KOEditorGeneral::pickAlarmSound() if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); } @@ -265,4 +267,5 @@ void KOEditorGeneral::pickAlarmProgram() 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()) { @@ -282,3 +285,3 @@ void KOEditorGeneral::pickAlarmProgram() if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); } @@ -319,3 +322,5 @@ void KOEditorGeneral::enableAlarmEdit(bool enable) 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()); + @@ -365,2 +370,3 @@ void KOEditorGeneral::setDefaults(bool allDay) + mAlarmMessage = i18n("Edit new item"); enableAlarmEdit( !allDay ); @@ -396,2 +402,3 @@ void KOEditorGeneral::readIncidence(Incidence *event) + mAlarmMessage = i18n("Edit") +" "+event->summary(); mAlarmIncrCombo->setCurrentItem(0); diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index de8edaf..f4728c7 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -110,2 +110,3 @@ class KOEditorGeneral : public QObject QString mAlarmProgram; + QString mAlarmMessage; }; |