Merged dev into master

antonpup · Jan 10, 2017 · be927f3 · be927f3
2 parents 7e87756 + bac2e30
commit be927f3
Show file tree

Hide file tree

Showing 43 changed files with 1,580 additions and 1,351 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,6 +86,12 @@ ipch/
 *.sdf
 *.cachefile
 
+# Visual Studi C++ compile files
+*.exp
+*.iobj
+*.ipdb
+*.lib
+
 # Visual Studio profiler
 *.psess
 *.vsp

diff --git a/Aurora-LeagueLogiLEDWrapper/Aurora-LeagueLogiLEDWrapper.vcxproj b/Aurora-LeagueLogiLEDWrapper/Aurora-LeagueLogiLEDWrapper.vcxproj
diff --git a/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj b/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj
diff --git a/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj b/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj
diff --git a/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj b/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj
diff --git a/Project-Aurora/NetworkListener.cs b/Project-Aurora/NetworkListener.cs
@@ -121,7 +121,10 @@ public bool Start()
                     net_Listener.Start();
                 }
                 catch (HttpListenerException exc)
-                {
+                {
+                    if(exc.ErrorCode == 5)//Access Denied
+                        System.Windows.MessageBox.Show($"Access error during start of network listener.\r\n\r\nTo fix this issue, please run the following commands as admin in Command Prompt:\r\n   netsh http add urlacl url=http://localhost:{Port}/ user=Everyone listen=yes\r\nand\r\n   netsh http add urlacl url=http://127.0.0.1:{Port}/ user=Everyone listen=yes", "Aurora - Error");
+
                     Global.logger.LogLine(exc.ToString(), Logging_Level.Error);
 
                     return false;

diff --git a/Project-Aurora/Profiles/Generic_Application/GenericApplicationProfileManager.cs b/Project-Aurora/Profiles/Generic_Application/GenericApplicationProfileManager.cs
@@ -51,17 +51,23 @@ public override void LoadProfiles()
 
             if (Directory.Exists(profiles_path))
             {
+                this.LoadScripts(profiles_path);
+
                 foreach (string profile in Directory.EnumerateFiles(profiles_path, "*.json", SearchOption.TopDirectoryOnly))
                 {
                     string profile_name = Path.GetFileNameWithoutExtension(profile);
+
+                    if (profile_name.Equals("app_info"))
+                        continue;
+
                     ProfileSettings profile_settings = LoadProfile(profile);
 
                     if (profile_settings != null)
                     {
+                        this.InitalizeScriptSettings(profile_settings);
+
                         if (profile_name.Equals("default"))
                             Settings = profile_settings;
-                        else if (profile_name.Equals("app_info"))
-                            continue;
                         else
                         {
                             if (!Profiles.ContainsKey(profile_name))

diff --git a/Project-Aurora/Program.cs b/Project-Aurora/Program.cs
@@ -147,11 +147,13 @@ static void Main(string[] args)
 
             AppDomain.CurrentDomain.ProcessExit += new EventHandler(OnProcessExit);
 
+            Global.dev_manager = new DeviceManager();
+            Global.effengine = new Effects();
+
             //Load config
             Global.logger.LogLine("Loading Configuration", Logging_Level.Info);
             try
             {
-                Global.Configuration = new Configuration();
                 Global.Configuration = ConfigManager.Load();
             }
             catch (Exception e)
@@ -183,12 +185,8 @@ static void Main(string[] args)
             }
 
             Global.logger.LogLine("Loading Device Manager", Logging_Level.Info);
-            Global.dev_manager = new DeviceManager();
             Global.dev_manager.Initialize();
 
-            Global.logger.LogLine("Loading Effects Engine", Logging_Level.Info);
-            Global.effengine = new Effects();
-
             Global.logger.LogLine("Loading KB Layouts", Logging_Level.Info);
             Global.kbLayout = new KeyboardLayoutManager();
             Global.kbLayout.LoadBrand(Global.Configuration.keyboard_brand, Global.Configuration.mouse_preference, Global.Configuration.mouse_orientation);

diff --git a/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora.csproj
@@ -1198,6 +1198,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -1220,7 +1221,7 @@
     <Resource Include="Resources\gta5_64x64.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\x64\Aurora-LogiLEDWrapper.dll" />
+    <Resource Include="Resources\Win64\Aurora-LogiLEDWrapper.dll" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\AddProfile_Icon.png" />
@@ -1308,7 +1309,7 @@
     <Resource Include="Resources\blacklight_64x64.png" />
     <Content Include="Resources\CorsairInstall\Step1.png" />
     <Content Include="Resources\CorsairInstall\Step2.png" />
-    <Resource Include="Resources\x64\Aurora-LightFXWrapper.dll" />
+    <Resource Include="Resources\Win64\Aurora-LightFXWrapper.dll" />
     <None Include="ver_minor.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -1336,7 +1337,7 @@
     <Resource Include="Resources\bns_48x48.png" />
     <Resource Include="Resources\keycap_backglow.png" />
     <Content Include="Resources\Win32\Aurora-RazerLEDWrapper.dll" />
-    <Resource Include="Resources\x64\Aurora-RazerLEDWrapper.dll" />
+    <Resource Include="Resources\Win64\Aurora-RazerLEDWrapper.dll" />
     <Resource Include="Resources\FreeForm_Circle.png" />
     <Resource Include="Resources\FreeForm_CircleFilled.png" />
     <Resource Include="Resources\FreeForm_Line.png" />