Localize Tab Manager, fix Folder Tools tab issues...
1271ab4c
Jayke R. Huempfner
committed
7 changed files
NameTabList.xaml
/BExplorer/BetterExplorer/Tabs/NameTabList.xaml-6+6
/BExplorer/BetterExplorer/Tabs/NameTabList.xaml
Add comment 3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Add comment 4 Title="Name Your New Tab List" Height="200" Width="350" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded">
Add comment 5 <Grid>
Add comment 6 Minus   <TextBlock Height="23" HorizontalAlignment="Left" Margin="15,18,0,0" Name="textBlock1" Text="Choose a name for this tab list" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" />
Add comment 7 Minus   <TextBlock Height="23" HorizontalAlignment="Left" Margin="15,36,0,0" Name="textBlock2" Text="(If this name already exists, the old list will be replaced)" VerticalAlignment="Top" />
Add comment 8 Minus   <TextBox Height="23" HorizontalAlignment="Left" Margin="12,65,0,0" Name="textBox1" VerticalAlignment="Top" Width="304" KeyUp="textBox1_KeyUp" />
Add comment 9 Minus   <Button Content="Cancel" Height="23" HorizontalAlignment="Left" Margin="241,126,0,0" Name="button1" VerticalAlignment="Top" Width="75" Click="button1_Click" />
Add comment 10 Minus   <Button Content="Save" Height="23" HorizontalAlignment="Left" Margin="160,126,0,0" Name="button2" VerticalAlignment="Top" Width="75" Click="button2_Click" />
Add comment 11 Minus   <TextBlock Height="23" HorizontalAlignment="Left" Margin="15,94,0,0" Name="textBlock3" Text="Cannot contain these characters: \ / : * ? &lt; &gt; |" VerticalAlignment="Top" />
Add comment 6 Plus   <TextBlock Height="23" HorizontalAlignment="Left" Margin="15,13,0,0" Name="textBlock1" Text="{StaticResource txtChooseName}" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" />
Add comment 7 Plus   <TextBlock Height="35" HorizontalAlignment="Left" Margin="15,35,0,0" Name="textBlock2" Text="{StaticResource txtOverwriteSavedTabs}" VerticalAlignment="Top" TextWrapping="Wrap" />
Add comment 8 Plus   <TextBox Height="23" HorizontalAlignment="Left" Margin="12,75,0,0" Name="textBox1" VerticalAlignment="Top" Width="322" KeyUp="textBox1_KeyUp" />
Add comment 9 Plus   <Button Content="{StaticResource txtCancel}" Height="23" HorizontalAlignment="Right" Margin="0,140,10,0" Name="button1" VerticalAlignment="Top" Width="75" Click="button1_Click" />
Add comment 10 Plus   <Button Content="{StaticResource btnSave}" Height="23" HorizontalAlignment="Right" Margin="0,140,90,0" Name="button2" VerticalAlignment="Top" Width="75" Click="button2_Click" />
Add comment 11 Plus   <TextBlock Height="35" HorizontalAlignment="Left" Margin="15,100,0,0" Name="textBlock3" Text="{StaticResource txtIllegalCharacters}" VerticalAlignment="Top" TextWrapping="Wrap" />
Add comment 12 </Grid>
Add comment 13 </Window>
Add comment 14
NameTabList.xaml.cs
/BExplorer/BetterExplorer/Tabs/NameTabList.xaml.cs+7
/BExplorer/BetterExplorer/Tabs/NameTabList.xaml.cs
Add comment 27
Add comment 28 private void button2_Click(object sender, RoutedEventArgs e)
Add comment 29 {
Add comment 30 Plus   if (textBox1.Text.Contains("\\") || textBox1.Text.Contains("/") || textBox1.Text.Contains(":") || textBox1.Text.Contains("?") || textBox1.Text.Contains("*") || textBox1.Text.Contains("<") || textBox1.Text.Contains(">") || textBox1.Text.Contains("|"))
Add comment 31 Plus   {
Add comment 32 Plus   MessageBox.Show(FindResource("txtIllegalCharacters") as string, "Choose a new name", MessageBoxButton.OK, MessageBoxImage.Error);
Add comment 33 Plus   }
Add comment 34 Plus   else
Add comment 35 Plus   {
Add comment 30 36 dialogresult = true;
Add comment 31 37 this.Close();
Add comment 32 38 }
Add comment 39 Plus   }
Add comment 33 40
Add comment 34 41 private void button1_Click(object sender, RoutedEventArgs e)
Add comment 35 42 {
TabListEditor.xaml
/BExplorer/BetterExplorer/Tabs/TabListEditor.xaml-3+5
/BExplorer/BetterExplorer/Tabs/TabListEditor.xaml
Add comment 10 <RowDefinition Height="25" />
Add comment 11 <RowDefinition Height="273*" />
Add comment 12 </Grid.RowDefinitions>
Add comment 13 Minus   <StackPanel Grid.Row="1" Name="stackPanel1" Orientation="Vertical"></StackPanel>
Add comment 13 Plus   <ScrollViewer Grid.Row="1">
Add comment 14 Plus   <StackPanel Name="stackPanel1" Orientation="Vertical"></StackPanel>
Add comment 15 Plus   </ScrollViewer>
Add comment 14 16 <Grid Name="grid1">
Add comment 15 17 <Grid.Background>
Add comment 16 18 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
Add comment 23 25 <ColumnDefinition Width="325*" />
Add comment 24 26 </Grid.ColumnDefinitions>
Add comment 25 27 <Rectangle Name="rectangle1" Stroke="Black" HorizontalAlignment="Right" />
Add comment 26 Minus   <Label Content="Name" Name="label1" Padding="4,0,0,0" VerticalContentAlignment="Center" />
Add comment 27 Minus   <Label Content="Path" Name="label2" Padding="4,0,0,0" VerticalContentAlignment="Center" Grid.Column="1" />
Add comment 28 Plus   <Label Content="{StaticResource txtName}" Name="label1" Padding="4,0,0,0" VerticalContentAlignment="Center" />
Add comment 29 Plus   <Label Content="{StaticResource txtPath}" Name="label2" Padding="4,0,0,0" VerticalContentAlignment="Center" Grid.Column="1" />
Add comment 28 30 <GridSplitter Name="gridSplitter1" HorizontalAlignment="Right" Width="4" Foreground="{x:Null}" Background="#03000000" Margin="0" DragCompleted="gridSplitter1_DragCompleted" DragDelta="gridSplitter1_DragDelta"></GridSplitter>
Add comment 29 31 </Grid>
Add comment 30 32 </Grid>
TabManager.xaml
/BExplorer/BetterExplorer/Tabs/TabManager.xaml-8+8
/BExplorer/BetterExplorer/Tabs/TabManager.xaml
Add comment 1 <Window x:Class="BetterExplorer.Tabs.TabManager"
Add comment 2 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Add comment 3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Add comment 4 Minus   Title="Tab Manager" Height="400" Width="600" xmlns:my="clr-namespace:BetterExplorer" Loaded="Window_Loaded">
Add comment 4 Plus   Title="{StaticResource txtTabManager}" Height="400" Width="600" xmlns:my="clr-namespace:BetterExplorer" Loaded="Window_Loaded">
Add comment 5 <Grid>
Add comment 6 <Grid.RowDefinitions>
Add comment 7 <RowDefinition Height="320*" />
Add comment 20 <Button Grid.Column="1" Height="23" HorizontalAlignment="Left" Margin="6,6,0,0" Name="button3" VerticalAlignment="Top" Width="75" Click="button3_Click">
Add comment 21 <StackPanel Orientation="Horizontal">
Add comment 22 <Image Source="Images\save.png" Stretch="Fill" />
Add comment 23 Minus   <TextBlock Text="Save" Margin="5,0,0,0" />
Add comment 23 Plus   <TextBlock Text="{StaticResource btnSave}" Margin="5,0,0,0" />
Add comment 24 </StackPanel>
Add comment 25 </Button>
Add comment 26 <Button Height="23" HorizontalAlignment="Left" Margin="6,6,0,0" Name="button4" VerticalAlignment="Top" Width="58" Click="button4_Click">
Add comment 27 <StackPanel Orientation="Horizontal">
Add comment 28 <Image Source="Images\new.png" Stretch="None" />
Add comment 29 Minus   <TextBlock Text="New" Margin="5,0,0,0" />
Add comment 29 Plus   <TextBlock Text="{StaticResource tgNewCP}" Margin="5,0,0,0" />
Add comment 30 </StackPanel>
Add comment 31 </Button>
Add comment 32 <Button Height="23" HorizontalAlignment="Right" Margin="0,6,6,0" Name="button5" VerticalAlignment="Top" Width="75" Grid.Column="1" Click="button5_Click">
Add comment 33 <StackPanel Orientation="Horizontal">
Add comment 34 <Image Source="Images\add_item.png" Stretch="None" />
Add comment 35 Minus   <TextBlock Text="Add Tab" Margin="5,0,0,0" />
Add comment 35 Plus   <TextBlock Text="{StaticResource btnAddTab}" Margin="5,0,0,0" />
Add comment 36 </StackPanel>
Add comment 37 </Button>
Add comment 38 <Button Height="23" HorizontalAlignment="Left" Margin="70,6,0,0" Name="button6" VerticalAlignment="Top" Width="58" Click="button6_Click">
Add comment 39 <StackPanel Orientation="Horizontal">
Add comment 40 <Image Source="Images\delete_item.png" Stretch="None" />
Add comment 41 Minus   <TextBlock Text="Delete" Margin="2,0,0,0" />
Add comment 41 Plus   <TextBlock Text="{StaticResource btnDeleteCP}" Margin="2,0,0,0" />
Add comment 42 </StackPanel>
Add comment 43 </Button>
Add comment 44 Minus   <Button Content="Save As" Height="23" HorizontalAlignment="Left" Margin="87,6,0,0" Name="button7" VerticalAlignment="Top" Width="75" Grid.Column="1" Click="button7_Click" />
Add comment 44 Plus   <Button Content="{StaticResource btnSaveAs}" Height="23" HorizontalAlignment="Left" Margin="87,6,0,0" Name="button7" VerticalAlignment="Top" Width="75" Grid.Column="1" Click="button7_Click" />
Add comment 45 </Grid>
Add comment 46 Minus   <Button Content="Open Folder" Grid.Row="1" Height="23" HorizontalAlignment="Left" Margin="12,0,0,8" Name="button1" VerticalAlignment="Bottom" Width="90" IsEnabled="False" />
Add comment 47 Minus   <Button Content="Close" Height="23" HorizontalAlignment="Right" Margin="0,0,12,8" Name="button2" VerticalAlignment="Bottom" Grid.Row="1" Width="60" Click="button2_Click" />
Add comment 46 Plus   <Button Content="{StaticResource btnOpenFolder}" Grid.Row="1" Height="23" HorizontalAlignment="Left" Margin="12,0,0,8" Name="button1" VerticalAlignment="Bottom" Width="Auto" Padding="8,1,8,1" IsEnabled="False" />
Add comment 47 Plus   <Button Content="{StaticResource btnClose}" Height="23" HorizontalAlignment="Right" Margin="0,0,12,8" Name="button2" VerticalAlignment="Bottom" Grid.Row="1" Width="Auto" Click="button2_Click" Padding="8,1,8,1" />
Add comment 48 </Grid>
Add comment 49 </Window>
Add comment 50
TabManager.xaml.cs
/BExplorer/BetterExplorer/Tabs/TabManager.xaml.cs-1+1
/BExplorer/BetterExplorer/Tabs/TabManager.xaml.cs
Add comment 150
Add comment 151 private void button6_Click(object sender, RoutedEventArgs e)
Add comment 152 {
Add comment 153 Minus   if (MessageBox.Show("Are you sure you want to delete this tab collection?", "Confirm Delete", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) == MessageBoxResult.Yes)
Add comment 153 Plus   if (MessageBox.Show((FindResource("txtConfirmDelete") as string) + "?", "Confirm Delete", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) == MessageBoxResult.Yes)
Add comment 154 {
Add comment 155 System.IO.File.Delete(selfile);
Add comment 156 RefreshList();
BetterExplorer.csproj
/BExplorer/BetterExplorer/BetterExplorer.csproj-3+3
/BExplorer/BetterExplorer/BetterExplorer.csproj
Add comment 234 <DependentUpon>NameTabList.xaml</DependentUpon>
Add comment 235 </Compile>
Add comment 236 <Compile Include="Tabs\SavedTabsList.cs" />
Add comment 237 Minus   <Compile Include="Tabs\SDateSearchCriteriaDialog.xaml.cs">
Add comment 237 Plus   <Compile Include="ConditionalSelect\SDateSearchCriteriaDialog.xaml.cs">
Add comment 238 <DependentUpon>SDateSearchCriteriaDialog.xaml</DependentUpon>
Add comment 239 </Compile>
Add comment 240 <Compile Include="ConditionalSelect\SizeSearchCriteriaDialog.xaml.cs">
Add comment 356 <SubType>Designer</SubType>
Add comment 357 <Generator>MSBuild:Compile</Generator>
Add comment 358 </Page>
Add comment 359 Minus   <Page Include="Tabs\SDateSearchCriteriaDialog.xaml">
Add comment 359 Plus   <Page Include="ConditionalSelect\SDateSearchCriteriaDialog.xaml">
Add comment 360 <SubType>Designer</SubType>
Add comment 361 <Generator>MSBuild:Compile</Generator>
Add comment 362 </Page>
Add comment 923 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Add comment 924 <ProjectExtensions>
Add comment 925 <VisualStudio>
Add comment 926 Minus   <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
Add comment 926 Plus   <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UseGlobalSettings="True" />
Add comment 927 </VisualStudio>
Add comment 928 </ProjectExtensions>
Add comment 929 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs