Merge branch 'hotfix-1.4.1'

dymanoid · Jul 7, 2018 · ae03912 · ae03912
2 parents 102438e + c55e2eb
commit ae03912
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 13 deletions.
diff --git a/src/RealTime/Core/RealTimeCore.cs b/src/RealTime/Core/RealTimeCore.cs
@@ -6,7 +6,6 @@ namespace RealTime.Core
 {
     using System;
     using System.Collections.Generic;
-    using System.Security.Permissions;
     using RealTime.Config;
     using RealTime.CustomAI;
     using RealTime.Events;
@@ -54,7 +53,6 @@ private RealTimeCore(TimeAdjustment timeAdjustment, CustomTimeBar timeBar, RealT
         ///
         /// <returns>A <see cref="RealTimeCore"/> instance that can be used to stop the mod.</returns>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "This is the entry point and needs to instantiate all parts")]
-        [PermissionSet(SecurityAction.LinkDemand, Name = "FullTrust")]
         public static RealTimeCore Run(RealTimeConfig config, string rootPath, LocalizationProvider localizationProvider)
         {
             if (config == null)
@@ -147,7 +145,6 @@ public static RealTimeCore Run(RealTimeConfig config, string rootPath, Localizat
         /// <summary>
         /// Stops the mod by deactivating all its parts.
         /// </summary>
-        [PermissionSet(SecurityAction.LinkDemand, Name = "FullTrust")]
         public void Stop()
         {
             if (!isEnabled)

diff --git a/src/RealTime/Core/RealTimeMod.cs b/src/RealTime/Core/RealTimeMod.cs
@@ -6,7 +6,6 @@ namespace RealTime.Core
 {
     using System;
     using System.Linq;
-    using System.Security.Permissions;
     using ColossalFramework;
     using ColossalFramework.Globalization;
     using ColossalFramework.Plugins;
@@ -94,7 +93,6 @@ public void OnSettingsUI(UIHelperBase helper)
         /// </summary>
         ///
         /// <param name="mode">The <see cref="LoadMode"/> a game level is loaded in.</param>
-        [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void OnLevelLoaded(LoadMode mode)
         {
             switch (mode)
@@ -110,13 +108,18 @@ public override void OnLevelLoaded(LoadMode mode)
             }
 
             core = RealTimeCore.Run(config, modPath, localizationProvider);
+            if (core == null)
+            {
+                MessageBox.Show(
+                    localizationProvider.Translate(TranslationKeys.Warning),
+                    localizationProvider.Translate(TranslationKeys.ModNotWorkingMessage));
+            }
         }
 
         /// <summary>
         /// Called when a game level is about to be unloaded. If the Real Time mod was activated
         /// for this level, deactivates the mod for this level.
         /// </summary>
-        [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void OnLevelUnloading()
         {
             if (core != null)

diff --git a/src/RealTime/Localization/Constants.cs b/src/RealTime/Localization/Constants.cs
@@ -8,9 +8,6 @@ internal static class Constants
         /// <summary>The placeholder string.</summary>
         public const string Placeholder = "Placeholder";
 
-        /// <summary>The tool tip string.</summary>
-        public const string Tooltip = "Tooltip";
-
         /// <summary>The 'no locale' placeholder string.</summary>
         public const string NoLocale = "No Locale found";
 

diff --git a/src/RealTime/Localization/TranslationKeys.cs b/src/RealTime/Localization/TranslationKeys.cs
@@ -0,0 +1,21 @@
+// <copyright file="TranslationKeys.cs" company="dymanoid">
+// Copyright (c) dymanoid. All rights reserved.
+// </copyright>
+
+namespace RealTime.Localization
+{
+    /// <summary>
+    /// A class containing constant string values that describe keys of the strings to be translated in various languages.
+    /// </summary>
+    internal static class TranslationKeys
+    {
+        /// <summary>The tool tip string.</summary>
+        public const string Tooltip = "Tooltip";
+
+        /// <summary>The warning key.</summary>
+        public const string Warning = "Warning";
+
+        /// <summary>The key for a 'mod not working' message.</summary>
+        public const string ModNotWorkingMessage = "ModNotWorkingMessage";
+    }
+}
diff --git a/src/RealTime/Localization/Translations/de.xml b/src/RealTime/Localization/Translations/de.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="de" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warnung" />
+  <translation id="ModNotWorkingMessage" value="Oh je! Etwas ist schief gelaufen - die Mod 'Real Time' kann nicht aktiviert werden. Bitte zeigen Sie das Log-File von Cities:Skylines dem Entwickler." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Alle Optionen zurücksetzen" />
 

diff --git a/src/RealTime/Localization/Translations/en.xml b/src/RealTime/Localization/Translations/en.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="en" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/Localization/Translations/es.xml b/src/RealTime/Localization/Translations/es.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="es" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Herramientas" />
   <translation id="ResetToDefaults" value="Restablecer todo por defecto" />
 
+  <translation id="1General" value="General" />
   <translation id="DayTimeSpeed" value="Velocidad del tiempo (día)" />
   <translation id="DayTimeSpeedTooltip" value="La velocidad a la que fluye el tiempo diurno. '1' es muy lento, ¡casi en tiempo real!" />
   <translation id="NightTimeSpeed" value="Velocidad del tiempo (noche)" />
@@ -16,7 +20,6 @@
   <translation id="VirtualCitizens.Few" value="Casi todos los ciudadanos reales" />
   <translation id="VirtualCitizens.Vanilla" value="Como en juego Original" />
   <translation id="VirtualCitizens.Many" value="Más ciudadanos virtuales" />
-  <translation id="1General" value="General" />
   <translation id="IsWeekendEnabled" value="Activar Fines de Semana" />
   <translation id="IsWeekendEnabledTooltip" value="Los ciudadanos no van al trabajo ni a la escuela los fines de semana" />
   <translation id="IsLunchtimeEnabled" value="Activar hora de Almorzar" />

diff --git a/src/RealTime/Localization/Translations/fr.xml b/src/RealTime/Localization/Translations/fr.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="fr" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/Localization/Translations/ko.xml b/src/RealTime/Localization/Translations/ko.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="ko" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/Localization/Translations/pl.xml b/src/RealTime/Localization/Translations/pl.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="pl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/Localization/Translations/pt.xml b/src/RealTime/Localization/Translations/pt.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="pt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/Localization/Translations/ru.xml b/src/RealTime/Localization/Translations/ru.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="ru" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Предупреждение" />
+  <translation id="ModNotWorkingMessage" value="Упс! Что-то пошло не так - мод 'Real Time' не может быть активирован. Пожалуйста, покажите лог-файл игры разработчику мода." />
+
   <translation id="Tools" value="Утилиты" />
   <translation id="ResetToDefaults" value="Вернуть опции по умолчанию" />
 

diff --git a/src/RealTime/Localization/Translations/zh.xml b/src/RealTime/Localization/Translations/zh.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <language id="zh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
+  <translation id="Warning" value="Warning" />
+  <translation id="ModNotWorkingMessage" value="Oops! Something went wrong - the 'Real Time' mod could not be activated. Please share your game log file with the mod's developer." />
+
   <translation id="Tools" value="Tools" />
   <translation id="ResetToDefaults" value="Reset all to defaults" />
 

diff --git a/src/RealTime/RealTime.csproj b/src/RealTime/RealTime.csproj
@@ -112,6 +112,7 @@
     <Compile Include="GameConnection\WeatherManagerConnection.cs" />
     <Compile Include="Localization\Constants.cs" />
     <Compile Include="Localization\LocalizationProvider.cs" />
+    <Compile Include="Localization\TranslationKeys.cs" />
     <Compile Include="Patching\FastDelegate.cs" />
     <Compile Include="Patching\MethodPatcher.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -143,6 +144,7 @@
     <Compile Include="UI\IValueViewItem.cs" />
     <Compile Include="UI\IViewItem.cs" />
     <Compile Include="UI\IViewItemFactory.cs" />
+    <Compile Include="UI\MessageBox.cs" />
     <Compile Include="UI\RealTimeUIDateTimeWrapper.cs" />
     <Compile Include="UI\CustomTimeBar.cs" />
     <Compile Include="UI\SliderValueType.cs" />

diff --git a/src/RealTime/UI/CitiesCheckBoxItem.cs b/src/RealTime/UI/CitiesCheckBoxItem.cs
@@ -39,7 +39,7 @@ public override void Translate(LocalizationProvider localizationProvider)
             }
 
             UIComponent.text = localizationProvider.Translate(UIComponent.name);
-            UIComponent.tooltip = localizationProvider.Translate(UIComponent.name + Constants.Tooltip);
+            UIComponent.tooltip = localizationProvider.Translate(UIComponent.name + TranslationKeys.Tooltip);
         }
 
         /// <summary>

diff --git a/src/RealTime/UI/CitiesComboBoxItem.cs b/src/RealTime/UI/CitiesComboBoxItem.cs
@@ -56,7 +56,7 @@ public override void Translate(LocalizationProvider localizationProvider)
                 throw new ArgumentNullException(nameof(localizationProvider));
             }
 
-            UIComponent.tooltip = localizationProvider.Translate(UIComponent.name + Constants.Tooltip);
+            UIComponent.tooltip = localizationProvider.Translate(UIComponent.name + TranslationKeys.Tooltip);
 
             UILabel label = UIComponent.parent?.Find<UILabel>(LabelName);
             if (label != null)

diff --git a/src/RealTime/UI/CitiesSliderItem.cs b/src/RealTime/UI/CitiesSliderItem.cs
@@ -87,7 +87,7 @@ public override void Translate(LocalizationProvider localizationProvider)
                 return;
             }
 
-            panel.tooltip = localizationProvider.Translate(UIComponent.name + Constants.Tooltip);
+            panel.tooltip = localizationProvider.Translate(UIComponent.name + TranslationKeys.Tooltip);
 
             UILabel label = panel.Find<UILabel>(LabelName);
             if (label != null)

diff --git a/src/RealTime/UI/MessageBox.cs b/src/RealTime/UI/MessageBox.cs
@@ -0,0 +1,24 @@
+// <copyright file="MessageBox.cs" company="dymanoid">
+// Copyright (c) dymanoid. All rights reserved.
+// </copyright>
+
+namespace RealTime.UI
+{
+    using ColossalFramework.UI;
+
+    /// <summary>
+    /// Displays a message box that can contain text that informs and instructs the user.
+    /// </summary>
+    internal static class MessageBox
+    {
+        private const string DialogPanelName = "ExceptionPanel";
+
+        /// <summary>Displays a message box with specified text and caption.</summary>
+        /// <param name="caption">The caption of the message to display.</param>
+        /// <param name="message">The message text.</param>
+        public static void Show(string caption, string message)
+        {
+            UIView.library.ShowModal<ExceptionPanel>(DialogPanelName).SetMessage(caption ?? string.Empty, message ?? string.Empty, false);
+        }
+    }
+}