Skip to content

Commit 190082d

Browse files
iwubcodeiwubcode
authored
Merge pull request #44 from Venomalia/V2-A
Dolphin Dynamic Input Textures version 2 (everything except subregion support)
2 parents 3a9e26b + 02187be commit 190082d

35 files changed

Lines changed: 1453 additions & 431 deletions

‎Controls/EditTags.xaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<UserControl x:Class="DolphinDynamicInputTextureCreator.Controls.EditTags"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:DolphinDynamicInputTextureCreator.Controls"
7+
mc:Ignorable="d"
8+
d:DesignHeight="300" d:DesignWidth="300">
9+
<Grid>
10+
<Grid.RowDefinitions>
11+
<RowDefinition Height="Auto" />
12+
<RowDefinition Height="*" />
13+
</Grid.RowDefinitions>
14+
<Grid Grid.Row="0">
15+
<Grid.ColumnDefinitions>
16+
<ColumnDefinition Width="4*"/>
17+
<ColumnDefinition Width="*"/>
18+
</Grid.ColumnDefinitions>
19+
<Button Grid.Column="0" Content="Add Tag" Command="{Binding AddTagCommand}" />
20+
<Button Grid.Column="1" Content="Add All" Command="{Binding AddAllTagsCommand}" />
21+
</Grid>
22+
<ScrollViewer Grid.Row="1">
23+
<ItemsControl ItemsSource="{Binding Tags}">
24+
<ItemsControl.ItemsPanel>
25+
<ItemsPanelTemplate>
26+
<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center" />
27+
</ItemsPanelTemplate>
28+
</ItemsControl.ItemsPanel>
29+
<ItemsControl.ItemTemplate>
30+
<DataTemplate>
31+
<Grid MinWidth="140" MaxWidth="200" MinHeight="30" Margin="5">
32+
<Border BorderThickness="1" BorderBrush="Black" Padding="2" Background="DarkGray">
33+
<Grid>
34+
<Grid.ColumnDefinitions>
35+
<ColumnDefinition Width="*"/>
36+
<ColumnDefinition Width="14"/>
37+
</Grid.ColumnDefinitions>
38+
39+
<Button Grid.Column="1" Style="{StaticResource delete}" VerticalAlignment="Center" Width="12" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EditTags}},
40+
Path=DataContext.DeleteTagCommand}" CommandParameter="{Binding}" />
41+
42+
<ComboBox IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" StaysOpenOnEdit="True" Text="{Binding Name, Mode=TwoWay, Delay=2}" TextSearch.TextPath="" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EditTags}},
43+
Path=DataContext.TagsSuggestions.Available}" />
44+
45+
</Grid>
46+
</Border>
47+
</Grid>
48+
</DataTemplate>
49+
</ItemsControl.ItemTemplate>
50+
</ItemsControl>
51+
</ScrollViewer>
52+
</Grid>
53+
</UserControl>

‎Controls/EditTags.xaml.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System.Windows.Controls;
2+
3+
namespace DolphinDynamicInputTextureCreator.Controls
4+
{
5+
/// <summary>
6+
/// Interaction logic for EditTags.xaml
7+
/// </summary>
8+
public partial class EditTags : UserControl
9+
{
10+
public EditTags()
11+
{
12+
InitializeComponent();
13+
}
14+
}
15+
}

‎Controls/EmulatedKeyList.xaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:DolphinDynamicInputTextureCreator.Controls"
7-
xmlns:data="clr-namespace:DolphinDynamicInputTexture.Data"
87
xmlns:design="clr-namespace:DolphinDynamicInputTextureCreator.Design"
98
xmlns:converters="clr-namespace:DolphinDynamicInputTextureCreator.ValueConverters"
109
mc:Ignorable="d"
@@ -31,20 +30,21 @@
3130
</ItemsControl.ItemsPanel>
3231
<ItemsControl.ItemTemplate>
3332
<DataTemplate>
34-
<Grid MinWidth="140" MaxWidth="200" Height="50" Margin="5">
33+
<Grid MinWidth="140" MaxWidth="200" MinHeight="30" Margin="5">
3534
<Border BorderThickness="1" BorderBrush="Black" Padding="2" Background="DarkGray">
36-
<StackPanel Orientation="Vertical">
37-
<Grid>
38-
<Grid.ColumnDefinitions>
39-
<ColumnDefinition Width="*" />
40-
<ColumnDefinition Width="24" />
41-
</Grid.ColumnDefinitions>
42-
<Button Content="X" Grid.Column="1" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EmulatedKeyList}},
35+
<Grid>
36+
<Grid.ColumnDefinitions>
37+
<ColumnDefinition Width="*"/>
38+
<ColumnDefinition Width="14"/>
39+
</Grid.ColumnDefinitions>
40+
41+
<Button Grid.Column="1" Style="{StaticResource delete}" VerticalAlignment="Center" Width="12" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EmulatedKeyList}},
4342
Path=DataContext.DeleteKeyCommand}" CommandParameter="{Binding}"></Button>
44-
</Grid>
45-
<ComboBox Grid.Row="1" IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" StaysOpenOnEdit="True" Text="{Binding Name, Mode=TwoWay, Delay=1}" TextSearch.TextPath="" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EmulatedKeyList}},
43+
44+
<ComboBox IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" StaysOpenOnEdit="True" Text="{Binding Name, Mode=TwoWay, Delay=2}" TextSearch.TextPath="" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:EmulatedKeyList}},
4645
Path=DataContext.EmulatedKeySuggestions.Available}" />
47-
</StackPanel>
46+
47+
</Grid>
4848
</Border>
4949
</Grid>
5050
</DataTemplate>

‎Controls/HostKeyList.xaml‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,30 @@
3131
</ItemsControl.ItemsPanel>
3232
<ItemsControl.ItemTemplate>
3333
<DataTemplate>
34-
<Grid Width="120" Height="120" Margin="5">
34+
<Grid Width="130" Height="140" Margin="5">
3535
<Border BorderThickness="1" BorderBrush="Black" Padding="2" Background="DarkGray">
36-
<Grid HorizontalAlignment="Stretch">
37-
<Grid.ColumnDefinitions>
38-
<ColumnDefinition Width="*" />
39-
</Grid.ColumnDefinitions>
40-
<Grid Grid.Column="0">
41-
<Grid.RowDefinitions>
42-
<RowDefinition Height="*" />
43-
<RowDefinition Height="Auto" />
44-
</Grid.RowDefinitions>
45-
<Viewbox>
46-
<Image Source="{Binding TexturePath, Converter={StaticResource PathToImageValueConverter}}" />
47-
</Viewbox>
48-
<Grid Grid.Row="0">
49-
<Grid.RowDefinitions>
50-
<RowDefinition Height="*" />
51-
<RowDefinition Height="3*" />
52-
</Grid.RowDefinitions>
53-
<Grid Grid.Row="0">
54-
<Grid.ColumnDefinitions>
55-
<ColumnDefinition Width="9*" />
56-
<ColumnDefinition Width="Auto" />
57-
</Grid.ColumnDefinitions>
58-
<Button Content="X" Grid.Column="1" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:HostKeyList}},
36+
<Grid Grid.Column="0">
37+
<Grid.RowDefinitions>
38+
<RowDefinition Height="*" />
39+
<RowDefinition Height="auto" />
40+
</Grid.RowDefinitions>
41+
<Image Source="{Binding TexturePath, Converter={StaticResource PathToImageValueConverter}}" />
42+
<Grid Grid.Row="0">
43+
<Button Grid.Column="0" Width="15" Height="15" Style="{StaticResource delete}" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:HostKeyList}},
5944
Path=DataContext.DeleteKeyCommand}" CommandParameter="{Binding}"></Button>
60-
</Grid>
61-
</Grid>
62-
<ComboBox Grid.Row="1" IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" StaysOpenOnEdit="True" Text="{Binding Name, Mode=TwoWay, Delay=2}" TextSearch.TextPath="" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:HostKeyList}},
63-
Path=DataContext.HostKeySuggestions.Available}" />
6445
</Grid>
46+
<StackPanel Grid.Row="2" Orientation="Vertical">
47+
<ComboBox IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" StaysOpenOnEdit="True" Text="{Binding Name, Mode=TwoWay, Delay=2}" TextSearch.TextPath="" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:HostKeyList}},
48+
Path=DataContext.HostKeySuggestions}" />
49+
<ComboBox IsEditable="False" StaysOpenOnEdit="True" SelectedValue="{Binding Tag, Mode=TwoWay, Delay=4}" Foreground="DarkViolet" TextSearch.TextPath="Name"
50+
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:HostKeyList}},Path=DataContext.Tags}">
51+
<ComboBox.ItemTemplate>
52+
<DataTemplate>
53+
<TextBlock VerticalAlignment="Center" Text="{Binding Name}" />
54+
</DataTemplate>
55+
</ComboBox.ItemTemplate>
56+
</ComboBox>
57+
</StackPanel>
6558
</Grid>
6659
</Border>
6760
</Grid>

0 commit comments

Comments
 (0)