From be80f5d5135d30fc477b5c28c94264bee866e877 Mon Sep 17 00:00:00 2001 From: Xinhuan Date: Fri, 31 Oct 2008 02:21:53 +0800 Subject: [PATCH] Add Use Focus Target and Test Mode checkboxes to the configuration panel. Update quick menu with newbie tooltips. Compensate for SetHeight's floating point inaccuracy. --- Localization/deDE.lua | 3 +++ Localization/enUS.lua | 3 +++ Localization/frFR.lua | 3 +++ Localization/koKR.lua | 3 +++ Localization/zhCN.lua | 3 +++ Localization/zhTW.lua | 3 +++ Omen.lua | 43 +++++++++++++++++++++++++++++++++++++------ 7 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Localization/deDE.lua b/Localization/deDE.lua index 30f173f..4770049 100644 --- a/Localization/deDE.lua +++ b/Localization/deDE.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = "Omen Schnellmenü" L["Use Focus Target"] = "Fokusziel verwenden" L["Test Mode"] = "Testmodus" L["Open Config"] = "Optionen öffnen" +L["Open Omen's configuration panel"] = true L["Hide Omen"] = "Omen verstecken" L["Name"] = "Name" L["Threat [%]"] = "Bedrohung [%]" @@ -31,6 +32,8 @@ L["Alpha"] = "Sichtbarkeit" L["Controls the transparency of the main Omen window."] = "Kontrolliert die Sichtbarkeit des Omen Hauptfensters" L["Scale"] = "Skalierung" L["Controls the scaling of the main Omen window."] = "Kontrolliert die Skalierung des Omen Hauptfensters" +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = "Automatisches Zusammenklappen" L["Collapse to show a minimum number of bars"] = "Zusammenklappen um nur eine minimale Anzahl an Balken zu zeigen" L["Lock Omen"] = "Omen verankern" diff --git a/Localization/enUS.lua b/Localization/enUS.lua index edb97e1..a367293 100644 --- a/Localization/enUS.lua +++ b/Localization/enUS.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = true L["Use Focus Target"] = true L["Test Mode"] = true L["Open Config"] = true +L["Open Omen's configuration panel"] = true L["Hide Omen"] = true L["Name"] = true L["Threat [%]"] = true @@ -31,6 +32,8 @@ L["Alpha"] = true L["Controls the transparency of the main Omen window."] = true L["Scale"] = true L["Controls the scaling of the main Omen window."] = true +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = true L["Collapse to show a minimum number of bars"] = true L["Lock Omen"] = true diff --git a/Localization/frFR.lua b/Localization/frFR.lua index 813fdf8..a2d03f0 100644 --- a/Localization/frFR.lua +++ b/Localization/frFR.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = "Accès rapide Omen" L["Use Focus Target"] = true L["Test Mode"] = "Mode de test" L["Open Config"] = "Ouvrir la fenêtre de config." +L["Open Omen's configuration panel"] = true L["Hide Omen"] = "Cacher Omen" L["Name"] = "Nom" L["Threat [%]"] = "Menace [%]" @@ -31,6 +32,8 @@ L["Alpha"] = "Transparence" L["Controls the transparency of the main Omen window."] = "Contrôle la transparence de la fenêtre principale de Omen." L["Scale"] = "Échelle" L["Controls the scaling of the main Omen window."] = "Contrôle l'échelle de la fenêtre principale de Omen." +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = "Réduire auto." L["Collapse to show a minimum number of bars"] = "Réduit Omen afin de n'afficher qu'un nombre minimal de barres." L["Lock Omen"] = "Verrouiller Omen" diff --git a/Localization/koKR.lua b/Localization/koKR.lua index 8657185..ca16c06 100644 --- a/Localization/koKR.lua +++ b/Localization/koKR.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = "Omen 빠른 메뉴" L["Use Focus Target"] = "주시 대상 사용" L["Test Mode"] = "테스트 모드" L["Open Config"] = "설정 열기" +L["Open Omen's configuration panel"] = true L["Hide Omen"] = "Omen 숨김" L["Name"] = "이름" L["Threat [%]"] = "위협 수준 [%]" @@ -31,6 +32,8 @@ L["Alpha"] = "투명도" L["Controls the transparency of the main Omen window."] = "Omen 창의 투명도를 조절합니다." L["Scale"] = "크기" L["Controls the scaling of the main Omen window."] = "Omen 창의 크기를 조절합니다." +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = "자동 접기" L["Collapse to show a minimum number of bars"] = "최소한의 바를 표시하기 위해 접기를 합니다." L["Lock Omen"] = "Omen 잠금" diff --git a/Localization/zhCN.lua b/Localization/zhCN.lua index bb5af3e..2c14221 100644 --- a/Localization/zhCN.lua +++ b/Localization/zhCN.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = "Omen 快捷菜单" L["Use Focus Target"] = "使用焦点目标" L["Test Mode"] = "测试模式" L["Open Config"] = "打开配置" +L["Open Omen's configuration panel"] = true L["Hide Omen"] = "隐藏 Omen" L["Name"] = "名字" L["Threat [%]"] = "仇恨 [%]" @@ -31,6 +32,8 @@ L["Alpha"] = "透明度" L["Controls the transparency of the main Omen window."] = "控制 Omen 主窗口的透明度。" L["Scale"] = "缩放" L["Controls the scaling of the main Omen window."] = "控制 Omen 主窗口的尺寸。" +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = "自动收起" L["Collapse to show a minimum number of bars"] = "收起以显示最小数量的计量条" L["Lock Omen"] = "锁定 Omen" diff --git a/Localization/zhTW.lua b/Localization/zhTW.lua index 781500a..5b69ab5 100644 --- a/Localization/zhTW.lua +++ b/Localization/zhTW.lua @@ -9,6 +9,7 @@ L["Omen Quick Menu"] = "Omen快捷選單" L["Use Focus Target"] = "使用Focus目標" L["Test Mode"] = "測試模式" L["Open Config"] = "開啟設定" +L["Open Omen's configuration panel"] = true L["Hide Omen"] = "隱藏Omen" L["Name"] = "名字" L["Threat [%]"] = "仇恨 [%]" @@ -31,6 +32,8 @@ L["Alpha"] = true L["Controls the transparency of the main Omen window."] = "控制主視窗的透明度" L["Scale"] = "縮放" L["Controls the scaling of the main Omen window."] = "控制主視窗的尺寸" +L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] = true +L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] = true L["Autocollapse"] = "自動收起" L["Collapse to show a minimum number of bars"] = "收起以顯示最小數量的計量條" L["Lock Omen"] = "鎖定Omen" diff --git a/Omen.lua b/Omen.lua index 2511d5b..38d9c9c 100644 --- a/Omen.lua +++ b/Omen.lua @@ -645,7 +645,7 @@ function Omen:UpdateBackdrop() self.Anchor:SetMinResize(90, h) self.Title:SetMinResize(90, h) if not db.TitleBar.ShowTitleBar then - self.Title:SetHeight(0.0000000001) -- See comment in Omen:UpdateTitleBar() + self.Title:SetHeight(1e-6) -- See comment in Omen:UpdateTitleBar() elseif h > db.TitleBar.Height then self.Title:SetHeight(h) else @@ -673,7 +673,7 @@ function Omen:UpdateTitleBar() self.TitleText:SetTextColor(color.r, color.g, color.b, color.a) if not db.TitleBar.ShowTitleBar then -- Yes, its a hack, since it can't be set to 0 - self.Title:SetHeight(0.0000000001) + self.Title:SetHeight(1e-6) self.Title:Hide() elseif db.Background.EdgeSize * 2 > db.TitleBar.Height then self.Title:SetHeight(db.Background.EdgeSize * 2) @@ -1301,7 +1301,7 @@ function Omen:UpdateBars() end -- Check how many bars of space we have - local numBars = db.Autocollapse and db.NumBars or floor((h - dbBar.Height) / (dbBar.Height + dbBar.Spacing) + 1) + local numBars = db.Autocollapse and db.NumBars or floor((h - dbBar.Height) / (dbBar.Height + dbBar.Spacing) + 1.01) i = 1 -- Counts one higher than number of bars used if dbBar.ShowHeadings then @@ -1512,28 +1512,38 @@ do LibStub("AceConfigRegistry-3.0"):NotifyChange("Omen") end info.checked = db.Locked + info.tooltipTitle = L["Lock Omen"] + info.tooltipText = L["Locks Omen in place and prevents it from being dragged or resized."] UIDropDownMenu_AddButton(info, level) - info.text = "Use Focus Target" + info.text = L["Use Focus Target"] info.func = function() Omen:ToggleFocus() end info.checked = db.UseFocus + info.tooltipTitle = L["Use Focus Target"] + info.tooltipText = L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."] UIDropDownMenu_AddButton(info, level) - info.text = "Test Mode" + info.text = L["Test Mode"] info.func = function() testMode = not testMode Omen:UpdateBars() end info.checked = testMode + info.tooltipTitle = L["Test Mode"] + info.tooltipText = L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."] UIDropDownMenu_AddButton(info, level) info.text = L["Open Config"] info.func = function() Omen:ShowConfig() end info.checked = nil + info.tooltipTitle = L["Open Config"] + info.tooltipText = L["Open Omen's configuration panel"] UIDropDownMenu_AddButton(info, level) info.text = L["Hide Omen"] info.func = function() Omen:Toggle() end + info.tooltipTitle = L["Hide Omen"] + info.tooltipText = nil UIDropDownMenu_AddButton(info, level) -- Close menu item @@ -1542,6 +1552,7 @@ do info.checked = nil info.arg1 = nil info.notCheckable = 1 + info.tooltipTitle = CLOSE UIDropDownMenu_AddButton(info, level) end end @@ -1613,6 +1624,26 @@ local options = { Omen:UpdateGrips() end, }, + UseFocus = { + type = "toggle", + name = L["Use Focus Target"], + desc = L["Tells Omen to additionally check your 'focus' and 'focustarget' before your 'target' and 'targettarget' in that order for threat display."], + order = 8, + set = function(info, value) + Omen:ToggleFocus() + end, + }, + TestMode = { + type = "toggle", + name = L["Test Mode"], + desc = L["Tells Omen to enter Test Mode so that you can configure Omen's display much more easily."], + order = 9, + get = function(info) return testMode end, + set = function(info, value) + testMode = value + Omen:UpdateBars() + end, + }, Autocollapse = { type = "toggle", name = L["Autocollapse"], @@ -1620,7 +1651,7 @@ local options = { order = 10, set = function(info, value) db.Autocollapse = value - Omen.Anchor:SetHeight(5*db.Bar.Height + 4*db.Bar.Spacing + Omen.Title:GetHeight() + 2*db.Background.BarInset) + Omen.Anchor:SetHeight(6*db.Bar.Height + 5*db.Bar.Spacing + Omen.Title:GetHeight() + 2*db.Background.BarInset) Omen:SetAnchors() Omen.BarList:Show() Omen:UpdateVisible()