From 75d0215826b58f79adc46793cf0b9bbe40e7c08e Mon Sep 17 00:00:00 2001 From: pschifferer Date: Thu, 22 Jan 2009 03:41:12 +0000 Subject: [PATCH] Reversed the behavior of clicking/shift-clicking on a category item in the dropdown. Now, clicking will select the clicked item and deselect all others; shift-clicking will toggle the selection state of the clicked item. Updated the revision tag placeholder. --- Cauldron/CauldronMain.lua | 6 +++--- Cauldron/CauldronMain.xml | 8 +++++--- Cauldron/CauldronMainUI.lua | 15 ++++++++++----- Cauldron/CauldronQueue.lua | 2 +- Cauldron/CauldronShoppingList.lua | 2 +- Cauldron/CauldronShoppingListUI.lua | 2 +- Cauldron/CauldronTradeskill.lua | 2 +- Cauldron/CauldronUtil.lua | 2 +- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Cauldron/CauldronMain.lua b/Cauldron/CauldronMain.lua index a309bcc..fb8b302 100644 --- a/Cauldron/CauldronMain.lua +++ b/Cauldron/CauldronMain.lua @@ -1,11 +1,11 @@ --- $Revision: 1.4 $ +-- $Revision$ -- Cauldron main file Cauldron = LibStub("AceAddon-3.0"):NewAddon("Cauldron", "AceEvent-3.0", "AceTimer-3.0", "AceConsole-3.0", "AceHook-3.0", "LibLogger-1.0") local L = LibStub("AceLocale-3.0"):GetLocale("Cauldron") -Cauldron.version = "0.9.2." .. string.sub("$Revision: 1.4 $", 12, -3); -Cauldron.date = string.sub("$Date: 2009/01/19 23:13:19 $", 8, 17); +Cauldron.version = "0.9.2." .. string.sub("$Revision$", 12, -3); +Cauldron.date = string.sub("$Date$", 8, 17); -- key binding names BINDING_HEADER_CAULDRON = "Cauldron"; diff --git a/Cauldron/CauldronMain.xml b/Cauldron/CauldronMain.xml index ec02b43..75ba2c4 100644 --- a/Cauldron/CauldronMain.xml +++ b/Cauldron/CauldronMain.xml @@ -112,9 +112,11 @@ HandleModifiedItemClick(GetTradeSkillItemLink(self.skillIndex)); - GameTooltip:SetOwner(self, "ANCHOR_RIGHT"); - GameTooltip:SetTradeSkillItem(self.skillIndex); - CursorUpdate(self); + if self.skillIndex then + GameTooltip:SetOwner(self, "ANCHOR_RIGHT"); + GameTooltip:SetTradeSkillItem(self.skillIndex); + CursorUpdate(self); + end GameTooltip:Hide(); diff --git a/Cauldron/CauldronMainUI.lua b/Cauldron/CauldronMainUI.lua index f9eb316..d3bea9e 100644 --- a/Cauldron/CauldronMainUI.lua +++ b/Cauldron/CauldronMainUI.lua @@ -1,4 +1,4 @@ --- $Revision: 1.3 $ +-- $Revision$ -- Cauldron user interface logic local L = LibStub("AceLocale-3.0"):GetLocale("Cauldron") @@ -100,7 +100,7 @@ function Cauldron:Frame_Update() -- update search text box self:debug("Frame_Update: display search text"); - self:UpdateSearchText(name); + self:UpdateSearchText(); -- TODO: update dropdowns self:debug("Frame_Update: update dropdowns"); @@ -135,10 +135,15 @@ function Cauldron:UpdateSkillInfo(skillName, rank, maxRank) self:debug("UpdateSkillInfo exit"); end -function Cauldron:UpdateSearchText(skillName) +function Cauldron:UpdateSearchText() self:debug("UpdateSearchText enter"); + + local skillName = CURRENT_TRADESKILL; + if IsTradeSkillLinked() then + skillName = "Linked-"..skillName; + end - local searchText = self.db.realm.userdata[self.vars.playername].skills[skillName].window.search; + local searchText = self.db.realm.userdata[self.vars.playername].skills[skillName].window.search or ""; if searchText == "" then searchText = SEARCH; end @@ -1389,7 +1394,7 @@ function Cauldron:CategoryDropDown_SetCategory(info) Cauldron.db.realm.userdata[Cauldron.vars.playername].skills[skillName].window.categories[name].shown = checked; end else - if IsShiftKeyDown() then + if not IsShiftKeyDown() then -- uncheck everything for name, _ in pairs(Cauldron.db.realm.userdata[Cauldron.vars.playername].skills[skillName].window.categories) do Cauldron.db.realm.userdata[Cauldron.vars.playername].skills[skillName].window.categories[name].shown = false; diff --git a/Cauldron/CauldronQueue.lua b/Cauldron/CauldronQueue.lua index da6dbb4..bfa3295 100644 --- a/Cauldron/CauldronQueue.lua +++ b/Cauldron/CauldronQueue.lua @@ -1,4 +1,4 @@ --- $Revision: 1.2 $ +-- $Revision$ -- Cauldron queue management functions CauldronQueue = {}; diff --git a/Cauldron/CauldronShoppingList.lua b/Cauldron/CauldronShoppingList.lua index 0ac265e..2ed6db8 100644 --- a/Cauldron/CauldronShoppingList.lua +++ b/Cauldron/CauldronShoppingList.lua @@ -1,4 +1,4 @@ --- $Revision: 1.2 $ +-- $Revision$ -- Cauldron shopping list functions CauldronShopping = {}; diff --git a/Cauldron/CauldronShoppingListUI.lua b/Cauldron/CauldronShoppingListUI.lua index b031640..30ec14c 100644 --- a/Cauldron/CauldronShoppingListUI.lua +++ b/Cauldron/CauldronShoppingListUI.lua @@ -1,4 +1,4 @@ --- $Revision: 1.2 $ +-- $Revision$ -- Cauldron shopping list UI functions function Cauldron:ShoppingList_Toggle() diff --git a/Cauldron/CauldronTradeskill.lua b/Cauldron/CauldronTradeskill.lua index 5ed504c..462ff8b 100644 --- a/Cauldron/CauldronTradeskill.lua +++ b/Cauldron/CauldronTradeskill.lua @@ -1,4 +1,4 @@ --- $Revision: 1.3 $ +-- $Revision$ -- Cauldron tradeskill functions function Cauldron:UpdateSkills() diff --git a/Cauldron/CauldronUtil.lua b/Cauldron/CauldronUtil.lua index 230f85c..ab6aaf4 100644 --- a/Cauldron/CauldronUtil.lua +++ b/Cauldron/CauldronUtil.lua @@ -1,4 +1,4 @@ --- $Revision: 1.2 $ +-- $Revision$ -- Cauldron utility functions function Cauldron:GetAltReagentCount(reagentInfo) -- 1.7.9.5