Merge pull request #2640 from retailcoder/next

removed folder annotation config

Author: retailcoder

RetailCoder.VBE/Navigation/Folders/FolderHelper.cs

@@ -2,14 +2,12 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Settings;
 
 namespace Rubberduck.Navigation.Folders
 {
     public class FolderHelper
     {
         private readonly RubberduckParserState _state;
-        private readonly ConfigurationLoader _configLoader;
 
         private static readonly DeclarationType[] ComponentTypes =
         {
@@ -19,10 +17,9 @@ public class FolderHelper
             DeclarationType.UserForm, 
         };
 
-        public FolderHelper(RubberduckParserState state, ConfigurationLoader configLoader)
+        public FolderHelper(RubberduckParserState state)
         {
             _state = state;
-            _configLoader = configLoader;
         }
 
         public CodeExplorerCustomFolderViewModel GetFolderTree(Declaration declaration = null)
@@ -65,8 +62,7 @@ public CodeExplorerCustomFolderViewModel GetFolderTree(Declaration declaration =
 
         private char GetDelimiter()
         {
-            var settings = _configLoader.LoadConfiguration();
-            return settings.UserSettings.GeneralSettings.Delimiter;
+            return '.';
         }
     }
 }

RetailCoder.VBE/Settings/GeneralSettings.cs

@@ -13,7 +13,7 @@ public interface IGeneralSettings
         bool SmartIndenterPrompted { get; set; }
         bool AutoSaveEnabled { get; set; }
         int AutoSavePeriod { get; set; }
-        char Delimiter { get; set; }
+        //char Delimiter { get; set; }
         int MinimumLogLevel { get; set; }
     }
 
@@ -26,7 +26,7 @@ public class GeneralSettings : IGeneralSettings, IEquatable<GeneralSettings>
         public bool SmartIndenterPrompted { get; set; }
         public bool AutoSaveEnabled { get; set; }
         public int AutoSavePeriod { get; set; }
-        public char Delimiter { get; set; }
+        //public char Delimiter { get; set; }
 
         private int _logLevel;
         public int MinimumLogLevel
@@ -57,7 +57,7 @@ public GeneralSettings()
             SmartIndenterPrompted = false;
             AutoSaveEnabled = false;
             AutoSavePeriod = 10;
-            Delimiter = '.';
+            //Delimiter = '.';
             MinimumLogLevel = LogLevel.Off.Ordinal;
         }
 
@@ -70,7 +70,7 @@ public bool Equals(GeneralSettings other)
                    SmartIndenterPrompted == other.SmartIndenterPrompted &&
                    AutoSaveEnabled == other.AutoSaveEnabled &&
                    AutoSavePeriod == other.AutoSavePeriod &&
-                   Delimiter.Equals(other.Delimiter) &&
+                   //Delimiter.Equals(other.Delimiter) &&
                    MinimumLogLevel == other.MinimumLogLevel;
         }
     }

RetailCoder.VBE/UI/Settings/GeneralSettings.xaml

@@ -136,13 +136,13 @@
                                        HorizontalAlignment="Left" />
                     </StackPanel>
 
-                    <Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=GeneralSettings_FolderDelimiterLabel}" FontWeight="SemiBold" />
+                    <!--<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=GeneralSettings_FolderDelimiterLabel}" FontWeight="SemiBold" />
                     <ComboBox Width="210"
                       HorizontalAlignment="Left"
                       Margin="5"
                       SelectedIndex="0"
                       ItemsSource="{Binding Source={StaticResource Delimiters}, Converter={StaticResource DelimiterToText}, UpdateSourceTrigger=PropertyChanged}"
-                      SelectedItem="{Binding Delimiter, Mode=TwoWay, Converter={StaticResource DelimiterValueToText}}" />
+                      SelectedItem="{Binding Delimiter, Mode=TwoWay, Converter={StaticResource DelimiterValueToText}}" />-->
 
                     <Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" />
                     <StackPanel Orientation="Horizontal">

RetailCoder.VBE/UI/Settings/GeneralSettingsViewModel.cs

@@ -185,7 +185,7 @@ private Rubberduck.Settings.GeneralSettings GetCurrentGeneralSettings()
                 SmartIndenterPrompted = _indenterPrompted,
                 AutoSaveEnabled = AutoSaveEnabled,
                 AutoSavePeriod = AutoSavePeriod,
-                Delimiter = (char)Delimiter,
+                //Delimiter = (char)Delimiter,
                 MinimumLogLevel = SelectedLogLevel.Ordinal
             };
         }
@@ -199,7 +199,7 @@ private void TransferSettingsToView(IGeneralSettings general, IHotkeySettings ho
             _indenterPrompted = general.SmartIndenterPrompted;
             AutoSaveEnabled = general.AutoSaveEnabled;
             AutoSavePeriod = general.AutoSavePeriod;
-            Delimiter = (DelimiterOptions)general.Delimiter;
+            //Delimiter = (DelimiterOptions)general.Delimiter;
             SelectedLogLevel = LogLevels.First(l => l.Ordinal == general.MinimumLogLevel);
         }