- Added an option for Numeral System.
This commit is contained in:
@@ -246,3 +246,9 @@ returns a table containing the texture file and coords for a arena.
|
||||
|
||||
Details:GetBattlegroundInfo (mapid)
|
||||
returns a table containing the texture file and coords for a battleground.
|
||||
|
||||
Details:GelectNumericalSystem()
|
||||
returns a number indicating which are the current numerical system: 1 for american/european, 2 for asian.
|
||||
|
||||
Details:SelectNumericalSystem (system)
|
||||
Set the numerical system to be used, 1 for american/european, 2 for asian.
|
||||
+136
-70
@@ -84,31 +84,33 @@
|
||||
return _table
|
||||
end
|
||||
|
||||
_detalhes.ToKFunctions = {}
|
||||
|
||||
--krKR by @yuk6196 (http://wow.curseforge.com/profiles/yuk6196)
|
||||
function _detalhes:UseEastAsianNumericalSystem()
|
||||
|
||||
function _detalhes:ToK (numero)
|
||||
if (numero > 100000000) then
|
||||
return _string_format ("%.2f", numero/100000000) .. Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.2f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 10000) then
|
||||
return _string_format ("%.2f", numero/10000) ..Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.2f", numero/10000) .. "만"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.1f", numero/1000) ..Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.1f", numero/1000) .. "천"
|
||||
end
|
||||
return numero
|
||||
end
|
||||
|
||||
function _detalhes:ToK2 (numero)
|
||||
if (numero > 99999999) then
|
||||
return _string_format ("%.2f", numero/100000000) .. Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.2f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 999999) then
|
||||
return _string_format ("%.2f", numero/10000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.2f", numero/10000) .. "만"
|
||||
elseif (numero > 99999) then
|
||||
return _math_floor (numero/10000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _math_floor (numero/10000) .. "만"
|
||||
elseif (numero > 9999) then
|
||||
return _string_format ("%.1f", (numero/10000)) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.1f", (numero/10000)) .. "만"
|
||||
elseif (numero > 999) then
|
||||
return _string_format ("%.1f", (numero/1000)) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.1f", (numero/1000)) .. "천"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
@@ -116,37 +118,37 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToK0 (numero)
|
||||
if (numero > 100000000) then
|
||||
return _string_format ("%.0f", numero/100000000) ..Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.0f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 10000) then
|
||||
return _string_format ("%.0f", numero/10000) ..Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.0f", numero/10000) .. "만"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.0f", numero/1000) ..Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.0f", numero/1000) .. "천"
|
||||
end
|
||||
return _string_format ("%.0f", numero)
|
||||
end
|
||||
|
||||
function _detalhes:ToKMin (numero)
|
||||
if (numero > 100000000) then
|
||||
return _string_format ("%.2f", numero/100000000) ..Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.2f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 10000) then
|
||||
return _string_format ("%.2f", numero/10000) ..Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.2f", numero/10000) .. "만"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.1f", numero/1000) ..Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.1f", numero/1000) .. "천"
|
||||
end
|
||||
return numero
|
||||
end
|
||||
|
||||
function _detalhes:ToK2Min (numero)
|
||||
if (numero > 99999999) then
|
||||
return _string_format ("%.2f", numero/100000000) .. Loc ["STRING_ABBREVIATE_LETTER_B_LOWER"]
|
||||
return _string_format ("%.2f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 999999) then
|
||||
return _string_format ("%.2f", numero/10000) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.2f", numero/10000) .. "만"
|
||||
elseif (numero > 99999) then
|
||||
return _math_floor (numero/10000) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _math_floor (numero/10000) .. "만"
|
||||
elseif (numero > 9999) then
|
||||
return _string_format ("%.1f", (numero/10000)) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.1f", (numero/10000)) .. "만"
|
||||
elseif (numero > 999) then
|
||||
return _string_format ("%.1f", (numero/1000)) .. Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.1f", (numero/1000)) .. "천"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
@@ -154,11 +156,11 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToK0Min (numero)
|
||||
if (numero > 100000000) then
|
||||
return _string_format ("%.0f", numero/100000000) ..Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.0f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 10000) then
|
||||
return _string_format ("%.0f", numero/10000) ..Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.0f", numero/10000) .. "만"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.0f", numero/1000) ..Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.0f", numero/1000) .. "천"
|
||||
end
|
||||
return _string_format ("%.0f", numero)
|
||||
end
|
||||
@@ -166,11 +168,11 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToKReport (numero)
|
||||
if (numero > 100000000) then
|
||||
return _string_format ("%.2f", numero/100000000) ..Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format ("%.2f", numero/100000000) .. "ì–µ"
|
||||
elseif (numero > 10000) then
|
||||
return _sting_format ("%.1f", numero/10000) ..Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.1f", numero/10000) .. "만"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.0f", numero/1000) ..Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.0f", numero/1000) .. "천"
|
||||
end
|
||||
return numero
|
||||
end
|
||||
@@ -179,9 +181,9 @@
|
||||
n = _math_floor (n)
|
||||
if (custom) then
|
||||
if (n > 99999999) then
|
||||
return _string_format (custom, n/100000000) .. Loc ["STRING_ABBREVIATE_LETTER_B_UPPER"]
|
||||
return _string_format (custom, n/100000000) .. "ì–µ"
|
||||
elseif (n > 9999) then
|
||||
return _string_format (custom, n/10000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format (custom, n/10000) .. "만"
|
||||
elseif (n > 999) then
|
||||
return _string_format (custom, (n/1000))
|
||||
else
|
||||
@@ -191,31 +193,53 @@
|
||||
return _detalhes.ToKFunctions [_detalhes.ps_abbreviation] (nil, n)
|
||||
end
|
||||
end
|
||||
|
||||
--> no changes
|
||||
function _detalhes:NoToK (numero)
|
||||
return _math_floor (numero)
|
||||
end
|
||||
-- thanks http://richard.warburton.it
|
||||
function _detalhes:comma_value (n)
|
||||
if (not n) then return "0" end
|
||||
n = _math_floor (n)
|
||||
if (n == 0) then
|
||||
return "0"
|
||||
end
|
||||
local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
|
||||
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
|
||||
end
|
||||
|
||||
wipe (_detalhes.ToKFunctions)
|
||||
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.NoToK)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK2)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK0)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToKMin)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK2Min)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK0Min)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.comma_value)
|
||||
|
||||
end
|
||||
|
||||
--> load specific ToK functions for East Asia region
|
||||
if (LibStub("AceLocale-3.0"):NewLocale ("Details", "koKR")) then
|
||||
_detalhes:UseEastAsianNumericalSystem()
|
||||
else
|
||||
--> load the defaults for all other languages
|
||||
|
||||
function _detalhes:UseWestNumericalSystem()
|
||||
--> short numbers
|
||||
function _detalhes:ToK (numero)
|
||||
if (numero > 1000000) then
|
||||
return _string_format ("%.2f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.2f", numero/1000000) .. "M"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.1f", numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.1f", numero/1000) .. "K"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
|
||||
function _detalhes:ToK2 (numero)
|
||||
if (numero > 999999) then
|
||||
return _string_format ("%.2f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.2f", numero/1000000) .. "M"
|
||||
elseif (numero > 99999) then
|
||||
return _math_floor (numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _math_floor (numero/1000) .. "K"
|
||||
elseif (numero > 999) then
|
||||
return _string_format ("%.1f", (numero/1000)) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.1f", (numero/1000)) .. "K"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
@@ -223,29 +247,29 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToK0 (numero)
|
||||
if (numero > 1000000) then
|
||||
return _string_format ("%.0f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.0f", numero/1000000) .. "M"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.0f", numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.0f", numero/1000) .. "K"
|
||||
end
|
||||
return _string_format ("%.0f", numero)
|
||||
end
|
||||
|
||||
function _detalhes:ToKMin (numero)
|
||||
if (numero > 1000000) then
|
||||
return _string_format ("%.2f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.2f", numero/1000000) .. "m"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.1f", numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.1f", numero/1000) .. "k"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
|
||||
function _detalhes:ToK2Min (numero)
|
||||
if (numero > 999999) then
|
||||
return _string_format ("%.2f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.2f", numero/1000000) .. "m"
|
||||
elseif (numero > 99999) then
|
||||
return _math_floor (numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _math_floor (numero/1000) .. "k"
|
||||
elseif (numero > 999) then
|
||||
return _string_format ("%.1f", (numero/1000)) .. Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.1f", (numero/1000)) .. "k"
|
||||
end
|
||||
return _string_format ("%.1f", numero)
|
||||
end
|
||||
@@ -253,9 +277,9 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToK0Min (numero)
|
||||
if (numero > 1000000) then
|
||||
return _string_format ("%.0f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_LOWER"]
|
||||
return _string_format ("%.0f", numero/1000000) .. "m"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.0f", numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_LOWER"]
|
||||
return _string_format ("%.0f", numero/1000) .. "k"
|
||||
end
|
||||
return _string_format ("%.0f", numero)
|
||||
end
|
||||
@@ -263,9 +287,9 @@
|
||||
--> short numbers no numbers after comma
|
||||
function _detalhes:ToKReport (numero)
|
||||
if (numero > 1000000) then
|
||||
return _string_format ("%.2f", numero/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format ("%.2f", numero/1000000) .. "M"
|
||||
elseif (numero > 1000) then
|
||||
return _string_format ("%.1f", numero/1000) .. Loc ["STRING_ABBREVIATE_LETTER_K_UPPER"]
|
||||
return _string_format ("%.1f", numero/1000) .. "K"
|
||||
end
|
||||
return numero
|
||||
end
|
||||
@@ -274,7 +298,7 @@
|
||||
n = _math_floor (n)
|
||||
if (custom) then
|
||||
if (n > 999999) then
|
||||
return _string_format (custom, n/1000000) .. Loc ["STRING_ABBREVIATE_LETTER_M_UPPER"]
|
||||
return _string_format (custom, n/1000000) .. "M"
|
||||
elseif (n > 999) then
|
||||
return _string_format (custom, (n/1000))
|
||||
else
|
||||
@@ -284,36 +308,78 @@
|
||||
return _detalhes.ToKFunctions [_detalhes.ps_abbreviation] (nil, n)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--------end of ToK functions----
|
||||
|
||||
--> no changes
|
||||
function _detalhes:NoToK (numero)
|
||||
return _math_floor (numero)
|
||||
end
|
||||
-- thanks http://richard.warburton.it
|
||||
function _detalhes:comma_value (n)
|
||||
if (not n) then return "0" end
|
||||
n = _math_floor (n)
|
||||
if (n == 0) then
|
||||
return "0"
|
||||
|
||||
--> no changes
|
||||
function _detalhes:NoToK (numero)
|
||||
return _math_floor (numero)
|
||||
end
|
||||
local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
|
||||
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
|
||||
|
||||
-- thanks http://richard.warburton.it
|
||||
function _detalhes:comma_value (n)
|
||||
if (not n) then return "0" end
|
||||
n = _math_floor (n)
|
||||
if (n == 0) then
|
||||
return "0"
|
||||
end
|
||||
local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
|
||||
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
|
||||
end
|
||||
|
||||
wipe (_detalhes.ToKFunctions)
|
||||
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.NoToK)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK2)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK0)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToKMin)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK2Min)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.ToK0Min)
|
||||
tinsert (_detalhes.ToKFunctions, _detalhes.comma_value)
|
||||
|
||||
--
|
||||
end
|
||||
|
||||
--> load western as default, the proper method is loaded within the profile
|
||||
_detalhes:UseWestNumericalSystem()
|
||||
|
||||
function _detalhes:GetCurrentToKFunction()
|
||||
return _detalhes.ToKFunctions [_detalhes.ps_abbreviation]
|
||||
end
|
||||
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
--> numerical system
|
||||
|
||||
_detalhes.ToKFunctions = {_detalhes.NoToK, _detalhes.ToK, _detalhes.ToK2, _detalhes.ToK0, _detalhes.ToKMin, _detalhes.ToK2Min, _detalhes.ToK0Min, _detalhes.comma_value}
|
||||
function _detalhes:GetNumericalSystem()
|
||||
return _detalhes.numerical_system
|
||||
end
|
||||
|
||||
function _detalhes:SelectNumericalSystem (system)
|
||||
if (not system or type (system) ~= "number") then
|
||||
system = _detalhes.numerical_system or 1
|
||||
end
|
||||
|
||||
_detalhes.numerical_system = system
|
||||
|
||||
if (system == 1) then
|
||||
_detalhes:UseWestNumericalSystem()
|
||||
elseif (system == 2) then
|
||||
_detalhes:UseEastAsianNumericalSystem()
|
||||
end
|
||||
|
||||
_detalhes:UpdateToKFunctions()
|
||||
end
|
||||
|
||||
function _detalhes:UpdateToKFunctions()
|
||||
_detalhes.atributo_damage:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_heal:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_energy:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_misc:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_custom:UpdateSelectedToKFunction()
|
||||
_detalhes:AtualizaGumpPrincipal (-1, true)
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
--------end of ToK functions----
|
||||
|
||||
--> replacing data for custom texts
|
||||
_detalhes.string = {}
|
||||
|
||||
|
||||
@@ -539,6 +539,9 @@ function _detalhes:ApplyProfile (profile_name, nosave, is_copy)
|
||||
|
||||
--> update player detail window
|
||||
_detalhes:ApplyPDWSkin()
|
||||
|
||||
--> update the numerical system
|
||||
_detalhes:SelectNumericalSystem()
|
||||
|
||||
if (_detalhes.initializing) then
|
||||
_detalhes.profile_loaded = true
|
||||
@@ -914,11 +917,12 @@ local default_profile = {
|
||||
--> item level tracker
|
||||
track_item_level = true,
|
||||
|
||||
--> text sizes
|
||||
--> text settings
|
||||
font_sizes = {menus = 10},
|
||||
font_faces = {menus = "Friz Quadrata TT"},
|
||||
ps_abbreviation = 3,
|
||||
total_abbreviation = 2,
|
||||
numerical_system = 1,
|
||||
|
||||
--> performance
|
||||
use_row_animations = false,
|
||||
|
||||
+33
-12
@@ -3955,13 +3955,8 @@ function window:CreateFrame1()
|
||||
local onSelectTimeAbbreviation = function (_, _, abbreviationtype)
|
||||
_detalhes.ps_abbreviation = abbreviationtype
|
||||
|
||||
_detalhes.atributo_damage:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_heal:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_energy:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_misc:UpdateSelectedToKFunction()
|
||||
_detalhes.atributo_custom:UpdateSelectedToKFunction()
|
||||
_detalhes:UpdateToKFunctions()
|
||||
|
||||
_detalhes:AtualizaGumpPrincipal (-1, true)
|
||||
_detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance)
|
||||
end
|
||||
local icon = [[Interface\COMMON\mini-hourglass]]
|
||||
@@ -3982,11 +3977,12 @@ function window:CreateFrame1()
|
||||
end
|
||||
|
||||
local d = g:NewDropDown (frame1, _, "$parentAbbreviateDropdown", "dpsAbbreviateDropdown", 160, dropdown_height, buildAbbreviationMenu, _detalhes.ps_abbreviation, options_dropdown_template)
|
||||
|
||||
frame1.dpsAbbreviateDropdown:SetPoint ("left", frame1.dpsAbbreviateLabel, "right", 2, 0)
|
||||
|
||||
window:CreateLineBackground2 (frame1, "dpsAbbreviateDropdown", "dpsAbbreviateLabel", Loc ["STRING_OPTIONS_PS_ABBREVIATE_DESC"])
|
||||
|
||||
|
||||
--> avatar
|
||||
|
||||
local avatar = NickTag:GetNicknameAvatar (UnitGUID ("player"), NICKTAG_DEFAULT_AVATAR, true)
|
||||
local background, cords, color = NickTag:GetNicknameBackground (UnitGUID ("player"), NICKTAG_DEFAULT_BACKGROUND, NICKTAG_DEFAULT_BACKGROUND_CORDS, {1, 1, 1, 1}, true)
|
||||
|
||||
@@ -3995,6 +3991,29 @@ function window:CreateFrame1()
|
||||
frame1.avatarPreview2.texcoord = cords
|
||||
frame1.avatarPreview2:SetVertexColor (unpack (color))
|
||||
|
||||
--> numerical system
|
||||
g:NewLabel (frame1, _, "$parentNumericalSystemLabel", "NumericalSystemLabel", Loc ["STRING_NUMERALSYSTEM"], "GameFontHighlightLeft")
|
||||
|
||||
local onSelectNumeralSystem = function (_, _, systemNumber)
|
||||
_detalhes:SelectNumericalSystem (systemNumber)
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
local numeralSystems = {
|
||||
{value = 1, label = Loc ["STRING_NUMERALSYSTEM_ARABIC_WESTERN"], desc = "1K = 1.000 \n10K = 10.000 \n100K = 100.000 \n1M = 1.000.000", onclick = onSelectNumeralSystem, icon = icon, iconcolor = iconcolor, iconsize = iconsize},
|
||||
{value = 2, label = Loc ["STRING_NUMERALSYSTEM_MYRIAD_EASTASIA"], desc = "1천 = 1.000 \n1만 = 10.000 \n10만 = 100.000 \n100만 = 1.000.000", onclick = onSelectNumeralSystem, icon = icon, iconcolor = iconcolor, iconsize = iconsize},
|
||||
}
|
||||
|
||||
local buildNumeralSystemsMenu = function()
|
||||
return numeralSystems
|
||||
end
|
||||
|
||||
local d = g:NewDropDown (frame1, _, "$parentNumericalSystemOfADropdown", "NumericalSystemDropdown", 160, dropdown_height, buildNumeralSystemsMenu, _detalhes.numerical_system, options_dropdown_template)
|
||||
d:SetPoint ("left", frame1.NumericalSystemLabel, "right", 2, 0)
|
||||
window:CreateLineBackground2 (frame1, "NumericalSystemDropdown", "NumericalSystemLabel", Loc ["STRING_NUMERALSYSTEM_DESC"])
|
||||
|
||||
--> animate bars
|
||||
|
||||
g:NewLabel (frame1, _, "$parentAnimateLabel", "animateLabel", Loc ["STRING_OPTIONS_ANIMATEBARS"], "GameFontHighlightLeft")
|
||||
@@ -4221,11 +4240,12 @@ function window:CreateFrame1()
|
||||
|
||||
{"maxInstancesLabel", 7, true},
|
||||
{"dpsAbbreviateLabel", 8},
|
||||
{"NumericalSystemLabel", 9},
|
||||
|
||||
{frame1.ToolsLabel, 9, true},
|
||||
{frame1.EraseDataLabel, 10},
|
||||
{frame1.BookmarkButton, 11},
|
||||
{frame1.ClassColorsButton, 12},
|
||||
{frame1.ToolsLabel, 10, true},
|
||||
{frame1.EraseDataLabel, 11},
|
||||
{frame1.BookmarkButton, 12},
|
||||
{frame1.ClassColorsButton, 13},
|
||||
|
||||
--{"WindowControlsLabel", 9, true},
|
||||
--{"LockButton", 10},
|
||||
@@ -10370,6 +10390,7 @@ end --> if not window
|
||||
_G.DetailsOptionsWindow1Slider.MyObject:SetValue (_detalhes.segments_amount) --segments
|
||||
_G.DetailsOptionsWindow1SegmentsLockedSlider.MyObject:SetValue (_detalhes.instances_segments_locked) --locked segments
|
||||
|
||||
_G.DetailsOptionsWindow1NumericalSystemOfADropdown.MyObject:Select (_detalhes.numerical_system)
|
||||
|
||||
_G.DetailsOptionsWindow1WheelSpeedSlider.MyObject:SetValue (_detalhes.scroll_speed)
|
||||
_G.DetailsOptionsWindow1SliderMaxInstances.MyObject:SetValue (_detalhes.instances_amount)
|
||||
|
||||
+105
-3
@@ -463,8 +463,16 @@ local window_openned_at = time()
|
||||
continuous:SetChecked (true)
|
||||
end
|
||||
|
||||
chronometer:SetScript ("OnClick", function() continuous:SetChecked (false); _detalhes.time_type = 1 end)
|
||||
continuous:SetScript ("OnClick", function() chronometer:SetChecked (false); _detalhes.time_type = 2 end)
|
||||
chronometer:SetScript ("OnClick", function()
|
||||
chronometer:SetChecked (true);
|
||||
continuous:SetChecked (false);
|
||||
_detalhes.time_type = 1
|
||||
end)
|
||||
continuous:SetScript ("OnClick", function()
|
||||
continuous:SetChecked (true);
|
||||
chronometer:SetChecked (false);
|
||||
_detalhes.time_type = 2
|
||||
end)
|
||||
|
||||
--
|
||||
|
||||
@@ -502,7 +510,7 @@ local window_openned_at = time()
|
||||
pleasewait:SetText ("")
|
||||
pleasewait:Hide()
|
||||
end
|
||||
end)
|
||||
end)
|
||||
|
||||
pages [#pages+1] = {pleasewait, free_frame3, thedude, sword_icon, ampulheta, texto2, chronometer, continuous, chronometer_text, continuous_text, window.changemind2Label}
|
||||
|
||||
@@ -510,6 +518,100 @@ local window_openned_at = time()
|
||||
widget:Hide()
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--> numeral system
|
||||
|
||||
local numeral_image = window:CreateTexture (nil, "overlay")
|
||||
|
||||
numeral_image:SetTexture ([[Interface\MainMenuBar\UI-MainMenuBar-EndCap-Human]])
|
||||
numeral_image:SetPoint ("bottomright", window, "bottomright", -10, 10)
|
||||
numeral_image:SetHeight (125*3)--125
|
||||
numeral_image:SetWidth (89*3)--82
|
||||
numeral_image:SetAlpha (.05)
|
||||
numeral_image:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
g:NewLabel (window, _, "$parentChangeMindNumeralLabel", "changemindNumeralLabel", Loc ["STRING_WELCOME_2"], "GameFontNormal", 9, "orange")
|
||||
window.changemindNumeralLabel:SetPoint ("center", window, "center")
|
||||
window.changemindNumeralLabel:SetPoint ("bottom", window, "bottom", 0, 19)
|
||||
window.changemindNumeralLabel.align = "|"
|
||||
|
||||
local texto2Numeral = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
texto2Numeral:SetPoint ("topleft", window, "topleft", 20, -80)
|
||||
texto2Numeral:SetText (Loc ["STRING_NUMERALSYSTEM_DESC"] .. ":")
|
||||
|
||||
local NumeralType1 = CreateFrame ("CheckButton", "WelcomeWindowNumeralType1", window, "ChatConfigCheckButtonTemplate")
|
||||
NumeralType1:SetPoint ("topleft", window, "topleft", 20, -110)
|
||||
local NumeralType2 = CreateFrame ("CheckButton", "WelcomeWindowNumeralType2", window, "ChatConfigCheckButtonTemplate")
|
||||
NumeralType2:SetPoint ("topleft", window, "topleft", 20, -170)
|
||||
|
||||
_G ["WelcomeWindowNumeralType1Text"]:SetText (Loc ["STRING_NUMERALSYSTEM_ARABIC_WESTERN"] .. ": " .. Loc ["STRING_NUMERALSYSTEM_ARABIC_WESTERN_DESC"])
|
||||
_G ["WelcomeWindowNumeralType2Text"]:SetText (Loc ["STRING_NUMERALSYSTEM_MYRIAD_EASTASIA"] .. ": " .. Loc ["STRING_NUMERALSYSTEM_ARABIC_MYRIAD_EASTASIA"])
|
||||
|
||||
local sword_icon2 = window:CreateTexture (nil, "overlay")
|
||||
sword_icon2:SetTexture ([[Interface\Addons\Details\images\icons2]])
|
||||
sword_icon2:SetPoint ("topright", window, "topright", -30, -10)
|
||||
sword_icon2:SetSize (128*1.4, 64*1.4)
|
||||
sword_icon2:SetTexCoord (330/512, 509/512, 437/512, 509/512)
|
||||
sword_icon2:SetDrawLayer ("overlay", 2)
|
||||
|
||||
local thedude2 = window:CreateTexture (nil, "overlay")
|
||||
--thedude2:SetTexture ([[Interface\TUTORIALFRAME\UI-TutorialFrame-TheDude]])
|
||||
thedude2:SetPoint ("bottomright", sword_icon, "bottomleft", 70, 19)
|
||||
thedude2:SetWidth (128*1.0)
|
||||
thedude2:SetHeight (128*1.0)
|
||||
thedude2:SetTexCoord (0, 1, 0, 1)
|
||||
thedude2:SetDrawLayer ("overlay", 3)
|
||||
|
||||
local NumeralType1_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
NumeralType1_text:SetText ("1K = 1.000 |cFFFFCC00| |r10K = 10.000 |cFFFFCC00| |r100K = 100.000 |cFFFFCC00| |r1M = 1.000.000")
|
||||
NumeralType1_text:SetWidth (500)
|
||||
NumeralType1_text:SetHeight (40)
|
||||
NumeralType1_text:SetJustifyH ("left")
|
||||
NumeralType1_text:SetJustifyV ("top")
|
||||
NumeralType1_text:SetTextColor (.8, .8, .8, 1)
|
||||
--NumeralType1_text:SetPoint ("topleft", _G ["WelcomeWindowNumeralType1Text"], "topright", 0, 0)
|
||||
NumeralType1_text:SetPoint ("topleft", window, "topleft", 40, -130)
|
||||
|
||||
local NumeralType2_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
NumeralType2_text:SetText ("1천 = 1.000 |cFFFFCC00| |r1만 = 10.000 |cFFFFCC00| |r10만 = 100.000 |cFFFFCC00| |r100만 = 1.000.000")
|
||||
NumeralType2_text:SetWidth (500)
|
||||
NumeralType2_text:SetHeight (40)
|
||||
NumeralType2_text:SetJustifyH ("left")
|
||||
NumeralType2_text:SetJustifyV ("top")
|
||||
NumeralType2_text:SetTextColor (.8, .8, .8, 1)
|
||||
--NumeralType2_text:SetPoint ("topleft", _G ["WelcomeWindowNumeralType2Text"], "topright", 0, 0)
|
||||
NumeralType2_text:SetPoint ("topleft", window, "topleft", 40, -190)
|
||||
|
||||
NumeralType1:SetHitRectInsets (0, -70, 0, 0)
|
||||
NumeralType2:SetHitRectInsets (0, -70, 0, 0)
|
||||
|
||||
if (_detalhes.numerical_system == 1) then --> west
|
||||
NumeralType1:SetChecked (true)
|
||||
NumeralType2:SetChecked (false)
|
||||
elseif (_detalhes.numerical_system == 2) then --> east
|
||||
NumeralType1:SetChecked (false)
|
||||
NumeralType2:SetChecked (true)
|
||||
end
|
||||
|
||||
NumeralType1:SetScript ("OnClick", function()
|
||||
NumeralType1:SetChecked (true);
|
||||
NumeralType2:SetChecked (false);
|
||||
_detalhes.numerical_system = 1
|
||||
_detalhes:SelectNumericalSystem()
|
||||
end)
|
||||
NumeralType2:SetScript ("OnClick", function()
|
||||
NumeralType2:SetChecked (true);
|
||||
NumeralType1:SetChecked (false);
|
||||
_detalhes.numerical_system = 2
|
||||
_detalhes:SelectNumericalSystem()
|
||||
end)
|
||||
|
||||
pages [#pages+1] = {thedude2, sword_icon2, numeral_image, texto2Numeral, NumeralType1, NumeralType2, NumeralType1_text, NumeralType2_text, window.changemindNumeralLabel}
|
||||
|
||||
for _, widget in ipairs (pages[#pages]) do
|
||||
widget:Hide()
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--> Skins Page
|
||||
|
||||
|
||||
Binary file not shown.
+1
-1
@@ -545,7 +545,7 @@ function _G._detalhes:Start()
|
||||
_detalhes:ScheduleTimer ("FadeStartVersion", 12)
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function _detalhes:OpenOptionsWindowAtStart()
|
||||
--_detalhes:OpenOptionsWindow (_detalhes.tabela_instancias[1])
|
||||
|
||||
Reference in New Issue
Block a user