PreserveExtension #5

alexleen · May 15, 2018 · 4b4ac4d · 4b4ac4d
1 parent 2786f39
commit 4b4ac4d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 2 deletions.
diff --git a/Source/Editor/Editor.csproj b/Source/Editor/Editor.csproj
@@ -105,6 +105,7 @@
     <Compile Include="Windows\Appenders\Properties\MaximumFileSize.cs" />
     <Compile Include="Windows\Appenders\Properties\MaxSizeRollBackups.cs" />
     <Compile Include="Windows\Appenders\Properties\Name.cs" />
+    <Compile Include="Windows\Appenders\Properties\PreserveExtension.cs" />
     <Compile Include="Windows\Appenders\Properties\Refs.cs" />
     <Compile Include="Windows\Appenders\Properties\RollingStyle.cs" />
     <Compile Include="Windows\Appenders\Properties\StaticLogFileName.cs" />

diff --git a/Source/Editor/Windows/Appenders/Properties/PreserveExtension.cs b/Source/Editor/Windows/Appenders/Properties/PreserveExtension.cs
@@ -0,0 +1,38 @@
+// Copyright © 2018 Alex Leendertsen
+
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Xml;
+using Editor.Utilities;
+
+namespace Editor.Windows.Appenders.Properties
+{
+    public class PreserveExtension : AppenderPropertyBase
+    {
+        private const string PreserveExtensionName = "preserveLogFileNameExtension";
+
+        public PreserveExtension(ObservableCollection<IAppenderProperty> container)
+            : base(container, GridLength.Auto)
+        {
+        }
+
+        public bool Preserve { get; set; }
+
+        public override void Load(XmlNode originalAppenderNode)
+        {
+            string preserveStr = originalAppenderNode.GetValueAttributeValueFromChildElement(PreserveExtensionName);
+            if (!string.IsNullOrEmpty(preserveStr) && bool.TryParse(preserveStr, out bool preserve))
+            {
+                Preserve = preserve;
+            }
+        }
+
+        public override void Save(XmlDocument xmlDoc, XmlNode newAppenderNode)
+        {
+            if (Preserve)
+            {
+                xmlDoc.CreateElementWithAttribute(PreserveExtensionName, "value", Preserve.ToString().ToLower()).AppendTo(newAppenderNode);
+            }
+        }
+    }
+}
diff --git a/Source/Editor/Windows/Appenders/Properties/PropertyDictionary.xaml b/Source/Editor/Windows/Appenders/Properties/PropertyDictionary.xaml
@@ -82,7 +82,19 @@
             <CheckBox Grid.Column="1" IsChecked="{Binding Value}" VerticalAlignment="Center"/>
         </Grid>
     </DataTemplate>
-
+
+    <DataTemplate DataType="{x:Type Properties:PreserveExtension}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition SharedSizeGroup="FirstColumn"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <Label>Preserve Extension:</Label>
+            <CheckBox Grid.Column="1" IsChecked="{Binding Preserve}" VerticalAlignment="Center"/>
+        </Grid>
+    </DataTemplate>
+
     <DataTemplate DataType="{x:Type Properties:CountDirection}">
         <Grid>
             <Grid.ColumnDefinitions>

diff --git a/Source/Editor/Windows/Appenders/RollingFileAppenderWindow.cs b/Source/Editor/Windows/Appenders/RollingFileAppenderWindow.cs
@@ -20,7 +20,8 @@ public RollingFileAppenderWindow(Window owner, XmlDocument configXml, XmlNode lo
             : base(owner, configXml, log4NetNode, appenderNode)
         {
             Title = "Rolling File Appender";
-            Height = 650;
+            Height = 700;
+            MinHeight = 700;
             mDatePattern = new DatePattern(AppenderProperties);
             mStaticLogFileName = new StaticLogFileName(AppenderProperties);
         }
@@ -38,6 +39,7 @@ protected override void AddOtherFileAppenderProperties()
             mDatePatternIndex = AppenderProperties.Count;
             AddRemoveBasedOnMode(rollingStyle.SelectedMode, mDatePatternIndex, mDatePattern);
 
+            AppenderProperties.Add(new PreserveExtension(AppenderProperties));
             AppenderProperties.Add(new MaximumFileSize(AppenderProperties));
             AppenderProperties.Add(new MaxSizeRollBackups(AppenderProperties));
             AppenderProperties.Add(new CountDirection(AppenderProperties));