From fa6884c33856a602cf414ae3a7fa90ca7c5c19a1 Mon Sep 17 00:00:00 2001 From: Nico Jeske Date: Wed, 27 Mar 2019 17:01:30 +0100 Subject: [PATCH] Fixed Issue #25 --- Ambilight/GUI/TraySettings.cs | 5 +++++ Ambilight/Logic/LogicManager.cs | 19 +------------------ Ambilight/Logic/MouseLogic.cs | 4 +--- Ambilight/Program.cs | 2 +- Ambilight/Properties/AssemblyInfo.cs | 6 +++--- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Ambilight/GUI/TraySettings.cs b/Ambilight/GUI/TraySettings.cs index 494ffdf..9d35007 100644 --- a/Ambilight/GUI/TraySettings.cs +++ b/Ambilight/GUI/TraySettings.cs @@ -151,6 +151,11 @@ private void InitializeTray() Visible = true }; + logger.Info("Keyboard Enabled: " + _keyboardEnabled); + logger.Info("Mouse Enabled: " + _mouseEnabled); + logger.Info("Mousemat Enabled: " + _mousematEnabled); + logger.Info("Ambilight mode: " + _ambiModeEnabled); + notifyIcon.ContextMenu = contextMenu; Application.Run(); } diff --git a/Ambilight/Logic/LogicManager.cs b/Ambilight/Logic/LogicManager.cs index 21991e7..7bff5d9 100644 --- a/Ambilight/Logic/LogicManager.cs +++ b/Ambilight/Logic/LogicManager.cs @@ -63,24 +63,7 @@ public void ProcessNewImage(Bitmap test) if (settings.MouseEnabledBool) _mouseLogic.Process(newImage); - /* using (MemoryStream outStream = new MemoryStream()) - { - using (ImageFactory imageFactory = new ImageFactory(preserveExifData: true)) - { - imageFactory.Load(newImage).Saturation(100).Save(outStream); - using (Bitmap image = new Bitmap(Image.FromStream(outStream))) - { - - if (settings.KeyboardEnabledBool) - _keyboardLogic.Process(image); - if (settings.PadEnabledBool) - _mousePadLogic.Process(image); - if (settings.MouseEnabledBool) - _mouseLogic.Process(image); - - } - } - }*/ + diff --git a/Ambilight/Logic/MouseLogic.cs b/Ambilight/Logic/MouseLogic.cs index e106e89..5d9bc85 100644 --- a/Ambilight/Logic/MouseLogic.cs +++ b/Ambilight/Logic/MouseLogic.cs @@ -33,9 +33,7 @@ internal void Process(Bitmap newImage) var mouseGrid = Corale.Colore.Razer.Mouse.Effects.CustomGrid.Create(); Bitmap mapMouse = ImageManipulation.ResizeImage(newImage, Corale.Colore.Razer.Mouse.Constants.MaxColumns, Corale.Colore.Razer.Mouse.Constants.MaxRows); - - - + mapMouse = ImageManipulation.ApplySaturation(mapMouse, settings.Saturation); mouseGrid = GenerateMouseGrid(mapMouse, mouseGrid); Chroma.Instance.Mouse.SetGrid(mouseGrid); mapMouse.Dispose(); diff --git a/Ambilight/Program.cs b/Ambilight/Program.cs index 3b24132..981bc7f 100644 --- a/Ambilight/Program.cs +++ b/Ambilight/Program.cs @@ -17,7 +17,7 @@ internal class Program private static void Main(string[] args) { - logger.Info("\n\n\n --- Razer Ambilight Version 2.0.1 ----"); + logger.Info("\n\n\n --- Razer Ambilight Version 2.0.3 ----"); AutoUpdater.Start("https://vertretungsplan.ga/ambi/ambi.xml"); GUI.TraySettings tray = new GUI.TraySettings(); diff --git a/Ambilight/Properties/AssemblyInfo.cs b/Ambilight/Properties/AssemblyInfo.cs index 97f6cf8..27dc59e 100644 --- a/Ambilight/Properties/AssemblyInfo.cs +++ b/Ambilight/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Ambilight")] -[assembly: AssemblyCopyright("Copyright Nico Jeske © 2018")] +[assembly: AssemblyCopyright("Copyright Nico Jeske © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,6 +32,6 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.2.0")] -[assembly: AssemblyFileVersion("2.0.2.0")] +[assembly: AssemblyVersion("2.0.3.0")] +[assembly: AssemblyFileVersion("2.0.3.0")] [assembly: NeutralResourcesLanguage("")] \ No newline at end of file