feat: entirely remove old banner
This commit is contained in:
@@ -7,7 +7,6 @@
|
|||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceDictionary Source="/Frontend/Styles/AccessoryIconControl.xaml"/>
|
<ResourceDictionary Source="/Frontend/Styles/AccessoryIconControl.xaml"/>
|
||||||
<ResourceDictionary Source="/Frontend/Styles/NoteBanner.xaml"/>
|
|
||||||
<ResourceDictionary Source="/Frontend/Styles/GenericButton.xaml"/>
|
<ResourceDictionary Source="/Frontend/Styles/GenericButton.xaml"/>
|
||||||
<ResourceDictionary Source="/Frontend/Styles/TextboxErrorTemplate.xaml"/>
|
<ResourceDictionary Source="/Frontend/Styles/TextboxErrorTemplate.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
||||||
<Style x:Key="NoteBannerStyle" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
|
|
||||||
<Setter Property="Background" Value="#0097A7"/>
|
|
||||||
<Setter Property="Foreground" Value="#CDDC39"/>
|
|
||||||
<Setter Property="Padding" Value="10"/>
|
|
||||||
</Style>
|
|
||||||
</ResourceDictionary>
|
|
||||||
@@ -5,9 +5,11 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
||||||
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
||||||
|
xmlns:conveter="clr-namespace:BallanceTasEditor.Frontend.Converters"
|
||||||
|
xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets"
|
||||||
d:DataContext="{d:DesignInstance vm:AddFrameDialog}"
|
d:DataContext="{d:DesignInstance vm:AddFrameDialog}"
|
||||||
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
||||||
Title="Add Frame" Height="250" Width="400" Icon="/Frontend/Assets/AddFrame.ico">
|
Title="Add Frame" Height="250" Width="400" Icon="/Frontend/Assets/App.ico">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
@@ -15,8 +17,9 @@
|
|||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Add frames with given FPS and frame count."
|
<widget:BannerBar Grid.Row="0"
|
||||||
Style="{StaticResource NoteBannerStyle}"/>
|
BannerText="Add frames with given FPS and frame count."
|
||||||
|
BannerIcon="/Frontend/Assets/AddFrame.ico"/>
|
||||||
|
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
@@ -45,9 +48,15 @@
|
|||||||
<TextBlock Margin="5" Grid.Column="1" Grid.Row="1" Text="FPS" VerticalAlignment="Center"/>
|
<TextBlock Margin="5" Grid.Column="1" Grid.Row="1" Text="FPS" VerticalAlignment="Center"/>
|
||||||
<TextBlock Margin="5" Grid.Column="1" Grid.Row="2" Text="Delta Time" VerticalAlignment="Center"/>
|
<TextBlock Margin="5" Grid.Column="1" Grid.Row="2" Text="Delta Time" VerticalAlignment="Center"/>
|
||||||
|
|
||||||
<TextBox Margin="5" Padding="3" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center"/>
|
<TextBox Margin="5" Padding="3" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center"
|
||||||
<TextBox Margin="5" Padding="3" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"/>
|
Text="{Binding Count, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
|
||||||
<TextBlock Margin="5" Padding="3" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Text="N/A"/>
|
Style="{StaticResource TextBoxWithErrorNotifyStyle}"/>
|
||||||
|
<TextBox Margin="5" Padding="3" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
|
||||||
|
Text="{Binding Fps, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
|
||||||
|
Style="{StaticResource TextBoxWithErrorNotifyStyle}"/>
|
||||||
|
<TextBlock Margin="5" Padding="3" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"
|
||||||
|
Text="{Binding Fps, Mode=OneWay, Converter={x:Static conveter:StringifiedDeltaTimeConverter.Instance}}"
|
||||||
|
Validation.ErrorTemplate="{x:Null}"/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -5,9 +5,11 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
||||||
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
||||||
|
xmlns:conveter="clr-namespace:BallanceTasEditor.Frontend.Converters"
|
||||||
|
xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets"
|
||||||
d:DataContext="{d:DesignInstance vm:EditFpsDialog}"
|
d:DataContext="{d:DesignInstance vm:EditFpsDialog}"
|
||||||
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
||||||
Title="Edit FPS" Height="220" Width="400" Icon="/Frontend/Assets/SetFps.ico">
|
Title="Edit FPS" Height="220" Width="400" Icon="/Frontend/Assets/App.ico">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
@@ -15,8 +17,9 @@
|
|||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Change frame delta time into your given FPS."
|
<widget:BannerBar Grid.Row="0"
|
||||||
Style="{StaticResource NoteBannerStyle}"/>
|
BannerText="Change frame delta time into your given FPS."
|
||||||
|
BannerIcon="/Frontend/Assets/SetFps.ico"/>
|
||||||
|
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
@@ -41,8 +44,12 @@
|
|||||||
<TextBlock Margin="5" Grid.Column="1" Grid.Row="0" Text="FPS" VerticalAlignment="Center"/>
|
<TextBlock Margin="5" Grid.Column="1" Grid.Row="0" Text="FPS" VerticalAlignment="Center"/>
|
||||||
<TextBlock Margin="5" Grid.Column="1" Grid.Row="1" Text="Delta Time" VerticalAlignment="Center"/>
|
<TextBlock Margin="5" Grid.Column="1" Grid.Row="1" Text="Delta Time" VerticalAlignment="Center"/>
|
||||||
|
|
||||||
<TextBox Margin="5" Padding="3" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center"/>
|
<TextBox Margin="5" Padding="3" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center"
|
||||||
<TextBlock Margin="5" Padding="3" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Text="N/A"/>
|
Text="{Binding Fps, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
|
||||||
|
Style="{StaticResource TextBoxWithErrorNotifyStyle}"/>
|
||||||
|
<TextBlock Margin="5" Padding="3" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
|
||||||
|
Text="{Binding Fps, Mode=OneWay, Converter={x:Static conveter:StringifiedDeltaTimeConverter.Instance}}"
|
||||||
|
Validation.ErrorTemplate="{x:Null}"/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -5,9 +5,10 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views"
|
||||||
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels"
|
||||||
|
xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets"
|
||||||
d:DataContext="{d:DesignInstance vm:GotoDialog}"
|
d:DataContext="{d:DesignInstance vm:GotoDialog}"
|
||||||
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
|
||||||
Title="Goto..." Height="180" Width="400" Icon="/Frontend/Assets/Goto.ico">
|
Title="Goto..." Height="180" Width="400" Icon="/Frontend/Assets/App.ico">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
@@ -15,8 +16,9 @@
|
|||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Jump into your specified index of frame."
|
<widget:BannerBar Grid.Row="0"
|
||||||
Style="{StaticResource NoteBannerStyle}"/>
|
BannerText="Jump into your specified index of frame."
|
||||||
|
BannerIcon="/Frontend/Assets/Goto.ico"/>
|
||||||
|
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
|||||||
Reference in New Issue
Block a user