From 01cd367c0caa1c56f14cce42776639196c17819f Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 3 May 2015 09:19:39 +0200 Subject: [PATCH] handle option editor event selcat --- src/ce_dockoptions.pas | 13 +++++++++++++ src/ce_editoroptions.pas | 5 +++-- src/ce_messages.pas | 2 +- src/ce_shortcutseditor.pas | 3 +++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/ce_dockoptions.pas b/src/ce_dockoptions.pas index 8c744397..f425df24 100644 --- a/src/ce_dockoptions.pas +++ b/src/ce_dockoptions.pas @@ -89,6 +89,19 @@ begin SaveToMaster; fBackup.Clear; DockMaster.SaveSettingsToConfig(fBackup); + end + // reload + else if anEvent = oeeSelectCat then + begin + fBackup.Clear; + DockMaster.SaveSettingsToConfig(fBackup); + LoadFromMaster; + end + //change + else + begin + SaveToMaster; + doChanged(nil); end; end; diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas index 2ed26a18..c8c90e8c 100644 --- a/src/ce_editoroptions.pas +++ b/src/ce_editoroptions.pas @@ -316,10 +316,11 @@ begin self.Assign(fBackup); D2Syn.Assign(fBackup.fD2Syn); TxtSyn.Assign(fBackup.fTxtSyn); - end; + end // apply, if change/accept event // to get a live preview - applyChangesFromSelf; + else if anEvent <> oeeSelectCat then + applyChangesFromSelf; // new backup values based on accepted values. if anEvent = oeeAccept then begin diff --git a/src/ce_messages.pas b/src/ce_messages.pas index 7a12ed94..c8120a2d 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -368,7 +368,7 @@ end; procedure TCEMessagesWidget.optionedEvent(anEvent: TOptionEditorEvent); begin case anEvent of - oeeAccept: + oeeAccept, oeeSelectCat: fOptionsBackup.assign(fOptions); oeeCancel: fOptions.assign(fOptionsBackup); diff --git a/src/ce_shortcutseditor.pas b/src/ce_shortcutseditor.pas index ae2bbf7c..3211d9a3 100644 --- a/src/ce_shortcutseditor.pas +++ b/src/ce_shortcutseditor.pas @@ -190,6 +190,9 @@ end; procedure TCEShortcutEditor.optionedEvent(anEvent: TOptionEditorEvent); begin + case anEvent of + oeeSelectCat: updateFromObservers; + end; // TODO-cfeature: pass new shortcut to observer end; {$ENDREGION}