Update folder structure

srwi · Nov 13, 2020 · 693c220 · 693c220
1 parent fc8da93
commit 693c220
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 34 deletions.
diff --git a/EverythingToolbar/StringToXamlConverter.cs → ...ar/Converters/HighlightedTextConverter.cs b/EverythingToolbar/StringToXamlConverter.cs → ...ar/Converters/HighlightedTextConverter.cs
@@ -8,7 +8,7 @@
 
 namespace EverythingToolbar
 {
-	public class StringToXamlConverter : MarkupExtension, IValueConverter
+	public class HighlightedTextConverter : MarkupExtension, IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{

diff --git a/EverythingToolbar/Rule.cs → EverythingToolbar/Data/Rule.cs b/EverythingToolbar/Rule.cs → EverythingToolbar/Data/Rule.cs
@@ -66,9 +66,6 @@ public bool ExpressionValid
 		{
 			get
 			{
-				if (string.IsNullOrEmpty(Expression))
-					return false;
-
 				try
 				{
 					Regex.IsMatch("", Expression);

diff --git a/EverythingToolbar/SearchResult.cs → EverythingToolbar/Data/SearchResult.cs b/EverythingToolbar/SearchResult.cs → EverythingToolbar/Data/SearchResult.cs
diff --git a/EverythingToolbar/EverythingToolbar.csproj b/EverythingToolbar/EverythingToolbar.csproj
@@ -72,7 +72,7 @@
       <DependentUpon>About.xaml</DependentUpon>
     </Compile>
     <Compile Include="EverythingSearch.cs" />
-    <Compile Include="Rule.cs" />
+    <Compile Include="Data\Rule.cs" />
     <Compile Include="Rules.xaml.cs">
       <DependentUpon>Rules.xaml</DependentUpon>
     </Compile>
@@ -82,8 +82,8 @@
     <Compile Include="SearchResultsView.xaml.cs">
       <DependentUpon>SearchResultsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ToolbarLogger.cs" />
-    <Compile Include="WindowsThumbnailProvider.cs" />
+    <Compile Include="Helpers\ToolbarLogger.cs" />
+    <Compile Include="Helpers\WindowsThumbnailProvider.cs" />
     <Page Include="About.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -141,8 +141,8 @@
     </Page>
     <Compile Include="Deskband.cs" />
     <Compile Include="CSDeskBand.cs" />
-    <Compile Include="SearchResult.cs" />
-    <Compile Include="StringToXamlConverter.cs" />
+    <Compile Include="Data\SearchResult.cs" />
+    <Compile Include="Converters\HighlightedTextConverter.cs" />
     <Compile Include="ToolbarControl.xaml.cs">
       <DependentUpon>ToolbarControl.xaml</DependentUpon>
       <SubType>Code</SubType>

diff --git a/EverythingToolbar/ToolbarLogger.cs → EverythingToolbar/Helpers/ToolbarLogger.cs b/EverythingToolbar/ToolbarLogger.cs → EverythingToolbar/Helpers/ToolbarLogger.cs
diff --git a/...ythingToolbar/WindowsThumbnailProvider.cs → ...olbar/Helpers/WindowsThumbnailProvider.cs b/...ythingToolbar/WindowsThumbnailProvider.cs → ...olbar/Helpers/WindowsThumbnailProvider.cs
diff --git a/EverythingToolbar/ItemTemplates/Compact (detailed).xaml b/EverythingToolbar/ItemTemplates/Compact (detailed).xaml
@@ -18,12 +18,12 @@
                    Width="16"
                    Height="16"
                    Margin="0, 0, 2, 0" />
-            <ContentControl Content="{Binding HighlightedFileName, Converter={local:StringToXamlConverter}, Mode=OneTime}"
+            <ContentControl Content="{Binding HighlightedFileName, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
                             Grid.Column="1"
                             FontSize="9pt"
                             Margin="2, 0"
                             Foreground="{DynamicResource SearchResultFileName}" />
-            <ContentControl Content="{Binding HighlightedPath, Converter={local:StringToXamlConverter}, Mode=OneTime}"
+            <ContentControl Content="{Binding HighlightedPath, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
                             ToolTip="{Binding Path}"
                             Grid.Column="2"
                             FontSize="9pt"

diff --git a/EverythingToolbar/ItemTemplates/Compact.xaml b/EverythingToolbar/ItemTemplates/Compact.xaml
@@ -16,7 +16,7 @@
                    Width="16"
                    Height="16"
                    Margin="0, 0, 2, 0" />
-            <ContentControl Content="{Binding HighlightedFileName, Converter={local:StringToXamlConverter}, Mode=OneTime}"
+            <ContentControl Content="{Binding HighlightedFileName, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
                             Grid.Column="1"
                             FontSize="9pt"
                             Margin="2, 0"

diff --git a/EverythingToolbar/ItemTemplates/Normal (detailed).xaml b/EverythingToolbar/ItemTemplates/Normal (detailed).xaml
@@ -16,13 +16,13 @@
                    Width="16"
                    Height="16"
                    Margin="0, 5, 0, 0" />
-            <ContentControl Content="{Binding HighlightedFileName, Converter={local:StringToXamlConverter}, Mode=OneTime}"
+            <ContentControl Content="{Binding HighlightedFileName, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
                             Grid.Column="1"
                             VerticalAlignment="Bottom"
                             Margin="0, 7, 0, 4"
                             FontSize="12pt"
                             Foreground="{DynamicResource SearchResultFileName}" />
-            <ContentControl Content="{Binding HighlightedPath, Converter={local:StringToXamlConverter}, Mode=OneTime}"
+            <ContentControl Content="{Binding HighlightedPath, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
                             ToolTip="{Binding Path}"
                             Grid.Column="1"
                             Grid.Row="1"

diff --git a/EverythingToolbar/ItemTemplates/Normal.xaml b/EverythingToolbar/ItemTemplates/Normal.xaml
@@ -13,21 +13,21 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Image Source="{Binding Icon, IsAsync=True}"
-                       Width="16"
-                       Height="16"
-                       Margin="0, 5, 0, 0" />
-            <ContentControl Content="{Binding HighlightedFileName, Converter={local:StringToXamlConverter}, Mode=OneTime}"
-                                Grid.Column="1"
-                                VerticalAlignment="Bottom"
-                                Margin="0, 7, 0, 4"
-                                FontSize="12pt"
-                                Foreground="{DynamicResource SearchResultFileName}" />
+                   Width="16"
+                   Height="16"
+                   Margin="0, 5, 0, 0" />
+            <ContentControl Content="{Binding HighlightedFileName, Converter={local:HighlightedTextConverter}, Mode=OneTime}"
+                            Grid.Column="1"
+                            VerticalAlignment="Bottom"
+                            Margin="0, 7, 0, 4"
+                            FontSize="12pt"
+                            Foreground="{DynamicResource SearchResultFileName}" />
             <TextBlock Grid.Column="2"
-                           VerticalAlignment="Bottom"
-                           Margin="10, 5, 10, 6"
-                           FontSize="10pt"
-                           Foreground="{DynamicResource SearchResultDateModified}"
-                           Text="{Binding DateModified}" />
+                       VerticalAlignment="Bottom"
+                       Margin="10, 5, 10, 6"
+                       FontSize="10pt"
+                       Foreground="{DynamicResource SearchResultDateModified}"
+                       Text="{Binding DateModified}" />
         </Grid>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/EverythingToolbar/Properties/AssemblyInfo.cs b/EverythingToolbar/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0")]
+[assembly: AssemblyVersion("0.5.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EverythingToolbar/Rules.xaml b/EverythingToolbar/Rules.xaml
@@ -43,7 +43,7 @@
                 Use %file%, %filename% and %path% as placeholders for commands.
             </TextBlock>
 
-            <CheckBox IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=isAutoApplyRules, Mode=TwoWay}"
+            <CheckBox Name="autoApplyRulesCheckbox"
                       Click="CheckBox_Click">
                 Automatically apply rules based on condition
             </CheckBox>

diff --git a/EverythingToolbar/Rules.xaml.cs b/EverythingToolbar/Rules.xaml.cs
@@ -20,6 +20,7 @@ public Rules()
 
 			rules = LoadRules();
 			dataGrid.ItemsSource = rules;
+			autoApplyRulesCheckbox.IsChecked = Properties.Settings.Default.isAutoApplyRules;
 			UpdateUI();
 		}
 
@@ -30,8 +31,12 @@ private void Cancel(object sender, RoutedEventArgs e)
 
 		private void Save(object sender, RoutedEventArgs e)
 		{
-			if(SaveRules(rules))
+			if(SaveRules(rules, (bool)autoApplyRulesCheckbox.IsChecked))
+			{
+				Properties.Settings.Default.isAutoApplyRules = (bool)autoApplyRulesCheckbox.IsChecked;
+				Properties.Settings.Default.Save();
 				Close();
+			}
 		}
 
 		public static List<Rule> LoadRules()
@@ -48,14 +53,14 @@ public static List<Rule> LoadRules()
 			return new List<Rule>();
 		}
 
-		public static bool SaveRules(List<Rule> newRules)
+		public static bool SaveRules(List<Rule> newRules, bool isAutoApplyRules)
 		{
 			if (newRules.Any(r => string.IsNullOrEmpty(r.Name)))
 			{
 				MessageBox.Show("Rule names cannot be empty.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
 				return false;
 			}
-			if (newRules.Any(r => !r.ExpressionValid))
+			if (isAutoApplyRules && newRules.Any(r => !r.ExpressionValid))
 			{
 				MessageBox.Show("At least one regular expression is invalid.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
 				return false;
@@ -129,7 +134,7 @@ private void UpdateUI()
 			MoveDownButton.IsEnabled = dataGrid.SelectedIndex + 1 < rules.Count && dataGrid.SelectedIndex >= 0;
 			MoveUpButton.IsEnabled = dataGrid.SelectedIndex > 0;
 
-			if (Properties.Settings.Default.isAutoApplyRules)
+			if ((bool)autoApplyRulesCheckbox.IsChecked)
 			{
 				TypeColumn.Visibility = Visibility.Visible;
 				ExpressionColumn.Visibility = Visibility.Visible;