feat(ui): ny fane Overblik — flows som tabel (flow/varer/fra/til/kører/status) grupperet Ind/Ud + Wait-puljer; Flows-fanen kun redigering (v1.19.1.0)

FS25_ADSmartPickup/gui/SmartPickupFrame.lua

@@ -10,10 +10,10 @@ SmartPickupFrame.REFRESH_INTERVAL_MS = 1000
 SmartPickupFrame.STATUS_OVERRIDE_TICKS = 6
 SmartPickupFrame.LOG_PREFIX = "ADSmartPickup: "
 SmartPickupFrame.STATE_OFF, SmartPickupFrame.STATE_ON = 1, 2
-SmartPickupFrame.TAB_FLOWS = 1
+SmartPickupFrame.TAB_OVERVIEW, SmartPickupFrame.TAB_FLOWS = 1, 2
 -- Lagerfaner: én pr. bygningstype (indeks -> kind i ADSources.getFarmInventory)
-SmartPickupFrame.TAB_NAMES = {"spu_tab_flows", "spu_tab_factories", "spu_tab_silos", "spu_tab_barns", "spu_tab_sheds"}
-SmartPickupFrame.TAB_KINDS = {[2] = "factory", [3] = "silo", [4] = "husbandry", [5] = "objectStorage"}
+SmartPickupFrame.TAB_NAMES = {"spu_tab_overview", "spu_tab_flows", "spu_tab_factories", "spu_tab_silos", "spu_tab_barns", "spu_tab_sheds"}
+SmartPickupFrame.TAB_KINDS = {[3] = "factory", [4] = "silo", [5] = "husbandry", [6] = "objectStorage"}
 
 function SmartPickupFrame.getTabKind(tab)
     return SmartPickupFrame.TAB_KINDS[tab]
@@ -38,7 +38,7 @@ function SmartPickupFrame.new(i18n, getAdEnv)
     self.pendingRebuild = false
     self.frameOpen = false
     self.focusLost = false
-    self.currentTab = SmartPickupFrame.TAB_FLOWS
+    self.currentTab = SmartPickupFrame.TAB_OVERVIEW
     self.subCategoryTabs = {}
     self.backButtonInfo = {inputAction = InputAction.MENU_BACK}
     self.startButtonInfo = {inputAction = InputAction.MENU_ACTIVATE, text = i18n:getText("spu_button_start"), callback = function() self:onClickStartStop() end}
@@ -62,7 +62,7 @@ end
 
 -- Prefabs skal ud af layoutet før de klones, ellers vises de selv som rækker.
 function SmartPickupFrame:initialize()
-    for _, name in ipairs({"ingredientPrefab", "vehiclePrefab", "textPrefab", "productPrefab", "statPrefab", "gridPrefab"}) do
+    for _, name in ipairs({"ingredientPrefab", "vehiclePrefab", "textPrefab", "productPrefab", "statPrefab", "gridPrefab", "flowPrefab"}) do
         local prefab = self[name]
         if prefab ~= nil then
             prefab:unlinkElement()
@@ -370,6 +370,19 @@ function SmartPickupFrame:rebuild()
         self:refreshLive()
         return
     end
+    if self.currentTab == SmartPickupFrame.TAB_OVERVIEW then
+        if adEnv ~= nil then
+            self:fillOverviewRows(adEnv)
+        end
+        self.statusRow = self:addTextRow("")
+        self:addTextRow(self.i18n:getText("spu_waitPools"))
+        self:fillPoolRows(adEnv)
+        self:colorRows()
+        self.boxLayout:invalidateLayout()
+        self:refreshLive()
+        self:restoreFocusIfLost()
+        return
+    end
     self:fillRunOption(adEnv)
     local hasRun = run ~= nil and adEnv ~= nil
     for _, element in ipairs({self.waitPoolOption, self.loopsOption, self.returnBelowOption, self.sellAtOption, self.storeAboveOption}) do
@@ -377,9 +390,6 @@ function SmartPickupFrame:rebuild()
             element:setDisabled(not hasRun)
         end
     end
-    if adEnv ~= nil then
-        self:fillBoardRows(adEnv)
-    end
     if hasRun then
         self:fillWaitPoolOption(adEnv, run)
         self:rebuildFlowDetail(adEnv, run)
@@ -388,8 +398,6 @@ function SmartPickupFrame:rebuild()
         self:addTextRow(self.i18n:getText("spu_section_status"))
     end
     self.statusRow = self:addTextRow("")
-    self:addTextRow(self.i18n:getText("spu_waitPools"))
-    self:fillPoolRows(adEnv)
     self:colorRows()
     self.boxLayout:invalidateLayout()
     self:refreshLive()
@@ -639,8 +647,8 @@ function SmartPickupFrame:refreshLive()
         self:setStatusText(self.i18n:getText("spu_status_noAd"))
         return
     end
-    if self.currentTab == SmartPickupFrame.TAB_FLOWS then
-        self:refreshBoard(adEnv)
+    if self.currentTab == SmartPickupFrame.TAB_OVERVIEW then
+        self:refreshOverview(adEnv)
     end
     self:refreshStorageRows(adEnv)
     local isRunning = false