Skip to content

Add new feature #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HandaQAQ-Code wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new feature #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RszTool.App/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected override void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);

ThemeManager.Init(SaveData.IsDarkTheme);
ThemeManager.Init(SaveData.CurTheme);
// 添加全局异常处理程序
SetupUnhandledExceptionHandling();
}
Expand Down
61 changes: 40 additions & 21 deletions RszTool.App/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=viewmodels:MainWindowModel}"
Title="RszTool" Height="960" Width="1280"
Title="RszTool" Height="960" Width="1280" MinWidth="500" MinHeight="250"
AllowDrop="True" DragOver="OnDragOver" Drop="OnDrop">
<Window.Resources>
<ResourceDictionary>
Expand Down Expand Up @@ -115,41 +115,57 @@
</MenuItem>
<MenuItem Header="{res:Text Tag}" Click="Tag_Click">
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Black" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Black" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Red" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Red" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Green" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Green" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Blue" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Blue" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Yellow" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Yellow" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Orange" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Orange" />
</MenuItem.Header>
</MenuItem>
<MenuItem>
<MenuItem.Header><Ellipse Width="10" Height="10" Fill="Purple" /></MenuItem.Header>
<MenuItem.Header>
<Ellipse Width="10" Height="10" Fill="Purple" />
</MenuItem.Header>
</MenuItem>
</MenuItem>
<MenuItem Header="{res:Text Help}">
<MenuItem Header="{res:Text About}" Command="{Binding OpenAbout}" />
</MenuItem>
</Menu>
<Grid Grid.Row="1" Margin="5">
<Grid Grid.Row="1" Margin="5" Width="Auto" Height="27">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="100" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Text="Game version" Margin="0 0 5 0" VerticalAlignment="Center" />
<ComboBox ItemsSource="{x:Static rsztool:RszDefines.GameNames}" Grid.Column="1" SelectedValue="{Binding SaveData.GameName}" />
<ToggleButton Content="{res:Text Dark}" Grid.Column="3" IsChecked="{Binding IsDarkTheme}" />
<TextBlock Text="Game version:" VerticalAlignment="Center" Grid.Column="0" Width="200" />
<ComboBox ItemsSource="{x:Static rsztool:RszDefines.GameNames}" Grid.Column="1" SelectedValue="{Binding SaveData.GameName}" Width="120" Margin="0,0,-100,0" />
<ToggleButton Content="{res:Text HSideBar}" Margin="129,0,0,0" Grid.Column="2" Click="SideColumn_Hide" Width="120" />
<TextBlock Text="Theme:" Grid.Column="3" Width="155" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<ComboBox ItemsSource="{x:Static rsztool:RszDefines.Themes}" Grid.Column="3" SelectedValue="{Binding SaveData.CurTheme,Mode=TwoWay}" Width="110" HorizontalAlignment="Right"/>
</Grid>
<!-- <dockablz:Layout Grid.Row="2" Margin="8">
<dockablz:Layout.BranchTemplate>
Expand All @@ -165,19 +181,22 @@
</dockablz:Layout> -->
<Grid Grid.Row="2" Cursor="">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" MinWidth="200" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="200" x:Name="col1" />
<ColumnDefinition Width="Auto" x:Name="col2" />
<ColumnDefinition Width="187*" x:Name="col3" />
<ColumnDefinition Width="285*"/>
<ColumnDefinition Width="605*"/>
</Grid.ColumnDefinitions>
<views:FileExplorerTree DataContext="{Binding FileExplorerViewModel}" Margin="6 6 3 6" HorizontalAlignment="Stretch" />
<GridSplitter Grid.Column="1" Width="3" VerticalAlignment="Stretch" HorizontalAlignment="Center" Background="Transparent" Cursor="SizeWE" />
<dragablz:TabablzControl Grid.Column="2" Margin="3 5 5 5" Style="{StaticResource TabablzControlStyle}">
<views:FileExplorerTree DataContext="{Binding FileExplorerViewModel}" Margin="6,6,3,6" />
<GridSplitter Grid.Column="1" Width="3" HorizontalAlignment="Center" Background="Transparent" Cursor="SizeWE" />
<dragablz:TabablzControl Grid.Column="2" Margin="3,5,5,5" Style="{StaticResource TabablzControlStyle}" Grid.ColumnSpan="3">
<dragablz:TabablzControl.InterTabController>
<dragablz:InterTabController InterTabClient="{Binding InterTabClient}" />
</dragablz:TabablzControl.InterTabController>
</dragablz:TabablzControl>
<TextBlock Text="{res:Text UsageHint}" TextAlignment="Center"
Style="{StaticResource UsageHint}" FontSize="18" VerticalAlignment="Center" Grid.Column="2" />
Style="{StaticResource UsageHint}" FontSize="18" VerticalAlignment="Center" Grid.Column="2" Grid.ColumnSpan="3" />
</Grid>

</Grid>
</Window>
13 changes: 12 additions & 1 deletion RszTool.App/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,19 @@ public MainWindow()
Title = $"{Title} v{version.Major}.{version.Minor}.{version.Build} - By chenstack";

Closing += OnClosing;
}

///隐藏/显示侧边栏
private void SideColumn_Hide(object sender, RoutedEventArgs e)
{
if (col1.Width != new GridLength(0))
{
col1.Width = new GridLength(0);
}
else {
col1.Width =new GridLength(200);
}
}

public void OnDragOver(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
Expand Down
Loading