From 2afcfafd28f54226b4fbfcacc20f5ace1d6a40a4 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Wed, 27 Jul 2016 19:17:38 +0300 Subject: [PATCH] New merchant skin style --- ElvUI_SLE/defaults/private.lua | 1 + ElvUI_SLE/locales/english.lua | 1 + ElvUI_SLE/locales/russian.lua | 1 + ElvUI_SLE/options/skins_c.lua | 10 +- ElvUI_SLE/skins/blizzard/load_blizzard.xml | 1 + ElvUI_SLE/skins/blizzard/merchant.lua | 5 +- ElvUI_SLE/skins/blizzard/merchantList.lua | 715 ++++++++++++++++++++++++++++ 7 files changed, 730 insertions(+), 4 deletions(-) create mode 100644 ElvUI_SLE/skins/blizzard/merchantList.lua diff --git a/ElvUI_SLE/defaults/private.lua b/ElvUI_SLE/defaults/private.lua index ae781e8..8ab7991 100644 --- a/ElvUI_SLE/defaults/private.lua +++ b/ElvUI_SLE/defaults/private.lua @@ -160,6 +160,7 @@ V["sle"] = { }, ["merchant"] = { ["enable"] = false, + ["style"] = "Default", ["subpages"] = 2, }, }, diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 1ae36c0..7f972a6 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -688,6 +688,7 @@ Ctrl + Left Click to collapce]] L["SLE_QUESTKING_Required"] = " Required: " L["ElvUI Objective Tracker"] = true L["ElvUI Skins"] = true +L["As List"] = true --Toolbars L["We are sorry, but you can't do this now. Try again after the end of this combat."] = true diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index c3c31be..a8c10be 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -679,6 +679,7 @@ L["Subpages are blocks of 10 items. This option set how many of subpages will be -- L["SLE_QUESTKING_Required"] = " Required: " L["ElvUI Objective Tracker"] = "Список задач ElvUI" L["ElvUI Skins"] = "Скины ElvUI" +L["As List"] = "Списком" --Toolbars L["We are sorry, but you can't do this now. Try again after the end of this combat."] = "Извините, но Вы не можете этого сделать сейчас. Попробуйте снова после окончания текущего боя." diff --git a/ElvUI_SLE/options/skins_c.lua b/ElvUI_SLE/options/skins_c.lua index ab6fd1f..f5bc7dc 100644 --- a/ElvUI_SLE/options/skins_c.lua +++ b/ElvUI_SLE/options/skins_c.lua @@ -337,13 +337,21 @@ local function configTable() type = "toggle", name = L["Enable"], }, + style = { + order = 2, type = "select", + name = L["Style"], + values = { + ["Default"] = DEFAULT, + ["List"] = L["As List"], + }, + }, subpages = { order = 2, type = 'range', name = L["Subpages"], desc = L["Subpages are blocks of 10 items. This option set how many of subpages will be shown on a single page."], min = 2, max = 5, step = 1, - disabled = function() return not E.private.sle.skins.merchant.enable end, + disabled = function() return not E.private.sle.skins.merchant.enable or E.private.sle.skins.merchant.style ~= "Default" end, }, }, }, diff --git a/ElvUI_SLE/skins/blizzard/load_blizzard.xml b/ElvUI_SLE/skins/blizzard/load_blizzard.xml index 58d7824..13eb219 100644 --- a/ElvUI_SLE/skins/blizzard/load_blizzard.xml +++ b/ElvUI_SLE/skins/blizzard/load_blizzard.xml @@ -3,4 +3,5 @@