Skip to content

Commit 58549a5

Browse files
author
Sébastien Geiser
committed
TextSource as C# Script in progress
1 parent 0887c82 commit 58549a5

File tree

2 files changed

+57
-34
lines changed

2 files changed

+57
-34
lines changed

‎RegexDialog/RegExToolDialog.xaml

Lines changed: 55 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,11 @@
582582
</ItemsControl.ItemTemplate>
583583
</ItemsControl>
584584
</TabItem>
585-
<TabItem x:Name="TextSourceTabItem" Header="Text _Source">
585+
<TabItem x:Name="TextSourceTabItem" Header="Ot_her Options">
586586
<DockPanel>
587-
<GroupBox Header="Other Options" DockPanel.Dock="Bottom">
588-
<StackPanel Margin="5,0">
587+
<GroupBox Header="Results"
588+
DockPanel.Dock="Bottom">
589+
<StackPanel Margin="5,5,5,0">
589590
<CheckBox x:Name="ShowEmptiesMatchesCheckBox"
590591
IsChecked="{Binding ShowEmptyMatches}"
591592
Content="Show _empties matches" />
@@ -594,7 +595,7 @@
594595
Content="Print Filenames when extract" />
595596
</StackPanel>
596597
</GroupBox>
597-
<GroupBox Header="Execute Regex on :">
598+
<GroupBox Header="Text Source">
598599
<GroupBox.Resources>
599600
<Style TargetType="RadioButton">
600601
<Setter Property="Margin" Value="0,0,0,5" />
@@ -603,8 +604,8 @@
603604
<Setter Property="Margin" Value="1,0,0,0" />
604605
</Style>
605606
</GroupBox.Resources>
606-
<StackPanel>
607-
<WrapPanel Margin="5">
607+
<DockPanel>
608+
<WrapPanel Margin="5" DockPanel.Dock="Top">
608609
<RadioButton x:Name="CurrentTabTextSourceRadioButton"
609610
Margin="5,0"
610611
Content="Current _tab"
@@ -617,24 +618,29 @@
617618
Margin="5,0"
618619
Content="Specified _directory"
619620
IsChecked="{Binding TextSourceOn, Converter={converters:EnumBooleanConverter}, ConverterParameter='Directory'}"/>
621+
<RadioButton x:Name="CSharpScriptTextSourceRadioButton"
622+
Margin="5,0"
623+
Content="C# _Script"
624+
IsChecked="{Binding TextSourceOn, Converter={converters:EnumBooleanConverter}, ConverterParameter='CSharpScript'}"/>
620625
</WrapPanel>
621-
<DockPanel Visibility="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}">
622-
<StackPanel DockPanel.Dock="Bottom"
623-
Margin="5,0">
624-
<CheckBox x:Name="SearchSubDirectoriesCheckBox"
625-
IsChecked="{Binding TextSourceDirectorySearchSubDirectories}"
626-
Content="Su_b directories" />
627-
<CheckBox x:Name="ShowNotMatchedFilesCheckBox"
628-
IsChecked="{Binding TextSourceDirectoryShowNotMatchedFiles}"
629-
Content="Show _not matched files" />
630-
<CheckBox x:Name="OpenFilesForReplaceCheckBox"
631-
IsChecked="{Binding OpenFilesForReplace}"
632-
Content="_Open files to replace in editor (otherwise modify the file on the disk)" />
626+
627+
<StackPanel Margin="5"
628+
DockPanel.Dock="Top"
629+
Visibility="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}">
633630

634-
</StackPanel>
635-
636-
<Grid DockPanel.Dock="Bottom"
637-
Margin="0,5">
631+
<DockPanel>
632+
<Button x:Name="SpecifiedDirectoryTextSourcePathButton"
633+
Content="..."
634+
Padding="10,0"
635+
DockPanel.Dock="Right"
636+
Click="SpecifiedDirectoryTextSourcePathButton_Click"/>
637+
<ComboBox x:Name="SpecifiedDirectoryTextSourcePathComboBox"
638+
Text="{Binding TextSourceDirectoryPath, UpdateSourceTrigger=PropertyChanged}"
639+
ItemsSource="{Binding TextSourceDirectoryPathHistory}"
640+
IsEditable="True"/>
641+
</DockPanel>
642+
643+
<Grid Margin="0,5">
638644
<Grid.ColumnDefinitions>
639645
<ColumnDefinition Width="Auto" />
640646
<ColumnDefinition Width="*" />
@@ -650,17 +656,33 @@
650656
VerticalAlignment="Center"
651657
IsEditable="True"/>
652658
</Grid>
653-
<Button x:Name="SpecifiedDirectoryTextSourcePathButton"
654-
Content="..."
655-
Padding="10,0"
656-
DockPanel.Dock="Right"
657-
Click="SpecifiedDirectoryTextSourcePathButton_Click"/>
658-
<ComboBox x:Name="SpecifiedDirectoryTextSourcePathComboBox"
659-
Text="{Binding TextSourceDirectoryPath, UpdateSourceTrigger=PropertyChanged}"
660-
ItemsSource="{Binding TextSourceDirectoryPathHistory}"
661-
IsEditable="True"/>
662-
</DockPanel>
663-
</StackPanel>
659+
660+
<StackPanel Margin="5">
661+
<CheckBox x:Name="SearchSubDirectoriesCheckBox"
662+
IsChecked="{Binding TextSourceDirectorySearchSubDirectories}"
663+
Content="Su_b directories" />
664+
<CheckBox x:Name="ShowNotMatchedFilesCheckBox"
665+
IsChecked="{Binding TextSourceDirectoryShowNotMatchedFiles}"
666+
Content="Show _not matched files" />
667+
<CheckBox x:Name="OpenFilesForReplaceCheckBox"
668+
IsChecked="{Binding OpenFilesForReplace}"
669+
Content="_Open files to replace in editor (otherwise modify the file on the disk)" />
670+
</StackPanel>
671+
</StackPanel>
672+
673+
<Border BorderBrush="Gray"
674+
BorderThickness="1"
675+
Visibility="{Binding IsChecked, ElementName=CSharpScriptTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}">
676+
<avalonEdit:TextEditor
677+
Name="TextSourceEditor"
678+
FontFamily="Consolas"
679+
FontSize="12"
680+
SyntaxHighlighting="C#"
681+
ShowLineNumbers="True"
682+
ScrollViewer.HorizontalScrollBarVisibility="Auto" />
683+
</Border>
684+
</DockPanel>
685+
664686
</GroupBox>
665687
</DockPanel>
666688
</TabItem>

‎RegexDialog/Utils/RegexTextSource.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public enum RegexTextSource
44
{
55
CurrentTab,
66
CurrentSelection,
7-
Directory
7+
Directory,
8+
CSharpScript
89
}
910
}

0 commit comments

Comments
 (0)