Merge pull request #10 from sirfredrick231/minor-bug-fixes

Minor bug fixes

ColorChangerService.sln

@@ -12,8 +12,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorChangerService", "Colo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLedApiDotNet", "GLedApiDotNet\GLedApiDotNet.csproj", "{8F12301F-EC86-4A76-A6A1-AE3EE0A2945B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer", "Installer\Installer.csproj", "{52277674-7FCD-4BE5-AAD9-F24472C40382}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vivaldi", "Vivaldi", "{0ABBC960-1950-4B3E-BC86-1D298CB3EA98}"
 	ProjectSection(SolutionItems) = preProject
 		Vivaldi\custom.js = Vivaldi\custom.js
@@ -26,14 +24,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoveVivaldiFiles", "MoveViv
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inno Setup", "Inno Setup", "{1E843EFB-F57F-43EE-A9BC-EBEB8304B47A}"
 	ProjectSection(SolutionItems) = preProject
+		Inno Setup\dwinshs license.txt = Inno Setup\dwinshs license.txt
 		Inno Setup\dwinshs.iss = Inno Setup\dwinshs.iss
 		Inno Setup\gpl-3.0.txt = Inno Setup\gpl-3.0.txt
-		Inno Setup\Setup.iss = Inno Setup\Setup.iss
+		Inno Setup\setup.iss = Inno Setup\setup.iss
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unzip", "unzip", "{922543B6-CA72-49D5-BBAC-37BAC55E194E}"
 	ProjectSection(SolutionItems) = preProject
-		unzip\License.txt = unzip\License.txt
+		unzip\unzip license.txt = unzip\unzip license.txt
 		unzip\unzip.exe = unzip\unzip.exe
 	EndProjectSection
 EndProject
@@ -71,18 +70,6 @@ Global
 		{8F12301F-EC86-4A76-A6A1-AE3EE0A2945B}.Release|x64.Build.0 = Release|Any CPU
 		{8F12301F-EC86-4A76-A6A1-AE3EE0A2945B}.Release|x86.ActiveCfg = Release|Any CPU
 		{8F12301F-EC86-4A76-A6A1-AE3EE0A2945B}.Release|x86.Build.0 = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|x64.Build.0 = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Debug|x86.Build.0 = Debug|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|x64.ActiveCfg = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|x64.Build.0 = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|x86.ActiveCfg = Release|Any CPU
-		{52277674-7FCD-4BE5-AAD9-F24472C40382}.Release|x86.Build.0 = Release|Any CPU
 		{1EF2608D-B11D-4EBA-AC8D-E8282FC47A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1EF2608D-B11D-4EBA-AC8D-E8282FC47A90}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1EF2608D-B11D-4EBA-AC8D-E8282FC47A90}.Debug|x64.ActiveCfg = Debug|Any CPU

ColorChangerService/ColorChangerService.csproj

@@ -95,7 +95,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GLedApiDotNet\GLedApiDotNet.csproj">
@@ -104,23 +106,26 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-        <VivaldiFiles Include="..\Vivaldi\**\*.*"/>
+    <VivaldiFiles Include="..\Vivaldi\**\*.*" />
   </ItemGroup>
   <ItemGroup>
-        <InnoSetupFiles Include="..\Inno Setup\**\*.*"/>
+    <InnoSetupFiles Include="..\Inno Setup\dwinshs license.txt" />
+    <InnoSetupFiles Include="..\Inno Setup\dwinshs.iss" />
+    <InnoSetupFiles Include="..\Inno Setup\gpl-3.0.txt" />
+    <InnoSetupFiles Include="..\Inno Setup\setup.iss" />
   </ItemGroup>
   <ItemGroup>
-        <unzipFiles Include="..\unzip\**\*.*"/>
+    <unzipFiles Include="..\unzip\**\*.*" />
   </ItemGroup>
   <Target Name="CopyVivaldiFiles" AfterTargets="AfterBuild">
-  <Copy SourceFiles="@(VivaldiFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\Vivaldi\" />
-</Target>
-<Target Name="CopyInnoSetupFiles" AfterTargets="AfterBuild">
-  <Copy SourceFiles="@(InnoSetupFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\" />
-</Target>
-<Target Name="CopyunzipFiles" AfterTargets="AfterBuild">
-  <Copy SourceFiles="@(unzipFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\unzip\" />
-</Target>
+    <Copy SourceFiles="@(VivaldiFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\Vivaldi\" />
+  </Target>
+  <Target Name="CopyInnoSetupFiles" AfterTargets="AfterBuild">
+    <Copy SourceFiles="@(InnoSetupFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\" />
+  </Target>
+  <Target Name="CopyunzipFiles" AfterTargets="AfterBuild">
+    <Copy SourceFiles="@(unzipFiles)" DestinationFolder="$(ProjectDir)\bin\x86\Release\unzip\" />
+  </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <UsingTask AssemblyFile="$(SolutionDir)packages\WixSharp.1.6.4.0\build\SetEnvVar.dll" TaskName="SetEnvVar" />
 </Project>

ColorChangerService/Properties/AssemblyInfo.cs

@@ -39,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

ColorChangerService/Service.cs

@@ -33,7 +33,7 @@ static void Main(string[] args)
                     s.WhenStopped(tc => tc.Stop());
                 });
                 x.RunAsLocalSystem();
-                x.SetDescription("Changes the RGB Color of Gigabyte Motherboards to a random color every three seconds.");
+                x.SetDescription("Changes the RGB Color of Gigabyte Motherboards based on current tab color of Vivaldi Browser.");
                 x.SetDisplayName("Color Changer");
                 x.SetServiceName("ColorChanger");
             });

Inno Setup/Setup.iss

@@ -1,18 +1,25 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
+;
+; Copyright (C) 2019 Jeffrey Tucker
+;
+; This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{0CED4BED-BBDC-4957-8694-803498B0C3B0}
 AppName=Vivaldi Color Changer Service
-AppVersion=2.1.0
-;AppVerName=Vivaldi Color Changer Service 2.1.0
+AppVersion=2.1.1
+AppVerName=Vivaldi Color Changer Service 2.1.1
 AppPublisher=Sir Fredrick
 AppPublisherURL=https://sirfredrick.vivaldi.net/
-AppSupportURL=https://sirfredrick.vivaldi.net/
-AppUpdatesURL=https://sirfredrick.vivaldi.net/
+AppSupportURL=https://github.com/sirfredrick231/VivaldiColorChanger/
+AppUpdatesURL=https://github.com/sirfredrick231/VivaldiColorChanger/
 DefaultDirName={pf}\Vivaldi Color Changer Service
 DefaultGroupName=Vivaldi Color Changer Service
 LicenseFile=<Release Folder>\gpl-3.0.txt
@@ -31,7 +38,7 @@ Source: "<Release Folder>\unzip\unzip.exe"; DestDir: "{tmp}"; Flags: ignoreversi
 Source: "<Release Folder>\MoveDLLs\*"; DestDir: "{tmp}"; Flags: ignoreversion recursesubdirs
 Source: "<Release Folder>\MoveVivaldiFiles\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "<Release Folder>\ColorChangerService\*"; DestDir: "{app}\ColorChangerService"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "<Release Folder>\Color Changer 2.1.0\Vivaldi\*"; DestDir: "{app}\Vivaldi"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "<Release Folder>\Vivaldi\*"; DestDir: "{app}\Vivaldi"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -47,6 +54,7 @@ Filename: {app}\ColorChangerService\config.ini; Section: configKeys; Key: subKey
 Filename: "{tmp}\unzip.exe"; Parameters: "SDK.zip"; Flags: runascurrentuser skipifsilent
 Filename: "{tmp}\MoveDLLs.exe"; Parameters: """{app}\ColorChangerService\"; Flags: runascurrentuser skipifsilent
 Filename: "{app}\ColorChangerService\ColorChangerService.exe"; Parameters: "install --localsystem --autostart"; Description: "{cm:LaunchProgram,Vivaldi Color Changer Service}"; Flags: runascurrentuser skipifsilent
+Filename: "{app}\ColorChangerService\ColorChangerService.exe"; Parameters: "start"; Flags: runascurrentuser skipifsilent
 Filename: "{app}\moveVivaldiFiles.exe"; Parameters: """{code:GetVivaldiPath}"""; Flags: runascurrentuser skipifsilent 
 
 [UninstallRun]

MoveDLLs/MoveDLLs.cs

@@ -1,3 +1,10 @@
+// Copyright (C) 2019 Jeffrey Tucker
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.IO;
 using System.Collections.Generic;

MoveDLLs/Properties/AssemblyInfo.cs

@@ -1,3 +1,10 @@
+// Copyright (C) 2019 Jeffrey Tucker
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -10,18 +17,18 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("MoveDLLs")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright © Jeffrey Tucker 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
+
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1ef2608d-b11d-4eba-ac8d-e8282fc47a90")]
-
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -32,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

MoveVivaldiFiles/MoveVivaldiFiles.cs

@@ -1,3 +1,10 @@
+// Copyright (C) 2019 Jeffrey Tucker
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.IO;
 using IniParser;
@@ -81,20 +88,10 @@ static void Install()
         }
         static void MoveFiles()
         {
-            CopyWithBackup(path + "Vivaldi\\custom.js", browserPath + "\\custom.js", path + "Vivaldi\\backup\\custom.js");
-            CopyWithBackup(path + "Vivaldi\\pubnub.js", browserPath + "\\pubnub.js", path + "Vivaldi\\backup\\pubnub.js");
-            CopyWithBackup(path + "Vivaldi\\browser.html", browserPath + "\\browser.html", path + "Vivaldi\\backup\\browser.html");
+            File.Copy(path + "Vivaldi\\custom.js", browserPath + "\\custom.js", true);
+            File.Copy(path + "Vivaldi\\pubnub.js", browserPath + "\\pubnub.js", true);
+            File.Copy(path + "Vivaldi\\browser.html", browserPath + "\\browser.html", true);
             exit = true;
         }
-        public static void CopyWithBackup(string sourceFileName, string destFileName, string backupFileName)
-        {
-            if (File.Exists(destFileName))
-            {
-                File.Copy(destFileName, backupFileName, true);
-            }
-
-            File.Copy(sourceFileName, destFileName, true);
-
-        }
     }
 }

MoveVivaldiFiles/Properties/AssemblyInfo.cs

@@ -1,16 +1,23 @@
+// Copyright (C) 2019 Jeffrey Tucker
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Installer")]
+[assembly: AssemblyTitle("MoveVivaldiFiles")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Installer")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyProduct("MoveVivaldiFiles")]
+[assembly: AssemblyCopyright("Copyright © Jeffrey Tucker 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

Vivaldi/custom.js

@@ -1,3 +1,10 @@
+// Copyright (C) 2018 Jeffrey Tucker
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 var firstTime = true;
 var colorOld = '';
 var pubnub = new PubNub({