DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Cleaned up settings windows, added scroll bars

Browse Source
This commit is contained in:
SpoinkyNL 2016-01-31 22:23:33 +01:00
parent 49d74a54ad
commit 18515a2c27
10 changed files with 492 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
View File

@ -6,14 +6,14 @@
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:audioVisualizer="clr-namespace:Artemis.Modules.Effects.AudioVisualizer"
mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -39,7 +39,7 @@
</StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="0"
HorizontalAlignment="Left">
HorizontalAlignment="Left" Width="130">
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
<xctk:ColorPicker x:Name="MainColor"
@ -47,7 +47,7 @@
</StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Left">
HorizontalAlignment="Left" Width="130">
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" />
<xctk:ColorPicker x:Name="SecondaryColor"
@ -56,7 +56,7 @@
<!-- Sensitivity slider -->
<StackPanel Grid.Row="2"
Grid.Column="0"
HorizontalAlignment="Left">
HorizontalAlignment="Left" Width="132">
<Label FontSize="16" Content="Sensitivity" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" />
<Slider x:Name="Sensitivity"
@ -65,13 +65,14 @@
Width="132"
TickPlacement="BottomRight"
TickFrequency="1"
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1" Maximum="10"
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1"
Maximum="10"
SmallChange="1"
IsSnapToTickEnabled="True" />
</StackPanel>
<StackPanel Grid.Row="3"
Grid.Column="0"
HorizontalAlignment="Left">
HorizontalAlignment="Left" Width="130">
<controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
Header="Origin"
OnLabel="Bottom" OffLabel="Top"
@ -80,7 +81,7 @@
<!-- Fadeout slider -->
<StackPanel Grid.Row="3"
Grid.Column="1"
HorizontalAlignment="Left">
HorizontalAlignment="Left" Width="132">
<Label FontSize="16" Content="Fade speed" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" />
<Slider x:Name="FadeSpeed"
@ -97,8 +98,10 @@
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
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"
Margin="10,0,0,0"
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

7
Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
View File

@ -4,15 +4,15 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:cal="http://www.caliburnproject.org"
xmlns:debug="clr-namespace:Artemis.Modules.Effects.Debug"
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -110,4 +110,5 @@
</TextBlock>
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

10
Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
View File

@ -7,12 +7,12 @@
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484"
d:DataContext="{d:DesignInstance Type=effects:TypeHoleViewModel, IsDesignTimeCreatable=True}"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -25,7 +25,8 @@
<Label FontSize="20"
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
<Label.Content>
<AccessText TextWrapping="Wrap" Text="Creates holes in the keyboard's lightning as you press keys." />
<AccessText TextWrapping="Wrap"
Text="Creates holes in the keyboard's lightning as you press keys." />
</Label.Content>
</Label>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
@ -37,4 +38,5 @@
</StackPanel>
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

13
Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
View File

@ -6,14 +6,14 @@
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:cal="http://www.caliburnproject.org"
xmlns:typeWave="clr-namespace:Artemis.Modules.Effects.TypeWave"
mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -73,7 +73,8 @@
HorizontalAlignment="Left">
<Label FontSize="16" Content="Wave color" Style="{DynamicResource DescriptionHeaderStyle}"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="125" />
<xctk:ColorPicker x:Name="WaveColor" SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}" />
<xctk:ColorPicker x:Name="WaveColor"
SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}" />
</StackPanel>
<!-- Shift speed slider -->
<StackPanel Grid.Row="2"
@ -110,8 +111,10 @@
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
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"
Margin="10,0,0,0"
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

6
Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
View File

@ -8,10 +8,11 @@
xmlns:cal="http://www.caliburnproject.org"
mc:Ignorable="d"
d:DesignHeight="475.61" d:DesignWidth="519.512">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -117,4 +118,5 @@
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

2
Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml
View File

@ -5,7 +5,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid>
<TextBlock Text="{Binding Content}" />
</Grid>
</ScrollViewer>
</UserControl>

17
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
View File

@ -4,16 +4,15 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:cal="http://www.caliburnproject.org"
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d"
d:DesignHeight="352.568" d:DesignWidth="490.332"
d:DesignHeight="383.137" d:DesignWidth="591.211"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -25,7 +24,7 @@
<Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
<Label.Content>
<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>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
@ -53,7 +52,7 @@
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top">
<Label FontSize="16"
Style="{DynamicResource DescriptionHeaderStyle}"
FontFamily="Segoe UI Semibold" Foreground="#535353" Height="79" Margin="0,10,0,0">
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="500" Margin="0,10,0,0" HorizontalAlignment="Left">
<Label.Content>
<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."
@ -64,8 +63,10 @@
<StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom">
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
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"
Margin="10,0,0,0"
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

10
Artemis/Artemis/Modules/Games/Witcher3/Witcher3View.xaml
View File

@ -4,11 +4,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
d:DesignHeight="386.842" d:DesignWidth="554.887">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -34,10 +35,11 @@
<Label.Content>
<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)."
FontStyle="Italic" FontSize="12" />
FontStyle="Italic" FontSize="12" Width="515" />
</Label.Content>
</Label>
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

11
Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
View File

@ -3,17 +3,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
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:cal="http://www.caliburnproject.org"
mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484"
d:DataContext="{d:DesignInstance Type=overlays:VolumeDisplayViewModel, IsDesignTimeCreatable=True}"
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="320" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@ -57,8 +56,10 @@
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
<Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
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"
Margin="10,0,0,0"
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid>
</ScrollViewer>
</UserControl>

4
Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
View File

@ -30,7 +30,7 @@
<Label Grid.Row="0" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
Content="Startup with Windows:" />
<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 -->
<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"
Content="Download pointers:" />
<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 -->
<Button Grid.Row="4" Grid.Column="0" Margin="10" x:Name="ResetSettings" Content="Reset settings"