Device layout editor

Project-Aurora/Project-Aurora/App.xaml.cs

@@ -116,7 +116,7 @@ public static void LogLine(this NLog.Logger logger, string text, Logging_Level l
         public static NetworkListener net_listener;
         public static Configuration Configuration;
         public static DeviceManager dev_manager;
-        public static KeyboardLayoutManager kbLayout;
+        public static DeviceLayoutManager devicesLayout;
         public static Effects effengine;
         public static KeyRecorder key_recorder;
         public static RzSdkManager razerSdkManager;
@@ -313,9 +313,9 @@ protected override void OnStartup(StartupEventArgs e)
                 Global.logger.Info("Loading Plugins");
                 (Global.PluginManager = new PluginManager()).Initialize();
 
-                Global.logger.Info("Loading KB Layouts");
-                Global.kbLayout = new KeyboardLayoutManager();
-                Global.kbLayout.LoadBrandDefault();
+
+                Global.devicesLayout = new DeviceLayoutManager();
+
 
                 Global.logger.Info("Loading Input Hooking");
                 Global.InputEvents = new InputEvents();
@@ -407,6 +407,8 @@ protected override void OnStartup(StartupEventArgs e)
                 MainWindow = new ConfigUI();
                 ((ConfigUI)MainWindow).Display();
 
+                Global.logger.Info("Loading Device Layouts");
+
                 //Debug Windows on Startup
                 if (Global.Configuration.BitmapWindowOnStartUp)
                     Window_BitmapView.Open();

Project-Aurora/Project-Aurora/ConfigUI.xaml

@@ -6,7 +6,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:Aurora"
              xmlns:tb="http://www.hardcodet.net/taskbar"
-             xmlns:Controls="clr-namespace:Aurora.Controls" xmlns:Settings="clr-namespace:Aurora.Settings" x:Class="Aurora.ConfigUI"
+             xmlns:Controls="clr-namespace:Aurora.Controls" xmlns:Settings="clr-namespace:Aurora.Settings" xmlns:DeviceLayout="clr-namespace:Aurora.Settings.DeviceLayoutViewer" x:Class="Aurora.ConfigUI"
              mc:Ignorable="d" Height="656" Width="1000" Title="Aurora" Loaded="Window_Loaded" Initialized="Window_Initialized" Closing="Window_Closing" Activated="Window_Activated" Deactivated="Window_Deactivated" HorizontalContentAlignment="Stretch" MinWidth="926" MinHeight="575" 
              DataContext="{Binding RelativeSource={RelativeSource Self}}" SizeChanged="Window_SizeChanged">
     <DockPanel x:Name="bg_grid" Background="#FF660000">
@@ -87,18 +87,7 @@
             </Grid.RowDefinitions>
 
             <ContentPresenter Margin="6,4,7,6" Grid.Row="1" Content="{Binding SelectedControl}" />
-            <Viewbox x:Name="keyboard_viewbox" StretchDirection="Both" Margin="0,0,7,0">
-                <Border Margin="5,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Background="#A51E1E1E" CornerRadius="8" MinWidth="650" MinHeight="216">
-                    <Grid>
-                        <Grid x:Name="keyboard_grid" Margin="10,10,10,10" Height="192" VerticalAlignment="Top" HorizontalAlignment="Left" Width="803">
-                            <Grid.CacheMode>
-                                <BitmapCache EnableClearType="True"/>
-                            </Grid.CacheMode>
-                        </Grid>
-                        <Label x:Name="keyboard_record_message" Content="Please select key(s) you want to assign" HorizontalAlignment="Right" Foreground="Red" Height="26" VerticalAlignment="Top" Margin="0,0,10,0" Grid.Column="1" Padding="0" IsHitTestVisible="False"  />
-                    </Grid>
-                </Border>
-            </Viewbox>
+            <DeviceLayout:Control_DeviceLayoutPresenter x:Name="deviceLayerPresenter" Margin="0,0,7,0" MaxHeight="500" MinHeight="200"/>
         </Grid>
     </DockPanel>
 </Window>

Project-Aurora/Project-Aurora/ConfigUI.xaml.cs

@@ -15,7 +15,6 @@
 using Aurora.Controls;
 using Aurora.Profiles.Generic_Application;
 using System.IO;
-using Aurora.Settings.Keycaps;
 using Aurora.Profiles;
 using Aurora.Settings.Layers;
 using Aurora.Profiles.Aurora_Wrapper;
@@ -50,13 +49,7 @@ partial class ConfigUI : Window, INotifyPropertyChanged
 
         private Timer virtual_keyboard_timer;
         private Stopwatch recording_stopwatch = new Stopwatch();
-        private Grid virtial_kb = new Grid();
 
-        private readonly double virtual_keyboard_width;
-        private readonly double virtual_keyboard_height;
-
-        private readonly double width;
-        private readonly double height;
 
         public static readonly DependencyProperty FocusedApplicationProperty = DependencyProperty.Register("FocusedApplication", typeof(Profiles.Application), typeof(ConfigUI), new PropertyMetadata(null, new PropertyChangedCallback(FocusedProfileChanged)));
 
@@ -70,8 +63,6 @@ public Profiles.Application FocusedApplication
             }
         }
 
-        LayerEditor layer_editor = new LayerEditor();
-
         private bool _ShowHidden = false;
 
         public bool ShowHidden
@@ -88,19 +79,10 @@ public ConfigUI()
         {
             InitializeComponent();
 
-            virtual_keyboard_height = this.keyboard_grid.Height;
-            virtual_keyboard_width = this.keyboard_grid.Width;
-
-            width = Width;
-            height = Height;
-
-            Global.kbLayout.KeyboardLayoutUpdated += KbLayout_KeyboardLayoutUpdated;
-
             ctrlProfileManager.ProfileSelected += CtrlProfileManager_ProfileSelected;
 
             GenerateProfileStack();
             settingsControl.DataContext = this;
-
 
         }
 
@@ -141,28 +123,7 @@ private void Layer_manager_NewLayer(Layer layer)
                 SelectedControl = layerPresenter;
         }
 
-        private void KbLayout_KeyboardLayoutUpdated(object sender)
-        {
-            virtial_kb = Global.kbLayout.Virtual_keyboard;
-
-            keyboard_grid.Children.Clear();
-            keyboard_grid.Children.Add(virtial_kb);
-            keyboard_grid.Children.Add(new LayerEditor());
-
-            keyboard_grid.Width = virtial_kb.Width;
-            this.Width = width + (virtial_kb.Width - virtual_keyboard_width);
-
-            keyboard_grid.Height = virtial_kb.Height;
-            this.Height = height + (virtial_kb.Height - virtual_keyboard_height);
-
-            keyboard_grid.UpdateLayout();
-
-            keyboard_viewbox.MaxWidth = virtial_kb.Width + 50;
-            keyboard_viewbox.MaxHeight = virtial_kb.Height + 50;
-            keyboard_viewbox.UpdateLayout();
-
-            this.UpdateLayout();
-        }
+
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
@@ -171,34 +132,15 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             if (!settingsloaded)
             {
                 virtual_keyboard_timer = new Timer(33);
-                virtual_keyboard_timer.Elapsed += new ElapsedEventHandler(virtual_keyboard_timer_Tick);
+                virtual_keyboard_timer.Elapsed += new ElapsedEventHandler(LayoutRenderTimerTick);
                 virtual_keyboard_timer.Start();
 
                 settingsloaded = true;
             }
 
-            this.keyboard_record_message.Visibility = Visibility.Hidden;
-
             current_color = desktop_color_scheme;
             bg_grid.Background = new SolidColorBrush(Color.FromRgb(desktop_color_scheme.Red, desktop_color_scheme.Green, desktop_color_scheme.Blue));
 
-            virtial_kb = Global.kbLayout.Virtual_keyboard;
-
-            keyboard_grid.Children.Clear();
-            keyboard_grid.Children.Add(virtial_kb);
-            keyboard_grid.Children.Add(new LayerEditor());
-
-            keyboard_grid.Width = virtial_kb.Width;
-            this.Width = width + (virtial_kb.Width - virtual_keyboard_width);
-
-            keyboard_grid.Height = virtial_kb.Height;
-            this.Height = height + (virtial_kb.Height - virtual_keyboard_height);
-
-            keyboard_grid.UpdateLayout();
-
-            keyboard_viewbox.MaxWidth = virtial_kb.Width + 50;
-            keyboard_viewbox.MaxHeight = virtial_kb.Height + 50;
-            keyboard_viewbox.UpdateLayout();
 
             UpdateManagerStackFocus(ctrlLayerManager);
 
@@ -233,7 +175,7 @@ public static bool ApplicationIsActivated()
         [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto, SetLastError = true)]
         private static extern int GetWindowThreadProcessId(IntPtr handle, out int processId);
 
-        private void virtual_keyboard_timer_Tick(object sender, EventArgs e)
+        private void LayoutRenderTimerTick(object sender, EventArgs e)
         {
             if (!ApplicationIsActivated())
                 return;
@@ -249,20 +191,11 @@ private void virtual_keyboard_timer_Tick(object sender, EventArgs e)
                                 bg_grid.UpdateLayout();
                             }
 
-
-                            Dictionary<Devices.DeviceKeys, System.Drawing.Color> keylights = new Dictionary<Devices.DeviceKeys, System.Drawing.Color>();
-
                             if (IsActive)
                             {
-                                keylights = Global.effengine.GetKeyboardLights();
-                                Global.kbLayout.SetKeyboardColors(keylights);
+                                deviceLayerPresenter.Refresh();
                             }
 
-                            if (Global.key_recorder.IsRecording())
-                                this.keyboard_record_message.Visibility = Visibility.Visible;
-                            else
-                                this.keyboard_record_message.Visibility = Visibility.Hidden;
-
                         });
         }
 

Project-Aurora/Project-Aurora/Controls/Control_AnimationEditor.xaml

@@ -4,27 +4,22 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aurora.Controls"
+             xmlns:DeviceLayout="clr-namespace:Aurora.Settings.DeviceLayoutViewer"
              mc:Ignorable="d" 
              d:DesignHeight="414" d:DesignWidth="535" Loaded="UserControl_Loaded" PreviewKeyDown="UserControl_PreviewKeyDown">
     <Grid>
         <DockPanel LastChildFill="True">
             <Grid DockPanel.Dock="Top">
                 <DockPanel>
                     <GroupBox x:Name="grpbxProperties" Header="Properties" BorderThickness="1" Margin="0,0,2,0" Width="200" MinWidth="200" DockPanel.Dock="Right"/>
-                    <Viewbox x:Name="viewbxAnimationView" StretchDirection="Both" Margin="0,0,7,0" >
-                        <Border Margin="5,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Background="#A51E1E1E" CornerRadius="8" MinWidth="650" MinHeight="216">
-                            <Grid>
-                                <Rectangle Margin="0" Width="15" Height="15" HorizontalAlignment="Left" VerticalAlignment="Top" Fill="White"/>
-                                <local:Control_Ruler x:Name="rulerHorizontalPixels" Height="15" Margin="15,0,0,0" Background="White" VerticalAlignment="Top" Foreground="Black" />
-                                <local:Control_Ruler x:Name="rulerVerticalPixels" Width="15" Margin="0,15,0,0" Background="White" IsVertical="True" HorizontalAlignment="Left" Foreground="Black" />
-                                <Image x:Name="keyboard_overlayPreview" RenderOptions.BitmapScalingMode="HighQuality" SizeChanged="keyboard_overlayPreview_SizeChanged" Margin="15,15,0,0" Stretch="Fill" />
-                                <Grid x:Name="keyboard_grid" Margin="15,15,0,0" Opacity="0.8">
-                                    <Grid.CacheMode>
-                                        <BitmapCache EnableClearType="True"/>
-                                    </Grid.CacheMode>
-                                </Grid>
-                            </Grid>
-                        </Border>
+                    <Viewbox x:Name="viewbxAnimationView" MaxHeight="500" MaxWidth="1200" StretchDirection="Both" Margin="0,0,7,0" >
+                        <Grid>                            
+                            <Image x:Name="keyboard_overlayPreview" RenderOptions.BitmapScalingMode="HighQuality" SizeChanged="keyboard_overlayPreview_SizeChanged" Margin="15,15,0,0" Stretch="Fill" />
+                            <DeviceLayout:Control_DeviceLayoutPresenter x:Name="deviceLayerPresenter" IsLayoutMoveEnabled="False" Margin="0,0,7,0" Opacity="0.8"/>
+                            <Rectangle Margin="0" Width="15" Height="15" HorizontalAlignment="Left" VerticalAlignment="Top" Fill="White"/>
+                            <local:Control_Ruler x:Name="rulerHorizontalPixels" Height="15" Margin="15,0,0,0" Background="White" VerticalAlignment="Top" Foreground="Black" />
+                            <local:Control_Ruler x:Name="rulerVerticalPixels" Width="15" Margin="0,15,0,0" Background="White" IsVertical="True" HorizontalAlignment="Left" Foreground="Black" />
+                        </Grid>
                     </Viewbox>
                 </DockPanel>
             </Grid>

Project-Aurora/Project-Aurora/Controls/Control_AnimationEditor.xaml.cs

@@ -1,5 +1,6 @@
 using Aurora.Devices;
 using Aurora.EffectsEngine.Animations;
+using Aurora.Settings;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -57,71 +58,41 @@ public Control_AnimationEditor()
         {
             InitializeComponent();
 
-            UpdateVirtualKeyboard();
-
-            Global.kbLayout.KeyboardLayoutUpdated += KbLayout_KeyboardLayoutUpdated;
-        }
-
-        private void KbLayout_KeyboardLayoutUpdated(object sender)
-        {
-            UpdateVirtualKeyboard();
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-        }
-
-        private void UpdateVirtualKeyboard()
-        {
-            Grid virtial_kb = Global.kbLayout.AbstractVirtualKeyboard;
-
-            keyboard_grid.Children.Clear();
-            keyboard_grid.Children.Add(virtial_kb);
-            keyboard_grid.Children.Add(new LayerEditor());
-
-            keyboard_grid.Width = virtial_kb.Width;
-            keyboard_grid.Height = virtial_kb.Height;
-
-            keyboard_grid.UpdateLayout();
-
-            viewbxAnimationView.MaxWidth = virtial_kb.Width + 50;
-            viewbxAnimationView.MaxHeight = virtial_kb.Height + 50;
-            viewbxAnimationView.UpdateLayout();
-
-            this.UpdateLayout();
-
-            //Generate a new mapping
-            foreach (FrameworkElement Child in virtial_kb.Children)
+            foreach (Settings.DeviceLayoutViewer.Control_Keycap key in deviceLayerPresenter.Keycaps)
             {
-                if (Child is Settings.Keycaps.IKeycap && (Child as Settings.Keycaps.IKeycap).GetKey() != DeviceKeys.NONE)
+                if (key.GetKey() != DeviceKeys.NONE)
                 {
-                    Child.PreviewMouseLeftButtonDown += KeyboardKey_PreviewMouseLeftButtonDown;
-                    Child.PreviewMouseRightButtonDown += KeyboardKey_PreviewMouseRightButtonDown;
+                    key.PreviewMouseLeftButtonDown += KeyboardKey_PreviewMouseLeftButtonDown;
+                    key.PreviewMouseRightButtonDown += KeyboardKey_PreviewMouseRightButtonDown;
                 }
             }
         }
 
         private void KeyboardKey_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (_selectedFrameItem != null && (_selectedFrameItem as Control_AnimationFrameItem).ContextFrame is AnimationManualColorFrame && sender is Settings.Keycaps.IKeycap)
+            if (_selectedFrameItem != null && (_selectedFrameItem as Control_AnimationFrameItem).ContextFrame is AnimationManualColorFrame && sender is Settings.DeviceLayoutViewer.Keycaps.KeycapViewer keycapViewer)
             {
-                SetKeyColor((sender as Settings.Keycaps.IKeycap).GetKey(), _PrimaryManualColor);
+                SetKeyColor(keycapViewer.GetKey(), _PrimaryManualColor);
 
                 this.animMixer.UpdatePlaybackTime();
             }
         }
 
         private void KeyboardKey_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (_selectedFrameItem != null && (_selectedFrameItem as Control_AnimationFrameItem).ContextFrame is AnimationManualColorFrame && sender is Settings.Keycaps.IKeycap)
+            if (_selectedFrameItem != null && (_selectedFrameItem as Control_AnimationFrameItem).ContextFrame is AnimationManualColorFrame && sender is Settings.DeviceLayoutViewer.Keycaps.KeycapViewer keycapViewer)
             {
-                SetKeyColor((sender as Settings.Keycaps.IKeycap).GetKey(), _SecondaryManualColor);
+                SetKeyColor(keycapViewer.GetKey(), _SecondaryManualColor);
 
                 this.animMixer.UpdatePlaybackTime();
             }
         }
 
-        private void SetKeyColor(DeviceKeys key, System.Drawing.Color color)
+        private void SetKeyColor(DeviceKey key, System.Drawing.Color color)
         {
             if (_selectedFrameItem != null && (_selectedFrameItem as Control_AnimationFrameItem).ContextFrame is AnimationManualColorFrame)
             {
@@ -443,7 +414,7 @@ private void BtnClearColors_Click(object sender, RoutedEventArgs e)
                 {
                     AnimationManualColorFrame frame = ((_selectedFrameItem as Control_AnimationFrameItem).ContextFrame as AnimationManualColorFrame);
 
-                    frame.SetBitmapColors(new Dictionary<DeviceKeys, System.Drawing.Color>());
+                    frame.SetBitmapColors(new Dictionary<DeviceKey, System.Drawing.Color>());
 
                     this.animMixer.UpdatePlaybackTime();
                 }