From 02408e6f87897ebc52ccc19fbc40b1a94e6afe35 Mon Sep 17 00:00:00 2001 From: Takayoshi Matsuyama Date: Wed, 11 Mar 2015 22:45:44 +0900 Subject: [PATCH] [BugFix] Multibackup toolbar button is not activated when new backup setting is created. --- Main/Core/Services/IBackupSettingService.cs | 5 +++++ Main/Properties/AssemblyInfo.cs | 4 ++-- Main/Services/BackupService.cs | 8 +++++++- Main/Services/BackupSettingService.cs | 12 +++++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Main/Core/Services/IBackupSettingService.cs b/Main/Core/Services/IBackupSettingService.cs index 87aea12..ce74bd5 100644 --- a/Main/Core/Services/IBackupSettingService.cs +++ b/Main/Core/Services/IBackupSettingService.cs @@ -31,6 +31,11 @@ namespace SimpleBackup.Core.Services public interface IBackupSettingService { /// + /// Occurs when backup setting is created. + /// + event EventHandler BackupSettingCreated; + + /// /// Occurs when backup setting is opened. /// event EventHandler BackupSettingOpened; diff --git a/Main/Properties/AssemblyInfo.cs b/Main/Properties/AssemblyInfo.cs index 535cd68..4188813 100644 --- a/Main/Properties/AssemblyInfo.cs +++ b/Main/Properties/AssemblyInfo.cs @@ -38,6 +38,6 @@ using System.Windows; ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("1.0.0.181")] -[assembly: AssemblyFileVersion("1.0.0.181")] +[assembly: AssemblyVersion("1.0.0.182")] +[assembly: AssemblyFileVersion("1.0.0.182")] [assembly: NeutralResourcesLanguageAttribute("en")] diff --git a/Main/Services/BackupService.cs b/Main/Services/BackupService.cs index e3de044..2729dfc 100644 --- a/Main/Services/BackupService.cs +++ b/Main/Services/BackupService.cs @@ -56,6 +56,7 @@ namespace SimpleBackup.Services /// private BackupService() { + BackupSettingService.Instance.BackupSettingCreated += OnBackupSettingCreated; BackupSettingService.Instance.BackupSettingOpened += this.OnBackupSettingOpened; BackupSettingService.Instance.BackupSettingClosed += this.OnBackupSettingClosed; } @@ -437,7 +438,7 @@ namespace SimpleBackup.Services destinationFileName, CompressionLevel.Optimal, false, - Encoding.GetEncoding(SimpleBackup.Properties.Settings.Default.DefaultZipEncodingKeyText)); + Encoding.GetEncoding(Properties.Settings.Default.DefaultZipEncodingKeyText)); } catch (Exception e) { @@ -605,6 +606,11 @@ namespace SimpleBackup.Services }); } + private void OnBackupSettingCreated(object sender, SettingFileEventArgs settingFileEventArgs) + { + this.IsReadyForBackup = true; + } + private void OnBackupSettingOpened(object sender, SettingFileEventArgs settingFileEventArgs) { this.IsReadyForBackup = true; diff --git a/Main/Services/BackupSettingService.cs b/Main/Services/BackupSettingService.cs index 368abcc..1308e4d 100644 --- a/Main/Services/BackupSettingService.cs +++ b/Main/Services/BackupSettingService.cs @@ -73,6 +73,11 @@ namespace SimpleBackup.Services } /// + /// Occurs when backup setting is created. + /// + public event EventHandler BackupSettingCreated; + + /// /// Occurs when backup setting is opened. /// public event EventHandler BackupSettingOpened; @@ -151,6 +156,11 @@ namespace SimpleBackup.Services this.CurrentSetting = backupSetting; this.CurrentSetting.SettingModified += this.OnCurrentSettingModified; + if (this.BackupSettingCreated != null) + { + this.BackupSettingCreated(this, new SettingFileEventArgs(this.CurrentSetting.SettingName)); + } + return true; } @@ -318,7 +328,7 @@ namespace SimpleBackup.Services public bool OpenDefaultBackupSetting(out string resultMessage) { return this.OpenBackupSetting( - SimpleBackup.Properties.Settings.Default.DefaultSettingFileName, + Properties.Settings.Default.DefaultSettingFileName, out resultMessage); } -- 2.11.0