From ae429dcfbe4d0ac29b70d0f2c5bf2f2e904bf75a Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 16 Feb 2013 11:19:28 +0400 Subject: [PATCH] Some locales and some changes to character frame options Commented your stuff in options, put mine. Imo we better use blizz globals there. --- ElvUI_SLE/locales/english.lua | 11 +- ElvUI_SLE/locales/russian.lua | 19 +- ElvUI_SLE/modules/characterframe/options.lua | 295 +++++++++++++------------- 3 files changed, 173 insertions(+), 152 deletions(-) diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 3963a78..b3ca26f 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -69,15 +69,15 @@ L["Show/Hide this frame during Pet Battles."] = true --Character Frame Options L["CFO_DESC"] = "This section will added different options/features to the character sheet. Here you can show item level and durability of your items for a quick glance." L["Character Frame Options"] = true -L["Enable/Disable Character Frame Options"] = true -L["Item Level"] = true -L["Show/Hide Item Levels"] = true +--L["Enable/Disable Character Frame Options"] = true +--L["Item Level"] = true +--L["Show/Hide Item Levels"] = true L['Font'] = true --L['Fonts'] is localized in elvui but not Font L["The font that the item level will use."] = true L["Set the font size that the item level will use."] = true L["Set the font outline that the item level will use."] = true -L["Item Durability"] = true -L["Show/Hide Item Durability"] = true +--L["Item Durability"] = true +--L["Show/Hide Item Durability"] = true L["The font that the item durability will use."] = true L["Set the font size that the item durability will use."] = true L["Set the font outline that the item durability will use."] = true @@ -89,6 +89,7 @@ L["Amount of messages to save. Set to 0 to disable."] = true --Datatexts-- L["Bosses killed: "] = true +L["You didn't select any instance to track."] = true L["This LFR isn't available for your lever/gear."] = true L["SLE_AUTHOR_INFO"] = "Shadow & Light Edit by Darth Predator & Repooc" L["SLE_CONTACTS"] = [=[Bug reports, suggestions and other stuff accepted via: diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index c9e33a0..34eb37a 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -66,14 +66,31 @@ L["Transparent"] = "Прозрачный" L["Hide in Pet Batlle"] = "Прятать в битвах питомцев" L["Show/Hide this frame during Pet Battles."] = "Показать/скрыть этот фрейм в битвах питомцев" +--Character Frame Options-- +L["CFO_DESC"] = "Дополнительные опции окна персонажа. Вы можете включить отображение уровня и прочности предметов." +L["Character Frame Options"] = "Настройки окна персонажа" +--L["Enable/Disable Character Frame Options"] = true +--L["Item Level"] = "Уровень предметов" +--L["Show/Hide Item Levels"] = true +L['Font'] = "Шрифт" --L['Fonts'] is localized in elvui but not Font +L["The font that the item level will use."] = "Шрифт уровня предметов." +L["Set the font size that the item level will use."] = "Размер шрифта уровня предметов." +L["Set the font outline that the item level will use."] = "Граница шрифта уровня предметов." +--L["Item Durability"] = true +--L["Show/Hide Item Durability"] = true +L["The font that the item durability will use."] = "Шрифт прочности предметов." +L["Set the font size that the item durability will use."] = "Размер шрифта прочности предметов." +L["Set the font outline that the item durability will use."] = "Граница шрифта прочности предметов." + --Chat-- L["Chat Options"] = "Настройки чата" L["Chat Editbox History"] = "История чата" L["Amount of messages to save. Set to 0 to disable."] = "Количество сообщений, введенных вами, которое будет сохранено между сеансами" --Datatexts-- -L["This LFR isn't available for your lever/gear."] = "Это подземелье не доступно для Вашего уровня или экипировки." L["Bosses killed: "] = "Боссов убито: " +L["You didn't select any instance to track."] = "Вы не выбрали подземелья для отслеживания" +L["This LFR isn't available for your lever/gear."] = "Это подземелье не доступно для Вашего уровня или экипировки." L["SLE_AUTHOR_INFO"] = "Редакция \"Тень и Свет\" от Darth Predator и Repooc" L["SLE_CONTACTS"] = [=[При возникновении вопросов, предложений и прочего обращаться: - Личное сообщение на форуме TukUI (tukui.org), ник Darth Predator или Repooc diff --git a/ElvUI_SLE/modules/characterframe/options.lua b/ElvUI_SLE/modules/characterframe/options.lua index fdd6007..5d2522c 100644 --- a/ElvUI_SLE/modules/characterframe/options.lua +++ b/ElvUI_SLE/modules/characterframe/options.lua @@ -1,147 +1,150 @@ -local E, L, V, P, G, _ = unpack(ElvUI); -local CFO = E:GetModule('CharacterFrameOptions') - ---UI Buttons -E.Options.args.sle.args.characterframeoptions = { - type = "group", - name = L["Character Frame"], - order = 2, - args = { - header = { - order = 1, - type = "header", - name = L["Character Frame Options"], - }, - intro = { - order = 2, - type = 'description', - name = L['CFO_DESC'], - }, - enable = { - order = 3, - type = "toggle", - name = L["Enable"], - desc = L["Enable/Disable Character Frame Options"], - get = function(info) return E.private.sle.characterframeoptions.enable end, - set = function(info, value) E.private.sle.characterframeoptions.enable = value; E:StaticPopup_Show("PRIVATE_RL") end - }, - itemlevel = { - type = "group", - name = L["Item Level"], - order = 4, - guiInline = true, - disabled = function() return not E.private.sle.characterframeoptions.enable end, - args = { - enable = { - order = 1, - type = "toggle", - name = L["Enable"], - desc = L["Show/Hide Item Levels"], - get = function(info) return E.db.sle.characterframeoptions.itemlevel.enable end, - set = function(info, value) E.db.sle.characterframeoptions.itemlevel.enable = value; CFO:ToggleCFO() end - }, - fontGroup = { - order = 2, - type = 'group', - guiInline = true, - disabled = function() return not E.db.sle.characterframeoptions.itemlevel.enable end, - name = L['Font'], - args = { - font = { - type = "select", dialogControl = 'LSM30_Font', - order = 1, - name = L["Fonts"], - desc = L["The font that the item level will use."], - values = AceGUIWidgetLSMlists.font, - get = function(info) return E.db.sle.characterframeoptions.itemlevel.font end, - set = function(info, value) E.db.sle.characterframeoptions.itemlevel.font = value; CFO:UpdateItemLevelFont(); end, - }, - fontSize = { - order = 2, - name = L["Font Size"], - desc = L["Set the font size that the item level will use."], - type = "range", - min = 6, max = 22, step = 1, - get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontSize end, - set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontSize = value; CFO:UpdateItemLevelFont(); end, - }, - fontOutline = { - order = 3, - name = L["Font Outline"], - desc = L["Set the font outline that the item level will use."], - type = "select", - values = { - ['NONE'] = L['None'], - ['OUTLINE'] = 'OUTLINE', - ['MONOCHROME'] = 'MONOCHROME', - ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE', - ['THICKOUTLINE'] = 'THICKOUTLINE', - }, - get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontOutline end, - set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontOutline = value; CFO:UpdateItemLevelFont(); end, - }, - }, - }, - }, - }, - itemdurabilty = { - type = "group", - name = L["Item Durability"], - order = 5, - guiInline = true, - disabled = function() return not E.private.sle.characterframeoptions.enable end, - args = { - enable = { - order = 1, - type = "toggle", - name = L["Enable"], - desc = L["Show/Hide Item Durability"], - get = function(info) return E.db.sle.characterframeoptions.itemdurability.enable end, - set = function(info, value) E.db.sle.characterframeoptions.itemdurability.enable = value; CFO:ToggleCFO() end, - }, - fontGroup = { - order = 2, - type = 'group', - guiInline = true, - disabled = function() return not E.db.sle.characterframeoptions.itemdurability.enable end, - name = L['Font'], - args = { - font = { - type = "select", dialogControl = 'LSM30_Font', - order = 2, - name = L["Font"], - desc = L["The font that the item durability will use."], - values = AceGUIWidgetLSMlists.font, - get = function(info) return E.db.sle.characterframeoptions.itemdurability.font end, - set = function(info, value) E.db.sle.characterframeoptions.itemdurability.font = value; CFO:UpdateItemDurabilityFont(); end, - }, - fontSize = { - order = 2, - name = L["Font Size"], - desc = L["Set the font size that the item durability will use."], - type = "range", - min = 6, max = 22, step = 1, - get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontSize end, - set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontSize = value; CFO:UpdateItemDurabilityFont(); end, - }, - fontOutline = { - order = 3, - name = L["Font Outline"], - desc = L["Set the font outline that the item durability will use."], - type = "select", - values = { - ['NONE'] = L['None'], - ['OUTLINE'] = 'OUTLINE', - ['MONOCHROME'] = 'MONOCHROME', - ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE', - ['THICKOUTLINE'] = 'THICKOUTLINE', - }, - get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontOutline end, - set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontOutline = value; CFO:UpdateItemDurabilityFont(); end, - }, - }, - }, - }, - }, - }, +local E, L, V, P, G, _ = unpack(ElvUI); +local CFO = E:GetModule('CharacterFrameOptions') + +--UI Buttons +E.Options.args.sle.args.characterframeoptions = { + type = "group", + name = L["Character Frame"], + order = 2, + args = { + header = { + order = 1, + type = "header", + name = L["Character Frame Options"], + }, + intro = { + order = 2, + type = 'description', + name = L['CFO_DESC'], + }, + enable = { + order = 3, + type = "toggle", + name = L["Enable"], + desc = L["Enable/Disable Character Frame Options"], + get = function(info) return E.private.sle.characterframeoptions.enable end, + set = function(info, value) E.private.sle.characterframeoptions.enable = value; E:StaticPopup_Show("PRIVATE_RL") end + }, + itemlevel = { + type = "group", + --name = L["Item Level"], + name = STAT_AVERAGE_ITEM_LEVEL, + order = 4, + guiInline = true, + disabled = function() return not E.private.sle.characterframeoptions.enable end, + args = { + enable = { + order = 1, + type = "toggle", + name = L["Enable"], + --desc = L["Show/Hide Item Levels"], + get = function(info) return E.db.sle.characterframeoptions.itemlevel.enable end, + set = function(info, value) E.db.sle.characterframeoptions.itemlevel.enable = value; CFO:ToggleCFO() end + }, + fontGroup = { + order = 2, + type = 'group', + guiInline = true, + disabled = function() return not E.db.sle.characterframeoptions.itemlevel.enable end, + name = L['Font'], + args = { + font = { + type = "select", dialogControl = 'LSM30_Font', + order = 1, + --name = L["Fonts"], + name = L["Font"], + desc = L["The font that the item level will use."], + values = AceGUIWidgetLSMlists.font, + get = function(info) return E.db.sle.characterframeoptions.itemlevel.font end, + set = function(info, value) E.db.sle.characterframeoptions.itemlevel.font = value; CFO:UpdateItemLevelFont(); end, + }, + fontSize = { + order = 2, + name = L["Font Size"], + desc = L["Set the font size that the item level will use."], + type = "range", + min = 6, max = 22, step = 1, + get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontSize end, + set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontSize = value; CFO:UpdateItemLevelFont(); end, + }, + fontOutline = { + order = 3, + name = L["Font Outline"], + desc = L["Set the font outline that the item level will use."], + type = "select", + values = { + ['NONE'] = L['None'], + ['OUTLINE'] = 'OUTLINE', + ['MONOCHROME'] = 'MONOCHROME', + ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE', + ['THICKOUTLINE'] = 'THICKOUTLINE', + }, + get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontOutline end, + set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontOutline = value; CFO:UpdateItemLevelFont(); end, + }, + }, + }, + }, + }, + itemdurabilty = { + type = "group", + --name = L["Item Durability"], + name = DURABILITY, + order = 5, + guiInline = true, + disabled = function() return not E.private.sle.characterframeoptions.enable end, + args = { + enable = { + order = 1, + type = "toggle", + name = L["Enable"], + --desc = L["Show/Hide Item Durability"], + get = function(info) return E.db.sle.characterframeoptions.itemdurability.enable end, + set = function(info, value) E.db.sle.characterframeoptions.itemdurability.enable = value; CFO:ToggleCFO() end, + }, + fontGroup = { + order = 2, + type = 'group', + guiInline = true, + disabled = function() return not E.db.sle.characterframeoptions.itemdurability.enable end, + name = L['Font'], + args = { + font = { + type = "select", dialogControl = 'LSM30_Font', + order = 2, + name = L["Font"], + desc = L["The font that the item durability will use."], + values = AceGUIWidgetLSMlists.font, + get = function(info) return E.db.sle.characterframeoptions.itemdurability.font end, + set = function(info, value) E.db.sle.characterframeoptions.itemdurability.font = value; CFO:UpdateItemDurabilityFont(); end, + }, + fontSize = { + order = 2, + name = L["Font Size"], + desc = L["Set the font size that the item durability will use."], + type = "range", + min = 6, max = 22, step = 1, + get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontSize end, + set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontSize = value; CFO:UpdateItemDurabilityFont(); end, + }, + fontOutline = { + order = 3, + name = L["Font Outline"], + desc = L["Set the font outline that the item durability will use."], + type = "select", + values = { + ['NONE'] = L['None'], + ['OUTLINE'] = 'OUTLINE', + ['MONOCHROME'] = 'MONOCHROME', + ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE', + ['THICKOUTLINE'] = 'THICKOUTLINE', + }, + get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontOutline end, + set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontOutline = value; CFO:UpdateItemDurabilityFont(); end, + }, + }, + }, + }, + }, + }, } \ No newline at end of file -- 1.7.9.5