fix: Smart Pickup-fane — layout som AD's egen side (ScrollingLayout + slider, rækkefarver), udskudt genopbygning, fokus på boxLayout (v1.9.1.0)

This commit is contained in:
2026-09-22 23:49:58 +02:00
parent 856b949749
commit 90d86b22e9
4 changed files with 165 additions and 97 deletions
+51 -57
View File
@@ -8,66 +8,60 @@
<Text profile="fs25_menuHeaderTitle" text="$l10n_spu_title"/>
</GuiElement>
<GuiElement profile="spuTabContainer">
<ScrollingLayout profile="fs25_settingsLayout" id="boxLayout">
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickRun" id="runOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_run_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_run"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickTarget" id="targetOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_target_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_target"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickIngredientMode" id="ingredientModeOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_ingredientMode_tooltip"/>
</BinaryOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_ingredientMode"/>
</Bitmap>
<BoxLayout profile="fs25_settingsLayout" id="ingredientBox"/>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickWaitPool" id="waitPoolOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_waitPool_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_waitPool"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickLoops" id="loopsOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_loops_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_loops"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer">
<Text profile="spuSectionTitle" text="$l10n_spu_vehicles"/>
</Bitmap>
<BoxLayout profile="fs25_settingsLayout" id="vehicleBox"/>
<Bitmap profile="fs25_multiTextOptionContainer">
<Text profile="spuSectionTitle" text="$l10n_spu_waitPools"/>
</Bitmap>
<BoxLayout profile="fs25_settingsLayout" id="poolBox"/>
<Bitmap profile="fs25_multiTextOptionContainer">
<Text profile="spuInfoText" id="statusText"/>
</Bitmap>
</ScrollingLayout>
<!-- prefabs: klones pr. vare / traktor / pulje og fjernes fra layoutet ved initialize -->
<Bitmap profile="fs25_multiTextOptionContainer" id="ingredientPrefab">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickIngredient" name="option"/>
<Text profile="fs25_settingsMultiTextOptionTitle" name="title"/>
<!-- Samme opbygning som AutoDrive's egne ESC-sider: ScrollingLayout direkte i
menuContainer, alle rækker som direkte børn (ingen indlejrede layouts). -->
<ScrollingLayout profile="fs25_settingsLayout" id="boxLayout">
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickRun" id="runOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_run_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_run"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer" id="vehiclePrefab">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickVehicle" name="option">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_vehicle_tooltip"/>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickTarget" id="targetOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_target_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_target"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickIngredientMode" id="ingredientModeOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_ingredientMode_tooltip"/>
</BinaryOption>
<Text profile="fs25_settingsMultiTextOptionTitle" name="title"/>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_ingredientMode"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer" id="poolPrefab">
<Text profile="spuInfoText" name="title"/>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickWaitPool" id="waitPoolOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_waitPool_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_waitPool"/>
</Bitmap>
</GuiElement>
<Bitmap profile="fs25_multiTextOptionContainer">
<MultiTextOption profile="fs25_settingsMultiTextOption" onClick="onClickLoops" id="loopsOption">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_loops_tooltip"/>
</MultiTextOption>
<Text profile="fs25_settingsMultiTextOptionTitle" text="$l10n_spu_loops"/>
</Bitmap>
</ScrollingLayout>
<!-- prefabs: klones pr. vare / traktor / tekstlinje og fjernes fra layoutet ved initialize -->
<Bitmap profile="fs25_multiTextOptionContainer" id="ingredientPrefab">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickIngredient" name="option"/>
<Text profile="fs25_settingsMultiTextOptionTitle" name="title"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer" id="vehiclePrefab">
<BinaryOption profile="fs25_settingsBinaryOption" onClick="onClickVehicle" name="option">
<Text profile="fs25_multiTextOptionTooltip" name="ignore" text="$l10n_spu_vehicle_tooltip"/>
</BinaryOption>
<Text profile="fs25_settingsMultiTextOptionTitle" name="title"/>
</Bitmap>
<Bitmap profile="fs25_multiTextOptionContainer" id="textPrefab">
<Text profile="spuInfoText" name="title"/>
</Bitmap>
</GuiElement>
<ThreePartBitmap profile="fs25_sliderDockedBg">
<ThreePartBitmap profile="fs25_sliderDockedBox">
<Slider profile="fs25_helpLineSlider" dataElementId="boxLayout"/>
</ThreePartBitmap>
</ThreePartBitmap>
</GUI>