From f3db8e4e5c259acfff843a66b73359bc68c54af7 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Sun, 27 Sep 2026 17:02:31 +0200 Subject: [PATCH] =?UTF-8?q?feat(gui):=20Flows-fanen=20viser=20det=20valgte?= =?UTF-8?q?=20flow=20=C3=B8verst=20og=20en=20kort=20liste=20til=20at=20v?= =?UTF-8?q?=C3=A6lge=20et=20andet=20=E2=80=94=20tavlen=20st=C3=A5r=20kun?= =?UTF-8?q?=20i=20Oversigt=20(v1.42.5.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/SmartPickupFlowGuide.lua | 24 +++++++++++++++++-- FS25_ADSmartPickup/l10n/l10n_da.xml | 1 + FS25_ADSmartPickup/l10n/l10n_en.xml | 1 + FS25_ADSmartPickup/modDesc.xml | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/FS25_ADSmartPickup/gui/SmartPickupFlowGuide.lua b/FS25_ADSmartPickup/gui/SmartPickupFlowGuide.lua index 684b074..46090a3 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupFlowGuide.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupFlowGuide.lua @@ -157,11 +157,31 @@ end -- ---- fanen: tavle + resumé ---- +-- Flows: det valgte flow øverst (indstillinger som "ret"-linjer + status), derunder en kort liste til at vælge +-- et andet flow. Tavlen med alle flows står i Oversigt (in-game 27/9: de to faner så ens ud). function SmartPickupFrame:fillFlowTabRows(adEnv) if self:hasGuideOn(SmartPickupFrame.TAB_FLOWS) and self:fillGuideRows(adEnv) then return end - self:fillOverviewRows(adEnv) + self.overviewRows = {} local run = self:getRun() - if run ~= nil then self:fillFlowSummary(adEnv, run) end + if run == nil then + self:addTextRow(self.i18n:getText("spu_noRuns")) + return + end + self:fillFlowSummary(adEnv, run) + self:addTextRow(self.i18n:getText("spu_flow_pickOther")) + for _, group in ipairs(ADFlowView.boardGroups(ADRunsController.store.runs)) do + for _, other in ipairs(group.runs) do + if other.id ~= run.id then + local cells = self:flowCells(adEnv, other) + local otherId = other.id + self:addLinkRow(string.format(" %s — %s", tostring(other.name), tostring(cells[6] or "")), function(frame) + frame.selectedRunId = otherId + frame.statusOverride = nil + frame:requestRebuild() + end) + end + end + end end function SmartPickupFrame:fillFlowSummary(adEnv, run) diff --git a/FS25_ADSmartPickup/l10n/l10n_da.xml b/FS25_ADSmartPickup/l10n/l10n_da.xml index d2013f2..ed7c20a 100644 --- a/FS25_ADSmartPickup/l10n/l10n_da.xml +++ b/FS25_ADSmartPickup/l10n/l10n_da.xml @@ -225,6 +225,7 @@ + diff --git a/FS25_ADSmartPickup/l10n/l10n_en.xml b/FS25_ADSmartPickup/l10n/l10n_en.xml index df664da..fa754be 100644 --- a/FS25_ADSmartPickup/l10n/l10n_en.xml +++ b/FS25_ADSmartPickup/l10n/l10n_en.xml @@ -225,6 +225,7 @@ + diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 09a3885..e321837 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.42.4.0 + 1.42.5.0 <en>AD Smart Pickup</en>