Cause f oRA
Darthpred [06-21-15 - 11:02]
diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc
index 6328b0f..a10b80f 100644
--- a/ElvUI_SLE/ElvUI_SLE.toc
+++ b/ElvUI_SLE/ElvUI_SLE.toc
@@ -7,7 +7,7 @@
## eMail: darthpred@gmail.com, repooc@tukui.org
## URL: http://tukui.org/
## RequiredDeps: ElvUI
-## OptionalDeps: AddonSkins, iFilger_ConfigUI, BigWigs, Clique, Hermes, xCT+
+## OptionalDeps: AddonSkins, BigWigs, Clique, Hermes, xCT+
## DefaultState: Enabled
## X-ElvVersion: 8.12
## SavedVariables: SLE_ArmoryDB
diff --git a/ElvUI_SLE/core/core.lua b/ElvUI_SLE/core/core.lua
index 3f359ef..3a0d231 100644
--- a/ElvUI_SLE/core/core.lua
+++ b/ElvUI_SLE/core/core.lua
@@ -62,6 +62,9 @@ local function CheckIncompatible()
if IsAddOnLoaded('LootConfirm') then
E:StaticPopup_Show('LOOTCONFIRM_SLE_INCOMPATIBLE')
end
+ if IsAddOnLoaded('oRA3') then
+ E:StaticPopup_Show('ORA_SLE_INCOMPATIBLE')
+ end
end
function SLE:CreateExport()
diff --git a/ElvUI_SLE/core/staticpopups.lua b/ElvUI_SLE/core/staticpopups.lua
index d3ca0e9..034ba26 100644
--- a/ElvUI_SLE/core/staticpopups.lua
+++ b/ElvUI_SLE/core/staticpopups.lua
@@ -35,6 +35,17 @@ E.PopupDialogs['LOOTCONFIRM_SLE_INCOMPATIBLE'] = {
hideOnEscape = false,
}
+E.PopupDialogs['ORA_SLE_INCOMPATIBLE'] = {
+ text = L['You have got oRA3 and Shadow & Light both enabled at the same time. Select an addon to disable.'],
+ OnAccept = function() DisableAddOn("oRA3"); ReloadUI() end,
+ OnCancel = function() DisableAddOn("ElvUI_SLE"); ReloadUI() end,
+ button1 = 'oRA3',
+ button2 = 'Shadow & Light',
+ timeout = 0,
+ whileDead = 1,
+ hideOnEscape = false,
+}
+
E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'] = {
text = gsub(L["INCOMPATIBLE_ADDON"], "ElvUI", "Shadow & Light"),
OnAccept = function(self) DisableAddOn(E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].addon); ReloadUI(); end,
diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua
index 9cbd421..d84885e 100644
--- a/ElvUI_SLE/locales/russian.lua
+++ b/ElvUI_SLE/locales/russian.lua
@@ -40,6 +40,7 @@ L["Reset All"] = "Сбросить все"
L["Resets all movers & options for S&L."] = "Сбросить все фиксаторы и опции S&L"
L['Oh lord, you have got ElvUI Enhanced and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Ешкин конь, одновременно включены ElvUI Enhanced и Shadow & Light. Выберите что отключить."
L['You have got Loot Confirm and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Одновременно активны Loot Confirm и Shadow & Light. Выберите что из них отключить."
+L['You have got oRA3 and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Одновременно активны oRA3 и Shadow & Light. Выберите что из них отключить."
L["Enabling mouse over will make ElvUI's raid utility show on mouse over instead of always showing."] = "Отображать кнопку управления рейдом только при наведении мыши."
L['Adjust the position of the threat bar to any of the datatext panels in ElvUI & S&L.'] = "Позволяет поместить полосу угрозы на любой панели инфо-текстов."
L["This option have been moved by Shadow & Light. Click to access it's new place."] = "Shadow & Light переместил эту опцию. Кликните для перехода к ее новому расположению."