Allow users to have multiple configuration files

Eve-O-Preview/Configuration/AppConfig.cs

@@ -0,0 +1,13 @@
+namespace EveOPreview.Configuration
+{
+	class AppConfig : IAppConfig
+	{
+		public AppConfig()
+		{
+			// Default values
+			this.ConfigFileName = null;
+		}
+
+		public string ConfigFileName { get; set; }
+	}
+}

Eve-O-Preview/Configuration/ConfigurationStorage.cs

@@ -3,15 +3,17 @@ using Newtonsoft.Json;
 
 namespace EveOPreview.Configuration
 {
-	public class ConfigurationStorage : IConfigurationStorage
+	class ConfigurationStorage : IConfigurationStorage
 	{
 		private const string ConfigurationFileName = "EVE-O Preview.json";
 
-		private readonly IThumbnailConfig _configuration;
+		private readonly IAppConfig _appConfig;
+		private readonly IThumbnailConfig _thumbnailConfig;
 
-		public ConfigurationStorage(IThumbnailConfig configuration)
+		public ConfigurationStorage(IAppConfig appConfig, IThumbnailConfig thumbnailConfig)
 		{
-			this._configuration = configuration;
+			this._appConfig = appConfig;
+			this._thumbnailConfig = thumbnailConfig;
 		}
 
 		public void Load()
@@ -25,22 +27,22 @@ namespace EveOPreview.Configuration
 
 			string rawData = File.ReadAllText(filename);
 
-			JsonConvert.PopulateObject(rawData, this._configuration);
+			JsonConvert.PopulateObject(rawData, this._thumbnailConfig);
 
 			// Validate data after loading it
-			this._configuration.ApplyRestrictions();
+			this._thumbnailConfig.ApplyRestrictions();
 		}
 
 		public void Save()
 		{
-			string rawData = JsonConvert.SerializeObject(this._configuration, Formatting.Indented);
+			string rawData = JsonConvert.SerializeObject(this._thumbnailConfig, Formatting.Indented);
 
 			File.WriteAllText(this.GetConfigFileName(), rawData);
 		}
 
 		private string GetConfigFileName()
 		{
-			return string.IsNullOrEmpty(this._configuration.ConfigFileName) ? ConfigurationStorage.ConfigurationFileName : this._configuration.ConfigFileName;
+			return string.IsNullOrEmpty(this._appConfig.ConfigFileName) ? ConfigurationStorage.ConfigurationFileName : this._appConfig.ConfigFileName;
 		}
 	}
 }

Eve-O-Preview/Configuration/IAppConfig.cs

@@ -0,0 +1,10 @@
+namespace EveOPreview.Configuration
+{
+	/// <summary>
+	/// Application configuration
+	/// </summary>
+	public interface IAppConfig
+	{
+		string ConfigFileName { get; set; }
+	}
+}

Eve-O-Preview/Configuration/IThumbnailConfig.cs

@@ -3,10 +3,11 @@ using System.Windows.Forms;
 
 namespace EveOPreview.Configuration
 {
+	/// <summary>
+	/// Thumbnails Manager configuration
+	/// </summary>
 	public interface IThumbnailConfig
 	{
-		string ConfigFileName { get; set; }
-
 		bool MinimizeToTray { get; set; }
 		int ThumbnailRefreshPeriod { get; set; }
 

Eve-O-Preview/Configuration/ThumbnailConfig.cs

@@ -5,13 +5,10 @@ using Newtonsoft.Json;
 
 namespace EveOPreview.Configuration
 {
-	public class ThumbnailConfig : IThumbnailConfig
+	class ThumbnailConfig : IThumbnailConfig
 	{
 		public ThumbnailConfig()
 		{
-			// Default values
-			this.ConfigFileName = null;
-
 			this.MinimizeToTray = false;
 			this.ThumbnailRefreshPeriod = 500;
 
@@ -43,9 +40,6 @@ namespace EveOPreview.Configuration
 			this.ClientHotkey = new Dictionary<string, string>();
 		}
 
-		[JsonIgnore]
-		public string ConfigFileName { get; set; }
-
 		public bool MinimizeToTray { get; set; }
 		public int ThumbnailRefreshPeriod { get; set; }
 

Eve-O-Preview/Eve-O-Preview.csproj

@@ -96,7 +96,9 @@
     <Compile Include="ApplicationBase\LightInjectContainer.cs" />
     <Compile Include="ApplicationBase\Presenter.cs" />
     <Compile Include="ApplicationBase\PresenterGeneric.cs" />
+    <Compile Include="Configuration\AppConfig.cs" />
     <Compile Include="Configuration\ConfigurationStorage.cs" />
+    <Compile Include="Configuration\IAppConfig.cs" />
     <Compile Include="Configuration\IThumbnailConfig.cs" />
     <Compile Include="Configuration\ZoomAnchor.cs" />
     <Compile Include="DwmAPI\DWM_BLURBEHIND.cs" />

Eve-O-Preview/Program.cs

@@ -31,9 +31,10 @@ namespace EveOPreview
 				.RegisterService<IThumbnailViewFactory, ThumbnailViewFactory>()
 				.RegisterService<IThumbnailDescriptionViewFactory, ThumbnailDescriptionViewFactory>()
 				.RegisterService<IConfigurationStorage, ConfigurationStorage>()
+				.RegisterInstance<IAppConfig>(new AppConfig())
 				.RegisterInstance<IThumbnailConfig>(new ThumbnailConfig());
 
-			controller.Create<IThumbnailConfig>().ConfigFileName = Program.GetCustomConfigFile(args);
+			controller.Create<IAppConfig>().ConfigFileName = Program.GetCustomConfigFile(args);
 
 			controller.Run<MainPresenter>();
 		}