Skip to content

Commit

Permalink
feat: add filtering options to hunted monsters log
Browse files Browse the repository at this point in the history
  • Loading branch information
@DorielRivalet
DorielRivalet committed Oct 23, 2022
1 parent 75f5b22 commit 7e0bc5c
Show file tree
Hide file tree
Showing 11 changed files with 495 additions and 133 deletions.
6 changes: 6 additions & 0 deletions MHFZ_Overlay/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@
<setting name="MotionValuesInfo" serializeAs="String">
<value>Sword and Shield</value>
</setting>
<setting name="WeaponTypeInfo" serializeAs="String">
<value>Sword and Shield</value>
</setting>
<setting name="HuntedMonsterFilter" serializeAs="String">
<value>All</value>
</setting>
</MHFZ_Overlay.Settings>
</userSettings>
</configuration>
46 changes: 45 additions & 1 deletion MHFZ_Overlay/ConfigWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,8 @@
</Grid.RowDefinitions>
<ComboBox Grid.Row="0" Name="SortBy" SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Margin="5,5,5,5"/>
<ComboBox Grid.Row="0" Name="SortDir" SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Margin="150,5,5,5"/>
<ComboBox Grid.Row="0" SelectionChanged="FilterBox_SelectionChanged" Name="FilterBox" SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Margin="300,5,5,5" >
</ComboBox>
<ListView x:Name="MyList" Grid.Row="1" HorizontalAlignment="Stretch">
<!--<ListView.Resources>
<DataTemplate x:Key="Templ">
Expand Down Expand Up @@ -637,7 +639,7 @@
</DockPanel>
</Grid>
</TabItem>
<TabItem ToolTip="View Hunting Horn Songs" Background="#11111b" Foreground="#cdd6f4">
<!--<TabItem ToolTip="View Hunting Horn Songs" Background="#11111b" Foreground="#cdd6f4">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<Image Source="icons/note_pink.png" Width="32" Height="32"/>
Expand All @@ -651,6 +653,48 @@
</ScrollViewer>
</DockPanel>
</Grid>
</TabItem>-->
<TabItem ToolTip="View Weapon Information" Background="#11111b" Foreground="#cdd6f4">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<Image Source="icons/attack.png" Width="32" Height="32"/>
<TextBlock Text="Sigils" Margin="4,0,0,0" VerticalAlignment="Center" />
</StackPanel>
</TabItem.Header>
<Grid>
<DockPanel Margin="5,5,5,5">
<ScrollViewer VerticalScrollBarVisibility="Visible">
<Grid Background="Transparent" Style="{StaticResource ConfigSingleGrid}" x:Name="WeaponInfoGrid" Margin="5,5,5,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Margin="5,5,5,5" ToolTip="Select Weapon Type" Style="{StaticResource ConfigTextBox}" Grid.Row="0" Grid.Column="0" Text="Weapon Type"/>
<ComboBox Grid.Column="1" Grid.Row="0" SelectedValuePath="Content" SelectedValue="{Binding Source={StaticResource Settings}, Path=WeaponTypeInfo}">
<ComboBoxItem>Sword and Shield</ComboBoxItem>
<ComboBoxItem>Dual Swords</ComboBoxItem>
<ComboBoxItem>Great Sword</ComboBoxItem>
<ComboBoxItem>Long Sword</ComboBoxItem>
<ComboBoxItem>Hammer</ComboBoxItem>
<ComboBoxItem>Hunting Horn</ComboBoxItem>
<ComboBoxItem>Lance</ComboBoxItem>
<ComboBoxItem>Gunlance</ComboBoxItem>
<ComboBoxItem>Tonfa</ComboBoxItem>
<ComboBoxItem>Switch Axe F</ComboBoxItem>
<ComboBoxItem>Magnet Spike</ComboBoxItem>
<ComboBoxItem>Light Bowgun</ComboBoxItem>
<ComboBoxItem>Heavy Bowgun</ComboBoxItem>
<ComboBoxItem>Bow</ComboBoxItem>
</ComboBox>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" ToolTip="Weapon Information" Text="{Binding GetGameWeaponInformation}" TextWrapping="Wrap"/>
</Grid>
</ScrollViewer>
</DockPanel>
</Grid>
</TabItem>
<TabItem ToolTip="View Sigils List" Background="#11111b" Foreground="#cdd6f4">
<TabItem.Header>
Expand Down
Loading

0 comments on commit 7e0bc5c

Please sign in to comment.