Skip to content
This repository has been archived by the owner on Feb 4, 2022. It is now read-only.

Commit

Permalink
Some adjustments
Browse files Browse the repository at this point in the history 
Image cache implemented in f80ef53
no need in ItemModel anymore.
  • Loading branch information
@aianlinb
aianlinb authored Sep 26, 2020
1 parent 86c7a93 commit b9fead5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 48 deletions.
6 changes: 2 additions & 4 deletions VisualBundle/ItemModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,11 @@ public ItemModel GetChildItem(string Name)
}
public class FolderModel : ItemModel
{
private static ImageSource _icon = Properties.Resources.dir;
override public ImageSource Icon
{
get
{
return _icon;
return Properties.Resources.dir;
}
}
public FolderModel() : base()
Expand All @@ -67,12 +66,11 @@ public FolderModel(string name) : this()
}
public class FileModel : ItemModel
{
private static ImageSource _icon = Properties.Resources.file;
override public ImageSource Icon
{
get
{
return _icon;
return Properties.Resources.file;
}
}
public FileModel()
Expand Down
30 changes: 15 additions & 15 deletions VisualBundle/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
</HierarchicalDataTemplate>
</Window.Resources>
<Grid>
<TreeView x:Name="View1" ItemTemplate="{StaticResource FileViewItemTemplate}" TreeViewItem.Expanded="OnTreeViewItemExpanded" SelectedItemChanged="OnTreeView1SelectedChanged" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250" Background="White"/>
<TreeView x:Name="View1" ItemTemplate="{StaticResource FileViewItemTemplate}" SelectedItemChanged="OnTreeView1SelectedChanged" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250"/>
<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Offset:" VerticalAlignment="Top" Margin="260,10,0,0"/>
<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Size:" VerticalAlignment="Top" Margin="420,10,0,0"/>
<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="No:" VerticalAlignment="Top" Margin="580,10,0,0"/>
<TextBox x:Name="offsetView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="310,6,0,0"/>
<TextBox x:Name="sizeView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="460,6,0,0"/>
<TextBox x:Name="noView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="610,6,0,0"/>
<TreeView x:Name="View2" ItemTemplate="{StaticResource FileViewItemTemplate}" TreeViewItem.Expanded="OnTreeViewItemExpanded" SelectedItemChanged="OnTreeView2SelectedChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="250,35,230,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Bundle):" VerticalAlignment="Top" Margin="0,80,130,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Index):" VerticalAlignment="Top" Margin="0,110,130,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="FileSize:" VerticalAlignment="Top" Margin="0,140,130,0"/>
<TextBox x:Name="BOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,76,25,0"/>
<TextBox x:Name="IOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,106,25,0"/>
<TextBox x:Name="fSizeView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,136,25,0"/>
<Button x:Name="ButtonExport" Content="Export" IsEnabled="False" HorizontalAlignment="Right" Margin="0,180,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonExportClick"/>
<Button x:Name="ButtonReplace" Content="Replace" IsEnabled="False" HorizontalAlignment="Right" Margin="0,210,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonReplaceClick"/>
<Button x:Name="ButtonMove" Content="MoveTo" IsEnabled="False" HorizontalAlignment="Right" Margin="0,240,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonMoveClick"/>
<Button x:Name="ButtonAdd" Content="AddFiles" IsEnabled="False" HorizontalAlignment="Right" Margin="0,270,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonAddClick"/>
<Button x:Name="ButtonReplaceAll" Content="ReplaceAll" IsEnabled="False" HorizontalAlignment="Right" Margin="0,300,25,0" VerticalAlignment="Top" Width="75" Click="ButtonReplaceAllClick"/>
<Button x:Name="ButtonOpen" Content="Open" IsEnabled="False" HorizontalAlignment="Right" Margin="0,330,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonOpenClick"/>
<Button x:Name="ButtonSave" Content="Save" IsEnabled="False" HorizontalAlignment="Right" Margin="0,360,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonSaveClick"/>
<TreeView x:Name="View2" ItemTemplate="{StaticResource FileViewItemTemplate}" SelectedItemChanged="OnTreeView2SelectedChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="250,35,230,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Bundle):" VerticalAlignment="Top" Margin="0,60,130,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Index):" VerticalAlignment="Top" Margin="0,90,130,0"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="FileSize:" VerticalAlignment="Top" Margin="0,120,130,0"/>
<TextBox x:Name="BOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,56,25,0"/>
<TextBox x:Name="IOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,86,25,0"/>
<TextBox x:Name="fSizeView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,116,25,0"/>
<Button x:Name="ButtonExport" Content="Export" IsEnabled="False" HorizontalAlignment="Right" Margin="0,170,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonExportClick"/>
<Button x:Name="ButtonReplace" Content="Replace" IsEnabled="False" HorizontalAlignment="Right" Margin="0,200,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonReplaceClick"/>
<Button x:Name="ButtonReplaceAll" Content="ReplaceAll" IsEnabled="False" HorizontalAlignment="Right" Margin="0,230,25,0" VerticalAlignment="Top" Width="75" Click="ButtonReplaceAllClick"/>
<Button x:Name="ButtonMove" Content="MoveTo" IsEnabled="False" HorizontalAlignment="Right" Margin="0,260,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonMoveClick"/>
<Button x:Name="ButtonAdd" Content="AddFiles" IsEnabled="False" HorizontalAlignment="Right" Margin="0,290,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonAddClick"/>
<Button x:Name="ButtonOpen" Content="Open" IsEnabled="False" HorizontalAlignment="Right" Margin="0,320,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonOpenClick"/>
<Button x:Name="ButtonSave" Content="Save" IsEnabled="False" HorizontalAlignment="Right" Margin="0,350,25,0" VerticalAlignment="Top" Width="75" Click="OnButtonSaveClick"/>
<TextBlock x:Name="MessageLabel" HorizontalAlignment="Right" TextWrapping="Wrap" Text="" Foreground="Red" VerticalAlignment="Bottom" Margin="0,0,10,30"/>
<TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Copyright © 2020 aianlinb." VerticalAlignment="Bottom" Margin="0,0,10,5"/>
</Grid>
Expand Down
35 changes: 6 additions & 29 deletions VisualBundle/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;

namespace VisualBundle
{
Expand All @@ -18,7 +16,7 @@ public partial class MainWindow : Window
public IndexContainer ic;
private FileRecord moveF;
private ItemModel moveD;
private HashSet<BundleRecord> changed = new HashSet<BundleRecord>();
private readonly HashSet<BundleRecord> changed = new HashSet<BundleRecord>();

public MainWindow()
{
Expand Down Expand Up @@ -92,20 +90,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
ButtonReplaceAll.IsEnabled = true;
}

private void OnTreeViewItemExpanded(object sender, RoutedEventArgs e)
{
// handle auto now
// no need anymore
/*
var tvi = e.OriginalSource as ItemModel;
if (tvi.Items != null)
{
tvi.Items.Clear();
foreach(var c in ((Dictionary<string, TreeViewItem>)tvi.Tag).Values)
tvi.Items.Add(c);
}
*/
}
private ItemModel GetSelectedBundle()
{
return (ItemModel)View1.SelectedItem;
Expand Down Expand Up @@ -177,17 +161,9 @@ private void OnTreeView2SelectedChanged(object sender, RoutedPropertyChangedEven

}

public StackPanel TreeItem(string path, ImageSource icon)
{
var sp = new StackPanel { Orientation = Orientation.Horizontal };
sp.Children.Add(new Image { Source = icon, Width = 20, Height = 20 });
sp.Children.Add(new TextBlock { Text = path, FontSize = 16 });
return sp;
}

public void BuildTree(ItemModel root, string path, object file)
{
if (path == null) { return; }
if (path == null) return;

var paths = path.Split('/');
ItemModel parent = root;
Expand Down Expand Up @@ -446,9 +422,10 @@ private void ButtonReplaceAllClick(object sender, RoutedEventArgs e)
if (fbd.ShowDialog() == true)
{
if (MessageBox.Show(
"This function will replace all files to every loaded bundles" + Environment.NewLine
"This will replace all files to every loaded bundles." + Environment.NewLine
+ "And bundles which weren't loaded won't be changed." + Environment.NewLine
+ "Are you sure you want to do this?",
"Replace all files to every loaded bundles",
"Replace All Confirm",
MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel) == MessageBoxResult.OK)
{
var Bundle2_path = Path.GetDirectoryName(fbd.FileName);
Expand Down Expand Up @@ -507,7 +484,7 @@ private HashSet<BundleRecord> GetLoadedBundleRecordAll()
return bundles;

}
private Microsoft.Win32.OpenFileDialog OpenBundle2Dialog()
private OpenFileDialog OpenBundle2Dialog()
{
var ofd = new OpenFileDialog()
{
Expand Down

0 comments on commit b9fead5

Please sign in to comment.