diff --git a/implement/alternate-ui/source/src/Common/App.elm b/implement/alternate-ui/source/src/Common/App.elm index 25efbb5..6daa143 100644 --- a/implement/alternate-ui/source/src/Common/App.elm +++ b/implement/alternate-ui/source/src/Common/App.elm @@ -3,4 +3,4 @@ module Common.App exposing (versionId) versionId : String versionId = - "2023-06-21" + "2023-11-21" diff --git a/implement/alternate-ui/source/src/EveOnline/ParseUserInterface.elm b/implement/alternate-ui/source/src/EveOnline/ParseUserInterface.elm index 38942c1..ddd6865 100644 --- a/implement/alternate-ui/source/src/EveOnline/ParseUserInterface.elm +++ b/implement/alternate-ui/source/src/EveOnline/ParseUserInterface.elm @@ -491,7 +491,7 @@ type alias HeatStatusTooltip = type alias Neocom = { uiNode : UITreeNodeWithDisplayRegion - , iconInventory : Maybe UITreeNodeWithDisplayRegion + , inventoryButton : Maybe UITreeNodeWithDisplayRegion , clock : Maybe NeocomClock } @@ -2857,17 +2857,11 @@ parseStandaloneBookmarkWindow windowUINode = parseNeocomFromUITreeRoot : UITreeNodeWithDisplayRegion -> Maybe Neocom parseNeocomFromUITreeRoot uiTreeRoot = - case - uiTreeRoot - |> listDescendantsWithDisplayRegion - |> List.filter (.uiNode >> .pythonObjectTypeName >> (==) "Neocom") - |> List.head - of - Nothing -> - Nothing - - Just uiNode -> - Just (parseNeocom uiNode) + uiTreeRoot + |> listDescendantsWithDisplayRegion + |> List.filter (.uiNode >> .pythonObjectTypeName >> (==) "NeocomContainer") + |> List.head + |> Maybe.map parseNeocom parseNeocom : UITreeNodeWithDisplayRegion -> Neocom @@ -2880,17 +2874,6 @@ parseNeocom neocomUiNode = |> List.concatMap getAllContainedDisplayTextsWithRegion |> List.head - nodeFromTexturePathEnd texturePathEnd = - neocomUiNode - |> listDescendantsWithDisplayRegion - |> List.filter - (.uiNode - >> getTexturePathFromDictEntries - >> Maybe.map (String.endsWith texturePathEnd) - >> Maybe.withDefault False - ) - |> List.head - clock = maybeClockTextAndNode |> Maybe.map @@ -2900,9 +2883,15 @@ parseNeocom neocomUiNode = , parsedText = parseNeocomClockText clockText } ) + + inventoryButton = + neocomUiNode + |> listDescendantsWithDisplayRegion + |> List.filter (.uiNode >> .pythonObjectTypeName >> (==) "ButtonInventory") + |> List.head in { uiNode = neocomUiNode - , iconInventory = nodeFromTexturePathEnd "items.png" + , inventoryButton = inventoryButton , clock = clock } diff --git a/implement/alternate-ui/source/src/Frontend/InspectParsedUserInterface.elm b/implement/alternate-ui/source/src/Frontend/InspectParsedUserInterface.elm index 61c4042..9057e75 100644 --- a/implement/alternate-ui/source/src/Frontend/InspectParsedUserInterface.elm +++ b/implement/alternate-ui/source/src/Frontend/InspectParsedUserInterface.elm @@ -1469,9 +1469,9 @@ treeNodeChildrenFromNeocom viewConfig neocom = treeNodeChildrenFromRecordWithUINode viewConfig neocom.uiNode - [ neocom.iconInventory + [ neocom.inventoryButton |> fieldFromMaybeInstance - { fieldName = "iconInventory" + { fieldName = "inventoryButton" , fieldValueSummary = always "..." , fieldValueChildren = treeViewNodeFromUINode viewConfig >> List.singleton }