fix: 🐛 resource updates and copyright text, change of text

removed google analytics as the site doesn't exist where it connects
FFXIVAPP · May 2, 2020 · 2026f42 · 2026f42
1 parent 4c2d5e1
commit 2026f42
Show file tree

Hide file tree

Showing 84 changed files with 988 additions and 933 deletions.
diff --git a/FFXIVAPP.Client/App.cs b/FFXIVAPP.Client/App.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="App.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>
@@ -83,10 +83,10 @@ internal partial class App {
         /// <summary>
         ///     Application Entry Point.
         /// </summary>
-        [STAThread]
-        [DebuggerNonUserCode]
-        [GeneratedCode("PresentationBuildTasks", "4.0.0.0")]
-        [LoaderOptimization(LoaderOptimization.MultiDomainHost)]
+        [STAThread,]
+        [DebuggerNonUserCode,]
+        [GeneratedCode("PresentationBuildTasks", "4.0.0.0"),]
+        [LoaderOptimization(LoaderOptimization.MultiDomainHost),]
         public static void Main() {
             var app = new App();
             app.Run();

diff --git a/FFXIVAPP.Client/App.xaml.cs b/FFXIVAPP.Client/App.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="App.xaml.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>

diff --git a/FFXIVAPP.Client/AppBootstrapper.cs b/FFXIVAPP.Client/AppBootstrapper.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AppBootstrapper.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>
@@ -61,7 +61,7 @@ internal class AppBootstrapper : INotifyPropertyChanged {
                 "LS7",
                 "LS8",
                 "FC",
-                "Yell"
+                "Yell",
             };
             AppViewModel.Instance.ScreenShotsPath = Common.Constants.ScreenShotsPath;
             AppViewModel.Instance.SoundsPath = Common.Constants.SoundsPath;
@@ -73,53 +73,51 @@ internal class AppBootstrapper : INotifyPropertyChanged {
                     Language = "English",
                     ImageURI = Theme.GetImagePackURI("en"),
                     Title = "English",
-                    CultureInfo = new CultureInfo("en")
+                    CultureInfo = new CultureInfo("en"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "Japanese",
                     ImageURI = Theme.GetImagePackURI("ja"),
                     Title = "日本語",
-                    CultureInfo = new CultureInfo("ja")
+                    CultureInfo = new CultureInfo("ja"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "French",
                     ImageURI = Theme.GetImagePackURI("fr"),
                     Title = "Français",
-                    CultureInfo = new CultureInfo("fr")
+                    CultureInfo = new CultureInfo("fr"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "German",
                     ImageURI = Theme.GetImagePackURI("de"),
                     Title = "Deutsch",
-                    CultureInfo = new CultureInfo("de")
+                    CultureInfo = new CultureInfo("de"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "Chinese",
                     ImageURI = Theme.GetImagePackURI("cn"),
                     Title = "中國",
-                    CultureInfo = new CultureInfo("zh")
+                    CultureInfo = new CultureInfo("zh"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "Korean",
                     ImageURI = Theme.GetImagePackURI("ko"),
                     Title = "한국어",
-                    CultureInfo = new CultureInfo("ko")
+                    CultureInfo = new CultureInfo("ko"),
                 });
             AppViewModel.Instance.UILanguages.Add(
                 new UILanguage {
                     Language = "Russian",
                     ImageURI = Theme.GetImagePackURI("ru"),
                     Title = "Русский",
-                    CultureInfo = new CultureInfo("ru")
+                    CultureInfo = new CultureInfo("ru"),
                 });
 
-
-
             Initializer.SetupCurrentUICulture();
             Initializer.LoadChatCodes();
             Initializer.LoadAutoTranslate();
@@ -129,8 +127,6 @@ internal class AppBootstrapper : INotifyPropertyChanged {
             Initializer.LoadAvailableNetworkDevices();
             Initializer.LoadSoundsIntoCache();
             Initializer.LoadPlugins();
-
-
         }
 
         public event PropertyChangedEventHandler PropertyChanged = delegate { };
@@ -141,7 +137,7 @@ internal class AppBootstrapper : INotifyPropertyChanged {
             }
         }
 
-        private void RaisePropertyChanged([CallerMemberName] string caller = "") {
+        private void RaisePropertyChanged([CallerMemberName,] string caller = "") {
             this.PropertyChanged(this, new PropertyChangedEventArgs(caller));
         }
     }

diff --git a/FFXIVAPP.Client/AppException.cs b/FFXIVAPP.Client/AppException.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AppException.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>
@@ -12,17 +12,14 @@ namespace FFXIVAPP.Client {
     using System;
     using System.Runtime.Serialization;
 
-    [Serializable]
+    [Serializable,]
     internal class AppException : Exception {
         public AppException() { }
 
-        public AppException(string message)
-            : base(message) { }
+        public AppException(string message) : base(message) { }
 
-        public AppException(string message, Exception inner)
-            : base(message, inner) { }
+        public AppException(string message, Exception inner) : base(message, inner) { }
 
-        protected AppException(SerializationInfo info, StreamingContext context)
-            : base(info, context) { }
+        protected AppException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
diff --git a/FFXIVAPP.Client/AppViewModel.cs b/FFXIVAPP.Client/AppViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AppViewModel.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>
@@ -32,7 +32,7 @@ namespace FFXIVAPP.Client {
 
     using ContextMenu = System.Windows.Forms.ContextMenu;
 
-    [Export(typeof(AppViewModel))]
+    [Export(typeof(AppViewModel)),]
     internal sealed class AppViewModel : INotifyPropertyChanged {
         private static bool _hasPlugins;
 
@@ -239,7 +239,7 @@ internal sealed class AppViewModel : INotifyPropertyChanged {
                     using (Stream iconStream = ResourceHelper.StreamResource(Constants.AppPack + "FFXIVAPP.ico").Stream) {
                         this._notifyIcon = new NotifyIcon {
                             Icon = new Icon(iconStream),
-                            Visible = true
+                            Visible = true,
                         };
                         iconStream.Dispose();
                         this._notifyIcon.Text = "FFXIVAPP";
@@ -435,7 +435,7 @@ internal sealed class AppViewModel : INotifyPropertyChanged {
             ShellView.View.Topmost = Settings.Default.TopMost;
         }
 
-        private void RaisePropertyChanged([CallerMemberName] string caller = "") {
+        private void RaisePropertyChanged([CallerMemberName,] string caller = "") {
             this.PropertyChanged(this, new PropertyChangedEventArgs(caller));
         }
     }

diff --git a/FFXIVAPP.Client/Constants.cs b/FFXIVAPP.Client/Constants.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Constants.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>
@@ -30,7 +30,7 @@ internal static class Constants {
             "de",
             "zh",
             "ru",
-            "ko"
+            "ko",
         };
 
         public static StringComparison CultureComparer = StringComparison.CurrentCultureIgnoreCase;

diff --git a/FFXIVAPP.Client/Converters/NameMultiValueConverter.cs b/FFXIVAPP.Client/Converters/NameMultiValueConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="NameMultiValueConverter.cs" company="SyndicatedLife">
-//   Copyright(c) 2018 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (http://syndicated.life/)
+//   Copyright© 2007 - 2020 Ryan Wilson &amp;lt;syndicated.life@gmail.com&amp;gt; (https://syndicated.life/)
 //   Licensed under the MIT license. See LICENSE.md in the solution root for full license information.
 // </copyright>
 // <summary>

diff --git a/FFXIVAPP.Client/FFXIVAPP.Client.csproj b/FFXIVAPP.Client/FFXIVAPP.Client.csproj
@@ -53,15 +53,6 @@
       <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FFXIVAPP.Common, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\ffxivapp-common\build\Debug\FFXIVAPP.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="FFXIVAPP.IPluginInterface, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\ffxivapp-iplugininterface\build\Debug\FFXIVAPP.IPluginInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="FFXIVAPP.ResourceFiles, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\ffxivapp-resourcefiles\build\Debug\FFXIVAPP.ResourceFiles.dll</HintPath>
-    </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
@@ -84,9 +75,6 @@
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Sharlayan, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\sharlayan\distribution\Sharlayan.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
@@ -332,24 +320,6 @@
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.Analyzers.dll" />
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.CSharp.Analyzers.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ffxivapp-common\FFXIVAPP.Common\FFXIVAPP.Common.csproj">
-      <Project>{8d6cda64-78be-4bf0-b613-0c9afa225df5}</Project>
-      <Name>FFXIVAPP.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\ffxivapp-iplugininterface\FFXIVAPP.IPluginInterface\FFXIVAPP.IPluginInterface.csproj">
-      <Project>{56e3fd21-17c4-4306-ba2c-adaf6aaea330}</Project>
-      <Name>FFXIVAPP.IPluginInterface</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\ffxivapp-resourcefiles\FFXIVAPP.ResourceFiles\FFXIVAPP.ResourceFiles.csproj">
-      <Project>{38e2405f-58d4-411c-b1df-6e2d6f14082e}</Project>
-      <Name>FFXIVAPP.ResourceFiles</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{9510d5ef-208a-4897-a582-8eae5c6e9406}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>%25SYSTEMROOT%25\System32\WindowsPowerShell\v1.0\powershell.exe –NonInteractive –ExecutionPolicy Unrestricted –command "&amp; { &amp;'$(SolutionDir)RestorePackages.ps1' '$(SolutionDir).nuget/nuget.exe' }"</PreBuildEvent>
@@ -374,4 +344,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/FFXIVAPP.Client/FodyWeavers.xml b/FFXIVAPP.Client/FodyWeavers.xml
@@ -1,3 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Weavers></Weavers>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"></Weavers>