Merge remote-tracking branch 'upstream/master'

Conflicts:
	GnomishVendorShrinker.lua
This commit is contained in:
Urth 2011-06-29 22:12:20 +02:00
commit 79e47f9b8e
4 changed files with 13 additions and 4 deletions

View File

@ -103,7 +103,7 @@ local function SetValue(self, text, icon, link)
local id = link and link:match("item:(%d+)") local id = link and link:match("item:(%d+)")
self.link, self.index, self.itemIndex = nil self.link, self.index, self.itemIndex = nil
if id then self.link = link end if id then self.link = link end
if id and GetItemCount(id) < text or link and not id and GetCurencyCount(link) < text then if id and (GetItemCount(id) or 0) < text or link and not id and (GetCurencyCount(link) or 0) < text then
color = "|cffff9999" color = "|cffff9999"
end end
self.text:SetText(color..text) self.text:SetText(color..text)
@ -250,7 +250,7 @@ local grads = setmetatable({
}, {__index = function(t,i) t[i] = default_grad return default_grad end}) }, {__index = function(t,i) t[i] = default_grad return default_grad end})
local _, _, _, _, _, _, RECIPE = GetAuctionItemClasses() local _, _, _, _, _, _, RECIPE = GetAuctionItemClasses()
local quality_colors = setmetatable({}, {__index = function() return "|cffffffff" end}) local quality_colors = setmetatable({}, {__index = function() return "|cffffffff" end})
for i=1,7 do quality_colors[i] = select(4, GetItemQualityColor(i)) end for i=1,7 do quality_colors[i] = "|c".. select(4, GetItemQualityColor(i)) end
local function ShowMerchantItem(row, i) local function ShowMerchantItem(row, i)
local name, itemTexture, itemPrice, itemStackCount, numAvailable, isUsable, extendedCost = GetMerchantItemInfo(i) local name, itemTexture, itemPrice, itemStackCount, numAvailable, isUsable, extendedCost = GetMerchantItemInfo(i)

View File

@ -1,4 +1,4 @@
## Interface: 40000 ## Interface: 40100
## Title: GnomishVendorShrinker ## Title: GnomishVendorShrinker
## Notes: Compact scrolling vendor frame ## Notes: Compact scrolling vendor frame
@ -7,9 +7,11 @@
## X-Website: http://www.tekkub.net/ ## X-Website: http://www.tekkub.net/
## X-Email: tekkub-wow@googlegroups.com ## X-Email: tekkub-wow@googlegroups.com
## X-Category: Misc ## X-Category: Misc
## X-Icon: Interface\Icons\INV_Misc_Toy_07
## LoadManagers: AddonLoader ## LoadManagers: AddonLoader
## X-LoadOn-Merchant: true ## X-LoadOn-Merchant: true
## X-LoadOn-InterfaceOptions: GnomishVendorShrinker
tekFunks\gsc.lua tekFunks\gsc.lua
tekKonfig\tekKonfig.xml tekKonfig\tekKonfig.xml

View File

@ -1,3 +1,9 @@
4.1.0.11-Release
Tagging stable version
4.0.0.10-Beta
Some people don't even know what honor points are
4.0.0.9-Beta 4.0.0.9-Beta
Make price text red if we can't afford an item Make price text red if we can't afford an item

View File

@ -1,9 +1,10 @@
local lib, oldminor = LibStub:NewLibrary("tekKonfig-AboutPanel", 5) local lib, oldminor = LibStub:NewLibrary("tekKonfig-AboutPanel", 6)
if not lib then return end if not lib then return end
function lib.new(parent, addonname) function lib.new(parent, addonname)
if not parent and AddonLoader and AddonLoader.RemoveInterfaceOptions then AddonLoader:RemoveInterfaceOptions(addonname) end
local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer) local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
frame.name, frame.parent, frame.addonname = parent and "About" or addonname, parent, addonname frame.name, frame.parent, frame.addonname = parent and "About" or addonname, parent, addonname
frame:Hide() frame:Hide()