From 0672b0da35a8975badf6524b32f59e77c00bebe3 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 17 Nov 2017 16:41:03 -0600
Subject: [PATCH] Setting Cleanup - Make NoRadio global (#5782)

---
 addons/noradio/XEH_preInit.sqf     |  2 +-
 addons/optionsmenu/CfgVehicles.hpp | 22 +---------------------
 addons/optionsmenu/config.cpp      |  2 +-
 addons/spectator/CfgVehicles.hpp   |  2 +-
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/addons/noradio/XEH_preInit.sqf b/addons/noradio/XEH_preInit.sqf
index 7cea9dedbd..052b189ae2 100644
--- a/addons/noradio/XEH_preInit.sqf
+++ b/addons/noradio/XEH_preInit.sqf
@@ -27,7 +27,7 @@ if (hasInterface) then {
     }, true] call CBA_fnc_addPlayerEventHandler;
 };
 
-[QGVAR(enabled), "CHECKBOX", [LSTRING(setting), LSTRING(setting_tooltip)], localize ELSTRING(common,ACEKeybindCategoryCommon), true, nil, {
+[QGVAR(enabled), "CHECKBOX", [LSTRING(setting), LSTRING(setting_tooltip)], format ["ACE - %1", localize ELSTRING(common,DisplayName)], true, true, {
     params ["_enabled"];
 
     if (_enabled) then {
diff --git a/addons/optionsmenu/CfgVehicles.hpp b/addons/optionsmenu/CfgVehicles.hpp
index 8e07cf74b3..a00d8abc3e 100644
--- a/addons/optionsmenu/CfgVehicles.hpp
+++ b/addons/optionsmenu/CfgVehicles.hpp
@@ -2,26 +2,6 @@ class CfgVehicles {
     class ACE_Module;
     class ACE_moduleAllowConfigExport: ACE_Module {
         scope = 1;
-        displayName = CSTRING(AllowConfigExport_Module_DisplayName);
-        //icon = "";
-        category = "ACE";
-        function = QUOTE(DFUNC(moduleAllowConfigExport));
-        functionPriority = 1;
-        isGlobal = 1;
-        isSingular = 1;
-        isTriggerActivated = 0;
-        author = ECSTRING(common,ACETeam);
-        class Arguments {
-            class allowconfigurationExport {
-                displayName = CSTRING(AllowConfigExport_allowconfigurationExport_DisplayName);
-                description = CSTRING(AllowConfigExport_allowconfigurationExport_Description);
-                typeName = "BOOL";
-                defaultValue = 1;
-            };
-        };
-        class ModuleDescription {
-            description = CSTRING(AllowConfigExport_Module_Description);
-            sync[] = {};
-        };
+        displayName = "Deprecated ACE Module";
     };
 };
diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp
index 46ffb0fcc5..b17fe12cc3 100644
--- a/addons/optionsmenu/config.cpp
+++ b/addons/optionsmenu/config.cpp
@@ -3,7 +3,7 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {"ACE_moduleAllowConfigExport"};
+        units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
diff --git a/addons/spectator/CfgVehicles.hpp b/addons/spectator/CfgVehicles.hpp
index b94dd211de..772c0fec5f 100644
--- a/addons/spectator/CfgVehicles.hpp
+++ b/addons/spectator/CfgVehicles.hpp
@@ -75,7 +75,7 @@ class CfgVehicles {
     class VirtualMan_F;
     class GVAR(virtual): VirtualMan_F {
         author = ECSTRING(common,ACETeam);
-        displayName = CSTRING(DisplayName);
+        displayName = CSTRING(Settings_DisplayName);
         scope = 2;
         scopeArsenal = 0;
         scopeCurator = 0;