Main menu and tool code refactoring

TLM/TLM/Custom/AI/CustomRoadBaseAI.cs

@@ -20,7 +20,7 @@ public void CustomClickNodeButton(ushort nodeId, ref NetNode data, int index) {
                     data.m_flags |= NetNode.Flags.CustomTrafficLights;*/
 
                 // NON-STOCK CODE START
-                ToggleTrafficLightsTool toggleTool = (ToggleTrafficLightsTool)UIBase
+                ToggleTrafficLightsTool toggleTool = (ToggleTrafficLightsTool)ModUI
                                                           .GetTrafficManagerTool(true)
                                                           .GetSubTool(ToolMode.SwitchTrafficLight);
                 toggleTool.ToggleTrafficLight(nodeId, ref data, false);

TLM/TLM/LoadingExtension.cs

@@ -73,8 +73,6 @@ public class ManualHarmonyPatch {
         /// </summary>
         public static Translation TranslationDatabase = new Translation();
 
-        public static UIBase BaseUI { get; private set; }
-
         public static UITransportDemand TransportDemandUI { get; private set; }
 
         public static List<ICustomManager> RegisteredManagers { get; private set; }
@@ -368,10 +366,10 @@ void Destroy<T>() where T : MonoBehaviour {
                 }
 
                 Log.Info("Removing Controls from UI.");
-                if (BaseUI != null) {
-                    BaseUI.Close(); // Hide the UI ASAP
-                    Object.Destroy(BaseUI);
-                    BaseUI = null;
+                if (ModUI.Instance != null) {
+                    ModUI.Instance.Close(); // Hide the UI ASAP
+                    Object.Destroy(ModUI.Instance);
+                    ModUI.SetSingletonInstance(null);
                     Log._Debug("removed UIBase instance.");
                 }
 
@@ -544,9 +542,10 @@ public override void OnLevelLoaded(LoadMode mode) {
             }
 
             Log.Info("Adding Controls to UI.");
-            if (BaseUI == null) {
+            if (ModUI.Instance == null) {
                 Log._Debug("Adding UIBase instance.");
-                BaseUI = ToolsModifierControl.toolController.gameObject.AddComponent<UIBase>();
+                ModUI.SetSingletonInstance(
+                    ToolsModifierControl.toolController.gameObject.AddComponent<ModUI>());
             }
 
             // Init transport demand UI

TLM/TLM/State/ConfigData/Main.cs

@@ -1,4 +1,5 @@
 namespace TrafficManager.State.ConfigData {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using TrafficManager.UI.MainMenu;
@@ -29,16 +30,16 @@ public class Main {
         /// </summary>
         public bool EnableTutorial = true;
 
-        /// <summary>
-        /// Determines if the main menu shall be displayed in a tiny format
-        /// </summary>
+        /// <summary>Determines if the main menu shall be displayed in a tiny format.</summary>
+        [Obsolete("Main Menu now scales based on screen size")]
         public bool TinyMainMenu = true;
 
-        /// <summary>
-        /// User interface transparency
-        /// </summary>
+        /// <summary>User interface transparency</summary>
         public byte GuiTransparency = 30;
 
+        /// <summary>User interface scale for TM:PE.</summary>
+        public float GuiScale = 100f;
+
         /// <summary>
         /// Overlay transparency
         /// </summary>

TLM/TLM/State/GlobalConfig.cs

@@ -33,10 +33,10 @@ private set {
         //private object ObserverLock = new object();
 
         /// <summary>
-        /// Holds a list of observers which are being notified as soon as the configuration is updated
+        /// Initializes static members of the <see cref="GlobalConfig"/> class.
+        /// Holds a list of observers which are being notified as soon as the configuration is updated.
         /// </summary>
         //private List<IObserver<GlobalConfig>> observers = new List<IObserver<GlobalConfig>>();
-
         static GlobalConfig() {
             Reload();
         }

TLM/TLM/State/Keybinds/KeybindSettingsPage.cs

@@ -26,9 +26,9 @@ private void CreateUI_Global() {
             AddKeybindRowUI(Translation.Options.Get("Keybind:Toggle Main Menu"),
                             ToggleMainMenu);
             ToggleMainMenu.OnKeyChanged(() => {
-                if (LoadingExtension.BaseUI != null &&
-                    LoadingExtension.BaseUI.MainMenuButton != null) {
-                    LoadingExtension.BaseUI.MainMenuButton.UpdateTooltip();
+                if (ModUI.Instance != null &&
+                    ModUI.Instance.MainMenuButton != null) {
+                    ModUI.Instance.MainMenuButton.UpdateButtonImageAndTooltip();
                 }
             });
 

TLM/TLM/State/Keybinds/KeybindUI.cs

@@ -140,19 +140,23 @@ public void CreateKeybindButton(UIPanel parent, KeybindSetting setting, SavedInp
             btn.eventKeyDown += OnBindingKeyDown;
             btn.eventMouseDown += OnBindingMouseDown;
             btn.objectUserData
-                = new KeybindSetting.Editable {Target = setting, TargetKey = editKey};
+                = new KeybindSetting.Editable { Target = setting, TargetKey = editKey };
 
-            AddXButton(parent, editKey, btn);
+            AddXButton(parent, editKey, btn, setting);
         }
 
         /// <summary>
         /// Add X button to the right of another button
         /// </summary>
-        /// <param name="parent">The panel to host the new button</param>
-        /// <param name="editKey">The key to be cleared on click</param>
-        /// <param name="alignTo">Align X button to the right of this</param>
-        private static void AddXButton(UIPanel parent, SavedInputKey editKey, UIButton alignTo) {
-            var btnX = parent.AddUIComponent<UIButton>();
+        /// <param name="parent">The panel to host the new button.</param>
+        /// <param name="editKey">The key to be cleared on click.</param>
+        /// <param name="alignTo">Align X button to the right of this.</param>
+        /// <param name="setting">KeybindSetting to notify that key was cleared.</param>
+        private static void AddXButton(UIPanel parent,
+                                       SavedInputKey editKey,
+                                       UIButton alignTo,
+                                       KeybindSetting setting) {
+            UIButton btnX = parent.AddUIComponent<UIButton>();
             btnX.autoSize = false;
             btnX.size = new Vector2(ROW_HEIGHT, ROW_HEIGHT);
             btnX.normalBgSprite = "buttonclose";
@@ -161,6 +165,7 @@ private static void AddXButton(UIPanel parent, SavedInputKey editKey, UIButton a
             btnX.eventClicked += (component, eventParam) => {
                 editKey.value = SavedInputKey.Empty;
                 alignTo.text = Keybind.ToLocalizedString(editKey);
+                setting.NotifyKeyChanged();
             };
         }
 
@@ -214,7 +219,7 @@ private void OnBindingKeyDown(UIComponent comp, UIKeyEventParameter evParam) {
                         var message = Translation.Options.Get("Keybinds.Dialog.Text:Keybind conflict")
                                       + "\n\n" + maybeConflict;
                         Log.Info($"Keybind conflict: {message}");
-                    UIView.library
+                        UIView.library
                           .ShowModal<ExceptionPanel>("ExceptionPanel")
                           .SetMessage("Key Conflict", message, false);
                     } else {

TLM/TLM/State/Options.cs

@@ -114,13 +114,13 @@ public static bool
         /// a new language. Takes a second, very slow.
         /// </summary>
         internal static void RebuildMenu() {
-            if (LoadingExtension.BaseUI != null) {
+            if (ModUI.Instance != null) {
                 Log._Debug("Rebuilding the TM:PE menu...");
-                LoadingExtension.BaseUI.RebuildMenu();
+                ModUI.Instance.RebuildMenu();
 
                 // TM:PE main button also needs to be uidated
-                if (LoadingExtension.BaseUI.MainMenuButton != null) {
-                    LoadingExtension.BaseUI.MainMenuButton.UpdateTooltip();
+                if (ModUI.Instance.MainMenuButton != null) {
+                    ModUI.Instance.MainMenuButton.UpdateButtonImageAndTooltip();
                 }
 
                 LoadingExtension.TranslationDatabase.ReloadTutorialTranslations();

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs

@@ -20,10 +20,8 @@ public static class OptionsGeneralTab {
         [UsedImplicitly]
         private static UICheckBox _lockMenuToggle;
 
-        [UsedImplicitly]
-        private static UICheckBox _tinyMenuToggle;
-
         private static UISlider _guiTransparencySlider;
+        private static UISlider _guiScaleSlider;
         private static UISlider _overlayTransparencySlider;
 
         [UsedImplicitly]
@@ -44,7 +42,6 @@ private static string T(string key) {
         }
 
         internal static void MakeSettings_General(ExtUITabstrip tabStrip) {
-
             UIHelper panelHelper = tabStrip.AddTabPage(T("Tab:General"));
 
             UIHelperBase generalGroup = panelHelper.AddGroup(
@@ -82,10 +79,16 @@ internal static void MakeSettings_General(ExtUITabstrip tabStrip) {
                                   T("General.Checkbox:Lock main menu window position"),
                                   GlobalConfig.Instance.Main.MainMenuPosLocked,
                                   OnLockMenuChanged) as UICheckBox;
-            _tinyMenuToggle = generalGroup.AddCheckbox(
-                                  T("General.Checkbox:Compact main menu"),
-                                  GlobalConfig.Instance.Main.TinyMainMenu,
-                                  OnCompactMainMenuChanged) as UICheckBox;
+
+            _guiScaleSlider = generalGroup.AddSlider(
+                                        T("General.Slider:GUI scale") + ":",
+                                        65,
+                                        200,
+                                        5,
+                                        GlobalConfig.Instance.Main.GuiScale,
+                                        OnGuiScaleChanged) as UISlider;
+            _guiScaleSlider.parent.Find<UILabel>("Label").width = 500;
+
             _guiTransparencySlider = generalGroup.AddSlider(
                                         T("General.Slider:Window transparency") + ":",
                                         0,
@@ -94,6 +97,7 @@ internal static void MakeSettings_General(ExtUITabstrip tabStrip) {
                                         GlobalConfig.Instance.Main.GuiTransparency,
                                         OnGuiTransparencyChanged) as UISlider;
             _guiTransparencySlider.parent.Find<UILabel>("Label").width = 500;
+
             _overlayTransparencySlider = generalGroup.AddSlider(
                                              T("General.Slider:Overlay transparency") + ":",
                                             0,
@@ -176,7 +180,7 @@ private static void OnLanguageChanged(int newLanguageIndex) {
         private static void OnLockButtonChanged(bool newValue) {
             Log._Debug($"Button lock changed to {newValue}");
             if (Options.IsGameLoaded(false)) {
-                LoadingExtension.BaseUI.MainMenuButton.SetPosLock(newValue);
+                ModUI.Instance.MainMenuButton.SetPosLock(newValue);
             }
 
             GlobalConfig.Instance.Main.MainMenuButtonPosLocked = newValue;
@@ -186,20 +190,13 @@ private static void OnLockButtonChanged(bool newValue) {
         private static void OnLockMenuChanged(bool newValue) {
             Log._Debug($"Menu lock changed to {newValue}");
             if (Options.IsGameLoaded(false)) {
-                LoadingExtension.BaseUI.MainMenu.SetPosLock(newValue);
+                ModUI.Instance.MainMenu.SetPosLock(newValue);
             }
 
             GlobalConfig.Instance.Main.MainMenuPosLocked = newValue;
             GlobalConfig.WriteConfig();
         }
 
-        private static void OnCompactMainMenuChanged(bool newValue) {
-            Log._Debug($"Compact main menu changed to {newValue}");
-            GlobalConfig.Instance.Main.TinyMainMenu = newValue;
-            GlobalConfig.Instance.NotifyObservers(GlobalConfig.Instance);
-            GlobalConfig.WriteConfig();
-        }
-
         private static void OnEnableTutorialsChanged(bool newValue) {
             Log._Debug($"Enable tutorial messages changed to {newValue}");
             GlobalConfig.Instance.Main.EnableTutorial = newValue;
@@ -238,6 +235,17 @@ private static void OnGuiTransparencyChanged(float newVal) {
             Log._Debug($"GuiTransparency changed to {GlobalConfig.Instance.Main.GuiTransparency}");
         }
 
+        private static void OnGuiScaleChanged(float newVal) {
+            SetGuiScale(newVal);
+            _guiScaleSlider.tooltip
+                = string.Format(
+                    T("General.Tooltip.Format:GUI scale: {0}%"),
+                    GlobalConfig.Instance.Main.GuiScale);
+
+            GlobalConfig.WriteConfig();
+            Log._Debug($"GuiScale changed to {GlobalConfig.Instance.Main.GuiScale}");
+        }
+
         private static void OnOverlayTransparencyChanged(float newVal) {
             if (!Options.IsGameLoaded()) {
                 return;
@@ -314,6 +322,16 @@ public static void SetGuiTransparency(byte val) {
             }
         }
 
+        public static void SetGuiScale(float val) {
+            bool changed = (int)val != (int)GlobalConfig.Instance.Main.GuiScale;
+            GlobalConfig.Instance.Main.GuiScale = val;
+
+            if (changed && _guiScaleSlider != null) {
+                _guiScaleSlider.value = val;
+                ModUI.Instance.NotifyGuiScaleChanged();
+            }
+        }
+
         public static void SetOverlayTransparency(byte val) {
             bool changed = val != GlobalConfig.Instance.Main.OverlayTransparency;
             GlobalConfig.Instance.Main.OverlayTransparency = val;