Improve bot quest result frames and add abandon actions

Locales/MultiBotAceLocale-deDE.lua

@@ -517,6 +517,7 @@ local deDEValues = {
   ["tips.quests.alllist"] = "Alle Quests des/der Bot(s)",
   ["tips.quests.compheader"] = "** Abgeschlossene Quests **",
   ["tips.quests.incompheader"] = "** Unvollständige Quests **",
+  ["tips.quests.drop"] = "Aufgeben",
   ["tips.quests.botsword"] = "Bots : ",
   ["tips.quests.gobsmaster"] = "GameObjects-Menü öffnen\n|cffffffffDieser Button öffnet das GameObjects-Menü.|r\n\n|cffff0000Linksklick zum Öffnen|r\n|cff999999(Ausführungsreihenfolge: System)|r",
   ["tips.quests.gobenter"] = "GameObject benutzen\n|cffffffffDieser Button öffnet ein Feld zur Eingabe des GameObject-Namens.\n\n|cffff0000Linksklick zum Öffnen des Eingabefeldes|r\n|cff999999(Ausführungsreihenfolge: Bot)|r",

Locales/MultiBotAceLocale-enGB.lua

@@ -519,6 +519,7 @@ local enGBValues = {
   ["tips.quests.alllist"] = "All Quests for Bot(s)",
   ["tips.quests.compheader"] = "** Complete Quests **",
   ["tips.quests.incompheader"] = "** Incomplete Quests **",
+  ["tips.quests.drop"] = "Abandon",
   ["tips.quests.botsword"] = "Bots : ",
   ["tips.quests.gobsmaster"] = "Game Objects Menu\n|cffffffffOpens the Use Game Objects Menu.|r\n\n|cffff0000Left-click to Open|r\n|cff999999(Executed by: System)|r",
   ["tips.quests.gobenter"] = "Use Game Object\n|cffffffffOpens a prompt to enter Game Object Name.\n\n|cffff0000Left-click to open prompt|r\n|cff999999(Executed by: Bot)|r",

Locales/MultiBotAceLocale-enUS.lua

@@ -519,6 +519,7 @@ local enUSValues = {
   ["tips.quests.alllist"] = "All Quests for Bot(s)",
   ["tips.quests.compheader"] = "** Complete Quests **",
   ["tips.quests.incompheader"] = "** Incomplete Quests **",
+  ["tips.quests.drop"] = "Abandon",
   ["tips.quests.botsword"] = "Bots : ",
   ["tips.quests.gobsmaster"] = "Game Objects Menu\n|cffffffffOpens the Use Game Objects Menu.|r\n\n|cffff0000Left-click to Open|r\n|cff999999(Executed by: System)|r",
   ["tips.quests.gobenter"] = "Use Game Object\n|cffffffffOpens a prompt to enter Game Object Name.\n\n|cffff0000Left-click to open prompt|r\n|cff999999(Executed by: Bot)|r",

Locales/MultiBotAceLocale-esES.lua

@@ -517,6 +517,7 @@ local esESValues = {
   ["tips.quests.alllist"] = "Todas las misiones del/de los bot(s)",
   ["tips.quests.compheader"] = "** Misiones completadas **",
   ["tips.quests.incompheader"] = "** Misiones incompletas **",
+  ["tips.quests.drop"] = "Abandonar",
   ["tips.quests.botsword"] = "Bots : ",
   ["tips.quests.gobsmaster"] = "Menú de Objetos del Juego\n|cffffffffEste botón abre el menú para usar objetos del juego.|r\n\n|cffff0000Clic izquierdo para abrir|r\n|cff999999(Orden de ejecución: Sistema)|r",
   ["tips.quests.gobenter"] = "Usar objeto del juego\n|cffffffffEste botón abre un cuadro para ingresar el nombre del objeto del juego.\n\n|cffff0000Clic izquierdo para abrir el cuadro|r\n|cff999999(Orden de ejecución: Bot)|r",

Locales/MultiBotAceLocale-frFR.lua

@@ -517,6 +517,7 @@ local frFRValues = {
   ["tips.quests.alllist"] = "Toutes les quêtes du/des bot(s)",
   ["tips.quests.compheader"] = "** Quêtes Terminées **",
   ["tips.quests.incompheader"] = "** Quêtes Incomplètes **",
+  ["tips.quests.drop"] = "Abandonner",
   ["tips.quests.botsword"] = "Bots : ",
   ["tips.quests.gobsmaster"] = "Menu Objets du Jeu\n|cffffffffCe bouton ouvre le menu pour utiliser des objets du jeu.|r\n\n|cffff0000Clic-Gauche pour ouvrir|r\n|cff999999(Ordre d'exécution : Système)|r",
   ["tips.quests.gobenter"] = "Utiliser un Objet du Jeu\n|cffffffffCe bouton ouvre une fenêtre pour entrer le nom de l'objet du jeu.\n\n|cffff0000Clic-Gauche pour ouvrir la fenêtre|r\n|cff999999(Ordre d'exécution : Bot)|r",

Locales/MultiBotAceLocale-koKR.lua

@@ -516,6 +516,7 @@ local koKRValues = {
   ["tips.quests.alllist"] = "모든 봇의 퀘스트 목록",
   ["tips.quests.compheader"] = "** 완료한 퀘스트 **",
   ["tips.quests.incompheader"] = "** 미완료 퀘스트 **",
+  ["tips.quests.drop"] = "포기",
   ["tips.quests.botsword"] = "봇 : ",
   ["tips.quests.gobsmaster"] = "게임 오브젝트 메뉴 열기\n|cffffffff이 버튼을 누르면 게임 오브젝트 사용 메뉴를 엽니다.|r\n\n|cffff0000왼쪽 클릭: 열기|r\n|cff999999(실행 순서: 시스템)|r",
   ["tips.quests.gobenter"] = "게임 오브젝트 사용\n|cffffffff이 버튼을 누르면 게임 오브젝트 이름을 입력할 수 있습니다.\n\n|cffff0000왼쪽 클릭: 입력창 열기|r\n|cff999999(실행 순서: 봇)|r",

Locales/MultiBotAceLocale-ruRU.lua

@@ -517,6 +517,7 @@ local ruRUValues = {
   ["tips.quests.alllist"] = "Все квесты бота(ов)",
   ["tips.quests.compheader"] = "** Выполненные квесты **",
   ["tips.quests.incompheader"] = "** Невыполненные квесты **",
+  ["tips.quests.drop"] = "Отказаться",
   ["tips.quests.botsword"] = "Боты : ",
   ["tips.quests.gobsmaster"] = "Меню игровых объектов\n|cffffffffЭта кнопка открывает меню для использования игровых объектов.|r\n\n|cffff0000Левый клик — открыть|r\n|cff999999(Порядок выполнения: система)|r",
   ["tips.quests.gobenter"] = "Использовать игровой объект\n|cffffffffЭта кнопка открывает окно для ввода названия игрового объекта.\n\n|cffff0000Левый клик — открыть окно ввода|r\n|cff999999(Порядок выполнения: бот)|r",

Locales/MultiBotAceLocale-zhCN.lua

@@ -517,6 +517,7 @@ local zhCNValues = {
   ["tips.quests.alllist"] = "机器人所有任务",
   ["tips.quests.compheader"] = "** 已完成任务 **",
   ["tips.quests.incompheader"] = "** 未完成任务 **",
+  ["tips.quests.drop"] = "放弃",
   ["tips.quests.botsword"] = "机器人：",
   ["tips.quests.gobsmaster"] = "使用游戏对象菜单\n|cffffffff此按钮打开使用游戏对象的菜单。|r\n\n|cffff0000左键点击打开|r\n|cff999999（执行顺序：系统）|r",
   ["tips.quests.gobenter"] = "使用游戏对象\n|cffffffff此按钮弹出窗口输入游戏对象名称。\n\n|cffff0000左键点击打开输入窗口|r\n|cff999999（执行顺序：机器人）|r",

README.md

@@ -211,7 +211,7 @@ The goal is to remove automatic UI-refresh spam.
   </tr>
   <tr>
     <td>Quests</td>
-    <td><strong>Bridge-first</strong> incompleted, completed and all quest lists</td>
+    <td><strong>Bridge-first</strong> incompleted, completed and all quest lists with dark result frames and per-bot abandon buttons</td>
   </tr>
   <tr>
     <td>Game object search</td>

TODO.md

@@ -52,7 +52,6 @@
 
 ## Améliorations UI encore ouvertes
 
-* Uniformiser le template des frames de quêtes avec le style d'Itemus.
 * Uniformiser le template de la frame reward avec le style d'Itemus.
 * Ajouter une option pour choisir la taille des icônes de la main bar et des Quick Shaman / Quick Hunter.
 * Voir quelles autres options utiles peuvent être ajoutées à la frame options de MultiBot.
@@ -102,6 +101,7 @@
   * incompleted ;
   * completed ;
   * all.
+* Frames de quêtes `all`, `completed` et `incompleted` uniformisées avec fond interne sombre, marges cohérentes et bouton `Abandonner` par quête de bot.
 * Outfits bridge-first.
 * Character Info bridge-first.
 * Réputations bridge-first dans la frame Infos personnage.

UI/MultiBotQuestAllFrame.lua

@@ -72,6 +72,11 @@ local function createQuestRow(self, questID, text)
     row:SetFullWidth(true)
     row:SetLayout("Flow")
 
+    local spacer = self.aceGUI:Create("Label")
+    spacer:SetText("")
+    spacer:SetWidth(Shared.QUEST_ROW_LEFT_PADDING or 12)
+    row:AddChild(spacer)
+
     local icon = self.aceGUI:Create("Icon")
     icon:SetImage(Shared.ICON_BOT_QUEST or "Interface\\Icons\\inv_misc_note_02")
     icon:SetImageSize(12, 12)
@@ -195,6 +200,7 @@ function MultiBot.InitializeQuestAllFrame()
     window:SetHeight(460)
     window:EnableResize(false)
     window:SetLayout("Fill")
+    Shared.ApplyWindowContentStyle(window, 0.90)
     local strataLevel = MultiBot.GetGlobalStrataLevel and MultiBot.GetGlobalStrataLevel()
     if strataLevel then
         window.frame:SetFrameStrata(strataLevel)
@@ -210,6 +216,8 @@ function MultiBot.InitializeQuestAllFrame()
     content:SetLayout("List")
     window:AddChild(content)
 
+    Shared.AddTopPadding(aceGUI, content)
+
     local summary = aceGUI:Create("Label")
     summary:SetFullWidth(true)
     summary:SetText("")
@@ -241,4 +249,4 @@ function MultiBot.InitializeQuestAllFrame()
 
     MultiBot.tBotAllPopup = window
     return QuestAllFrame
-end
+end

UI/MultiBotQuestCompletedFrame.lua

@@ -54,14 +54,29 @@ local function resolveBotQuestBucket(store, botName)
     return EMPTY_TABLE
 end
 
+local function dropBotQuest(botName, entry)
+    if not Shared.SendDropQuest(botName, entry) then
+        return
+    end
+
+    Shared.RemoveQuestEntryFromBucket(resolveBotQuestBucket(getBotQuestsCompletedStore(), botName), entry)
+    MultiBot.BuildBotCompletedList(botName)
+end
+
 function MultiBot.BuildBotCompletedList(botName)
     local frame = MultiBot.InitializeQuestCompletedFrame()
     local completedStore = getBotQuestsCompletedStore()
     local entries = Shared.SortQuestEntries(resolveBotQuestBucket(completedStore, botName))
 
     frame:Show()
     Shared.RenderQuestEntries(frame, entries, {
-        summaryText = botName and ("|cff80ff80" .. botName .. "|r") or (MultiBot.L("tips.quests.complist") or ""),
+        summaryText = botName and ((Shared.QUEST_SUMMARY_PREFIX or "   ") .. "|cff80ff80" .. botName .. "|r") or (MultiBot.L("tips.quests.complist") or ""),
+        rowOptions = botName and {
+            leftPadding = Shared.QUEST_ROW_LEFT_PADDING or 12,
+            onDrop = function(entry)
+                dropBotQuest(botName, entry)
+            end,
+        } or nil,
     })
 end
 
@@ -72,6 +87,9 @@ function MultiBot.BuildAggregatedCompletedList()
     frame:Show()
     Shared.RenderQuestEntries(frame, entries, {
         summaryText = "",
+        rowOptions = {
+            leftPadding = Shared.QUEST_ROW_LEFT_PADDING or 12,
+        },
     })
 end
 
@@ -97,6 +115,7 @@ function MultiBot.InitializeQuestCompletedFrame()
     window:SetHeight(420)
     window:EnableResize(false)
     window:SetLayout("Fill")
+    Shared.ApplyWindowContentStyle(window, 0.90)
     local strataLevel = MultiBot.GetGlobalStrataLevel and MultiBot.GetGlobalStrataLevel()
     if strataLevel then
         window.frame:SetFrameStrata(strataLevel)
@@ -112,6 +131,8 @@ function MultiBot.InitializeQuestCompletedFrame()
     content:SetLayout("List")
     window:AddChild(content)
 
+    Shared.AddTopPadding(aceGUI, content)
+
     local summary = aceGUI:Create("Label")
     summary:SetFullWidth(true)
     summary:SetText("")
@@ -138,4 +159,4 @@ function MultiBot.InitializeQuestCompletedFrame()
 
     MultiBot.tBotCompPopup = window
     return QuestCompletedFrame
-end
+end

UI/MultiBotQuestIncompleteFrame.lua

@@ -54,6 +54,15 @@ local function resolveBotQuestBucket(store, botName)
     return EMPTY_TABLE
 end
 
+local function dropBotQuest(botName, entry)
+    if not Shared.SendDropQuest(botName, entry) then
+        return
+    end
+
+    Shared.RemoveQuestEntryFromBucket(resolveBotQuestBucket(getBotQuestsIncompletedStore(), botName), entry)
+    MultiBot.BuildBotQuestList(botName)
+end
+
 function MultiBot.BuildBotQuestList(botName)
     local frame = MultiBot.InitializeQuestIncompleteFrame and MultiBot.InitializeQuestIncompleteFrame()
     if not frame then
@@ -64,7 +73,13 @@ function MultiBot.BuildBotQuestList(botName)
 
     frame:Show()
     Shared.RenderQuestEntries(frame, entries, {
-        summaryText = botName and ("|cff80ff80" .. botName .. "|r") or (MultiBot.L("tips.quests.incomplist") or ""),
+        summaryText = botName and ((Shared.QUEST_SUMMARY_PREFIX or "   ") .. "|cff80ff80" .. botName .. "|r") or (MultiBot.L("tips.quests.incomplist") or ""),
+        rowOptions = botName and {
+            leftPadding = Shared.QUEST_ROW_LEFT_PADDING or 12,
+            onDrop = function(entry)
+                dropBotQuest(botName, entry)
+            end,
+        } or nil,
     })
 end
 
@@ -75,6 +90,9 @@ function MultiBot.BuildAggregatedQuestList()
     frame:Show()
     Shared.RenderQuestEntries(frame, entries, {
         summaryText = "",
+        rowOptions = {
+            leftPadding = Shared.QUEST_ROW_LEFT_PADDING or 12,
+        },
     })
 end
 
@@ -100,6 +118,7 @@ function MultiBot.InitializeQuestIncompleteFrame()
     window:SetHeight(420)
     window:EnableResize(false)
     window:SetLayout("Fill")
+    Shared.ApplyWindowContentStyle(window, 0.90)
     local strataLevel = MultiBot.GetGlobalStrataLevel and MultiBot.GetGlobalStrataLevel()
     if strataLevel then
         window.frame:SetFrameStrata(strataLevel)
@@ -115,6 +134,8 @@ function MultiBot.InitializeQuestIncompleteFrame()
     content:SetLayout("List")
     window:AddChild(content)
 
+    Shared.AddTopPadding(aceGUI, content)
+
     local summary = aceGUI:Create("Label")
     summary:SetFullWidth(true)
     summary:SetText("")
@@ -141,4 +162,4 @@ function MultiBot.InitializeQuestIncompleteFrame()
 
     MultiBot.tBotPopup = window
     return QuestIncompleteFrame
-end
+end