mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-13 05:48:35 +00:00
Progress on the layers display
This commit is contained in:
SpoinkyNL
parent
ca4ae8344d
commit
266390975d
@ -17,6 +17,7 @@
|
|||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<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">
|
||||||
@ -41,6 +42,9 @@
|
|||||||
Note: For this game to work with Artemis, please open up your Division settings, navigate to 3rd Party and set LED keyboard support to Yes. (This only works if you have Artemis running before starting the game)
|
Note: For this game to work with Artemis, please open up your Division settings, navigate to 3rd Party and set LED keyboard support to Yes. (This only works if you have Artemis running before starting the game)
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
|
|
||||||
|
<!-- Profile editor -->
|
||||||
|
<ContentControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" />
|
||||||
|
|
||||||
<!-- 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"
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using Artemis.Managers;
|
using Artemis.Managers;
|
||||||
|
using Artemis.ViewModels;
|
||||||
using Artemis.ViewModels.Abstract;
|
using Artemis.ViewModels.Abstract;
|
||||||
|
|
||||||
namespace Artemis.Modules.Games.TheDivision
|
namespace Artemis.Modules.Games.TheDivision
|
||||||
@ -15,8 +16,12 @@ namespace Artemis.Modules.Games.TheDivision
|
|||||||
// Create effect model and add it to MainManager
|
// Create effect model and add it to MainManager
|
||||||
GameModel = new TheDivisionModel(mainManager, (TheDivisionSettings) GameSettings);
|
GameModel = new TheDivisionModel(mainManager, (TheDivisionSettings) GameSettings);
|
||||||
MainManager.EffectManager.EffectModels.Add(GameModel);
|
MainManager.EffectManager.EffectModels.Add(GameModel);
|
||||||
|
|
||||||
|
ProfileEditor = new ProfileEditorViewModel(MainManager.KeyboardManager.ActiveKeyboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ProfileEditorViewModel ProfileEditor { get; set; }
|
||||||
|
|
||||||
public static string Name => "The Division";
|
public static string Name => "The Division";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4,7 +4,7 @@ using Caliburn.Micro;
|
|||||||
|
|
||||||
namespace Artemis.ViewModels
|
namespace Artemis.ViewModels
|
||||||
{
|
{
|
||||||
internal class ProfileEditorViewModel : Screen
|
public class ProfileEditorViewModel : Screen
|
||||||
{
|
{
|
||||||
private readonly KeyboardProvider _keyboard;
|
private readonly KeyboardProvider _keyboard;
|
||||||
|
|
||||||
|
|||||||
@ -5,26 +5,252 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:Artemis.Views"
|
xmlns:local="clr-namespace:Artemis.Views"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="800">
|
d:DesignHeight="772.5" d:DesignWidth="1335">
|
||||||
<Grid>
|
<Grid Width="Auto" Height="Auto">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Image Grid.Column="0" Grid.Row="0" Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\keyboards\k95.png" Height="200"/>
|
|
||||||
<StackPanel Grid.Column="1" Grid.Row="0">
|
<!-- Preview -->
|
||||||
<Label Content="Layers" Style="{DynamicResource DescriptionHeaderStyle}" />
|
<Label Grid.Column="0" Grid.Row="0" FontSize="20" HorizontalAlignment="Left" Content="Preview" />
|
||||||
<ListView Margin="10,10,0,13" Name="ListView1" HorizontalAlignment="Left" VerticalAlignment="Top" Width="78" Height="178" Style="{StaticResource VirtualisedMetroListView}">>
|
<Border Grid.Column="0" Grid.Row="1" Background="#FF232323" BorderBrush="{DynamicResource HighlightBrush}"
|
||||||
<ListViewItem Content="Coffie"></ListViewItem>
|
BorderThickness="3" Width="800" Height="400">
|
||||||
<ListViewItem Content="Tea"></ListViewItem>
|
<Border>
|
||||||
<ListViewItem Content="Orange Juice"></ListViewItem>
|
<Border.Effect>
|
||||||
<ListViewItem Content="Milk"></ListViewItem>
|
<!-- TODO: Pulse 10-20 -->
|
||||||
<ListViewItem Content="Iced Tea"></ListViewItem>
|
<DropShadowEffect ShadowDepth="0"
|
||||||
<ListViewItem Content="Mango Shake"></ListViewItem>
|
Color="{DynamicResource HighlightColor}"
|
||||||
</ListView>
|
Opacity="1"
|
||||||
|
BlurRadius="20" />
|
||||||
|
</Border.Effect>
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\keyboards\k95.png" Margin="50" />
|
||||||
|
</Border>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- Layer list -->
|
||||||
|
<Label Grid.Column="1" Grid.Row="0" FontSize="20" HorizontalAlignment="Left" Content="Layers" Margin="10,0,0,0" />
|
||||||
|
<Border Grid.Column="1" Grid.Row="1" Background="#FF232323" BorderBrush="{DynamicResource HighlightBrush}"
|
||||||
|
BorderThickness="3" Margin="10,0,0,0" Height="400" Width="200">
|
||||||
|
<!--<ListView x:Name="ListView1" BorderThickness="0">
|
||||||
|
<ListView.Resources>
|
||||||
|
<ResourceDictionary
|
||||||
|
Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
|
||||||
|
</ListView.Resources>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\rect.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\rect.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
<ListViewItem>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="5">
|
||||||
|
<CheckBox VerticalAlignment="Center" />
|
||||||
|
<Image Source="D:\Gebruiker folder\Mijn afbeeldingen\Artemis logo\Config concept\circle.png"
|
||||||
|
Height="30" Margin="5,0" />
|
||||||
|
<TextBlock Text="Layer" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</ListViewItem>
|
||||||
|
</ListView>-->
|
||||||
|
<TreeView>
|
||||||
|
<TreeView.Resources>
|
||||||
|
<ResourceDictionary
|
||||||
|
Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
|
||||||
|
</TreeView.Resources>
|
||||||
|
<TreeViewItem>
|
||||||
|
<!-- Layer example -->
|
||||||
|
<!-- Content -->
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom"
|
||||||
|
Fill="#FFFFE800" />
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 1" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
<!-- Context menu -->
|
||||||
|
<TreeViewItem.ContextMenu>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem Header="Rename" />
|
||||||
|
<MenuItem Header="Delete" />
|
||||||
|
<MenuItem Header="Properties" />
|
||||||
|
</ContextMenu>
|
||||||
|
</TreeViewItem.ContextMenu>
|
||||||
|
</TreeViewItem>
|
||||||
|
<TreeViewItem Header="Group 1">
|
||||||
|
<!-- Context menu -->
|
||||||
|
<TreeViewItem.ContextMenu>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem Header="Rename" />
|
||||||
|
<MenuItem Header="Delete" />
|
||||||
|
<MenuItem Header="Properties" />
|
||||||
|
</ContextMenu>
|
||||||
|
</TreeViewItem.ContextMenu>
|
||||||
|
<!-- Group example -->
|
||||||
|
<TreeViewItem>
|
||||||
|
<!-- Content -->
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom"
|
||||||
|
Fill="#FFC50A0A" />
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 2" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
</TreeViewItem>
|
||||||
|
<!-- Circular Layer example -->
|
||||||
|
<TreeViewItem>
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom"
|
||||||
|
Fill="#FF0AC50A" RadiusX="18" RadiusY="18" />
|
||||||
|
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 3" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
</TreeViewItem>
|
||||||
|
<TreeViewItem>
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom" Fill="#FF2C0AC5" />
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 4" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
</TreeViewItem>
|
||||||
|
</TreeViewItem>
|
||||||
|
<TreeViewItem Header="Group 2">
|
||||||
|
<TreeViewItem>
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom"
|
||||||
|
Fill="#FF0AC5C5" RadiusX="18" RadiusY="18" />
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 5" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
</TreeViewItem>
|
||||||
|
<TreeViewItem>
|
||||||
|
<TreeViewItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<CheckBox VerticalAlignment="Center" ToolTip="Layer enabled" />
|
||||||
|
<Rectangle Height="18" Width="18" Stroke="Black" VerticalAlignment="Bottom" Fill="White" RadiusX="18" RadiusY="18" />
|
||||||
|
<TextBlock Margin="5,0,0,0" Text="Layer 6" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TreeViewItem.Header>
|
||||||
|
</TreeViewItem>
|
||||||
|
</TreeViewItem>
|
||||||
|
</TreeView>
|
||||||
|
</Border>
|
||||||
|
<Grid Grid.Column="1" Grid.Row="2" Margin="10,5,0,0">
|
||||||
|
<Button x:Name="AddLayer" Content="Add layer" VerticalAlignment="Top"
|
||||||
|
Style="{DynamicResource SquareButtonStyle}" Width="95" HorizontalAlignment="Left" />
|
||||||
|
<Button x:Name="RemoveLayer" Content="Remove layer" VerticalAlignment="Top"
|
||||||
|
Style="{DynamicResource SquareButtonStyle}" Width="95" HorizontalAlignment="Right" />
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
Loading…
x
Reference in New Issue
Block a user