Disabled ML Settings Panel

Disabled to get a working update out while the code is updated to handle new settings
astog · Feb 4, 2021 · d8f09fa · d8f09fa
1 parent 299b09c
commit d8f09fa
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 43 deletions.
diff --git a/Base/Assets/UI/minimappanel.xml b/Base/Assets/UI/minimappanel.xml
@@ -5,6 +5,7 @@
 
   <Grid             ID="LensPanel"            Anchor="L,T" AnchorSide="I,O"                 Offset="-10,-5" Size="230,326"  Texture="Tracker_OptionsBacking.dds" SliceCorner="55,61" SliceSize="1,1" SliceTextureSize="121,119" ConsumeAllMouse="1" Hidden="1">
     <Label                                    Anchor="C,T" String="{LOC_HUD_LENSES:upper}"  Offset="-6,10"  Style="FontFlair16" Color0="106,93,69,255" Color1="0,0,0,150" Color2="146,133,109,255" FontStyle="Glow" SmallCaps="20" SmallCapsLeading="0" SmallCapsType="EveryWord" KerningAdjustment="0"/>
+    <!-- <CheckBox ID="MLSettingsExpandButton" ButtonSize="41,26" CheckTexture="Controls_ExpandButton" CheckSize="22,22" CheckTextureOffset="0,0" UnCheckTexture="Controls_ExpandButton" UnCheckSize="22,22" UnCheckTextureOffset="0,22" UseSelectedTextures="1" Anchor="L,T" Offset="16,8" /> -->
     <ScrollPanel    ID="LensChooserList"                                                    Offset="36,35"  Size="parent,parent-65" Style="ScrollPanelWithLeftBar">
       <Stack      ID="LensToggleStack"      Anchor="L,T"              StackGrowth="Bottom"  Offset="-5,0" StackPadding="-7" >
         <RadioButton  ID="ReligionLensButton"   RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_RELIGION_LENS"    AllowClickOff="1" ToolTip="LOC_HUD_RELIGION_LENS_TOOLTIP"   Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>

diff --git a/DLC/Expansion1/UI/Replacements/minimappanel.xml b/DLC/Expansion1/UI/Replacements/minimappanel.xml
@@ -5,6 +5,7 @@
 
   <Grid             ID="LensPanel"            Anchor="L,T" AnchorSide="I,O"                 Offset="-10,-5" Size="230,326"  Texture="Tracker_OptionsBacking.dds" SliceCorner="55,61" SliceSize="1,1" SliceTextureSize="121,119" ConsumeAllMouse="1" Hidden="1">
     <Label                                    Anchor="C,T" String="{LOC_HUD_LENSES:upper}"  Offset="-6,10"  Style="FontFlair16" Color0="106,93,69,255" Color1="0,0,0,150" Color2="146,133,109,255" FontStyle="Glow" SmallCaps="20" SmallCapsLeading="0" SmallCapsType="EveryWord" KerningAdjustment="0"/>
+    <!-- <CheckBox ID="MLSettingsExpandButton" ButtonSize="41,26" CheckTexture="Controls_ExpandButton" CheckSize="22,22" CheckTextureOffset="0,0" UnCheckTexture="Controls_ExpandButton" UnCheckSize="22,22" UnCheckTextureOffset="0,22" UseSelectedTextures="1" Anchor="L,T" Offset="16,8" /> -->
     <ScrollPanel    ID="LensChooserList"                                                    Offset="36,35"  Size="parent,parent-65" Style="ScrollPanelWithLeftBar">
       <Stack      ID="LensToggleStack"      Anchor="L,T"              StackGrowth="Bottom"  Offset="-5,0" StackPadding="-7" >
         <RadioButton  ID="ReligionLensButton"   RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_RELIGION_LENS"    AllowClickOff="1" ToolTip="LOC_HUD_RELIGION_LENS_TOOLTIP"   Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>

diff --git a/DLC/Expansion2/UI/Replacements/minimappanel.xml b/DLC/Expansion2/UI/Replacements/minimappanel.xml
@@ -5,6 +5,7 @@
 
   <Grid             ID="LensPanel"            Anchor="L,T" AnchorSide="I,O"                 Offset="-10,-5" Size="230,326"  Texture="Tracker_OptionsBacking.dds" SliceCorner="55,61" SliceSize="1,1" SliceTextureSize="121,119" ConsumeAllMouse="1" Hidden="1">
     <Label                                    Anchor="C,T" String="{LOC_HUD_LENSES:upper}"  Offset="-6,10"  Style="FontFlair16" Color0="106,93,69,255" Color1="0,0,0,150" Color2="146,133,109,255" FontStyle="Glow" SmallCaps="20" SmallCapsLeading="0" SmallCapsType="EveryWord" KerningAdjustment="0"/>
+    <!-- <CheckBox ID="MLSettingsExpandButton" ButtonSize="41,26" CheckTexture="Controls_ExpandButton" CheckSize="22,22" CheckTextureOffset="0,0" UnCheckTexture="Controls_ExpandButton" UnCheckSize="22,22" UnCheckTextureOffset="0,22" UseSelectedTextures="1" Anchor="L,T" Offset="16,8" /> -->
     <ScrollPanel    ID="LensChooserList"                                                    Offset="36,35"  Size="parent,parent-65" Style="ScrollPanelWithLeftBar">
       <Stack      ID="LensToggleStack"      Anchor="L,T"              StackGrowth="Bottom"  Offset="-5,0" StackPadding="-7" >
         <RadioButton  ID="ReligionLensButton"   RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_RELIGION_LENS"    AllowClickOff="1" ToolTip="LOC_HUD_RELIGION_LENS_TOOLTIP"   Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
@@ -14,7 +15,7 @@
         <RadioButton  ID="GovernmentLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_GOVERNMENT_LENS"  AllowClickOff="1" ToolTip="LOC_HUD_GOVERNMENT_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
         <RadioButton  ID="OwnerLensButton"      RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_OWNER_LENS"       AllowClickOff="1" ToolTip="LOC_HUD_OWNER_LENS_TOOLTIP"      Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
         <RadioButton  ID="TourismLensButton"    RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_TOURISM_LENS"     AllowClickOff="1" ToolTip="LOC_HUD_TOURISM_LENS_TOOLTIP"    Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
-		<RadioButton	ID="LoyaltyLensButton"    RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_CULTURAL_IDENTITY_LENS" AllowClickOff="1" ToolTip="LOC_HUD_CULTURAL_IDENTITY_LENS_TOOLTIP"  Style="WhiteSemiBold14" Offset="10,4"	ButtonTexture="Controls_RadioButtonLarge.dds"	ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds"	CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
+		    <RadioButton	ID="LoyaltyLensButton"    RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_CULTURAL_IDENTITY_LENS" AllowClickOff="1" ToolTip="LOC_HUD_CULTURAL_IDENTITY_LENS_TOOLTIP"  Style="WhiteSemiBold14" Offset="10,4"	ButtonTexture="Controls_RadioButtonLarge.dds"	ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds"	CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
         <RadioButton  ID="EmpireLensButton"     RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_EMPIRE_LENS"      AllowClickOff="1" ToolTip="LOC_HUD_EMPIRE_LENS_TOOLTIP"     Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
         <RadioButton  ID="PowerLensButton"      RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_POWER_LENS"             AllowClickOff="1" ToolTip="LOC_HUD_POWER_LENS_TOOLTIP"              Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140"  Anchor="L,T" BoxOnLeft="1"/>
       </Stack>

diff --git a/Lenses/Scout/ModLens_Scout.lua b/Lenses/Scout/ModLens_Scout.lua
@@ -2,7 +2,7 @@ local LENS_NAME = "ML_SCOUT"
 local ML_LENS_LAYER = UILens.CreateLensLayerHash("Hex_Coloring_Appeal_Level")
 
 -- Should the scout lens auto apply, when a scout/ranger is selected.
-local AUTO_APPLY_SCOUT_LENS:boolean = false
+local AUTO_APPLY_SCOUT_LENS:boolean = true
 
 -- ===========================================================================
 -- Scout Lens Support

diff --git a/MoreLenses.modinfo b/MoreLenses.modinfo
@@ -196,9 +196,11 @@
     <File>Lenses/Resource/ModLens_Resource.lua</File>
 
     <!-- Settings -->
+    <!--
     <File>Settings/ML_SettingsPanel.xml</File>
     <File>Settings/ML_SettingsPanel.lua</File>
     <File>Settings/ML_SettingsSchema.sql</File>
     <File>Settings/ML_Settings.sql</File>
+    -->
   </Files>
 </Mod>
diff --git a/Settings/ml_settingspanel.lua b/Settings/ml_settingspanel.lua
@@ -88,7 +88,8 @@ local function Initialize()
     ContextPtr:SetShutdown( OnShutdown )
     ContextPtr:SetInputHandler( OnInputHandler, true )
 
-    -- PopulateCheckBox(Controls.ApproximateTraderPathCheckbox, "ML_AutoApplyBuilderLens")
+    PopulateCheckBox(Controls.AutoApplyBuilderLensCheckbox, "ML_AutoApplyBuilderLens")
+    PopulateCheckBox(Controls.AutoApplyScoutLensCheckbox, "ML_AutoApplyScoutLens")
 
     -- Call this once to ensure all files have updated settings
     LuaEvents.ML_SettingsUpdate();

diff --git a/Settings/ml_settingspanel.xml b/Settings/ml_settingspanel.xml
@@ -8,46 +8,12 @@
         </Grid>
       </Container>
 
-      <Grid ID="Content" Style="SubContainer4" Size="parent-10,670" Anchor="C,T" Color="7,28,50" Offset="0,55">
-        <Grid Style="SubContainerFill" Size="210,parent-6" Offset="3,3" Color="6,36,57,150">
-          <Grid Style="SubContainer3" Size="parent-6,parent-6" Anchor="C,C" Color="13,70,82,255">
-            <Stack ID="TabStack" StackGrowth="Down" Anchor="C,T" Padding="10">
-              <GridButton ID="GeneralTab" Style="ShellTabSmall" String="{LOC_CQUI_GENERAL:upper}" Size="200,32"/>
-              <GridButton ID="CityviewTab" Style="ShellTabSmall" String="{LOC_CQUI_CITYVIEW:upper}" Size="200,32"/>
-              <GridButton ID="UnitsTab" Style="ShellTabSmall" String="{LOC_CQUI_UNITS:upper}" Size="200,32"/>
-              <GridButton ID="PopupsTab" Style="ShellTabSmall" String="{LOC_CQUI_POPUPS:upper}" Size="200,32"/>
-              <GridButton ID="BindingsTab" Style="ShellTabSmall" String="{LOC_CQUI_BINDINGS:upper}" Size="200,32"/>
-              <GridButton ID="GossipTab" Style="ShellTabSmall" String="{LOC_CQUI_GOSSIP:upper}" Size="200,32"/>
-              <GridButton ID="LensesTab" Style="ShellTabSmall" String="{LOC_CQUI_LENSES:upper}" Size="200,32"/>
-              <GridButton ID="TraderScreenTab" Style="ShellTabSmall" String="{LOC_CQUI_TRADER_SCREEN:upper}" Size="200,32"/>
-              <GridButton ID="RecommendationsTab" Style="ShellTabSmall" String="{LOC_CQUI_RECOMMENDATIONS_SCREEN:upper}" Size="200,32"/>
-            </Stack>
-          </Grid>
-        </Grid>
-        <Container Anchor="R,T" Size="parent-215,parent-6">
-          <Container ID="LensesOptions" Size="parent,parent" Hidden="0">
-            <Stack Anchor="C,T" StackGrowth="Down" Padding="5" Offset="0,50">
-              <Stack Anchor="R,T" StackGrowth="Left" Padding="5">
-                <GridButton ID="AutoapplyArchaeologistLensCheckbox" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_CQUI_LENSES_AUTOAPPLYARCHAEOLOGISTLENS"/>
-              </Stack>
-              <Stack Anchor="R,T" StackGrowth="Left" Padding="5">
-                <GridButton ID="AutoapplyBuilderLensCheckbox" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_CQUI_LENSES_AUTOAPPLYBUILDERLENS"/>
-              </Stack>
-              <Stack Anchor="R,T" StackGrowth="Left" Padding="5">
-                <GridButton ID="AutoapplyScoutLensCheckbox" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_CQUI_LENSES_AUTOAPPLYSCOUTLENS"/>
-              </Stack>
-              <!--<Stack Anchor="R,T" StackGrowth="Left" Padding="5">
-                <GridButton ID="ShowNothingToDoInBuilderLens" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_CQUI_LENSES_SHOWNOTHINGTODO_BUILDER"/>
-              </Stack>
-              <Stack Anchor="R,T" StackGrowth="Left" Padding="5">
-                <GridButton ID="ShowGenericInBuilderLens" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_CQUI_LENSES_SHOWGENERIC_BUILDER"/>
-              </Stack>-->
-            </Stack>
-          </Container>
-        </Container>
-        <GridButton ID="ConfirmButton" Style="ButtonConfirm"  AnchorSide="I,O" Anchor="c,b" String="LOC_GENERIC_CONFIRM_BUTTON" Size="300,41"/>
-        <Label Anchor="c,b" AnchorSide="I,O" Style="FontNormal14" String="LOC_CQUI_SETTINGS_REMINDER" Offset="0,50" Color="102,122,145"/>
-      </Grid>
+      <Container ID="GeneralOptions" Size="parent,parent-54" Offset="0,20" Hidden="0" Anchor="C,T">
+        <Stack Anchor="C,T" StackGrowth="Down" Padding="5" Offset="0,50">
+          <GridButton ID="AutoApplyBuilderLensCheckbox" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_HUD_ML_SETTINGS_AUTO_APPLY_BUILDER" ToolTip="LOC_TOOLTOP_ML_SETTINGS_AUTO_APPLY_BUILDER"/>
+          <GridButton ID="AutoApplyScoutLensCheckbox" Anchor="L,C" Offset="0,0" Size="300,24" Style="CheckBoxControl" String="LOC_HUD_ML_SETTINGS_AUTO_APPLY_SCOUT" ToolTip="LOC_TOOLTOP_ML_SETTINGS_AUTO_APPLY_SCOUT"/>
+        </Stack>
+      </Container>
 
       <Container ID="Header" Size="parent,60" Anchor="C,B" Offset="0,-5" Style="ShellHeaderContainer">
         <GridButton ID="ConfirmButton" Style="ButtonConfirm" Anchor="C,C" Offset="0,-1" String="LOC_AUTONARRATE_BUTTON_DONE" Size="300,41"/>

diff --git a/Text/MoreLenses_Text.xml b/Text/MoreLenses_Text.xml
@@ -167,5 +167,22 @@
       <Text>Needs fixing to be used for a park</Text>
     </Row>
 
+    <!-- Settings Panel -->
+    <Row Tag="LOC_HUD_ML_SETTINGS_PANEL_TITLE">
+      <Text>More Lenses - Settings Panel</Text>
+    </Row>
+    <Row Tag="LOC_HUD_ML_SETTINGS_AUTO_APPLY_BUILDER">
+      <Text>Auto apply Buider lens</Text>
+    </Row>
+    <Row Tag="LOC_TOOLTOP_ML_SETTINGS_AUTO_APPLY_BUILDER">
+      <Text>Enable this to automatically apply the Builder lens when selecting a builder.</Text>
+    </Row>
+    <Row Tag="LOC_HUD_ML_SETTINGS_AUTO_APPLY_SCOUT">
+      <Text>Auto apply Scout lens</Text>
+    </Row>
+    <Row Tag="LOC_TOOLTOP_ML_SETTINGS_AUTO_APPLY_SCOUT">
+      <Text>Enable this to automatically apply the Scout lens when selecting a recon unit class.</Text>
+    </Row>
+
   </BaseGameText>
 </GameData>