|
@@ -16,8 +16,8 @@
|
|
xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
|
|
xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
|
|
mc:Ignorable="d"
|
|
mc:Ignorable="d"
|
|
Title="Settings" Name="window"
|
|
Title="Settings" Name="window"
|
|
- Height="688" Width="766"
|
|
|
|
- MinHeight="500" MinWidth="640"
|
|
|
|
|
|
+ Height="688" Width="780"
|
|
|
|
+ MinHeight="500" MinWidth="680"
|
|
WindowStyle="None" DataContext="{DynamicResource SettingsWindowViewModel}"
|
|
WindowStyle="None" DataContext="{DynamicResource SettingsWindowViewModel}"
|
|
WindowStartupLocation="CenterScreen"
|
|
WindowStartupLocation="CenterScreen"
|
|
BorderBrush="Black" BorderThickness="1"
|
|
BorderBrush="Black" BorderThickness="1"
|
|
@@ -183,23 +183,34 @@
|
|
<Grid Visibility="{Binding CurrentPage, Converter={converters:EqualityBoolToVisibilityConverter}, ConverterParameter='Keybinds'}"
|
|
<Grid Visibility="{Binding CurrentPage, Converter={converters:EqualityBoolToVisibilityConverter}, ConverterParameter='Keybinds'}"
|
|
Margin="10,10,10,0">
|
|
Margin="10,10,10,0">
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
|
|
+ <RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition/>
|
|
<RowDefinition/>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Margin="0,0,0,10">
|
|
|
|
- <Grid.ColumnDefinitions>
|
|
|
|
- <ColumnDefinition/>
|
|
|
|
- <ColumnDefinition Width="Auto"/>
|
|
|
|
- </Grid.ColumnDefinitions>
|
|
|
|
- <TextBox Style="{StaticResource DarkTextBoxStyle}"
|
|
|
|
- Text="{Binding SearchTerm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
|
|
|
- <Button Grid.Column="1" Style="{StaticResource DarkRoundButton}"
|
|
|
|
- Content="Reset all" Height="Auto" Margin="5,0"
|
|
|
|
- FontSize="12" Padding="1"
|
|
|
|
- Command="{cmds:Command PixiEditor.Shortcuts.Reset}"/>
|
|
|
|
- </Grid>
|
|
|
|
|
|
+ <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
|
|
|
|
+ <StackPanel.Resources>
|
|
|
|
+ <Style TargetType="Button" BasedOn="{StaticResource DarkRoundButton}">
|
|
|
|
+ <Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
|
|
+ <Setter Property="Width" Value="115"/>
|
|
|
|
+ <Setter Property="Height" Value="Auto"/>
|
|
|
|
+ <Setter Property="Margin" Value="5,0"/>
|
|
|
|
+ <Setter Property="FontSize" Value="12"/>
|
|
|
|
+ <Setter Property="Padding" Value="5"/>
|
|
|
|
+ </Style>
|
|
|
|
+ </StackPanel.Resources>
|
|
|
|
+ <Button Command="{cmds:Command PixiEditor.Shortcuts.Export}"
|
|
|
|
+ Content="Export"/>
|
|
|
|
+ <Button Command="{cmds:Command PixiEditor.Shortcuts.Import}"
|
|
|
|
+ Content="Import"/>
|
|
|
|
+ <Button Command="{cmds:Command PixiEditor.Shortcuts.OpenTemplatePopup}"
|
|
|
|
+ Content="Import other"/>
|
|
|
|
+ <Button Command="{cmds:Command PixiEditor.Shortcuts.Reset}"
|
|
|
|
+ Content="Reset all"/>
|
|
|
|
+ </StackPanel>
|
|
|
|
+ <TextBox Grid.Row="1" Style="{StaticResource DarkTextBoxStyle}" Margin="0,10"
|
|
|
|
+ Text="{Binding SearchTerm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
|
|
|
|
|
- <ScrollViewer Grid.Row="1" x:Name="commandScroll">
|
|
|
|
|
|
+ <ScrollViewer Grid.Row="2" x:Name="commandScroll">
|
|
<ScrollViewer.Template>
|
|
<ScrollViewer.Template>
|
|
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
|
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
|
<Grid x:Name="Grid" Background="{TemplateBinding Background}">
|
|
<Grid x:Name="Grid" Background="{TemplateBinding Background}">
|
|
@@ -244,7 +255,7 @@
|
|
</Grid>
|
|
</Grid>
|
|
</ScrollViewer>
|
|
</ScrollViewer>
|
|
|
|
|
|
- <Grid Grid.Row="1" Height="10" VerticalAlignment="Top"
|
|
|
|
|
|
+ <Grid Grid.Row="2" Height="10" VerticalAlignment="Top"
|
|
Visibility="{Binding VerticalOffset, ElementName=commandScroll, Mode=OneWay, Converter={converters:EqualityBoolToVisibilityConverter Invert=True}, ConverterParameter=0}"
|
|
Visibility="{Binding VerticalOffset, ElementName=commandScroll, Mode=OneWay, Converter={converters:EqualityBoolToVisibilityConverter Invert=True}, ConverterParameter=0}"
|
|
Margin="-10,0">
|
|
Margin="-10,0">
|
|
<Grid.Background>
|
|
<Grid.Background>
|