diff --git a/.pkgmeta b/.pkgmeta index c45bb87..63f70b8 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -53,5 +53,5 @@ externals: Libs/LibQtip-1.0: url: svn://svn.wowace.com/wow/libqtip-1-0/mainline/trunk tag: latest - Libs/StarLibs-1.0: - url: svn://svn.curseforge.net/wow/starlibs-1-0/mainline/trunk \ No newline at end of file + Libs/LibScriptableDisplay-1.0: + url: svn://svn.curseforge.net/wow/libscriptabledisplay-1-0/mainline/trunk \ No newline at end of file diff --git a/Display.lua b/Display.lua index d1221a1..ac4a629 100644 --- a/Display.lua +++ b/Display.lua @@ -2,18 +2,18 @@ local mod = LCD4WoW:NewModule("LCD4WoW") mod.name = "LCD Display" mod.toggled = true mod.defaultOff = true -local Evaluator = LibStub("StarLibEvaluator-1.0") -local LibCore = LibStub("StarLibCore-1.0") -local LibLCDText = LibStub("StarLibLCDText-1.0") -local LibDriverQTip = LibStub("StarLibDriverQTip-1.0") -local LibDriverCharacter = LibStub("StarLibDriverCharacter-1.0") -local WidgetText = LibStub("StarLibWidgetText-1.0") -local WidgetBar = LibStub("StarLibWidgetBar-1.0") -local WidgetHistogram = LibStub("StarLibWidgetHistogram-1.0") -local WidgetKey = LibStub("StarLibWidgetKey-1.0") -local WidgetTimer = LibStub("StarLibWidgetTimer-1.0") -local LayoutOptions = LibStub("StarLibLayoutOptions-1.0") -local Resources = LibStub("StarLibPluginResourceTools-1.0") +local Evaluator = LibStub("LibScriptableDisplayEvaluator-1.0") +local LibCore = LibStub("LibScriptableDisplayCore-1.0") +local LibLCDText = LibStub("LibScriptableDisplayLCDText-1.0") +local LibDriverQTip = LibStub("LibScriptableDisplayDriverQTip-1.0") +local LibDriverCharacter = LibStub("LibScriptableDisplayDriverCharacter-1.0") +local WidgetText = LibStub("LibScriptableDisplayWidgetText-1.0") +local WidgetBar = LibStub("LibScriptableDisplayWidgetBar-1.0") +local WidgetHistogram = LibStub("LibScriptableDisplayWidgetHistogram-1.0") +local WidgetKey = LibStub("LibScriptableDisplayWidgetKey-1.0") +local WidgetTimer = LibStub("LibScriptableDisplayWidgetTimer-1.0") +local LayoutOptions = LibStub("LibScriptableDisplayLayoutOptions-1.0") +local Resources = LibStub("LibScriptableDisplayPluginResourceTools-1.0") local resources = {} Resources:New(resources) @@ -51,13 +51,10 @@ for i, v in ipairs(anchors) do end local function copy(tbl) + if type(tbl) ~= "table" then return tbl end local new = {} for k, v in pairs(tbl) do - if type(v) == "table" then - new[k] = copy(v) - else - new[k] = v - end + new[k] = copy(v) end return new end diff --git a/LCD4WoW.lua b/LCD4WoW.lua index 5baee3f..3ab5220 100644 --- a/LCD4WoW.lua +++ b/LCD4WoW.lua @@ -5,7 +5,7 @@ local LibDBIcon = LibStub("LibDBIcon-1.0") local LSM = _G.LibStub("LibSharedMedia-3.0") local LDB = LibStub:GetLibrary("LibDataBroker-1.1") local AceConfigDialog = LibStub("AceConfigDialog-3.0") -local LibError = LibStub("StarLibError-1.0") +local LibError = LibStub("LibScriptableDisplayError-1.0") local LibQTip = LibStub("LibQTip-1.0") local _G = _G diff --git a/LCD4WoW.toc b/LCD4WoW.toc index bade340..267a006 100644 --- a/LCD4WoW.toc +++ b/LCD4WoW.toc @@ -5,7 +5,7 @@ ## Author: Starlon ## Version: 1.0 ## X-LCD4WoW-Version: @project-version@ -## OptionalDeps: Ace3, LibTalentQuery-1.0, LibMobHealth-4.0, DBM-Core, BigWigs, StarLibs-1.0, StarTip, ResourceServer +## OptionalDeps: Ace3, LibTalentQuery-1.0, LibMobHealth-4.0, DBM-Core, BigWigs, LibScriptableDisplay-1.0, StarTip, ResourceServer ## SavedVariables: LCD4WoWDB Localization\enUS.lua diff --git a/config.lua b/config.lua index 86864a3..c1914a4 100644 --- a/config.lua +++ b/config.lua @@ -51,29 +51,48 @@ LCD4WoW.config = { ["transition_speed"] = 50, ["widgets"] = {"widget_key_up", "widget_key_down", "widget_resources_timer"}, ["layouts"] = {"layout_lcd4wow", "layout_histogram_cpu", "layout_histogram_mem"}, - ["font"] = {normal="Interface\\AddOns\\LCD4WoW\\Fonts\\ttf-bitstream-vera-1.10\\VeraMo.ttf", bold="Interface\\AddOns\\LCD4WoW\\Fonts\\ttf-bitstream-vera-1.10\\VeraMoBd.ttf", size=12}, + ["font"] = {normal="Interface\\AddOns\\LCD4WoW\\Fonts\\sfd\\FreeMonoBold.ttf", bold="Interface\\AddOns\\LCD4WoW\\Fonts\\ttf-bitstream-vera-1.10\\VeraMoBd.ttf", size=10}, ["points"] = {{"CENTER", "UIParent", "CENTER", 0, 200}} }, ["display_character"] = { ["addon"] = "LCD4WoW", ["enabled"] = true, ["driver"] = "character", - ["layers"] = 1, + ["layers"] = 2, ["background"] = "d9ccf16f", - ["pixel"] = 1, + ["pixel"] = 2, ["row"] = -50, ["col"] = 0, - ["rows"] = 2, - ["cols"] = 20, + ["rows"] = 6, + ["cols"] = 30, ["update"] = 0, ["timeout"] = 7000, ["transition_speed"] = 50, ["widgets"] = {"widget_key_up", "widget_key_down", "widget_resources_timer"}, - ["layouts"] = {"layout_tiny"}, - ["points"] = {{"CENTER", UIParent, "CENTER"}}, + ["layouts"] = {"layout_lcd4wow", "layout_histogram_cpu", "layout_histogram_mem"}, + ["points"] = {{"CENTER", "UIParent", "CENTER"}}, ["parent"] = "UIParent", ["strata"] = 1 }, + ["display_character_tiny"] = { + ["addon"] = "LCD4WoW", + ["enabled"] = true, + ["driver"] = "character", + ["layers"] = 1, + ["background"] = "d9ccf16f", + ["pixel"] = 2, + ["row"] = 0, + ["col"] = 0, + ["rows"] = 2, + ["cols"] = 20, + ["update"] = 0, + ["timeout"] = 0, + ["transition_speed"] = 50, + ["layouts"] = {"layout_tiny"}, + ["points"] = {{"CENTER", "UIParent", "CENTER"}}, + ["parent"] = "UIParent", + ["strata"] = 1 + }, ["display_icon"] = { ["addon"] = "LCD4WoW", ["enabled"] = false, @@ -91,7 +110,7 @@ LCD4WoW.config = { }, ["display_health"] = { ["addon"] = "LCD4WoW", - ["enabled"] = true, + ["enabled"] = false, ["driver"] = "character", ["pixel"] = 1, ["layers"] = 1, @@ -105,7 +124,7 @@ LCD4WoW.config = { }, ["display_mana"] = { ["addon"] = "LCD4WoW", - ["enabled"] = true, + ["enabled"] = false, ["driver"] = "character", ["pixel"] = 1, ["layers"] = 1, diff --git a/embeds.xml b/embeds.xml index e56271e..e174c0d 100644 --- a/embeds.xml +++ b/embeds.xml @@ -1,7 +1,7 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> -<Include file = "Libs\StarLibs-1.0\StarLibs-1.0.xml"/> +<Include file = "Libs\LibScriptableDisplay-1.0\LibScriptableDisplay-1.0.xml"/> <Include file = "Libs\AceAddon-3.0\AceAddon-3.0.xml"/> <Include file = "Libs\AceEvent-3.0\AceEvent-3.0.xml"/>