Shrink the customization patch to only touch what's needed for the autologin + character-reorder features, so upstream refreshes don't conflict on areas we've been unnecessarily rewriting. Reverted to upstream in AccountLogin.lua/.xml: - Side-button stack (Cinematics + Turtle URL buttons) instead of our TOS/Credits/Community/ManageAccount replacements. - Turtle URL helper functions (AccountLogin_Turtle_Website and siblings). - turtlewow_expansion_logo texture (was swapped for Glues-WoW-Logo). - AcceptTOS()/AcceptEULA() in OnShow instead of the full TOSFrame + four scroll-frames + EULA/Scanning/Contest dispatcher. - VirtualKeypad layout, PIN display, random positioning, PIN remap-to-key-position logic. - SurveyNotificationFrame at original location (TOSFrame block removed). Reverted to upstream in CharacterSelect.lua/.xml: - AutologinSaveCharacterButton checkbox (dead UI) and its two shim functions (Autologin_OnCharactersLoad, Autologin_EnterWorld). - CharacterDelete/RenameButton1 text=CONFIRM (was OKAY). - Dialog background text offsets. - CharSelectEnterWorldButton NormalText block. - Stylistic churn (_G[...] <-> getglobal, TEXT() wrapping, trailing whitespace, unused gender 0/1 -> MALE/FEMALE conversion). Kept: AutologinAccountsFrame + AutologinAccountButtonTemplate + password hide-on-known-account + Change password flow; drag-to-reorder + translationTable + CharacterOrder persistence + pendingSelectedCharID logout-slot fix + class-color hook (already in Turtle upstream, no change) + drag mouse handlers on button template + delete/rename wrapper functions.
This commit is contained in:
+14
-50
@@ -125,52 +125,16 @@
|
||||
CharacterSelect_EnterWorld();
|
||||
</OnClick>
|
||||
</Scripts>
|
||||
<NormalText>
|
||||
<Anchors>
|
||||
<Anchor point="CENTER">
|
||||
<Offset>
|
||||
<AbsDimension x="-1" y="3"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
</NormalText>
|
||||
</Button>
|
||||
<CheckButton name="AutologinSaveCharacterButton">
|
||||
<Size>
|
||||
<AbsDimension x="20" y="20"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="LEFT" relativeTo="CharSelectEnterWorldButton" relativePoint="RIGHT"/>
|
||||
</Anchors>
|
||||
<Layers>
|
||||
<Layer level="ARTWORK">
|
||||
<FontString inherits="GlueFontNormalSmall" text="Auto-login this character">
|
||||
<Anchors>
|
||||
<Anchor point="LEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="24" y="0"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<FontHeight>
|
||||
<AbsValue val="10"/>
|
||||
</FontHeight>
|
||||
<Shadow>
|
||||
<Offset>
|
||||
<AbsDimension x="1" y="-1"/>
|
||||
</Offset>
|
||||
<Color r="0" g="0" b="0"/>
|
||||
</Shadow>
|
||||
<Color r="1.0" g="0.78" b="0"/>
|
||||
</FontString>
|
||||
</Layer>
|
||||
</Layers>
|
||||
<Scripts>
|
||||
<OnClick>
|
||||
if ( this:GetChecked() ) then
|
||||
PlaySound("igMainMenuOptionCheckBoxOff");
|
||||
else
|
||||
PlaySound("igMainMenuOptionCheckBoxOn");
|
||||
end
|
||||
</OnClick>
|
||||
</Scripts>
|
||||
<NormalTexture file="Interface\Buttons\UI-CheckBox-Up"/>
|
||||
<PushedTexture file="Interface\Buttons\UI-CheckBox-Down"/>
|
||||
<HighlightTexture file="Interface\Buttons\UI-CheckBox-Highlight" alphaMode="ADD"/>
|
||||
<CheckedTexture file="Interface\Buttons\UI-CheckBox-Check"/>
|
||||
<DisabledCheckedTexture file="Interface\Buttons\UI-CheckBox-Check-Disabled"/>
|
||||
</CheckButton>
|
||||
<Button name="CharacterSelectRotateLeft">
|
||||
<Size>
|
||||
<AbsDimension x="50" y="50"/>
|
||||
@@ -643,7 +607,7 @@
|
||||
<Anchors>
|
||||
<Anchor point="LEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="12" y="10"/>
|
||||
<AbsDimension x="12" y="4"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
@@ -651,7 +615,7 @@
|
||||
</Layer>
|
||||
</Layers>
|
||||
<Frames>
|
||||
<Button name="CharacterDeleteButton1" inherits="GlueDialogButtonTemplate" id="1" text="OKAY">
|
||||
<Button name="CharacterDeleteButton1" inherits="GlueDialogButtonTemplate" id="1" text="CONFIRM">
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMRIGHT" relativeTo="CharacterDeleteBackground" relativePoint="BOTTOM">
|
||||
<Offset>
|
||||
@@ -731,7 +695,7 @@
|
||||
else
|
||||
CharacterDeleteButton1:Disable();
|
||||
end
|
||||
</OnTextChanged>
|
||||
</OnTextChanged>
|
||||
<OnEnterPressed>
|
||||
if ( CharacterDeleteButton1:IsEnabled() == 1 ) then
|
||||
CharacterSelect_DeleteCharacter();
|
||||
@@ -811,7 +775,7 @@
|
||||
<Anchors>
|
||||
<Anchor point="LEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="12" y="10"/>
|
||||
<AbsDimension x="12" y="4"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
@@ -819,7 +783,7 @@
|
||||
</Layer>
|
||||
</Layers>
|
||||
<Frames>
|
||||
<Button name="CharacterRenameButton1" inherits="GlueDialogButtonTemplate" id="1" text="OKAY">
|
||||
<Button name="CharacterRenameButton1" inherits="GlueDialogButtonTemplate" id="1" text="CONFIRM">
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMRIGHT" relativeTo="CharacterRenameBackground" relativePoint="BOTTOM">
|
||||
<Offset>
|
||||
|
||||
Reference in New Issue
Block a user