From bb83d20d41c79e45f3cb69f81b03b7dfc9b9994e Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Thu, 30 Oct 2008 08:39:47 +0100 Subject: [PATCH] Added support for Focus-Cast --- ActionBarStates.lua | 6 +++++- Bartender4.lua | 1 + Options/Options.lua | 46 ++++++++++++++++++++++++++++++++++++++++++++- locale/deDE.lua | 7 +++++++ locale/enUS.lua | 7 +++++++ locale/esES.lua | 7 +++++++ locale/esMX.lua | 7 +++++++ locale/frFR.lua | 7 +++++++ locale/koKR.lua | 7 +++++++ locale/ruRU.lua | 7 +++++++ locale/zhCN.lua | 7 +++++++ locale/zhTW.lua | 7 +++++++ 12 files changed, 114 insertions(+), 2 deletions(-) diff --git a/ActionBarStates.lua b/ActionBarStates.lua index efb58da..1740c60 100644 --- a/ActionBarStates.lua +++ b/ActionBarStates.lua @@ -140,7 +140,11 @@ function ActionBar:UpdateStates(returnOnly) local pre = "" if Bartender4.db.profile.selfcastmodifier then - pre = "[mod:SELFCAST]player;" + pre = pre .. "[mod:SELFCAST]player;" + end + + if Bartender4.db.profile.focuscastmodifier then + pre = pre .. "[mod:FOCUSCAST,target=focus,exists,nodead]focus;" end UnregisterStateDriver(self, "assist-help") diff --git a/Bartender4.lua b/Bartender4.lua index 67fd895..d7c51d7 100644 --- a/Bartender4.lua +++ b/Bartender4.lua @@ -10,6 +10,7 @@ local defaults = { outofrange = "button", colors = { range = { r = 0.8, g = 0.1, b = 0.1 }, mana = { r = 0.5, g = 0.5, b = 1.0 } }, selfcastmodifier = true, + focuscastmodifier = true, selfcastrightclick = false, snapping = true, } diff --git a/Options/Options.lua b/Options/Options.lua index d195426..e451d3d 100644 --- a/Options/Options.lua +++ b/Options/Options.lua @@ -67,8 +67,47 @@ local function getOptions() Bartender4.Bar:ForAll("UpdateSelfCast") end, }, - selfcastrightclick = { + setselfcastmod = { order = 2, + type = "select", + name = L["Self-Cast Modifier"], + desc = L["Select the Self-Cast Modifier"], + get = function(info) return GetModifiedClick("SELFCAST") end, + set = function(info, value) SetModifiedClick("SELFCAST", value) end, + values = { NONE = L["None"], ALT = L["ALT"], SHIFT = L["SHIFT"], CTRL = L["CTRL"] }, + }, + selfcast_nl = { + order = 3, + type = "description", + name = "", + }, + focuscastmodifier = { + order = 5, + type = "toggle", + name = L["Focus-Cast by modifier"], + desc = L["Toggle the use of the modifier-based focus-cast functionality."], + get = getFunc, + set = function(info, value) + Bartender4.db.profile.focuscastmodifier = value + Bartender4.Bar:ForAll("UpdateSelfCast") + end, + }, + setfocuscastmod = { + order = 6, + type = "select", + name = L["Focus-Cast Modifier"], + desc = L["Select the Focus-Cast Modifier"], + get = function(info) return GetModifiedClick("FOCUSCAST") end, + set = function(info, value) SetModifiedClick("FOCUSCAST", value) end, + values = { NONE = L["None"], ALT = L["ALT"], SHIFT = L["SHIFT"], CTRL = L["CTRL"] }, + }, + focuscast_nl = { + order = 7, + type = "description", + name = "", + }, + selfcastrightclick = { + order = 8, type = "toggle", name = L["Right-click Self-Cast"], desc = L["Toggle the use of the right-click self-cast functionality."], @@ -78,6 +117,11 @@ local function getOptions() Bartender4.Bar:ForAll("ForAll", "UpdateRightClickSelfCast") end, }, + rightclickselfcast_nl = { + order = 9, + type = "description", + name = "", + }, range = { order = 10, name = L["Out of Range Indicator"], diff --git a/locale/deDE.lua b/locale/deDE.lua index f65f07e..13532eb 100644 --- a/locale/deDE.lua +++ b/locale/deDE.lua @@ -59,6 +59,8 @@ if not L then return end -- L["Fade Out"] = true -- L["Fade Out Alpha"] = true -- L["Fade Out Delay"] = true +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true -- L["Frequently Asked Questions"] = true -- L["Full Button Mode"] = true -- L["General Settings"] = true @@ -85,6 +87,7 @@ if not L then return end -- L["Micro Menu"] = true -- L["Modifier Based Switching"] = true -- L["No Display"] = true +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true -- L["Number of buttons."] = true -- L["Number of rows."] = true @@ -100,6 +103,9 @@ if not L then return end -- L["Rows"] = true -- L["SHIFT"] = true -- L["Scale"] = true +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true -- L["Self-Cast by modifier"] = true -- L["Show the MicroMenu vertically."] = true -- L["Show the keyring button."] = true @@ -117,6 +123,7 @@ if not L then return end -- L["This bar will be hidden whenever you are not in combat."] = true -- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true -- L["Toggle the button grid."] = true +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true -- L["Toggle the use of the modifier-based self-cast functionality."] = true -- L["Toggle the use of the right-click self-cast functionality."] = true -- L["Use Custom Condition"] = true diff --git a/locale/enUS.lua b/locale/enUS.lua index 42c5f57..caae95e 100644 --- a/locale/enUS.lua +++ b/locale/enUS.lua @@ -59,6 +59,8 @@ L["FAQ"] = true L["Fade Out"] = true L["Fade Out Alpha"] = true L["Fade Out Delay"] = true +L["Focus-Cast Modifier"] = true +L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = true L["Full Button Mode"] = true L["General Settings"] = true @@ -85,6 +87,7 @@ L["Lock the buttons."] = true L["Micro Menu"] = true L["Modifier Based Switching"] = true L["No Display"] = true +L["None"] = true L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true L["Number of buttons."] = true L["Number of rows."] = true @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = true L["Rows"] = true L["SHIFT"] = true L["Scale"] = true +L["Select the Focus-Cast Modifier"] = true +L["Select the Self-Cast Modifier"] = true +L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = true L["Show the MicroMenu vertically."] = true L["Show the keyring button."] = true @@ -117,6 +123,7 @@ L["This bar will be hidden once you enter combat."] = true L["This bar will be hidden whenever you are not in combat."] = true L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true L["Toggle the button grid."] = true +L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = true L["Toggle the use of the right-click self-cast functionality."] = true L["Use Custom Condition"] = true diff --git a/locale/esES.lua b/locale/esES.lua index e0bbff9..e3b8a2a 100644 --- a/locale/esES.lua +++ b/locale/esES.lua @@ -59,6 +59,8 @@ if not L then return end -- L["Fade Out"] = true -- L["Fade Out Alpha"] = true -- L["Fade Out Delay"] = true +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true -- L["Frequently Asked Questions"] = true -- L["Full Button Mode"] = true -- L["General Settings"] = true @@ -85,6 +87,7 @@ if not L then return end -- L["Micro Menu"] = true -- L["Modifier Based Switching"] = true -- L["No Display"] = true +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true -- L["Number of buttons."] = true -- L["Number of rows."] = true @@ -100,6 +103,9 @@ if not L then return end -- L["Rows"] = true -- L["SHIFT"] = true -- L["Scale"] = true +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true -- L["Self-Cast by modifier"] = true -- L["Show the MicroMenu vertically."] = true -- L["Show the keyring button."] = true @@ -117,6 +123,7 @@ if not L then return end -- L["This bar will be hidden whenever you are not in combat."] = true -- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true -- L["Toggle the button grid."] = true +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true -- L["Toggle the use of the modifier-based self-cast functionality."] = true -- L["Toggle the use of the right-click self-cast functionality."] = true -- L["Use Custom Condition"] = true diff --git a/locale/esMX.lua b/locale/esMX.lua index d8df8ba..ef7e2df 100644 --- a/locale/esMX.lua +++ b/locale/esMX.lua @@ -59,6 +59,8 @@ if not L then return end -- L["Fade Out"] = true -- L["Fade Out Alpha"] = true -- L["Fade Out Delay"] = true +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true -- L["Frequently Asked Questions"] = true -- L["Full Button Mode"] = true -- L["General Settings"] = true @@ -85,6 +87,7 @@ if not L then return end -- L["Micro Menu"] = true -- L["Modifier Based Switching"] = true -- L["No Display"] = true +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true -- L["Number of buttons."] = true -- L["Number of rows."] = true @@ -100,6 +103,9 @@ if not L then return end -- L["Rows"] = true -- L["SHIFT"] = true -- L["Scale"] = true +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true -- L["Self-Cast by modifier"] = true -- L["Show the MicroMenu vertically."] = true -- L["Show the keyring button."] = true @@ -117,6 +123,7 @@ if not L then return end -- L["This bar will be hidden whenever you are not in combat."] = true -- L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = true -- L["Toggle the button grid."] = true +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true -- L["Toggle the use of the modifier-based self-cast functionality."] = true -- L["Toggle the use of the right-click self-cast functionality."] = true -- L["Use Custom Condition"] = true diff --git a/locale/frFR.lua b/locale/frFR.lua index 376b9ec..f20ea21 100644 --- a/locale/frFR.lua +++ b/locale/frFR.lua @@ -59,6 +59,8 @@ L["FAQ"] = "FAQ" L["Fade Out"] = "Fondu" L["Fade Out Alpha"] = "Transparence du fondu" L["Fade Out Delay"] = "Délai du fondu" +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = "Questions fréquemment posées." L["Full Button Mode"] = "Mode Tout le bouton" L["General Settings"] = "Paramètres généraux" @@ -85,6 +87,7 @@ L["Lock the buttons."] = "Verrouille tous les boutons." L["Micro Menu"] = "Micro menu" L["Modifier Based Switching"] = "Permutations basées sur les modificateurs" L["No Display"] = "Pas d'affichage" +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true L["Number of buttons."] = "Nombre de boutons." L["Number of rows."] = "Nombre de rangées." @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = "Ciblage auto. clic droit" L["Rows"] = "Rangées" L["SHIFT"] = "SHIFT" L["Scale"] = "Échelle" +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = "Ciblage auto. modific." -- L["Show the MicroMenu vertically."] = true L["Show the keyring button."] = "Affiche le bouton du trousseau de clés." @@ -117,6 +123,7 @@ L["The default behaviour of this bar when no state-based paging option affects i -- L["This bar will be hidden whenever you are not in combat."] = true L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "Zoome ou non sur les boutons.\nPour plus d'options de style, installez ButtonFacade." L["Toggle the button grid."] = "Affiche ou non la grille des boutons." +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = "Utilise ou non la fonctionnalité de ciblage auto. basé sur les modificateurs." L["Toggle the use of the right-click self-cast functionality."] = "Utilise ou non la fonctionnalité de ciblage auto. au clic droit." -- L["Use Custom Condition"] = true diff --git a/locale/koKR.lua b/locale/koKR.lua index 9526f5e..b282b5f 100644 --- a/locale/koKR.lua +++ b/locale/koKR.lua @@ -59,6 +59,8 @@ L["FAQ"] = "묻고 답하기" L["Fade Out"] = "사라짐" L["Fade Out Alpha"] = "사라짐 투명도" L["Fade Out Delay"] = "사라짐 지연시간" +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = "자주하는 질문에 대한 답변" L["Full Button Mode"] = "전체 버튼 모드" L["General Settings"] = "일반 설정" @@ -85,6 +87,7 @@ L["Lock the buttons."] = "버튼을 고정합니다." L["Micro Menu"] = "게임 메뉴" L["Modifier Based Switching"] = "기능키 기반 교체" L["No Display"] = "표시 안함" +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true L["Number of buttons."] = "버튼 수를 지정합니다." L["Number of rows."] = "열의 수를 지정합니다." @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = "우-클릭시 자신에게 시전" L["Rows"] = "열" L["SHIFT"] = "SHIFT" L["Scale"] = "크기" +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = "기능키에 의한 자신-시전" -- L["Show the MicroMenu vertically."] = true L["Show the keyring button."] = "열쇠 고리 버튼을 표시합니다." @@ -117,6 +123,7 @@ L["This bar will be hidden once you enter combat."] = "현재 행동바는 전 L["This bar will be hidden whenever you are not in combat."] = "현재 행동바는 전투가 종료되면 숨겨집니다." L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "버튼 확대를 전환합니다. /n보다 더 많은 양식 옵션을 위해서는 애드온 ButtonFacade의 설치가 필요합니다." L["Toggle the button grid."] = "버튼 무늬를 전환합니다." +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = "기능키-기반 자신에게 시전 기능의 사용을 전환합니다." L["Toggle the use of the right-click self-cast functionality."] = "우-클릭시 자신에게 시전 기능의 사용을 전환합니다." L["Use Custom Condition"] = "사용자 설정 사용" diff --git a/locale/ruRU.lua b/locale/ruRU.lua index 816b4c0..8983259 100644 --- a/locale/ruRU.lua +++ b/locale/ruRU.lua @@ -59,6 +59,8 @@ L["FAQ"] = "ЧАВО" L["Fade Out"] = "Сокрытие" L["Fade Out Alpha"] = "Прозрачность при сокрытии" L["Fade Out Delay"] = "Задержка сокрытия" +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = "Часто задаваемые Вопросы и Ответы" L["Full Button Mode"] = "Режим всех кнопок" L["General Settings"] = "Основные параметры" @@ -85,6 +87,7 @@ L["Lock the buttons."] = "Заблокировать кнопки" L["Micro Menu"] = "Микроменю" L["Modifier Based Switching"] = "Переключение, основанное на модификаторах" L["No Display"] = "Не отображать" +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true L["Number of buttons."] = "Количество кнопок на панели." L["Number of rows."] = "Количество строк у панели." @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = "ПКМ чтение на себя" L["Rows"] = "Строки" L["SHIFT"] = "SHIFT" L["Scale"] = "Масштаб" +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = "Чтение на себя по умолчанию" -- L["Show the MicroMenu vertically."] = true L["Show the keyring button."] = "Показывать кнопку для связки ключей" @@ -117,6 +123,7 @@ L["The default behaviour of this bar when no state-based paging option affects i -- L["This bar will be hidden whenever you are not in combat."] = true L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "Переключение увеличения кнопок\nДля дополнительных стилей и настроек необходимо установить ButtonFacade" L["Toggle the button grid."] = "Переключение отображения пустых кнопок." +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = "Переключение использования функции Чтение на себя по умолчанию." L["Toggle the use of the right-click self-cast functionality."] = "Переключение использования функции ПКМ Чтение на себя." -- L["Use Custom Condition"] = true diff --git a/locale/zhCN.lua b/locale/zhCN.lua index bf5cd0f..eb4304d 100644 --- a/locale/zhCN.lua +++ b/locale/zhCN.lua @@ -59,6 +59,8 @@ L["FAQ"] = "帮助" L["Fade Out"] = "淡出" L["Fade Out Alpha"] = "淡出程度" L["Fade Out Delay"] = "淡出延迟" +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = "帮助信息" L["Full Button Mode"] = "整个按钮" L["General Settings"] = "一般设置" @@ -85,6 +87,7 @@ L["Lock the buttons."] = "锁定动作条按钮。" L["Micro Menu"] = "微型主菜单" L["Modifier Based Switching"] = "修改基本切换" L["No Display"] = "不显示" +-- L["None"] = true L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = "注意: 启用自定义条件将禁用以上所有设置!" L["Number of buttons."] = "设置按钮的数量。" L["Number of rows."] = "设置行数。" @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = "右键自我施法" L["Rows"] = "行" L["SHIFT"] = "按下SHIFT" L["Scale"] = "缩放" +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = "自我施法" L["Show the MicroMenu vertically."] = "显示垂直的微型菜单." L["Show the keyring button."] = "显示钥匙链" @@ -117,6 +123,7 @@ L["This bar will be hidden once you enter combat."] = "当你进入战斗状态 L["This bar will be hidden whenever you are not in combat."] = "当你脱离战斗状态时将隐藏." L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "开启/关闭 按钮缩放\n若需要进一步改变按钮风格,您需要安装插件ButtonFacade" L["Toggle the button grid."] = "勾选该选项将显示空的按钮。" +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = "关闭/开启 自我施法功能。" L["Toggle the use of the right-click self-cast functionality."] = "关闭/开启 使用右键点击对自己施法功能。" L["Use Custom Condition"] = "使用自定义条件" diff --git a/locale/zhTW.lua b/locale/zhTW.lua index 901f41b..3096070 100644 --- a/locale/zhTW.lua +++ b/locale/zhTW.lua @@ -59,6 +59,8 @@ L["FAQ"] = "問與答" L["Fade Out"] = "淡出" L["Fade Out Alpha"] = "淡出透明度" L["Fade Out Delay"] = "淡出延遲" +-- L["Focus-Cast Modifier"] = true +-- L["Focus-Cast by modifier"] = true L["Frequently Asked Questions"] = "常問問題" L["Full Button Mode"] = "完整按鈕模式" L["General Settings"] = "一般設定" @@ -85,6 +87,7 @@ L["Lock the buttons."] = "鎖定按鈕" L["Micro Menu"] = "微型選單" L["Modifier Based Switching"] = "修改基本切換" L["No Display"] = "不顯示" +-- L["None"] = true -- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true L["Number of buttons."] = "按鈕數量" L["Number of rows."] = "行數" @@ -100,6 +103,9 @@ L["Right-click Self-Cast"] = "右鍵自我施法" L["Rows"] = "行" L["SHIFT"] = "SHIFT" L["Scale"] = "大小" +-- L["Select the Focus-Cast Modifier"] = true +-- L["Select the Self-Cast Modifier"] = true +-- L["Self-Cast Modifier"] = true L["Self-Cast by modifier"] = "自我施法" -- L["Show the MicroMenu vertically."] = true L["Show the keyring button."] = "顯示鑰匙圈按鈕" @@ -117,6 +123,7 @@ L["The default behaviour of this bar when no state-based paging option affects i -- L["This bar will be hidden whenever you are not in combat."] = true L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "切換按鈕放大/n 如需更多風格的按鈕你需要安裝 ButtonFacade" L["Toggle the button grid."] = "顯示空白按鈕" +-- L["Toggle the use of the modifier-based focus-cast functionality."] = true L["Toggle the use of the modifier-based self-cast functionality."] = "切換使用自我施法功能" L["Toggle the use of the right-click self-cast functionality."] = "切換使用右鍵自我施法功能" -- L["Use Custom Condition"] = true