Skip to content

Commit

Permalink
style: rename controller
Browse files Browse the repository at this point in the history
  • Loading branch information
@DorielRivalet
DorielRivalet committed Jun 13, 2023
1 parent cf5103a commit 1a378e2
Show file tree
Hide file tree
Showing 43 changed files with 106 additions and 106 deletions.
6 changes: 3 additions & 3 deletions MHFZ_Overlay/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,13 +481,13 @@
<setting name="KBMLayoutY" serializeAs="String">
<value>610</value>
</setting>
<setting name="ControllerLayoutShown" serializeAs="String">
<setting name="GamepadShown" serializeAs="String">
<value>False</value>
</setting>
<setting name="ControllerLayoutX" serializeAs="String">
<setting name="GamepadX" serializeAs="String">
<value>160</value>
</setting>
<setting name="ControllerLayoutY" serializeAs="String">
<setting name="GamepadY" serializeAs="String">
<value>550</value>
</setting>
<setting name="EnableInputLogging" serializeAs="String">
Expand Down
10 changes: 5 additions & 5 deletions MHFZ_Overlay/ConfigWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@
<TextBlock Margin="5,5,5,5" ToolTip="{Binding Source={StaticResource Settings}, Path=DatabaseFilePath}" Style="{StaticResource ConfigTextBox}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Text="Hover to view database file path"/>
<TextBlock Margin="5,5,5,5" ToolTip="Enable logging of quests when completing them and inserts the information into a local database" Style="{StaticResource ConfigTextBox}" Grid.Row="2" Grid.Column="0" Text="(Required for speedrun) Quest Logging" />
<ui:ToggleSwitch HorizontalAlignment="Center" Grid.Row="2" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=EnableQuestLogging}" Checked="questLoggingToggle_Check"/>
<TextBlock Margin="5,5,5,5" ToolTip="Enable logging of inputs (KBM + Controller) during quests and inserts the information into a local database. WARNING: the runs with this option disabled will not be displayed on leaderboards, in order to prevent cheating." Style="{StaticResource ConfigTextBox}" Grid.Row="3" Grid.Column="0" Text="(Required for speedrun) Log Inputs during Quest" />
<TextBlock Margin="5,5,5,5" ToolTip="Enable logging of inputs (KBM + Gamepad) during quests and inserts the information into a local database. WARNING: the runs with this option disabled will not be displayed on leaderboards, in order to prevent cheating." Style="{StaticResource ConfigTextBox}" Grid.Row="3" Grid.Column="0" Text="(Required for speedrun) Log Inputs during Quest" />
<ui:ToggleSwitch HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=EnableInputLogging}"/>
<TextBlock Margin="5,5,5,5" ToolTip="Show a watermark that has to be visible at all times during a YouTube video of a quest run in order for the run to be verified" Style="{StaticResource ConfigTextBox}" Grid.Row="4" Grid.Column="0" Text="(Required for speedrun) Overlay Mode Watermark" />
<ui:ToggleSwitch HorizontalAlignment="Center" Grid.Row="4" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=OverlayModeWatermarkShown}"/>
Expand Down Expand Up @@ -1853,13 +1853,13 @@
</Button>
<TextBlock Margin="5,5,5,5" Style="{StaticResource ConfigTextBox}" Text="Controller/Gamepad Layout"/>
</StackPanel>
<ui:ToggleSwitch HorizontalAlignment="Center" Grid.Row="67" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=ControllerLayoutShown}"/>
<ui:ToggleSwitch HorizontalAlignment="Center" Grid.Row="67" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=GamepadShown}"/>
<TextBlock Margin="5,5,5,5" Style="{StaticResource ConfigTextBox}" Grid.Row="68" Grid.Column="0" Text="Controller/Gamepad Layout X Coordinate"/>
<ui:TextBox IsUndoEnabled="False" TextAlignment="Center" Grid.Row="68" Grid.Column="1" Text="{Binding Source={StaticResource Settings},Path=ControllerLayoutX}" PreviewTextInput="ValidateNumber"/>
<ui:TextBox IsUndoEnabled="False" TextAlignment="Center" Grid.Row="68" Grid.Column="1" Text="{Binding Source={StaticResource Settings},Path=GamepadX}" PreviewTextInput="ValidateNumber"/>
<TextBlock Margin="5,5,5,5" Style="{StaticResource ConfigTextBox}" Grid.Row="69" Grid.Column="0" Text="Controller/Gamepad Layout Y Coordinate"/>
<ui:TextBox IsUndoEnabled="False" TextAlignment="Center" Grid.Row="69" Grid.Column="1" Text="{Binding Source={StaticResource Settings},Path=ControllerLayoutY}" PreviewTextInput="ValidateNumber"/>
<ui:TextBox IsUndoEnabled="False" TextAlignment="Center" Grid.Row="69" Grid.Column="1" Text="{Binding Source={StaticResource Settings},Path=GamepadY}" PreviewTextInput="ValidateNumber"/>

<StackPanel Margin="5,5,5,5" Orientation="Horizontal" Grid.Row="70" Grid.Column="0" ToolTip="Show Actions Per Minute (actions are defined as the total sum of keystrokes, mouse button presses and controller inputs)">
<StackPanel Margin="5,5,5,5" Orientation="Horizontal" Grid.Row="70" Grid.Column="0" ToolTip="Show Actions Per Minute (actions are defined as the total sum of keystrokes, mouse button presses and gamepad inputs)">
<Image Source="UI/Icons/png/flame_ul.png" Margin="0,0,5,0"/>
<TextBlock Style="{StaticResource ConfigTextBox}" Text="Actions per Minute"/>
</StackPanel>
Expand Down
36 changes: 18 additions & 18 deletions MHFZ_Overlay/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@
<Image x:Name="MouseMiddleClick" Opacity="0.2" Source="UI/Icons/png/middle_click.png" Grid.Row="4" Grid.Column="3"/>
<Image x:Name="MouseRightClick" Opacity="0.2" Source="UI/Icons/png/right_click.png" Grid.Row="4" Grid.Column="4"/>
</Grid>
<Grid Background="{Binding Source={StaticResource Settings},Path=HPBackGroundColor}" x:Name="ControllerLayoutGrid" Canvas.Left="{Binding Source={StaticResource Settings},Path=ControllerLayoutX}" Canvas.Top="{Binding Source={StaticResource Settings},Path=ControllerLayoutY}" Width="150" Height="150" MouseLeftButtonDown="ElementMouseLeftButtonDown"
Visibility="{Binding ElementName=Window, Path=DataLoader.model.ShowControllerLayout, Converter={StaticResource BoolToVis}}">
<Grid Background="{Binding Source={StaticResource Settings},Path=HPBackGroundColor}" x:Name="GamepadGrid" Canvas.Left="{Binding Source={StaticResource Settings},Path=ControllerLayoutX}" Canvas.Top="{Binding Source={StaticResource Settings},Path=ControllerLayoutY}" Width="150" Height="150" MouseLeftButtonDown="ElementMouseLeftButtonDown"
Visibility="{Binding ElementName=Window, Path=DataLoader.model.ShowGamepad, Converter={StaticResource BoolToVis}}">
<Grid.ColumnDefinitions >
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
Expand All @@ -330,23 +330,23 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border x:Name="ControllerLayoutGridBorder" BorderBrush="{StaticResource Red}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="10" Grid.RowSpan="10" BorderThickness="0"/>
<Border x:Name="GamepadGridBorder" BorderBrush="{StaticResource Red}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="10" Grid.RowSpan="10" BorderThickness="0"/>

<Image x:Name="ButtonL2" Opacity="0.2" Source="UI/Icons/png/controller_l2.png" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonR2" Opacity="0.2" Source="UI/Icons/png/controller_r2.png" Grid.Row="0" Grid.Column="5" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonL1" Opacity="0.2" Source="UI/Icons/png/controller_l1.png" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonR1" Opacity="0.2" Source="UI/Icons/png/controller_r1.png" Grid.Row="1" Grid.Column="5" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="DPad" Opacity="0.2" Source="UI/Icons/png/controller_dpad.png" Grid.Row="2" Grid.Column="0" Grid.RowSpan="3" Grid.ColumnSpan="3" />
<Image x:Name="LJoystick" Opacity="0.2" Source="UI/Icons/png/controller_joystick.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="2" Grid.ColumnSpan="2"/>
<Image x:Name="RJoystick" Opacity="0.2" Source="UI/Icons/png/controller_joystick.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="4" Grid.ColumnSpan="2"/>
<Image x:Name="LJoystickMovement" Opacity="0.2" Source="UI/Icons/png/controller_joystick_up.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="2" Grid.ColumnSpan="2"/>
<Image x:Name="RJoystickMovement" Opacity="0.2" Source="UI/Icons/png/controller_joystick_up.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="4" Grid.ColumnSpan="2"/>
<Image x:Name="ButtonA" Opacity="0.2" Source="UI/Icons/png/controller_a.png" Grid.Row="4" Grid.Column="6"/>
<Image x:Name="ButtonB" Opacity="0.2" Source="UI/Icons/png/controller_b.png" Grid.Row="3" Grid.Column="7"/>
<Image x:Name="ButtonX" Opacity="0.2" Source="UI/Icons/png/controller_x.png" Grid.Row="3" Grid.Column="5"/>
<Image x:Name="ButtonY" Opacity="0.2" Source="UI/Icons/png/controller_y.png" Grid.Row="2" Grid.Column="6"/>
<Image x:Name="ButtonSelect" Opacity="0.2" Source="UI/Icons/png/controller_select.png" Grid.Row="3" Grid.Column="3"/>
<Image x:Name="ButtonStart" Opacity="0.2" Source="UI/Icons/png/controller_start.png" Grid.Row="3" Grid.Column="4"/>
<Image x:Name="ButtonL2" Opacity="0.2" Source="UI/Icons/png/gamepad_l2.png" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonR2" Opacity="0.2" Source="UI/Icons/png/gamepad_r2.png" Grid.Row="0" Grid.Column="5" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonL1" Opacity="0.2" Source="UI/Icons/png/gamepad_l1.png" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="ButtonR1" Opacity="0.2" Source="UI/Icons/png/gamepad_r1.png" Grid.Row="1" Grid.Column="5" Grid.ColumnSpan="2" Stretch="Fill"/>
<Image x:Name="DPad" Opacity="0.2" Source="UI/Icons/png/gamepad_dpad.png" Grid.Row="2" Grid.Column="0" Grid.RowSpan="3" Grid.ColumnSpan="3" />
<Image x:Name="LJoystick" Opacity="0.2" Source="UI/Icons/png/gamepad_joystick.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="2" Grid.ColumnSpan="2"/>
<Image x:Name="RJoystick" Opacity="0.2" Source="UI/Icons/png/gamepad_joystick.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="4" Grid.ColumnSpan="2"/>
<Image x:Name="LJoystickMovement" Opacity="0.2" Source="UI/Icons/png/gamepad_joystick_up.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="2" Grid.ColumnSpan="2"/>
<Image x:Name="RJoystickMovement" Opacity="0.2" Source="UI/Icons/png/gamepad_joystick_up.png" Grid.Row="4" Grid.RowSpan="2" Grid.Column="4" Grid.ColumnSpan="2"/>
<Image x:Name="ButtonA" Opacity="0.2" Source="UI/Icons/png/gamepad_a.png" Grid.Row="4" Grid.Column="6"/>
<Image x:Name="ButtonB" Opacity="0.2" Source="UI/Icons/png/gamepad_b.png" Grid.Row="3" Grid.Column="7"/>
<Image x:Name="ButtonX" Opacity="0.2" Source="UI/Icons/png/gamepad_x.png" Grid.Row="3" Grid.Column="5"/>
<Image x:Name="ButtonY" Opacity="0.2" Source="UI/Icons/png/gamepad_y.png" Grid.Row="2" Grid.Column="6"/>
<Image x:Name="ButtonSelect" Opacity="0.2" Source="UI/Icons/png/gamepad_select.png" Grid.Row="3" Grid.Column="3"/>
<Image x:Name="ButtonStart" Opacity="0.2" Source="UI/Icons/png/gamepad_start.png" Grid.Row="3" Grid.Column="4"/>
</Grid>
<Grid Background="{Binding Source={StaticResource Settings},Path=HPBackGroundColor}" x:Name="Monster1HpBar" Canvas.Left="{Binding Source={StaticResource Settings},Path=Monster1HealthBarX}" Canvas.Top="{Binding Source={StaticResource Settings},Path=Monster1HealthBarY}" Width="500" Height="40" MouseLeftButtonDown="ElementMouseLeftButtonDown"
Visibility="{Binding ElementName=Window, Path=DataLoader.model.ShowMonster1HPBar, Converter={StaticResource BoolToVis}}">
Expand Down
Loading

0 comments on commit 1a378e2

Please sign in to comment.