DARKMILK-15 | Ресурсы и LoadingWindow

MilkRen · May 4, 2024 · 05f4163 · 05f4163
1 parent 850f59d
commit 05f4163
Show file tree

Hide file tree

Showing 22 changed files with 238 additions and 110 deletions.
diff --git a/LauncherDM/App.xaml b/LauncherDM/App.xaml
@@ -6,11 +6,11 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
 
-
                 <ResourceDictionary Source="Styles/Other/DockPanelStyles.xaml"/>
                 <ResourceDictionary Source="Styles/Other/LabelStyle.xaml"/>
                 <ResourceDictionary Source="Styles/Other/BorderStyle.xaml"/>
                 <ResourceDictionary Source="Styles/Other/ButtonStyle.xaml"/>
+                <ResourceDictionary Source="Styles/Other/ContextMenuStyle.xaml"/>
 
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

diff --git a/LauncherDM/App.xaml.cs b/LauncherDM/App.xaml.cs
@@ -1,9 +1,11 @@
 using LauncherDM.Services;
 using LauncherDM.Services.Interfaces;
 using System;
+using System.Globalization;
 using System.Reflection;
 using System.Threading;
 using System.Windows;
+using ServerTCP;
 
 namespace LauncherDM
 {
@@ -17,16 +19,10 @@ public partial class App : Application
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            //new MainWindow(){DataContext = new MainWindowViewModel()}.Show();
-            //var authorization = new AuthorizationWIndow();
-            //authorization.DataContext = new AuthorizationWindowViewModel(authorization.Close);
-
-            //authorization.Show();
-
-
             if (mutex.WaitOne(TimeSpan.Zero, true))
             {
                 base.OnStartup(e);
+                MessageLanguages.Language = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName == "ru" ? MessageLanguages.Languages.rus : MessageLanguages.Languages.eng;
                 IDialogWindowService windowService = new DialogWindowService();
                 windowService.OpenLoadingWindow();
                 mutex.ReleaseMutex();

diff --git a/LauncherDM/LauncherDM.csproj b/LauncherDM/LauncherDM.csproj
@@ -91,7 +91,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Update="Source\Settings\SettingsApp.Designer.cs">
+    <Compile Update="Properties\SettingsApp.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
       <DependentUpon>SettingsApp.settings</DependentUpon>
@@ -109,7 +109,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Source\Settings\SettingsApp.settings">
+    <None Update="Properties\SettingsApp.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>SettingsApp.Designer.cs</LastGenOutput>
     </None>

diff --git a/LauncherDM/Properties/Resources.Designer.cs b/LauncherDM/Properties/Resources.Designer.cs
diff --git a/LauncherDM/Properties/Resources.en.resx b/LauncherDM/Properties/Resources.en.resx
@@ -12,6 +12,21 @@
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
 	<data name="Reconnection" xml:space="preserve">
-		<value>Reconnect after {0} ms</value>
+		<value>Reconnect after {0} ms...</value>
+	</data>
+	<data name="ServerClose" xml:space="preserve">
+		<value>The server is unavailable.</value>
+	</data>
+	<data name="Error" xml:space="preserve">
+		<value>Error!</value>
+	</data>
+	<data name="Сonnection" xml:space="preserve">
+		<value>Сonnection...</value>
+	</data>
+	<data name="EthernetClose" xml:space="preserve">
+		<value>There is no internet connection.</value>
+	</data>
+	<data name="CloseApp" xml:space="preserve">
+		<value>Close the application</value>
 	</data>
 </root>
diff --git a/LauncherDM/Properties/Resources.resx b/LauncherDM/Properties/Resources.resx
@@ -99,6 +99,21 @@
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
 	<data name="Reconnection" xml:space="preserve">
-		<value>Повторное подключение через {0} мс</value>
+		<value>Повторное подключение через {0} мс...</value>
+	</data>
+	<data name="ServerClose" xml:space="preserve">
+		<value>Сервер недоступен.</value>
+	</data>
+	<data name="Error" xml:space="preserve">
+		<value>Ошибка!</value>
+	</data>
+	<data name="Сonnection" xml:space="preserve">
+		<value>Подключение...</value>
+	</data>
+	<data name="EthernetClose" xml:space="preserve">
+		<value>Нет подключения к интернету.</value>
+	</data>
+	<data name="CloseApp" xml:space="preserve">
+		<value>Закрыть приложение</value>
 	</data>
 </root>
diff --git a/...M/Source/Settings/SettingsApp.Designer.cs → ...cherDM/Properties/SettingsApp.Designer.cs b/...M/Source/Settings/SettingsApp.Designer.cs → ...cherDM/Properties/SettingsApp.Designer.cs
diff --git a/LauncherDM/Properties/SettingsApp.settings b/LauncherDM/Properties/SettingsApp.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/LauncherDM/Services/CheckNetworkService.cs b/LauncherDM/Services/CheckNetworkService.cs
@@ -13,6 +13,7 @@ class CheckNetworkService : ICheckNetworkService
         public bool CheckingNetworkConnection()
         {
             IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
+            IResourcesHelperService resourcesHelper = new ResourcesHelperService();
             try
             {
                 using var ping = new Ping();
@@ -24,7 +25,7 @@ public bool CheckingNetworkConnection()
             }
             catch (PingException)
             {
-                dialogMessageBox.DialogShow("Ethernet error", "Ethernet error");
+                dialogMessageBox.DialogShow(resourcesHelper.LocalizationGet("Error"), resourcesHelper.LocalizationGet("EthernetClose"));
                 return false;
             }
         }

diff --git a/LauncherDM/Services/DialogWindowService.cs b/LauncherDM/Services/DialogWindowService.cs
@@ -57,7 +57,7 @@ public void HideWindow(Window window)
         public void OpenLoadingWindow()
         {
             var loadingWindow = new LoadingWindow();
-            loadingWindow.DataContext = new LoadingWindowViewModel();
+            loadingWindow.DataContext = new LoadingWindowViewModel(new ResourcesHelperService());
             loadingWindow.Show();
         }
     }

diff --git a/LauncherDM/Services/Interfaces/IResourcesHelperService.cs b/LauncherDM/Services/Interfaces/IResourcesHelperService.cs
@@ -1,7 +1,7 @@
 namespace LauncherDM.Services.Interfaces
 {
     interface IResourcesHelperService
-    {
-        static abstract void LocalizationGet(string resource);
+    { 
+        string LocalizationGet(string resource);
     }
 }
diff --git a/LauncherDM/Services/LoadingWindowService.cs b/LauncherDM/Services/LoadingWindowService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using LauncherDM.Services.Interfaces;
 using ServerTCP;
 
@@ -14,7 +15,7 @@ public bool CheckRequestServer()
                 serverRequest = new ServerRequestService();
 
             var requestMessageServer = serverRequest.SendMessageRequest(MessageHeader.MessageType.Check);
-            return requestMessageServer.Message.ToString() == "1";
+            return requestMessageServer?.Message.ToString() == "1";
         }
 
         public string GetTitle()
@@ -28,7 +29,8 @@ public string GetTitle()
 
         public bool CheckUpdate()
         {
-            throw new NotImplementedException();
+            var curver = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
+            return false;
         }
 
         public string DescInfoConnect()

diff --git a/LauncherDM/Services/ResourcesHelperService.cs b/LauncherDM/Services/ResourcesHelperService.cs
@@ -1,17 +1,34 @@
-using LauncherDM.Services.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using LauncherDM.Services.Interfaces;
+using ServerTCP;
+using System.Globalization;
+using System.Threading;
+using LauncherDM.Properties;
 
 namespace LauncherDM.Services
 {
     class ResourcesHelperService : IResourcesHelperService
     {
-        public static void LocalizationGet(string resource)
+        public string LocalizationGet(string resource)
         {
-            throw new NotImplementedException();
+            if (string.IsNullOrEmpty(resource))
+                throw new ArgumentNullException(nameof(resource));
+
+            string resourceReady = string.Empty;
+            switch (MessageLanguages.Language)
+            {
+                case MessageLanguages.Languages.rus:
+                    resourceReady =  Resources.ResourceManager.GetString(resource, new CultureInfo("ru-RU"));
+                    break;
+                default:
+                    resourceReady = Resources.ResourceManager.GetString(resource, new CultureInfo("en-GB"));
+                    break;
+            }
+
+            if (string.IsNullOrEmpty(resourceReady))
+                throw new ArgumentNullException(nameof(resourceReady));
+
+            return resourceReady;
         }
     }
 }
diff --git a/LauncherDM/Services/ServerRequestService.cs b/LauncherDM/Services/ServerRequestService.cs
@@ -93,8 +93,8 @@ public MessageHeader SendMessageRequest(MessageHeader.MessageType messageType)
             }
             catch (Exception e)
             {
-                IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
-                dialogMessageBox.DialogShow("Error Server Reques", "Error Server Reques");
+                //IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
+                //dialogMessageBox.DialogShow("Error Server Reques", "Error Server Reques");
                 return null;
             }
             finally

diff --git a/LauncherDM/Source/Settings/SettingsApp.settings b/LauncherDM/Source/Settings/SettingsApp.settings
diff --git a/LauncherDM/Styles/Other/ContextMenuStyle.xaml b/LauncherDM/Styles/Other/ContextMenuStyle.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="ContextMenuLoadingForm" TargetType="ContextMenu">
+
+    </Style>
+</ResourceDictionary>
diff --git a/LauncherDM/Styles/Other/LabelStyle.xaml b/LauncherDM/Styles/Other/LabelStyle.xaml
@@ -27,6 +27,15 @@
     <Style x:Key="DescFont" TargetType="Label">
         <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
         <Setter Property="Foreground" Value="White"/>
+        <Style.Triggers>
+            <EventTrigger RoutedEvent="Button.Loaded">
+                <BeginStoryboard>
+                    <Storyboard>
+                        <DoubleAnimation Storyboard.TargetProperty="Opacity" From="1"  To="0.5" Duration="0:0:1" AutoReverse="True"  RepeatBehavior="Forever"/>
+                    </Storyboard>
+                </BeginStoryboard>
+            </EventTrigger>
+        </Style.Triggers>
     </Style>
 
 </ResourceDictionary>