mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-13 05:48:35 +00:00
Cleaned up settings windows, added scroll bars
This commit is contained in:
SpoinkyNL
parent
49d74a54ad
commit
18515a2c27
@ -6,99 +6,102 @@
|
|||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
||||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||||
xmlns:audioVisualizer="clr-namespace:Artemis.Modules.Effects.AudioVisualizer"
|
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20"
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20"
|
||||||
<Label.Content>
|
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap" Text="Visualizes the default audio device on the keyboard." />
|
<Label.Content>
|
||||||
</Label.Content>
|
<AccessText TextWrapping="Wrap" Text="Visualizes the default audio device on the keyboard." />
|
||||||
</Label>
|
</Label.Content>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
||||||
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
||||||
|
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left" Width="130">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
<xctk:ColorPicker x:Name="MainColor"
|
||||||
<xctk:ColorPicker x:Name="MainColor"
|
SelectedColor="{Binding Path=AudioVisualizerSettings.MainColor, Mode=TwoWay}" />
|
||||||
SelectedColor="{Binding Path=AudioVisualizerSettings.MainColor, Mode=TwoWay}" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="1"
|
||||||
Grid.Column="1"
|
HorizontalAlignment="Left" Width="130">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
<xctk:ColorPicker x:Name="SecondaryColor"
|
||||||
<xctk:ColorPicker x:Name="SecondaryColor"
|
SelectedColor="{Binding Path=AudioVisualizerSettings.SecondaryColor, Mode=TwoWay}" />
|
||||||
SelectedColor="{Binding Path=AudioVisualizerSettings.SecondaryColor, Mode=TwoWay}" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<!-- Sensitivity slider -->
|
||||||
<!-- Sensitivity slider -->
|
<StackPanel Grid.Row="2"
|
||||||
<StackPanel Grid.Row="2"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left" Width="132">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Sensitivity" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Sensitivity" Style="{DynamicResource DescriptionHeaderStyle}"
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
<Slider x:Name="Sensitivity"
|
||||||
<Slider x:Name="Sensitivity"
|
VerticalAlignment="top"
|
||||||
VerticalAlignment="top"
|
HorizontalAlignment="Left"
|
||||||
HorizontalAlignment="Left"
|
Width="132"
|
||||||
Width="132"
|
TickPlacement="BottomRight"
|
||||||
TickPlacement="BottomRight"
|
TickFrequency="1"
|
||||||
TickFrequency="1"
|
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1"
|
||||||
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1" Maximum="10"
|
Maximum="10"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Row="3"
|
<StackPanel Grid.Row="3"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left" Width="130">
|
||||||
<controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
|
<controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
|
||||||
Header="Origin"
|
Header="Origin"
|
||||||
OnLabel="Bottom" OffLabel="Top"
|
OnLabel="Bottom" OffLabel="Top"
|
||||||
Margin="5,3,0,0" Width="125" />
|
Margin="5,3,0,0" Width="125" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- Fadeout slider -->
|
<!-- Fadeout slider -->
|
||||||
<StackPanel Grid.Row="3"
|
<StackPanel Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left" Width="132">
|
||||||
<Label FontSize="16" Content="Fade speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Fade speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="FadeSpeed"
|
<Slider x:Name="FadeSpeed"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="132"
|
Width="132"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding Path=AudioVisualizerSettings.FadeSpeed, Mode=TwoWay}" Minimum="1" Maximum="10"
|
Value="{Binding Path=AudioVisualizerSettings.FadeSpeed, Mode=TwoWay}" Minimum="1" Maximum="10"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- Buttons -->
|
<!-- Buttons -->
|
||||||
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
||||||
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100" Margin="10,0,0,0"
|
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Margin="10,0,0,0"
|
||||||
</StackPanel>
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
</Grid>
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -4,110 +4,111 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
xmlns:debug="clr-namespace:Artemis.Modules.Effects.Debug"
|
|
||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20"
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20"
|
||||||
<Label.Content>
|
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap" Text="A debug effect." />
|
<Label.Content>
|
||||||
</Label.Content>
|
<AccessText TextWrapping="Wrap" Text="A debug effect." />
|
||||||
</Label>
|
</Label.Content>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
||||||
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
||||||
|
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Direction" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Direction" Style="{DynamicResource DescriptionHeaderStyle}"
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
<ComboBox x:Name="RectangleTypes" Width="120" />
|
||||||
<ComboBox x:Name="RectangleTypes" Width="120" />
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Row="2"
|
<StackPanel Grid.Row="2"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Label FontSize="16" Content="Width" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Width" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="Width"
|
<Slider x:Name="Width"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="132"
|
Width="132"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding Path=DebugEffectSettings.Width, Mode=TwoWay}" Minimum="1" Maximum="84"
|
Value="{Binding Path=DebugEffectSettings.Width, Mode=TwoWay}" Minimum="1" Maximum="84"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Row="2"
|
<StackPanel Grid.Row="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Label FontSize="16" Content="Height" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Height" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="Height"
|
<Slider x:Name="Height"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="200"
|
Width="200"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding Path=DebugEffectSettings.Height, Mode=TwoWay}" Minimum="0" Maximum="24"
|
Value="{Binding Path=DebugEffectSettings.Height, Mode=TwoWay}" Minimum="0" Maximum="24"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Row="3"
|
<StackPanel Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<controls:ToggleSwitch IsChecked="{Binding Path=DebugEffectSettings.Rotate, Mode=TwoWay}"
|
<controls:ToggleSwitch IsChecked="{Binding Path=DebugEffectSettings.Rotate, Mode=TwoWay}"
|
||||||
Header="Rotate" OnLabel="Yes" OffLabel="No"
|
Header="Rotate" OnLabel="Yes" OffLabel="No"
|
||||||
Margin="0 3 0 0" Width="125" />
|
Margin="0 3 0 0" Width="125" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Row="3"
|
<StackPanel Grid.Row="3"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Label FontSize="16" Content="Spread" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Spread" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="Spread"
|
<Slider x:Name="Spread"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="132"
|
Width="132"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding Path=DebugEffectSettings.Spread, Mode=TwoWay}" Minimum="0" Maximum="5"
|
Value="{Binding Path=DebugEffectSettings.Spread, Mode=TwoWay}" Minimum="0" Maximum="5"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- Preview panel -->
|
<!-- Preview panel -->
|
||||||
<StackPanel Grid.Column="1" Grid.Row="1">
|
<StackPanel Grid.Column="1" Grid.Row="1">
|
||||||
<TextBlock>
|
<TextBlock>
|
||||||
<InlineUIContainer>
|
<InlineUIContainer>
|
||||||
<GroupBox Header="Preview" Margin="0" Height="70" Width="118">
|
<GroupBox Header="Preview" Margin="0" Height="70" Width="118">
|
||||||
<Image Source="{Binding ImageSource}"
|
<Image Source="{Binding ImageSource}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Stretch="Fill" />
|
Stretch="Fill" />
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</InlineUIContainer>
|
</InlineUIContainer>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -7,34 +7,36 @@
|
|||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
||||||
d:DataContext="{d:DesignInstance Type=effects:TypeHoleViewModel, IsDesignTimeCreatable=True}"
|
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20"
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20"
|
||||||
<Label.Content>
|
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap" Text="Creates holes in the keyboard's lightning as you press keys." />
|
<Label.Content>
|
||||||
</Label.Content>
|
<AccessText TextWrapping="Wrap"
|
||||||
</Label>
|
Text="Creates holes in the keyboard's lightning as you press keys." />
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label.Content>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
</Label>
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
||||||
|
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
||||||
|
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</Grid>
|
||||||
</Grid>
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -6,112 +6,115 @@
|
|||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
||||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
xmlns:typeWave="clr-namespace:Artemis.Modules.Effects.TypeWave"
|
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20"
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20"
|
||||||
<Label.Content>
|
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap" Text="Creates waves on the keyboard as you press keys." />
|
<Label.Content>
|
||||||
</Label.Content>
|
<AccessText TextWrapping="Wrap" Text="Creates waves on the keyboard as you press keys." />
|
||||||
</Label>
|
</Label.Content>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
|
||||||
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
||||||
|
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsRandomColors, Mode=TwoWay}"
|
||||||
<controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsRandomColors, Mode=TwoWay}"
|
Header="Random colors" OnLabel="Yes" OffLabel="No"
|
||||||
Header="Random colors" OnLabel="Yes" OffLabel="No"
|
Margin="0 3 0 0" Width="125" />
|
||||||
Margin="0 3 0 0" Width="125" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="2"
|
||||||
<StackPanel Grid.Row="2"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsShiftColors, Mode=TwoWay}"
|
||||||
<controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsShiftColors, Mode=TwoWay}"
|
Header="Shift colors"
|
||||||
Header="Shift colors"
|
OnLabel="Yes" OffLabel="No"
|
||||||
OnLabel="Yes" OffLabel="No"
|
Margin="0 3 0 0" Width="125" />
|
||||||
Margin="0 3 0 0" Width="125" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<!-- TTL slider -->
|
||||||
<!-- TTL slider -->
|
<StackPanel Grid.Row="3"
|
||||||
<StackPanel Grid.Row="3"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Time to live" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Time to live" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" />
|
<Slider VerticalAlignment="top"
|
||||||
<Slider VerticalAlignment="top"
|
HorizontalAlignment="Left"
|
||||||
HorizontalAlignment="Left"
|
Width="132"
|
||||||
Width="132"
|
TickPlacement="BottomRight"
|
||||||
TickPlacement="BottomRight"
|
TickFrequency="100"
|
||||||
TickFrequency="100"
|
x:Name="TypeWaveSettings_TimeToLive"
|
||||||
x:Name="TypeWaveSettings_TimeToLive"
|
Value="{Binding Path=TypeWaveSettings.TimeToLive, Mode=TwoWay}" Minimum="100" Maximum="2000"
|
||||||
Value="{Binding Path=TypeWaveSettings.TimeToLive, Mode=TwoWay}" Minimum="100" Maximum="2000"
|
SmallChange="45"
|
||||||
SmallChange="45"
|
IsSnapToTickEnabled="True" />
|
||||||
IsSnapToTickEnabled="True" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="1"
|
||||||
Grid.Column="1"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Wave color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Wave color" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="125" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="125" />
|
<xctk:ColorPicker x:Name="WaveColor"
|
||||||
<xctk:ColorPicker x:Name="WaveColor" SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}" />
|
SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- Shift speed slider -->
|
<!-- Shift speed slider -->
|
||||||
<StackPanel Grid.Row="2"
|
<StackPanel Grid.Row="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Label FontSize="16" Content="Color shift speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Color shift speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="ColorShiftSpeed"
|
<Slider x:Name="ColorShiftSpeed"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="132"
|
Width="132"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="10"
|
TickFrequency="10"
|
||||||
Value="{Binding Path=TypeWaveSettings.ShiftColorSpeed, Mode=TwoWay}" Minimum="1" Maximum="200"
|
Value="{Binding Path=TypeWaveSettings.ShiftColorSpeed, Mode=TwoWay}" Minimum="1" Maximum="200"
|
||||||
SmallChange="5"
|
SmallChange="5"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- Spread Speed slider -->
|
<!-- Spread Speed slider -->
|
||||||
<StackPanel Grid.Row="3"
|
<StackPanel Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Label FontSize="16" Content="Spread speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
<Label FontSize="16" Content="Spread speed" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
Foreground="#535353" FontFamily="Segoe UI Semibold" />
|
||||||
<Slider x:Name="SpreadSpeed"
|
<Slider x:Name="SpreadSpeed"
|
||||||
VerticalAlignment="top"
|
VerticalAlignment="top"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="132"
|
Width="132"
|
||||||
TickPlacement="BottomRight"
|
TickPlacement="BottomRight"
|
||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding Path=TypeWaveSettings.SpreadSpeed, Mode=TwoWay}" Minimum="1" Maximum="6"
|
Value="{Binding Path=TypeWaveSettings.SpreadSpeed, Mode=TwoWay}" Minimum="1" Maximum="6"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
IsSnapToTickEnabled="True" />
|
IsSnapToTickEnabled="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
||||||
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100" Margin="10,0,0,0"
|
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Margin="10,0,0,0"
|
||||||
</StackPanel>
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
</Grid>
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -8,10 +8,11 @@
|
|||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="475.61" d:DesignWidth="519.512">
|
d:DesignHeight="475.61" d:DesignWidth="519.512">
|
||||||
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
@ -117,4 +118,5 @@
|
|||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -5,7 +5,9 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="300">
|
d:DesignHeight="300" d:DesignWidth="300">
|
||||||
<Grid>
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<TextBlock Text="{Binding Content}" />
|
<Grid>
|
||||||
</Grid>
|
<TextBlock Text="{Binding Content}" />
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -4,68 +4,69 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
|
||||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="352.568" d:DesignWidth="490.332"
|
d:DesignHeight="383.137" d:DesignWidth="591.211"
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
<Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<Label.Content>
|
<Label.Content>
|
||||||
<AccessText TextWrapping="Wrap"
|
<AccessText TextWrapping="Wrap"
|
||||||
Text="Fills up the keyboard according to the amount of boost you have." />
|
Text="Fills up the keyboard according to the amount of boost you have." Width="536" />
|
||||||
</Label.Content>
|
</Label.Content>
|
||||||
</Label>
|
</Label>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}" />
|
Style="{DynamicResource MetroCircleToggleButtonStyle}" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
<xctk:ColorPicker x:Name="MainColor"
|
||||||
<xctk:ColorPicker x:Name="MainColor"
|
SelectedColor="{Binding Path=RocketLeagueSettings.MainColor, Mode=TwoWay}" />
|
||||||
SelectedColor="{Binding Path=RocketLeagueSettings.MainColor, Mode=TwoWay}" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Row="1"
|
||||||
<StackPanel Grid.Row="1"
|
Grid.Column="1"
|
||||||
Grid.Column="1"
|
HorizontalAlignment="Left">
|
||||||
HorizontalAlignment="Left">
|
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
|
<xctk:ColorPicker x:Name="SecondaryColor"
|
||||||
<xctk:ColorPicker x:Name="SecondaryColor"
|
SelectedColor="{Binding Path=RocketLeagueSettings.SecondaryColor, Mode=TwoWay}" />
|
||||||
SelectedColor="{Binding Path=RocketLeagueSettings.SecondaryColor, Mode=TwoWay}" />
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top">
|
||||||
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top">
|
<Label FontSize="16"
|
||||||
<Label FontSize="16"
|
Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="500" Margin="0,10,0,0" HorizontalAlignment="Left">
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Height="79" Margin="0,10,0,0">
|
<Label.Content>
|
||||||
<Label.Content>
|
<AccessText TextWrapping="Wrap"
|
||||||
<AccessText TextWrapping="Wrap"
|
Text="Tip: To find a color combination you like, start an exhibition match, pickup 100 boost and play around with the colors. They'll appear on your keyboard immediately! Once you're satisfied don't forget to click save changes."
|
||||||
Text="Tip: To find a color combination you like, start an exhibition match, pickup 100 boost and play around with the colors. They'll appear on your keyboard immediately! Once you're satisfied don't forget to click save changes."
|
FontStyle="Italic" FontSize="12" />
|
||||||
FontStyle="Italic" FontSize="12" />
|
</Label.Content>
|
||||||
</Label.Content>
|
</Label>
|
||||||
</Label>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom">
|
||||||
<StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom">
|
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
||||||
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
|
||||||
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100" Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -4,40 +4,42 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="300">
|
d:DesignHeight="386.842" d:DesignWidth="554.887">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition Height="Auto" />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
<Label.Content>
|
<Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap"
|
<Label.Content>
|
||||||
Text="Colors the keyboard according to the sign Gerald is using." />
|
<AccessText TextWrapping="Wrap"
|
||||||
</Label.Content>
|
Text="Colors the keyboard according to the sign Gerald is using." />
|
||||||
</Label>
|
</Label.Content>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}" />
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
|
Style="{DynamicResource MetroCircleToggleButtonStyle}" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top">
|
||||||
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top">
|
<Label FontSize="16"
|
||||||
<Label FontSize="16"
|
Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}"
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Height="79" Margin="0,10,0,0">
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Height="79" Margin="0,10,0,0">
|
<Label.Content>
|
||||||
<Label.Content>
|
<AccessText TextWrapping="Wrap"
|
||||||
<AccessText TextWrapping="Wrap"
|
Text="Note: Requires patch 1.12. When a new patch is released Artemis download new pointers for the latest version (unless disabled in settings)."
|
||||||
Text="Note: Requires patch 1.12. When a new patch is released Artemis download new pointers for the latest version (unless disabled in settings)."
|
FontStyle="Italic" FontSize="12" Width="515" />
|
||||||
FontStyle="Italic" FontSize="12" />
|
|
||||||
|
|
||||||
</Label.Content>
|
</Label.Content>
|
||||||
</Label>
|
</Label>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -3,62 +3,63 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
|
||||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||||
xmlns:cal="http://www.caliburnproject.org"
|
xmlns:cal="http://www.caliburnproject.org"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
d:DesignHeight="407.812" d:DesignWidth="671.484"
|
||||||
d:DataContext="{d:DesignInstance Type=overlays:VolumeDisplayViewModel, IsDesignTimeCreatable=True}"
|
|
||||||
cal:Bind.AtDesignTime="True">
|
cal:Bind.AtDesignTime="True">
|
||||||
<Grid Margin="15, 5, 15, 5">
|
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid Margin="15, 5, 15, 5">
|
||||||
<ColumnDefinition />
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="320" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid.RowDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition />
|
||||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
</Grid.RowDefinitions>
|
||||||
<Label FontSize="20"
|
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
|
||||||
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
<Label FontSize="20"
|
||||||
<Label.Content>
|
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
|
||||||
<AccessText TextWrapping="Wrap" Text="Displays media key actions on the keyboard." />
|
<Label.Content>
|
||||||
</Label.Content>
|
<AccessText TextWrapping="Wrap" Text="Displays media key actions on the keyboard." />
|
||||||
</Label>
|
</Label.Content>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
</Label>
|
||||||
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
<Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
|
||||||
IsChecked="{Binding Path=VolumeDisplaySettings.Enabled, Mode=TwoWay}"
|
<ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
|
||||||
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
IsChecked="{Binding Path=VolumeDisplaySettings.Enabled, Mode=TwoWay}"
|
||||||
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
Style="{DynamicResource MetroCircleToggleButtonStyle}"
|
||||||
|
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
HorizontalAlignment="Left">
|
||||||
|
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
|
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="134" HorizontalAlignment="Left" />
|
||||||
|
<xctk:ColorPicker x:Name="MainColor"
|
||||||
|
SelectedColor="{Binding Path=VolumeDisplaySettings.MainColor, Mode=TwoWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Grid.Row="1"
|
||||||
|
Grid.Column="1"
|
||||||
|
HorizontalAlignment="Left">
|
||||||
|
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
||||||
|
FontFamily="Segoe UI Semibold" Foreground="#535353" />
|
||||||
|
<xctk:ColorPicker x:Name="SecondaryColor"
|
||||||
|
SelectedColor="{Binding Path=VolumeDisplaySettings.SecondaryColor, Mode=TwoWay}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Grid.Row="1"
|
|
||||||
Grid.Column="0"
|
|
||||||
HorizontalAlignment="Left">
|
|
||||||
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
|
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="134" HorizontalAlignment="Left" />
|
|
||||||
<xctk:ColorPicker x:Name="MainColor"
|
|
||||||
SelectedColor="{Binding Path=VolumeDisplaySettings.MainColor, Mode=TwoWay}" />
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Grid.Row="1"
|
|
||||||
Grid.Column="1"
|
|
||||||
HorizontalAlignment="Left">
|
|
||||||
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
|
|
||||||
FontFamily="Segoe UI Semibold" Foreground="#535353" />
|
|
||||||
<xctk:ColorPicker x:Name="SecondaryColor"
|
|
||||||
SelectedColor="{Binding Path=VolumeDisplaySettings.SecondaryColor, Mode=TwoWay}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
|
||||||
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100" Margin="10,0,0,0"
|
<Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
|
||||||
Style="{DynamicResource SquareButtonStyle}" />
|
Margin="10,0,0,0"
|
||||||
</StackPanel>
|
Style="{DynamicResource SquareButtonStyle}" />
|
||||||
</Grid>
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@ -30,7 +30,7 @@
|
|||||||
<Label Grid.Row="0" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
<Label Grid.Row="0" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
||||||
Content="Startup with Windows:" />
|
Content="Startup with Windows:" />
|
||||||
<controls:ToggleSwitch Grid.Row="0" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
|
<controls:ToggleSwitch Grid.Row="0" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
|
||||||
VerticalAlignment="Center" HorizontalAlignment="Right" Width="120" />
|
VerticalAlignment="Center" HorizontalAlignment="Right" Width="125" />
|
||||||
|
|
||||||
<!-- Keyboard selection -->
|
<!-- Keyboard selection -->
|
||||||
<Label Grid.Row="1" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
<Label Grid.Row="1" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
||||||
@ -48,7 +48,7 @@
|
|||||||
<Label Grid.Row="3" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
<Label Grid.Row="3" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
|
||||||
Content="Download pointers:" />
|
Content="Download pointers:" />
|
||||||
<controls:ToggleSwitch Grid.Row="3" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
|
<controls:ToggleSwitch Grid.Row="3" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
|
||||||
VerticalAlignment="Center" HorizontalAlignment="Right" Width="120" />
|
VerticalAlignment="Center" HorizontalAlignment="Right" Width="125" />
|
||||||
|
|
||||||
<!-- Buttons -->
|
<!-- Buttons -->
|
||||||
<Button Grid.Row="4" Grid.Column="0" Margin="10" x:Name="ResetSettings" Content="Reset settings"
|
<Button Grid.Row="4" Grid.Column="0" Margin="10" x:Name="ResetSettings" Content="Reset settings"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user