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

Redesigned all setting windows

Browse Source
This commit is contained in:
SpoinkyNL 2016-02-01 13:04:18 +01:00
parent 18515a2c27
commit d8aa1d88ea
16 changed files with 531 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Artemis/Artemis/App.config
View File

@ -59,11 +59,14 @@
<setting name="FadeSpeed" serializeAs="String"> <setting name="FadeSpeed" serializeAs="String">
<value>3</value> <value>3</value>
</setting> </setting>
<setting name="MainColor" serializeAs="String"> <setting name="TopColor" serializeAs="String">
<value>#FF0000FF</value> <value>#FFF90000</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="MiddleColor" serializeAs="String">
<value>#FF1E90FF</value> <value>#FFFF761E</value>
</setting>
<setting name="BottomColor" serializeAs="String">
<value>#FF00DF00</value>
</setting> </setting>
</Artemis.Modules.Effects.AudioVisualizer.AudioVisualization> </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
<Artemis.Modules.Games.CounterStrike.CounterStrike> <Artemis.Modules.Games.CounterStrike.CounterStrike>

28
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.Designer.cs generated
View File

@ -73,25 +73,37 @@ namespace Artemis.Modules.Effects.AudioVisualizer {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("#FF0000FF")] [global::System.Configuration.DefaultSettingValueAttribute("#FFF90000")]
public global::System.Windows.Media.Color MainColor { public global::System.Windows.Media.Color TopColor {
get { get {
return ((global::System.Windows.Media.Color)(this["MainColor"])); return ((global::System.Windows.Media.Color)(this["TopColor"]));
} }
set { set {
this["MainColor"] = value; this["TopColor"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("#FF1E90FF")] [global::System.Configuration.DefaultSettingValueAttribute("#FFFF761E")]
public global::System.Windows.Media.Color SecondaryColor { public global::System.Windows.Media.Color MiddleColor {
get { get {
return ((global::System.Windows.Media.Color)(this["SecondaryColor"])); return ((global::System.Windows.Media.Color)(this["MiddleColor"]));
} }
set { set {
this["SecondaryColor"] = value; this["MiddleColor"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("#FF00DF00")]
public global::System.Windows.Media.Color BottomColor {
get {
return ((global::System.Windows.Media.Color)(this["BottomColor"]));
}
set {
this["BottomColor"] = value;
} }
} }
} }

15
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.settings
View File

@ -1,7 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Effects.AudioVisualizer" GeneratedClassName="AudioVisualization">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
GeneratedClassNamespace="Artemis.Modules.Effects.AudioVisualizer" GeneratedClassName="AudioVisualization">
<Profiles /> <Profiles />
<Settings> <Settings>
<Setting Name="Sensitivity" Type="System.Int32" Scope="User"> <Setting Name="Sensitivity" Type="System.Int32" Scope="User">
@ -16,11 +14,14 @@
<Setting Name="FadeSpeed" Type="System.Int32" Scope="User"> <Setting Name="FadeSpeed" Type="System.Int32" Scope="User">
<Value Profile="(Default)">3</Value> <Value Profile="(Default)">3</Value>
</Setting> </Setting>
<Setting Name="MainColor" Type="System.Windows.Media.Color" Scope="User"> <Setting Name="TopColor" Type="System.Windows.Media.Color" Scope="User">
<Value Profile="(Default)">#FF0000FF</Value> <Value Profile="(Default)">#FFF90000</Value>
</Setting> </Setting>
<Setting Name="SecondaryColor" Type="System.Windows.Media.Color" Scope="User"> <Setting Name="MiddleColor" Type="System.Windows.Media.Color" Scope="User">
<Value Profile="(Default)">#FF1E90FF</Value> <Value Profile="(Default)">#FFFF761E</Value>
</Setting>
<Setting Name="BottomColor" Type="System.Windows.Media.Color" Scope="User">
<Value Profile="(Default)">#FF00DF00</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

9
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs
View File

@ -4,6 +4,7 @@ using System.Drawing;
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using System.Linq; using System.Linq;
using Artemis.Models; using Artemis.Models;
using Artemis.Utilities;
using Artemis.Utilities.Audio; using Artemis.Utilities.Audio;
using Artemis.Utilities.Keyboard; using Artemis.Utilities.Keyboard;
using NAudio.CoreAudioApi; using NAudio.CoreAudioApi;
@ -64,11 +65,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
MainModel.ActiveKeyboard, MainModel.ActiveKeyboard,
0, 0, new List<Color> 0, 0, new List<Color>
{ {
//ColorHelpers.MediaColorToDrawingColor(Settings.MainColor), ColorHelpers.ToDrawingColor(Settings.TopColor),
//ColorHelpers.MediaColorToDrawingColor(Settings.SecondaryColor) ColorHelpers.ToDrawingColor(Settings.MiddleColor),
Color.Red, ColorHelpers.ToDrawingColor(Settings.BottomColor)
Color.Yellow,
Color.Green,
}, },
LinearGradientMode.Vertical) {ContainedBrush = false}); LinearGradientMode.Vertical) {ContainedBrush = false});

20
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerSettings.cs
View File

@ -14,8 +14,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
public int Bars { get; set; } public int Bars { get; set; }
public bool FromBottom { get; set; } public bool FromBottom { get; set; }
public int FadeSpeed { get; set; } public int FadeSpeed { get; set; }
public Color MainColor { get; set; } public Color TopColor { get; set; }
public Color SecondaryColor { get; set; } public Color MiddleColor { get; set; }
public Color BottomColor { get; set; }
public override sealed void Load() public override sealed void Load()
{ {
@ -23,8 +24,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
Bars = AudioVisualization.Default.Bars; Bars = AudioVisualization.Default.Bars;
FromBottom = AudioVisualization.Default.FromBottom; FromBottom = AudioVisualization.Default.FromBottom;
FadeSpeed = AudioVisualization.Default.FadeSpeed; FadeSpeed = AudioVisualization.Default.FadeSpeed;
MainColor = AudioVisualization.Default.MainColor; TopColor = AudioVisualization.Default.TopColor;
SecondaryColor = AudioVisualization.Default.SecondaryColor; MiddleColor = AudioVisualization.Default.MiddleColor;
BottomColor = AudioVisualization.Default.BottomColor;
} }
public override sealed void Save() public override sealed void Save()
@ -33,8 +35,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
AudioVisualization.Default.Bars = Bars; AudioVisualization.Default.Bars = Bars;
AudioVisualization.Default.FromBottom = FromBottom; AudioVisualization.Default.FromBottom = FromBottom;
AudioVisualization.Default.FadeSpeed = FadeSpeed; AudioVisualization.Default.FadeSpeed = FadeSpeed;
AudioVisualization.Default.MainColor = MainColor; AudioVisualization.Default.TopColor = TopColor;
AudioVisualization.Default.SecondaryColor = SecondaryColor; AudioVisualization.Default.MiddleColor = MiddleColor;
AudioVisualization.Default.BottomColor = BottomColor;
AudioVisualization.Default.Save(); AudioVisualization.Default.Save();
} }
@ -45,8 +48,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
Bars = 21; Bars = 21;
FromBottom = true; FromBottom = true;
FadeSpeed = 3; FadeSpeed = 3;
MainColor = Color.FromArgb(255, 0, 0, 255); TopColor = Color.FromArgb(255, 249, 0, 0);
SecondaryColor = Color.FromArgb(255, 30, 144, 255); MiddleColor = Color.FromArgb(255, 255, 118, 30);
BottomColor = Color.FromArgb(255, 0, 223, 0);
} }
} }
} }

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

@ -3,99 +3,116 @@
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:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
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"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484" d:DesignHeight="476.986" d:DesignWidth="538.772">
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="20" <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
<Label.Content> <Label.Content>
<AccessText TextWrapping="Wrap" Text="Visualizes the default audio device on the keyboard." /> <AccessText TextWrapping="Wrap"
Text="Visualizes the default audio device on the keyboard." />
</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"
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
Style="{DynamicResource MetroCircleToggleButtonStyle}" Style="{DynamicResource MetroCircleToggleButtonStyle}"
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" /> cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="0" <!-- Top color -->
HorizontalAlignment="Left" Width="130"> <TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}" Height="16" Margin="0,8">
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" /> Color used on top
<xctk:ColorPicker x:Name="MainColor" </TextBlock>
SelectedColor="{Binding Path=AudioVisualizerSettings.MainColor, Mode=TwoWay}" /> <xctk:ColorPicker x:Name="TopColor"
</StackPanel> SelectedColor="{Binding Path=AudioVisualizerSettings.TopColor, Mode=TwoWay}"
<StackPanel Grid.Row="1" Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right"
Grid.Column="1" VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
HorizontalAlignment="Left" Width="130">
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}" <!-- Middle color -->
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" /> <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
<xctk:ColorPicker x:Name="SecondaryColor" Height="16" Margin="0,8">
SelectedColor="{Binding Path=AudioVisualizerSettings.SecondaryColor, Mode=TwoWay}" /> Color used in the middle
</StackPanel> </TextBlock>
<!-- Sensitivity slider --> <xctk:ColorPicker x:Name="MiddleColor"
<StackPanel Grid.Row="2" SelectedColor="{Binding Path=AudioVisualizerSettings.MiddleColor, Mode=TwoWay}"
Grid.Column="0" Grid.Row="2" Grid.Column="1" Width="110" HorizontalAlignment="Right"
HorizontalAlignment="Left" Width="132"> VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<Label FontSize="16" Content="Sensitivity" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" /> <!-- Bottom color -->
<Slider x:Name="Sensitivity" <TextBlock Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
VerticalAlignment="top" Height="16" Margin="0,8">
HorizontalAlignment="Left" Color used on the bottom
Width="132" </TextBlock>
TickPlacement="BottomRight" <xctk:ColorPicker x:Name="Bottom"
TickFrequency="1" SelectedColor="{Binding Path=AudioVisualizerSettings.BottomColor, Mode=TwoWay}"
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1" Grid.Row="3" Grid.Column="1" Width="110" HorizontalAlignment="Right"
Maximum="10" VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
SmallChange="1"
IsSnapToTickEnabled="True" /> <!-- Bar direction -->
</StackPanel> <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" Width="116" VerticalAlignment="Center"
<StackPanel Grid.Row="3" Height="16" Margin="0,9,0,10">
Grid.Column="0" Grow bars bottom
HorizontalAlignment="Left" Width="130"> </TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}" <controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
Header="Origin" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
OnLabel="Bottom" OffLabel="Top" OffLabel="No"
Margin="5,3,0,0" Width="125" /> Margin="0,0,-5,0" Width="114" />
</StackPanel>
<!-- Fadeout slider --> <!-- Bars amount -->
<StackPanel Grid.Row="3" <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Grid.Column="1" Height="16" Margin="0,8">
HorizontalAlignment="Left" Width="132"> Bars amount (less bars means thicker bars)
<Label FontSize="16" Content="Fade speed" Style="{DynamicResource DescriptionHeaderStyle}" </TextBlock>
Foreground="#535353" FontFamily="Segoe UI Semibold" /> <Slider x:Name="Bars" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"
<Slider x:Name="FadeSpeed" HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
VerticalAlignment="top" Value="{Binding Path=AudioVisualizerSettings.Bars, Mode=TwoWay}" Minimum="2" Maximum="21"
HorizontalAlignment="Left" SmallChange="1" IsSnapToTickEnabled="True" />
Width="132"
TickPlacement="BottomRight" <!-- Sensitivity -->
TickFrequency="1" <TextBlock Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Value="{Binding Path=AudioVisualizerSettings.FadeSpeed, Mode=TwoWay}" Minimum="1" Maximum="10" Height="16" Margin="0,8">
SmallChange="1" Volume sensitivity multiplier
IsSnapToTickEnabled="True" /> </TextBlock>
</StackPanel> <Slider x:Name="Sensitivity" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1" Maximum="10"
SmallChange="1" IsSnapToTickEnabled="True" />
<!-- Fade speed -->
<TextBlock Grid.Row="7" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Bar fade-out speed
</TextBlock>
<Slider x:Name="FadeSpeed" Grid.Row="7" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
Value="{Binding Path=AudioVisualizerSettings.FadeSpeed, Mode=TwoWay}" Minimum="1" Maximum="3"
SmallChange="1" IsSnapToTickEnabled="True" />
<!-- Buttons --> <!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom"> <StackPanel Grid.Column="0" Grid.Row="8" 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"

2
Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs
View File

@ -45,6 +45,8 @@ namespace Artemis.Modules.Effects.Debug
KeyboardRectangle.Width = Settings.Width; KeyboardRectangle.Width = Settings.Width;
KeyboardRectangle.GradientMode = Settings.Type; KeyboardRectangle.GradientMode = Settings.Type;
KeyboardRectangle.Rotate = Settings.Rotate; KeyboardRectangle.Rotate = Settings.Rotate;
KeyboardRectangle.Scale = Settings.Scale;
Scale = Settings.Scale;
} }
public override Bitmap GenerateBitmap() public override Bitmap GenerateBitmap()

10
Artemis/Artemis/Modules/Effects/Debug/DebugEffectSettings.cs
View File

@ -12,8 +12,8 @@ namespace Artemis.Modules.Effects.Debug
public int Width { get; set; } public int Width { get; set; }
public int Height { get; set; } public int Height { get; set; }
public int Spread { get; set; }
public bool Rotate { get; set; } public bool Rotate { get; set; }
public int Scale { get; set; }
public LinearGradientMode Type { get; set; } public LinearGradientMode Type { get; set; }
public override sealed void Load() public override sealed void Load()
@ -27,11 +27,11 @@ namespace Artemis.Modules.Effects.Debug
public override sealed void ToDefault() public override sealed void ToDefault()
{ {
Width = 6; Width = 84;
Height = 100; Height = 24;
Spread = 0; Scale = 4;
Type = LinearGradientMode.Horizontal; Type = LinearGradientMode.Horizontal;
Rotate = false; Rotate = true;
} }
} }
} }

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

@ -5,99 +5,92 @@
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:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="407.812" d:DesignWidth="671.484" d:DesignHeight="476.986" d:DesignWidth="538.772">
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="20" <Label FontSize="20" MaxWidth="500" Style="{DynamicResource DescriptionHeaderStyle}"
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Label.Content> <Label.Content>
<AccessText TextWrapping="Wrap" Text="A debug effect." /> <AccessText TextWrapping="Wrap"
Text="A few debugging options, also lets you see what is being sent to the keyboard" />
</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"
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
Style="{DynamicResource MetroCircleToggleButtonStyle}" Style="{DynamicResource MetroCircleToggleButtonStyle}"
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" /> cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="0"
HorizontalAlignment="Left">
<Label FontSize="16" Content="Direction" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" />
<ComboBox x:Name="RectangleTypes" Width="120" />
</StackPanel> <!-- Direction -->
<StackPanel Grid.Row="2" <TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Grid.Column="0" Height="16" Margin="0,8">
HorizontalAlignment="Left"> Color gradient direction
<Label FontSize="16" Content="Width" Style="{DynamicResource DescriptionHeaderStyle}" </TextBlock>
Foreground="#535353" FontFamily="Segoe UI Semibold" /> <ComboBox Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right" VerticalAlignment="Center"
<Slider x:Name="Width" x:Name="RectangleTypes" />
VerticalAlignment="top"
HorizontalAlignment="Left" <!-- Width -->
Width="132" <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
TickPlacement="BottomRight" Height="16" Margin="0,8">
TickFrequency="1" Debug-rectangle width
Value="{Binding Path=DebugEffectSettings.Width, Mode=TwoWay}" Minimum="1" Maximum="84" </TextBlock>
SmallChange="1" <Slider x:Name="Width" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"
IsSnapToTickEnabled="True" /> HorizontalAlignment="Right" Width="110" TickPlacement="None" TickFrequency="1"
</StackPanel> Value="{Binding Path=DebugEffectSettings.Width, Mode=TwoWay}" Minimum="0" Maximum="84"
<StackPanel Grid.Row="2" SmallChange="1" IsSnapToTickEnabled="True" />
Grid.Column="1"
HorizontalAlignment="Left"> <!-- Height -->
<Label FontSize="16" Content="Height" Style="{DynamicResource DescriptionHeaderStyle}" <TextBlock Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Foreground="#535353" FontFamily="Segoe UI Semibold" /> Height="16" Margin="0,8">
<Slider x:Name="Height" Debug-rectangle height
VerticalAlignment="top" </TextBlock>
HorizontalAlignment="Left" <Slider x:Name="Height" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"
Width="200" HorizontalAlignment="Right" Width="110" TickPlacement="None" TickFrequency="1"
TickPlacement="BottomRight"
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> <!-- Scale -->
<StackPanel Grid.Row="3" <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Grid.Column="1" Height="16" Margin="0,8">
HorizontalAlignment="Left"> Debug-rectangle scale (higher means more fluent)
</TextBlock>
<Slider x:Name="Scale" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
Value="{Binding Path=DebugEffectSettings.Scale, Mode=TwoWay}" Minimum="1" Maximum="4"
SmallChange="1" IsSnapToTickEnabled="True" />
<!-- Color rotation -->
<TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,9,0,10">
Rotate colors on debug-rectangle
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=DebugEffectSettings.Rotate, Mode=TwoWay}" <controls:ToggleSwitch IsChecked="{Binding Path=DebugEffectSettings.Rotate, Mode=TwoWay}"
Header="Rotate" OnLabel="Yes" OffLabel="No" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
Margin="0 3 0 0" Width="125" /> OffLabel="No"
</StackPanel> Margin="0,0,-5,0" Width="114" />
<StackPanel Grid.Row="3"
Grid.Column="0"
HorizontalAlignment="Left">
<Label FontSize="16" Content="Spread" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" />
<Slider x:Name="Spread"
VerticalAlignment="top"
HorizontalAlignment="Left"
Width="132"
TickPlacement="BottomRight"
TickFrequency="1"
Value="{Binding Path=DebugEffectSettings.Spread, Mode=TwoWay}" Minimum="0" Maximum="5"
SmallChange="1"
IsSnapToTickEnabled="True" />
</StackPanel>
<!-- Preview panel --> <!-- Preview panel -->
<StackPanel Grid.Column="1" Grid.Row="1"> <StackPanel Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left" Margin="0,25,0,0">
<TextBlock> <TextBlock>
<InlineUIContainer> <InlineUIContainer>
<GroupBox Header="Preview" Margin="0" Height="70" Width="118"> <GroupBox Header="Preview" Margin="0" Height="70" Width="118">
@ -109,6 +102,15 @@
</InlineUIContainer> </InlineUIContainer>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="8" 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"
Style="{DynamicResource SquareButtonStyle}" />
</StackPanel>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>

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

@ -7,108 +7,123 @@
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="476.986" d:DesignWidth="538.772">
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="20" <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
<Label.Content> <Label.Content>
<AccessText TextWrapping="Wrap" Text="Creates waves on the keyboard as you press keys." /> <AccessText TextWrapping="Wrap"
Text="Creates waves on the keyboard as you press keys." />
</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"
IsChecked="{Binding Path=EffectEnabled, Mode=OneWay}"
Style="{DynamicResource MetroCircleToggleButtonStyle}" Style="{DynamicResource MetroCircleToggleButtonStyle}"
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" /> cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="0" <!-- Color -->
HorizontalAlignment="Left"> <TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Wave color
</TextBlock>
<xctk:ColorPicker x:Name="MiddleColor"
SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}"
Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right"
VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<!-- Random colors -->
<TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Use random colors
</TextBlock>
<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" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
Margin="0 3 0 0" Width="125" /> OffLabel="No"
</StackPanel> Margin="0,0,-5,0" Width="114" />
<StackPanel Grid.Row="2"
Grid.Column="0" <!-- Shift color -->
HorizontalAlignment="Left"> <TextBlock Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Shift through colors as the wave grows
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsShiftColors, Mode=TwoWay}" <controls:ToggleSwitch IsChecked="{Binding Path=TypeWaveSettings.IsShiftColors, Mode=TwoWay}"
Header="Shift colors" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
OnLabel="Yes" OffLabel="No" OffLabel="No"
Margin="0 3 0 0" Width="125" /> Margin="0,0,-5,0" Width="114" />
</StackPanel>
<!-- TTL slider --> <!-- Shift speed -->
<StackPanel Grid.Row="3" <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Grid.Column="0" Height="16" Margin="0,8">
HorizontalAlignment="Left"> Speed to shift colors at
<Label FontSize="16" Content="Time to live" Style="{DynamicResource DescriptionHeaderStyle}" </TextBlock>
FontFamily="Segoe UI Semibold" Foreground="#535353" /> <Slider x:Name="ColorShiftSpeed" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"
<Slider VerticalAlignment="top" HorizontalAlignment="Right" Width="110" TickPlacement="None" TickFrequency="1"
HorizontalAlignment="Left"
Width="132"
TickPlacement="BottomRight"
TickFrequency="100"
x:Name="TypeWaveSettings_TimeToLive"
Value="{Binding Path=TypeWaveSettings.TimeToLive, Mode=TwoWay}" Minimum="100" Maximum="2000"
SmallChange="45"
IsSnapToTickEnabled="True" />
</StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="1"
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}" />
</StackPanel>
<!-- Shift speed slider -->
<StackPanel Grid.Row="2"
Grid.Column="1"
HorizontalAlignment="Left">
<Label FontSize="16" Content="Color shift speed" Style="{DynamicResource DescriptionHeaderStyle}"
Foreground="#535353" FontFamily="Segoe UI Semibold" />
<Slider x:Name="ColorShiftSpeed"
VerticalAlignment="top"
HorizontalAlignment="Left"
Width="132"
TickPlacement="BottomRight"
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="45" IsSnapToTickEnabled="True" />
IsSnapToTickEnabled="True" />
</StackPanel> <!-- TTL -->
<!-- Spread Speed slider --> <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
<StackPanel Grid.Row="3" Height="16" Margin="0,8">
Grid.Column="1" Wave time to live
HorizontalAlignment="Left"> </TextBlock>
<Label FontSize="16" Content="Spread speed" Style="{DynamicResource DescriptionHeaderStyle}" <Slider x:Name="TimeToLive" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"
Foreground="#535353" FontFamily="Segoe UI Semibold" /> HorizontalAlignment="Right" Width="110" TickPlacement="None" TickFrequency="1"
<Slider x:Name="SpreadSpeed" Value="{Binding Path=TypeWaveSettings.TimeToLive, Mode=TwoWay}" Minimum="100" Maximum="2000"
VerticalAlignment="top" SmallChange="45" IsSnapToTickEnabled="True" />
HorizontalAlignment="Left"
Width="132" <!-- Growth speed -->
TickPlacement="BottomRight" <TextBlock Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left" Width="116" VerticalAlignment="Center"
TickFrequency="1" Height="16" Margin="0,9,0,10">
Wave growth speed
</TextBlock>
<Slider x:Name="SpreadSpeed" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" 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> <!-- Sensitivity -->
<StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom"> <TextBlock Grid.Row="7" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Volume sensitivity multiplier
</TextBlock>
<Slider x:Name="Sensitivity" Grid.Row="7" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
Value="{Binding Path=AudioVisualizerSettings.Sensitivity, Mode=TwoWay}" Minimum="1" Maximum="10"
SmallChange="1" IsSnapToTickEnabled="True" />
<!-- Fade speed -->
<TextBlock Grid.Row="8" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,8">
Bar fade-out speed
</TextBlock>
<Slider x:Name="FadeSpeed" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"
HorizontalAlignment="Right" Width="110" TickPlacement="BottomRight" TickFrequency="1"
Value="{Binding Path=AudioVisualizerSettings.FadeSpeed, Mode=TwoWay}" Minimum="1" Maximum="3"
SmallChange="1" IsSnapToTickEnabled="True" />
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="9" 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"

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

@ -7,24 +7,27 @@
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
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="476.986" d:DesignWidth="538.772">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="80" /> <RowDefinition Height="80" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<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"
@ -40,7 +43,7 @@
<StackPanel Grid.Row="1" <StackPanel Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2"> Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="16" Content="CS:GO Directory" Style="{DynamicResource DescriptionHeaderStyle}" <Label FontSize="16" Content="CS:GO Directory" Style="{DynamicResource DescriptionHeaderStyle}"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" HorizontalAlignment="Left" /> FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" HorizontalAlignment="Left" />
<Grid> <Grid>
@ -52,69 +55,78 @@
Style="{DynamicResource SquareButtonStyle}" Height="25" /> Style="{DynamicResource SquareButtonStyle}" Height="25" />
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2"
Grid.Column="0" <!-- Ammo display -->
HorizontalAlignment="Left"> <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" Width="130" VerticalAlignment="Center"
Height="16" Margin="0,10,0,9">
Display ammo on F-keys
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.AmmoEnabled, Mode=TwoWay}" <controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.AmmoEnabled, Mode=TwoWay}"
Header="Ammo display" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" OffLabel="No"
OnLabel="Yes" OffLabel="No" Margin="0,0,-5,0" Width="114" />
Margin="5,3,0,0" Width="180" />
</StackPanel> <!-- Ammo main color -->
<StackPanel Grid.Row="3" <TextBlock Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left" Width="94" VerticalAlignment="Center"
Grid.Column="0" Height="16" Margin="0,8">
HorizontalAlignment="Left"> Main ammo color
<Label FontSize="16" Content="Ammo main color" Style="{DynamicResource DescriptionHeaderStyle}" </TextBlock>
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="180" />
<xctk:ColorPicker x:Name="MainColor" <xctk:ColorPicker x:Name="MainColor"
SelectedColor="{Binding Path=CounterStrikeSettings.AmmoMainColor, Mode=TwoWay}" SelectedColor="{Binding Path=CounterStrikeSettings.AmmoMainColor, Mode=TwoWay}"
Margin="5,0,0,0" /> Grid.Row="3" Grid.Column="1" Width="110" HorizontalAlignment="Right"
</StackPanel> VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<StackPanel Grid.Row="3"
Grid.Column="1" <!-- Ammo secondary color -->
HorizontalAlignment="Left"> <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" Width="122" VerticalAlignment="Center"
<Label FontSize="16" Content="Ammo secondary color" Style="{DynamicResource DescriptionHeaderStyle}" Height="16" Margin="0,8">
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="180" /> Secondary ammo color
</TextBlock>
<xctk:ColorPicker x:Name="SecondaryColor" <xctk:ColorPicker x:Name="SecondaryColor"
SelectedColor="{Binding Path=CounterStrikeSettings.AmmoSecondaryColor, Mode=TwoWay}" SelectedColor="{Binding Path=CounterStrikeSettings.AmmoSecondaryColor, Mode=TwoWay}"
Margin="5,0,0,0" /> Grid.Row="4" Grid.Column="1" Width="110" HorizontalAlignment="Right"
</StackPanel> VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<StackPanel Grid.Row="4"
Grid.Column="0"
HorizontalAlignment="Left">
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.SmokeEnabled, Mode=TwoWay}"
Header="Smoked effect"
OnLabel="Yes" OffLabel="No"
Margin="5,3,0,0" Width="180" />
</StackPanel>
<StackPanel Grid.Row="4"
Grid.Column="1"
HorizontalAlignment="Left">
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.FlashEnabled, Mode=TwoWay}"
Header="Flashed effect"
OnLabel="Yes" OffLabel="No"
Margin="5,3,0,0" Width="180" />
</StackPanel>
<StackPanel Grid.Row="5"
Grid.Column="0"
HorizontalAlignment="Left">
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.TeamColorEnabled, Mode=TwoWay}"
Header="Team colors"
OnLabel="Yes" OffLabel="No"
Margin="5,3,0,0" Width="180" />
</StackPanel>
<StackPanel Grid.Row="5"
Grid.Column="1"
HorizontalAlignment="Left">
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.LowHpEnabled, Mode=TwoWay}"
Header="Low HP effect"
OnLabel="Yes" OffLabel="No"
Margin="5,3,0,0" Width="180" />
</StackPanel>
<StackPanel Grid.Column="0" Grid.Row="6" Orientation="Horizontal" VerticalAlignment="Bottom"> <!-- Smoke effect -->
<TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" Width="116" VerticalAlignment="Center"
Height="16" Margin="0,9,0,10">
Display smoked effect
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.SmokeEnabled, Mode=TwoWay}"
Grid.Row="5" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" OffLabel="No"
Margin="0,0,-5,0" Width="114" />
<!-- Flash effect -->
<TextBlock Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left" Width="113" VerticalAlignment="Center"
Height="16" Margin="0,10,0,9">
Display flashed effect
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.FlashEnabled, Mode=TwoWay}"
Grid.Row="6" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" OffLabel="No"
Margin="0,0,-5,0" Width="114" />
<!-- Team color -->
<TextBlock Grid.Row="7" Grid.Column="0" HorizontalAlignment="Left" Width="181" VerticalAlignment="Center"
Height="16" Margin="0,9,0,10">
Color keyboard according to team
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.TeamColorEnabled, Mode=TwoWay}"
Grid.Row="7" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" OffLabel="No"
Margin="0,0,-5,0" Width="114" />
<!-- Team color -->
<TextBlock Grid.Row="8" Grid.Column="0" HorizontalAlignment="Left" Width="160" VerticalAlignment="Center"
Height="16" Margin="0,10,0,9">
Color keyboard red on low HP
</TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=CounterStrikeSettings.LowHpEnabled, Mode=TwoWay}"
Grid.Row="8" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" OffLabel="No"
Margin="0,0,-5,0" Width="114" />
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="9" 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"
Margin="10,0,0,0"
Style="{DynamicResource SquareButtonStyle}" /> Style="{DynamicResource SquareButtonStyle}" />
</StackPanel> </StackPanel>
</Grid> </Grid>

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

@ -7,7 +7,7 @@
d:DesignHeight="300" d:DesignWidth="300"> d:DesignHeight="300" d:DesignWidth="300">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid> <Grid>
<TextBlock Text="{Binding Content}" /> <TextBlock Text="Dota 2 support is still to be done." />
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>

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

@ -3,28 +3,29 @@
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:cal="http://www.caliburnproject.org"
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="383.137" d:DesignWidth="591.211" d:DesignHeight="476.986" d:DesignWidth="538.772">
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<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." Width="536" /> Text="Shows your boost amount on the keyboard." />
</Label.Content> </Label.Content>
</Label> </Label>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
@ -33,34 +34,41 @@
Style="{DynamicResource MetroCircleToggleButtonStyle}" /> Style="{DynamicResource MetroCircleToggleButtonStyle}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1"
Grid.Column="0" <!-- Main color -->
HorizontalAlignment="Left"> <TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
<Label FontSize="16" Content="Main color" Style="{DynamicResource DescriptionHeaderStyle}" Height="16" Margin="0,8">
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" /> Main boost display color
</TextBlock>
<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> Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right"
<StackPanel Grid.Row="1" VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
Grid.Column="1"
HorizontalAlignment="Left"> <!-- Secondary color -->
<Label FontSize="16" Content="Secondary color" Style="{DynamicResource DescriptionHeaderStyle}" <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" /> Height="16" Margin="0,8">
Secondary boost display color
</TextBlock>
<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> Grid.Row="2" Grid.Column="1" Width="110" HorizontalAlignment="Right"
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top"> VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<Label FontSize="16"
Style="{DynamicResource DescriptionHeaderStyle}" <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
FontFamily="Segoe UI Semibold" Foreground="#535353" Width="500" Margin="0,10,0,0" HorizontalAlignment="Left"> TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
<Label.Content> Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
<AccessText TextWrapping="Wrap" Tip: To find a color combination you like, start an exhibition match, pickup 100 boost and play around with the colors.
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." They'll appear on your keyboard immediately! Once you're satisfied don't forget to click save changes.
FontStyle="Italic" FontSize="12" /> </TextBlock>
</Label.Content> <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
</Label> TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
</StackPanel> Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
<StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom"> Note: Requires patch x.x. When a new patch is released Artemis downloads new pointers for the latest version (unless disabled in settings).
</TextBlock>
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="9" 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"

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

@ -8,8 +8,8 @@
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -28,18 +28,12 @@
Style="{DynamicResource MetroCircleToggleButtonStyle}" /> Style="{DynamicResource MetroCircleToggleButtonStyle}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Top"> <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
<Label FontSize="16" TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
Style="{DynamicResource DescriptionHeaderStyle}" Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
FontFamily="Segoe UI Semibold" Foreground="#535353" Height="79" Margin="0,10,0,0"> Note: Requires patch x.x. When a new patch is released Artemis downloads new pointers for the latest version (unless disabled in settings).
<Label.Content> </TextBlock>
<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" Width="515" />
</Label.Content>
</Label>
</StackPanel>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>

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

@ -6,54 +6,64 @@
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="476.986" d:DesignWidth="538.772">
cal:Bind.AtDesignTime="True">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="320" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"> <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
<Label FontSize="20" <Label FontSize="20" MaxWidth="500" Style="{DynamicResource DescriptionHeaderStyle}"
Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Label.Content> <Label.Content>
<AccessText TextWrapping="Wrap" Text="Displays media key actions on the keyboard." /> <AccessText TextWrapping="Wrap" Text="Shows the Windows volume on the keyboard" />
</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 overlay" 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"
IsChecked="{Binding Path=VolumeDisplaySettings.Enabled, Mode=TwoWay}"
Style="{DynamicResource MetroCircleToggleButtonStyle}" Style="{DynamicResource MetroCircleToggleButtonStyle}"
cal:Message.Attach="[Event Click] = [Action ToggleEffect]" /> cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
</StackPanel> </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"> <!-- Main color -->
<TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16"
Margin="0,8">
Main volume display color
</TextBlock>
<xctk:ColorPicker x:Name="MainColor"
SelectedColor="{Binding Path=VolumeDisplaySettings.MainColor, Mode=TwoWay}"
Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right"
VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<!-- Secondary color -->
<TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16"
Margin="0,8">
Secondary volume display color
</TextBlock>
<xctk:ColorPicker x:Name="SecondaryColor"
SelectedColor="{Binding Path=VolumeDisplaySettings.SecondaryColor, Mode=TwoWay}"
Grid.Row="2" Grid.Column="1" Width="110" HorizontalAlignment="Right"
VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
Note: This is an overlay. It will go over any other active effect, and is only shown at certain moments (in this case when changing volume).
</TextBlock>
<!-- Buttons -->
<StackPanel Grid.Column="0" Grid.Row="9" 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"

3
Artemis/Artemis/Views/ShellView.xaml
View File

@ -7,7 +7,8 @@
xmlns:cal="http://www.caliburnproject.org" xmlns:cal="http://www.caliburnproject.org"
mc:Ignorable="d" mc:Ignorable="d"
cal:Message.Attach="[Event Closing] = [Action OnClose($eventArgs)]" cal:Message.Attach="[Event Closing] = [Action OnClose($eventArgs)]"
Title="Artemis" Height="600" Width="718" Title="Artemis" Height="670" Width="675"
MinWidth="500" MinHeight="400"
GlowBrush="{DynamicResource AccentColorBrush}"> GlowBrush="{DynamicResource AccentColorBrush}">
<Controls:MetroWindow.RightWindowCommands> <Controls:MetroWindow.RightWindowCommands>
<Controls:WindowCommands> <Controls:WindowCommands>