From 67430619626d7e7b6a6ec09ddf0cc70b43c47917 Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Wed, 2 Dec 2020 22:06:50 +1300 Subject: [PATCH] Fixed missing HeliosPLus renames --- .../DisplayMagician.LogReporter.csproj | 4 +- .../{HeliosPlus.ico => DisplayMagician.ico} | Bin DisplayMagician.Setup/HeliosPlus.Setup.vdproj | 350 +++++++++--------- .../DisplayMagician.Shared.csproj | 10 +- ...ion.cs => DisplayMagicianStartupAction.cs} | 2 +- DisplayMagician.Shared/Helios.cs | 137 ------- .../Properties/Resources.Designer.cs | 4 +- DisplayMagician/Program.cs | 4 +- DisplayMagician/ShortcutItem.cs | 2 +- DisplayMagician/UIForms/MainForm.resx | 160 ++++---- 10 files changed, 267 insertions(+), 406 deletions(-) rename DisplayMagician.LogReporter/{HeliosPlus.ico => DisplayMagician.ico} (100%) rename DisplayMagician.Shared/{HeliosStartupAction.cs => DisplayMagicianStartupAction.cs} (71%) delete mode 100644 DisplayMagician.Shared/Helios.cs diff --git a/DisplayMagician.LogReporter/DisplayMagician.LogReporter.csproj b/DisplayMagician.LogReporter/DisplayMagician.LogReporter.csproj index 4777061..dcebfa9 100644 --- a/DisplayMagician.LogReporter/DisplayMagician.LogReporter.csproj +++ b/DisplayMagician.LogReporter/DisplayMagician.LogReporter.csproj @@ -55,7 +55,7 @@ false - HeliosPlus.ico + DisplayMagician.ico true @@ -80,7 +80,7 @@ - + diff --git a/DisplayMagician.LogReporter/HeliosPlus.ico b/DisplayMagician.LogReporter/DisplayMagician.ico similarity index 100% rename from DisplayMagician.LogReporter/HeliosPlus.ico rename to DisplayMagician.LogReporter/DisplayMagician.ico diff --git a/DisplayMagician.Setup/HeliosPlus.Setup.vdproj b/DisplayMagician.Setup/HeliosPlus.Setup.vdproj index 84958eb..65ab5d7 100644 --- a/DisplayMagician.Setup/HeliosPlus.Setup.vdproj +++ b/DisplayMagician.Setup/HeliosPlus.Setup.vdproj @@ -52,13 +52,13 @@ "Entry" { "MsmKey" = "8:_1F472B27928AAF875547361F33301756" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1F472B27928AAF875547361F33301756" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -76,13 +76,13 @@ "Entry" { "MsmKey" = "8:_20C50515084193D4C8ADF9B6B676DE77" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_20C50515084193D4C8ADF9B6B676DE77" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,13 +106,13 @@ "Entry" { "MsmKey" = "8:_2BECE346513978E22D85CF70C5335C00" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_2BECE346513978E22D85CF70C5335C00" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -142,13 +142,13 @@ "Entry" { "MsmKey" = "8:_328C0F8CD9164AB0EB6387D511274083" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_328C0F8CD9164AB0EB6387D511274083" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -165,24 +165,6 @@ } "Entry" { - "MsmKey" = "8:_40B76C15CBAE15075FB583A089EC6E7E" - "OwnerKey" = "8:_421DEEA736F14466A32568905067E9A7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_40B76C15CBAE15075FB583A089EC6E7E" - "OwnerKey" = "8:_AF0CEA76E15F427B95FFB76749B52E17" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_421DEEA736F14466A32568905067E9A7" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_4F488048273045DD8EE3B904E25EE5FB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -201,6 +183,12 @@ } "Entry" { + "MsmKey" = "8:_5BC175B3D9AE4E399DB97412626E9B1D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6F8A3FB2F67D41956E65B4D859B389E9" "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" @@ -231,6 +219,18 @@ } "Entry" { + "MsmKey" = "8:_7E279826AED3D503C2B7F7DB69F2C6E7" + "OwnerKey" = "8:_AF0CEA76E15F427B95FFB76749B52E17" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7E279826AED3D503C2B7F7DB69F2C6E7" + "OwnerKey" = "8:_C821E9F716AD43339553D7462B777612" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7EF733F9AECA4C7062436E30CF9FC73C" "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" @@ -291,14 +291,14 @@ } "Entry" { - "MsmKey" = "8:_BA36701EA973451CBE81355EA0F1572D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_BD72F94F74F20DED3B5752C78BFB566C" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BD72F94F74F20DED3B5752C78BFB566C" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "MsmKey" = "8:_C821E9F716AD43339553D7462B777612" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -321,6 +321,18 @@ } "Entry" { + "MsmKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" + "OwnerKey" = "8:_CCD39A4DC1C9485F961A6E6EF8D7ED61" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D05DB69FF9722F53BCEC1895D9EF5A2A" "OwnerKey" = "8:_4F488048273045DD8EE3B904E25EE5FB" "MsmSig" = "8:_UNDEFINED" @@ -328,13 +340,13 @@ "Entry" { "MsmKey" = "8:_D05DB69FF9722F53BCEC1895D9EF5A2A" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D05DB69FF9722F53BCEC1895D9EF5A2A" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" + "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -387,18 +399,6 @@ } "Entry" { - "MsmKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" - "OwnerKey" = "8:_CCD39A4DC1C9485F961A6E6EF8D7ED61" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" - "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F28FBBAC98C5E96A3B233D50EDBE7E97" "OwnerKey" = "8:_E5F37DD38C5142669C0C67A50EC67181" "MsmSig" = "8:_UNDEFINED" @@ -418,19 +418,25 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CF2B5512697D3444DA5C7C187AE26988" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C821E9F716AD43339553D7462B777612" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_AF0CEA76E15F427B95FFB76749B52E17" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_421DEEA736F14466A32568905067E9A7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_40B76C15CBAE15075FB583A089EC6E7E" + "OwnerKey" = "8:_7E279826AED3D503C2B7F7DB69F2C6E7" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -562,12 +568,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF2DD8DAE57B72AF49C7CD06B2B9D472" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_90FC8214331F53FD9474FAE9E83D2C2C" "MsmSig" = "8:_UNDEFINED" } @@ -1079,68 +1079,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_40B76C15CBAE15075FB583A089EC6E7E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpShell, Version=2.7.2.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_40B76C15CBAE15075FB583A089EC6E7E" - { - "Name" = "8:SharpShell.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:SharpShell.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_421DEEA736F14466A32568905067E9A7" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HeliosPlus.ShellExtension, Version=0.9.5.40690, Culture=neutral, PublicKeyToken=20bd5a8aff754671, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_421DEEA736F14466A32568905067E9A7" - { - "Name" = "8:HeliosPlus.ShellExtension.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:..\\Debug\\HeliosPlus.ShellExtension.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FABC52BA03E938FFC3C8012A8BF1DAC" { "AssemblyRegister" = "3:1" @@ -1172,6 +1110,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BC175B3D9AE4E399DB97412626E9B1D" + { + "SourcePath" = "8:..\\DisplayMagician\\Resources\\DisplayMagician.ico" + "TargetName" = "8:DisplayMagician.ico" + "Tag" = "8:" + "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6F8A3FB2F67D41956E65B4D859B389E9" { "AssemblyRegister" = "3:1" @@ -1265,6 +1223,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E279826AED3D503C2B7F7DB69F2C6E7" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpShell, Version=2.7.2.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_7E279826AED3D503C2B7F7DB69F2C6E7" + { + "Name" = "8:SharpShell.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpShell.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7EF733F9AECA4C7062436E30CF9FC73C" { "AssemblyRegister" = "3:1" @@ -1451,26 +1440,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA36701EA973451CBE81355EA0F1572D" - { - "SourcePath" = "8:Resources\\HeliosPlus.ico" - "TargetName" = "8:HeliosPlus.ico" - "Tag" = "8:" - "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BD72F94F74F20DED3B5752C78BFB566C" { "AssemblyRegister" = "3:1" @@ -1502,6 +1471,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C821E9F716AD43339553D7462B777612" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DisplayMagician.ShellExtension, Version=0.9.5.39558, Culture=neutral, PublicKeyToken=20bd5a8aff754671, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C821E9F716AD43339553D7462B777612" + { + "Name" = "8:DisplayMagician.ShellExtension.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\Debug\\DisplayMagician.ShellExtension.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CD63D9BE951A79519CD69B373F5A245D" { "AssemblyRegister" = "3:1" @@ -1533,6 +1533,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CF2B5512697D3444DA5C7C187AE26988" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DisplayMagician.Shared, Version=0.9.5.39602, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_CF2B5512697D3444DA5C7C187AE26988" + { + "Name" = "8:DisplayMagician.Shared.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DisplayMagician.Shared.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D05DB69FF9722F53BCEC1895D9EF5A2A" { "AssemblyRegister" = "3:1" @@ -1688,37 +1719,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF2DD8DAE57B72AF49C7CD06B2B9D472" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HeliosPlus.Shared, Version=0.9.5.40690, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_EF2DD8DAE57B72AF49C7CD06B2B9D472" - { - "Name" = "8:HeliosPlus.Shared.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:HeliosPlus.Shared.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F28FBBAC98C5E96A3B233D50EDBE7E97" { "AssemblyRegister" = "3:1" @@ -1866,7 +1866,7 @@ "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:_BA36701EA973451CBE81355EA0F1572D" + "ARPPRODUCTICON" = "8:" "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" @@ -1988,7 +1988,7 @@ "Target" = "8:_E5F37DD38C5142669C0C67A50EC67181" "Folder" = "8:_5AF97EC9EA2843FB8CB7128E28CA7776" "WorkingFolder" = "8:_994B36D509C14116B6C6DCEC92ED8846" - "Icon" = "8:_BA36701EA973451CBE81355EA0F1572D" + "Icon" = "8:" "Feature" = "8:" } } @@ -2420,7 +2420,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4F488048273045DD8EE3B904E25EE5FB" { - "SourcePath" = "8:..\\HeliosPlus.Shared\\obj\\Debug\\HeliosPlus.Shared.dll" + "SourcePath" = "8:..\\DisplayMagician.Shared\\obj\\Debug\\DisplayMagician.Shared.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" @@ -2504,7 +2504,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_CCD39A4DC1C9485F961A6E6EF8D7ED61" { - "SourcePath" = "8:..\\HeliosPlus.LogReporter\\obj\\Debug\\HeliosPlus.LogReporter.exe" + "SourcePath" = "8:..\\DisplayMagician.LogReporter\\obj\\Debug\\HeliosPlus.LogReporter.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" @@ -2532,7 +2532,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E5F37DD38C5142669C0C67A50EC67181" { - "SourcePath" = "8:..\\HeliosPlus\\obj\\Debug\\HeliosPlus.exe" + "SourcePath" = "8:..\\DisplayMagician\\obj\\Debug\\DisplayMagician.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_994B36D509C14116B6C6DCEC92ED8846" diff --git a/DisplayMagician.Shared/DisplayMagician.Shared.csproj b/DisplayMagician.Shared/DisplayMagician.Shared.csproj index f7f1919..a4ac67a 100644 --- a/DisplayMagician.Shared/DisplayMagician.Shared.csproj +++ b/DisplayMagician.Shared/DisplayMagician.Shared.csproj @@ -7,8 +7,8 @@ {1CACDA43-01C7-4CD4-BF6E-9421A29510FC} Library Properties - HeliosPlus.Shared - HeliosPlus.Shared + DisplayMagician.Shared + DisplayMagician.Shared v4.8 512 @@ -33,8 +33,7 @@ 4 - - + Resources\DisplayMagician.ico false @@ -60,13 +59,12 @@ - - + diff --git a/DisplayMagician.Shared/HeliosStartupAction.cs b/DisplayMagician.Shared/DisplayMagicianStartupAction.cs similarity index 71% rename from DisplayMagician.Shared/HeliosStartupAction.cs rename to DisplayMagician.Shared/DisplayMagicianStartupAction.cs index 96b0a44..9160c13 100644 --- a/DisplayMagician.Shared/HeliosStartupAction.cs +++ b/DisplayMagician.Shared/DisplayMagicianStartupAction.cs @@ -1,6 +1,6 @@ namespace DisplayMagician.Shared { - public enum HeliosStartupAction + public enum DisplayMagicianStartupAction { RunShortcut, ChangeProfile, diff --git a/DisplayMagician.Shared/Helios.cs b/DisplayMagician.Shared/Helios.cs deleted file mode 100644 index c290a0d..0000000 --- a/DisplayMagician.Shared/Helios.cs +++ /dev/null @@ -1,137 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using Microsoft.Win32; - -namespace DisplayMagician.Shared -{ - public class Helios - { - public static string Address - { - get - { - try - { - using ( - var key = - Registry.LocalMachine.OpenSubKey(@"SOFTWARE\DisplayMagician", false)) - { - var executableAddress = key?.GetValue(@"ExecutableAddress", null) as string; - - if (!string.IsNullOrWhiteSpace(executableAddress) && File.Exists(executableAddress)) - { - return executableAddress; - } - } - } - catch - { - // ignored - } - - return null; - } - } - - public static bool IsInstalled - { - get => !string.IsNullOrWhiteSpace(Address); - } - - // ReSharper disable once MethodTooLong - // ReSharper disable once TooManyArguments - public static void Open( - HeliosStartupAction action = HeliosStartupAction.StartUpNormally, - ProfileItem profile = null, - string programAddress = null, - bool asAdmin = false) - { - try - { - if (!IsInstalled) - { - return; - } - - var args = new List {$"-a {action}"}; - - if (profile != null) - { - args.Add($"-p \"{profile.UUID}\""); - } - - if (!string.IsNullOrWhiteSpace(programAddress)) - { - args.Add($"-e \"{programAddress}\""); - } - - var processInfo = new ProcessStartInfo(Address, string.Join(" ", args)) - { - UseShellExecute = true - }; - - if (asAdmin) - { - processInfo.Verb = @"runas"; - } - - Process.Start(processInfo); - } - catch (Exception e) - { - // Check if operation canceled by user - if ((e as Win32Exception)?.NativeErrorCode == 1223) - { - return; - } - - throw; - } - } - - public static void OpenSteamGame( - HeliosStartupAction action = HeliosStartupAction.StartUpNormally, - ProfileItem profile = null, - uint steamAppId = 0) - { - try - { - if (!IsInstalled) - { - return; - } - - var args = new List {$@"-a {action}"}; - - if (profile != null) - { - args.Add($"-p \"{profile.UUID}\""); - } - - if (steamAppId > 0) - { - args.Add($"-s \"{steamAppId}\""); - } - - var processInfo = new ProcessStartInfo(Address, string.Join(" ", args)) - { - UseShellExecute = true - }; - Process.Start(processInfo); - } - catch (Exception e) - { - // Check if operation canceled by user - if ((e as Win32Exception)?.NativeErrorCode == 1223) - { - return; - } - - throw; - } - } - } -} \ No newline at end of file diff --git a/DisplayMagician.Shared/Properties/Resources.Designer.cs b/DisplayMagician.Shared/Properties/Resources.Designer.cs index 7a43015..143d742 100644 --- a/DisplayMagician.Shared/Properties/Resources.Designer.cs +++ b/DisplayMagician.Shared/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace HeliosPlus.Shared.Properties { +namespace DisplayMagician.Shared.Properties { using System; @@ -39,7 +39,7 @@ namespace HeliosPlus.Shared.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeliosPlus.Shared.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DisplayMagician.Shared.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/DisplayMagician/Program.cs b/DisplayMagician/Program.cs index 0212561..fc744d8 100644 --- a/DisplayMagician/Program.cs +++ b/DisplayMagician/Program.cs @@ -87,7 +87,7 @@ namespace DisplayMagician { }); // This is the RunShortcut command - app.Command(HeliosStartupAction.RunShortcut.ToString(), (runShortcutCmd) => + app.Command(DisplayMagicianStartupAction.RunShortcut.ToString(), (runShortcutCmd) => { var argumentShortcut = runShortcutCmd.Argument("\"SHORTCUT_UUID\"", "(required) The UUID of the shortcut to run from those stored in the shortcut library.").IsRequired(); argumentShortcut.Validators.Add(new ShortcutMustExistValidator()); @@ -104,7 +104,7 @@ namespace DisplayMagician { }); // This is the ChangeProfile command - app.Command(HeliosStartupAction.ChangeProfile.ToString(), (runProfileCmd) => + app.Command(DisplayMagicianStartupAction.ChangeProfile.ToString(), (runProfileCmd) => { var argumentProfile = runProfileCmd.Argument("\"Profile_UUID\"", "(required) The UUID of the profile to run from those stored in the profile file.").IsRequired(); argumentProfile.Validators.Add(new ProfileMustExistValidator()); diff --git a/DisplayMagician/ShortcutItem.cs b/DisplayMagician/ShortcutItem.cs index 47c1e0f..243f365 100644 --- a/DisplayMagician/ShortcutItem.cs +++ b/DisplayMagician/ShortcutItem.cs @@ -1419,7 +1419,7 @@ namespace DisplayMagician var shortcutArgs = new List { // Add the SwitchProfile command as the first argument to start to switch to another profile - $"{HeliosStartupAction.RunShortcut}", + $"{DisplayMagicianStartupAction.RunShortcut}", $"\"{UUID}\"" }; diff --git a/DisplayMagician/UIForms/MainForm.resx b/DisplayMagician/UIForms/MainForm.resx index b66e96c..3456ebe 100644 --- a/DisplayMagician/UIForms/MainForm.resx +++ b/DisplayMagician/UIForms/MainForm.resx @@ -10738,10 +10738,10 @@ NoControl - 245, 354 + 232, 357 - 296, 20 + 332, 20 5 @@ -10771,7 +10771,7 @@ Microsoft Sans Serif, 9.75pt - 12, 356 + 12, 359 25, 16 @@ -10807,7 +10807,7 @@ Microsoft Sans Serif, 21.75pt - 212, 184 + 212, 186 360, 50 @@ -10840,7 +10840,7 @@ NoControl - 698, 352 + 698, 355 75, 23 @@ -63196,6 +63196,81 @@ 152, 17 + + False + + + Segoe UI, 9pt, style=Italic + + + 218, 22 + + + DisplayMagician + + + 215, 6 + + + Segoe UI, 9pt, style=Bold + + + 218, 22 + + + Open Application Window + + + False + + + Segoe UI, 9pt, style=Italic + + + 155, 22 + + + Display Profiles + + + 152, 6 + + + 218, 22 + + + Change Display Profile + + + False + + + Segoe UI, 9pt, style=Italic + + + 156, 22 + + + Game Shortcuts + + + 153, 6 + + + 218, 22 + + + Run Game Shortcut + + + 215, 6 + + + 218, 22 + + + Close DisplayMagician + 219, 126 @@ -71025,81 +71100,6 @@ True - - False - - - Segoe UI, 9pt, style=Italic - - - 218, 22 - - - DisplayMagician - - - 215, 6 - - - Segoe UI, 9pt, style=Bold - - - 218, 22 - - - Open Application Window - - - 218, 22 - - - Change Display Profile - - - False - - - Segoe UI, 9pt, style=Italic - - - 155, 22 - - - Display Profiles - - - 152, 6 - - - 218, 22 - - - Run Game Shortcut - - - False - - - Segoe UI, 9pt, style=Italic - - - 156, 22 - - - Game Shortcuts - - - 153, 6 - - - 215, 6 - - - 218, 22 - - - Close DisplayMagician - True