Skip to content

Commit 0887c82

Browse files
author
Sébastien Geiser
committed
Reorg fors future script text source
1 parent c1111f0 commit 0887c82

File tree

7 files changed

+2809
-174
lines changed

7 files changed

+2809
-174
lines changed

‎RegexDialog/RegExToolDialog.xaml

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@
225225
</Grid.ColumnDefinitions>
226226
<Grid>
227227
<Grid.RowDefinitions>
228-
<RowDefinition x:Name="RegexEditorRow" Height="*"/>
228+
<RowDefinition x:Name="RegexEditorRow" Height="*" />
229229
<RowDefinition Height="5" />
230-
<RowDefinition Height="*" MinHeight="10" />
230+
<RowDefinition x:Name="ReplaceEditorRow" Height="*" />
231231
</Grid.RowDefinitions>
232232
<Grid Grid.Row="0">
233233
<Grid.RowDefinitions>
@@ -298,8 +298,7 @@
298298
<GridSplitter
299299
Grid.Row="1"
300300
VerticalAlignment="Stretch"
301-
HorizontalAlignment="Stretch"
302-
ResizeBehavior="PreviousAndNext"/>
301+
HorizontalAlignment="Stretch"/>
303302
<Grid Grid.Row="2">
304303
<Grid.RowDefinitions>
305304
<RowDefinition Height="Auto" />
@@ -584,77 +583,86 @@
584583
</ItemsControl>
585584
</TabItem>
586585
<TabItem x:Name="TextSourceTabItem" Header="Text _Source">
587-
<GroupBox Header="Execute Regex on :">
588-
<GroupBox.Resources>
589-
<Style TargetType="RadioButton">
590-
<Setter Property="Margin" Value="0,0,0,5" />
591-
</Style>
592-
<Style TargetType="ComboBox">
593-
<Setter Property="Margin" Value="1,0,0,0" />
594-
</Style>
595-
</GroupBox.Resources>
596-
<StackPanel Margin="5">
597-
<RadioButton x:Name="CurrentTabTextSourceRadioButton"
586+
<DockPanel>
587+
<GroupBox Header="Other Options" DockPanel.Dock="Bottom">
588+
<StackPanel Margin="5,0">
589+
<CheckBox x:Name="ShowEmptiesMatchesCheckBox"
590+
IsChecked="{Binding ShowEmptyMatches}"
591+
Content="Show _empties matches" />
592+
<CheckBox x:Name="PrintFileNamesWhenExtractCheckBox"
593+
IsChecked="{Binding PrintFileNameWhenExtract}"
594+
Content="Print Filenames when extract" />
595+
</StackPanel>
596+
</GroupBox>
597+
<GroupBox Header="Execute Regex on :">
598+
<GroupBox.Resources>
599+
<Style TargetType="RadioButton">
600+
<Setter Property="Margin" Value="0,0,0,5" />
601+
</Style>
602+
<Style TargetType="ComboBox">
603+
<Setter Property="Margin" Value="1,0,0,0" />
604+
</Style>
605+
</GroupBox.Resources>
606+
<StackPanel>
607+
<WrapPanel Margin="5">
608+
<RadioButton x:Name="CurrentTabTextSourceRadioButton"
609+
Margin="5,0"
598610
Content="Current _tab"
599611
IsChecked="{Binding TextSourceOn, Converter={converters:EnumBooleanConverter}, ConverterParameter='CurrentTab'}" />
600-
<RadioButton x:Name="CurrentSelectedTextSourceRadioButton"
612+
<RadioButton x:Name="CurrentSelectedTextSourceRadioButton"
613+
Margin="5,0"
601614
Content="Current se_lection"
602615
IsChecked="{Binding TextSourceOn, Converter={converters:EnumBooleanConverter}, ConverterParameter='CurrentSelection'}"/>
603-
<RadioButton x:Name="SpecifiedDirectoryTextSourceRadioButton"
616+
<RadioButton x:Name="SpecifiedDirectoryTextSourceRadioButton"
617+
Margin="5,0"
604618
Content="Specified _directory"
605619
IsChecked="{Binding TextSourceOn, Converter={converters:EnumBooleanConverter}, ConverterParameter='Directory'}"/>
606-
<DockPanel IsEnabled="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton}">
607-
<StackPanel DockPanel.Dock="Bottom"
620+
</WrapPanel>
621+
<DockPanel Visibility="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}">
622+
<StackPanel DockPanel.Dock="Bottom"
608623
Margin="5,0">
609-
<CheckBox x:Name="SearchSubDirectoriesCheckBox"
624+
<CheckBox x:Name="SearchSubDirectoriesCheckBox"
610625
IsChecked="{Binding TextSourceDirectorySearchSubDirectories}"
611626
Content="Su_b directories" />
612-
<CheckBox x:Name="ShowNotMatchedFilesCheckBox"
627+
<CheckBox x:Name="ShowNotMatchedFilesCheckBox"
613628
IsChecked="{Binding TextSourceDirectoryShowNotMatchedFiles}"
614629
Content="Show _not matched files" />
615-
<CheckBox x:Name="OpenFilesForReplaceCheckBox"
630+
<CheckBox x:Name="OpenFilesForReplaceCheckBox"
616631
IsChecked="{Binding OpenFilesForReplace}"
617632
Content="_Open files to replace in editor (otherwise modify the file on the disk)" />
618633

619-
</StackPanel>
634+
</StackPanel>
620635

621-
<Grid DockPanel.Dock="Bottom"
636+
<Grid DockPanel.Dock="Bottom"
622637
Margin="0,5">
623-
<Grid.ColumnDefinitions>
624-
<ColumnDefinition Width="Auto" />
625-
<ColumnDefinition Width="*" />
626-
</Grid.ColumnDefinitions>
627-
<Label Content="_Filters"
638+
<Grid.ColumnDefinitions>
639+
<ColumnDefinition Width="Auto" />
640+
<ColumnDefinition Width="*" />
641+
</Grid.ColumnDefinitions>
642+
<Label Content="_Filters"
628643
VerticalAlignment="Center"
629644
Padding="3,0"
630645
ToolTip="File Patterns supporting * and ? wildcards.Multi patterns separated by [,] char"/>
631-
<ComboBox x:Name="SpecifiedDirectoryTextSourceFilterComboBox"
646+
<ComboBox x:Name="SpecifiedDirectoryTextSourceFilterComboBox"
632647
Text="{Binding TextSourceDirectorySearchFilter, UpdateSourceTrigger=PropertyChanged}"
633648
ItemsSource="{Binding TextSourceDirectorySearchFilterHistory}"
634649
Grid.Column="1"
635650
VerticalAlignment="Center"
636651
IsEditable="True"/>
637-
</Grid>
638-
<Button x:Name="SpecifiedDirectoryTextSourcePathButton"
652+
</Grid>
653+
<Button x:Name="SpecifiedDirectoryTextSourcePathButton"
639654
Content="..."
640655
Padding="10,0"
641656
DockPanel.Dock="Right"
642657
Click="SpecifiedDirectoryTextSourcePathButton_Click"/>
643-
<ComboBox x:Name="SpecifiedDirectoryTextSourcePathComboBox"
658+
<ComboBox x:Name="SpecifiedDirectoryTextSourcePathComboBox"
644659
Text="{Binding TextSourceDirectoryPath, UpdateSourceTrigger=PropertyChanged}"
645660
ItemsSource="{Binding TextSourceDirectoryPathHistory}"
646661
IsEditable="True"/>
647-
</DockPanel>
648-
<StackPanel Margin="5,0">
649-
<CheckBox x:Name="ShowEmptiesMatchesCheckBox"
650-
IsChecked="{Binding ShowEmptyMatches}"
651-
Content="Show _empties matches" />
652-
<CheckBox x:Name="PrintFileNamesWhenExtractCheckBox"
653-
IsChecked="{Binding PrintFileNameWhenExtract}"
654-
Content="Print Filenames when extract" />
662+
</DockPanel>
655663
</StackPanel>
656-
</StackPanel>
657-
</GroupBox>
664+
</GroupBox>
665+
</DockPanel>
658666
</TabItem>
659667
</TabControl>
660668
</Grid>

0 commit comments

Comments
 (0)