Skip to content

Commit

Permalink
Update to ACE3 r1309
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ludovicus-Maior
Ludovicus-Maior committed Jul 12, 2023
1 parent 3ba1173 commit ce20a4d
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 134 deletions.
13 changes: 11 additions & 2 deletions WoWPro/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
-- @class file
-- @name AceConfigDialog-3.0
-- @release $Id: AceConfigDialog-3.0.lua 1292 2022-09-29 08:00:11Z nevcairiel $
-- @release $Id: AceConfigDialog-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $

local LibStub = LibStub
local gui = LibStub("AceGUI-3.0")
local reg = LibStub("AceConfigRegistry-3.0")

local MAJOR, MINOR = "AceConfigDialog-3.0", 85
local MAJOR, MINOR = "AceConfigDialog-3.0", 86
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

if not AceConfigDialog then return end
Expand Down Expand Up @@ -147,6 +147,7 @@ local stringIsLiteral = {
width = true,
image = true,
fontSize = true,
tooltipHyperlink = true
}

--Is Never a function or method
Expand Down Expand Up @@ -501,6 +502,14 @@ local function OptionOnMouseOver(widget, event)
local tooltip = AceConfigDialog.tooltip

tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")

local tooltipHyperlink = GetOptionsMemberValue("tooltipHyperlink", opt, options, path, appName)
if tooltipHyperlink then
tooltip:SetHyperlink(tooltipHyperlink)
tooltip:Show()
return
end

local name = GetOptionsMemberValue("name", opt, options, path, appName)
local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
Expand Down
5 changes: 3 additions & 2 deletions WoWPro/Libraries/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
-- @class file
-- @name AceConfigRegistry-3.0
-- @release $Id: AceConfigRegistry-3.0.lua 1207 2019-06-23 12:08:33Z nevcairiel $
-- @release $Id: AceConfigRegistry-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
local CallbackHandler = LibStub("CallbackHandler-1.0")

local MAJOR, MINOR = "AceConfigRegistry-3.0", 20
local MAJOR, MINOR = "AceConfigRegistry-3.0", 21
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)

if not AceConfigRegistry then return end
Expand Down Expand Up @@ -83,6 +83,7 @@ local basekeys={
dialogHidden=optmethodbool,
dropdownHidden=optmethodbool,
cmdHidden=optmethodbool,
tooltipHyperlink=optstringfunc,
icon=optstringnumberfunc,
iconCoords=optmethodtable,
handler=opttable,
Expand Down
6 changes: 3 additions & 3 deletions WoWPro/Libraries/AceDB-3.0/AceDB-3.0.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
-- end
-- @class file
-- @name AceDB-3.0.lua
-- @release $Id: AceDB-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
-- @release $Id: AceDB-3.0.lua 1306 2023-06-23 14:55:09Z nevcairiel $
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 28
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)

if not AceDB then return end -- No upgrade needed
Expand Down Expand Up @@ -260,7 +260,7 @@ local factionrealmKey = factionKey .. " - " .. realmKey
local localeKey = GetLocale():lower()

local regionTable = { "US", "KR", "EU", "TW", "CN" }
local regionKey = regionTable[GetCurrentRegion()]
local regionKey = regionTable[GetCurrentRegion()] or GetCurrentRegionName() or "TR"
local factionrealmregionKey = factionrealmKey .. " - " .. regionKey

-- Actual database initialization function
Expand Down
48 changes: 24 additions & 24 deletions WoWPro/Libraries/AceDBOptions-3.0/AceDBOptions-3.0.lua
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
-- @class file
-- @name AceDBOptions-3.0
-- @release $Id: AceDBOptions-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
-- @release $Id: AceDBOptions-3.0.lua 1304 2023-05-19 19:50:10Z nevcairiel $
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)

Expand Down Expand Up @@ -84,25 +84,25 @@ elseif LOCALE == "frFR" then
L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
elseif LOCALE == "koKR" then
L["choose"] = "저장 중인 프로필"
L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
L["choose"] = "기존 프로필"
L["choose_desc"] = "편집 상자에 이름을 입력하여 새로운 프로필을 만들거나 이미 존재하는 프로필 중 하나를 선택할 수 있습니다."
L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
L["copy"] = "복사해오기"
L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
L["copy"] = "복사해 올 프로필"
L["copy_desc"] = "기존 프로필의 설정을 현재 활성화된 프로필로 복사합니다."
L["current"] = "현재 프로필:"
L["default"] = "기본값"
L["delete"] = "프로필 삭제"
L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
L["delete_confirm"] = "선택한 프로필을 삭제하시겠습니까?"
L["delete_desc"] = "데이터베이스에서 기존 프로필과 사용하지 않는 프로필을 삭제하여 공간을 절약하고 SavedVariables 파일을 정리합니다."
L["delete_sub"] = "데이터베이스에서 프로필을 삭제합니다."
L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있으며, 모든 캐릭터마다 서로 다른 설정을 지정할 수 있습니다."
L["new"] = "새로운 프로필"
L["new_sub"] = "새로운 프로필을 만듭니다."
L["new_sub"] = "비어 있는 프로필을 새로 만듭니다."
L["profiles"] = "프로필"
L["profiles_sub"] = "프로필 관리"
L["reset"] = "프로필 초기화"
L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
L["reset"] = "프로필 재설정"
L["reset_desc"] = "구성이 손상되었거나 처음부터 다시 시작하고 싶은 경우 현재 프로필을 기본값으로 재설정하세요."
L["reset_sub"] = "현재 프로필을 기본값으로 재설정합니다"
elseif LOCALE == "esES" or LOCALE == "esMX" then
L["choose"] = "Perfiles existentes"
L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
Expand Down Expand Up @@ -166,31 +166,31 @@ elseif LOCALE == "zhCN" then
elseif LOCALE == "ruRU" then
L["choose"] = "Существующие профили"
L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
L["choose_sub"] = "Выбор одиного из уже доступных профилей"
L["choose_sub"] = "Выбор одного из уже доступных профилей."
L["copy"] = "Скопировать из"
L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
L["copy_desc"] = "Копирование настроек из выбранного профиля в активный."
L["current"] = "Текущий профиль:"
L["default"] = "По умолчанию"
L["delete"] = "Удалить профиль"
L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
L["delete_sub"] = "Удаление профиля из БД"
L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
L["delete_confirm"] = "Вы уверены, что хотите удалить выбранный профиль?"
L["delete_desc"] = "Удаление существующего и неиспользуемого профиля из базы данных для сохранения места, и очистка файла SavedVariables."
L["delete_sub"] = "Удаление профиля из базы данных."
L["intro"] = "Изменяя активный профиль, Вы можете задать разные настройки для каждого персонажа."
L["new"] = "Новый"
L["new_sub"] = "Создать новый чистый профиль"
L["new_sub"] = "Создание нового чистого профиля."
L["profiles"] = "Профили"
L["profiles_sub"] = "Управление профилями"
L["reset"] = "Сброс профиля"
L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
L["reset"] = "Сбросить профиль"
L["reset_desc"] = "Сброс текущего профиля к стандартным настройкам, если Ваша конфигурация испорчена или Вы хотите настроить все заново."
L["reset_sub"] = "Сброс текущего профиля на стандартный"
elseif LOCALE == "itIT" then
L["choose"] = "Profili Esistenti"
L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
L["copy"] = "Copia Da"
L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
L["copy_desc"] = "Copia le impostazioni da un profilo esistente nel profilo attivo in questo momento."
L["current"] = "Profilo Attivo:"
L["default"] = "Standard"
L["default"] = "Predefinito"
L["delete"] = "Cancella un Profilo"
L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."
Expand Down
149 changes: 55 additions & 94 deletions WoWPro/Libraries/CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,148 +1,109 @@
------------------------------------------------------------------------
r1280 | nevcairiel | 2022-09-21 21:20:09 +0000 (Wed, 21 Sep 2022) | 1 line
r1308 | nevcairiel | 2023-07-12 10:15:09 +0000 (Wed, 12 Jul 2023) | 1 line
Changed paths:
M /trunk
M /trunk/changelog.txt

Update changelog for release
Update changelog
------------------------------------------------------------------------
r1279 | nevcairiel | 2022-09-20 12:32:37 +0000 (Tue, 20 Sep 2022) | 3 lines
r1307 | funkehdude | 2023-07-12 02:24:07 +0000 (Wed, 12 Jul 2023) | 1 line
Changed paths:
M /trunk/changelog.txt

Style consistency
M /trunk/Ace3.toc

... and also testing git-svn bridge
bump toc
------------------------------------------------------------------------
r1278 | nevcairiel | 2022-09-20 12:30:10 +0000 (Tue, 20 Sep 2022) | 1 line
r1306 | nevcairiel | 2023-06-23 14:55:09 +0000 (Fri, 23 Jun 2023) | 9 lines
Changed paths:
M /trunk
M /trunk/changelog.txt
M /trunk/.luacheckrc
M /trunk/AceDB-3.0/AceDB-3.0.lua

Update changelog for WoW 10.0 support
------------------------------------------------------------------------
r1277 | nevcairiel | 2022-09-08 16:35:10 +0000 (Thu, 08 Sep 2022) | 1 line
Changed paths:
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
AceDB-3.0: Add fallbacks for region names

AceConfigDialog-3.0: Use native 10.0 Settings panel integration, when available
------------------------------------------------------------------------
r1276 | nevcairiel | 2022-09-08 16:34:28 +0000 (Thu, 08 Sep 2022) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
PTRs now return region 72, instead of extending the table fallback to
GetCurrentRegionName(), and an absolute fallback if even that fails, so
AceDB does not error out on loading.

AceGUI-3.0: BlizOptionsGroup: Expose 10.0 compatible settings callbacks
GetCurrentRegionName() could be used as the primary source, instead of
the look-up table, however we need to confirm first that the region keys
would remain stable.
------------------------------------------------------------------------
r1275 | nevcairiel | 2022-09-08 06:15:05 +0000 (Thu, 08 Sep 2022) | 1 line
r1305 | funkehdude | 2023-06-21 11:59:15 +0000 (Wed, 21 Jun 2023) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
M /trunk/Ace3_Wrath.toc

AceGUI-3.0: Use SetResizeBounds now that its fixed in 10.0.2
bump wrath toc
------------------------------------------------------------------------
r1274 | nevcairiel | 2022-09-02 17:05:08 +0000 (Fri, 02 Sep 2022) | 1 line
r1304 | nevcairiel | 2023-05-19 19:50:10 +0000 (Fri, 19 May 2023) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk
M /trunk/AceDBOptions-3.0/AceDBOptions-3.0.lua

AceGUI-3.0: TreeGroup: Another temporary fix for SetMin/MaxResize replacements
AceDBOptions-3.0: Minor locale fixes for russian
------------------------------------------------------------------------
r1273 | nevcairiel | 2022-09-01 20:37:43 +0000 (Thu, 01 Sep 2022) | 1 line
r1303 | nevcairiel | 2023-05-16 15:05:10 +0000 (Tue, 16 May 2023) | 3 lines
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
M /trunk
M /trunk/AceDBOptions-3.0/AceDBOptions-3.0.lua

AceGUI-3.0: Temporary fix for frame resize boundary changes in WoW 10.0
------------------------------------------------------------------------
r1272 | nevcairiel | 2022-08-29 15:56:35 +0000 (Mon, 29 Aug 2022) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
AceDBOptions-3.0: Update locale strings

AceGUI-3.0: DropDown: Fix leaked globals and texture draw layers of item sub-textures
Fixes WoWAce #629
------------------------------------------------------------------------
r1271 | nevcairiel | 2022-08-19 10:33:06 +0000 (Fri, 19 Aug 2022) | 1 line
r1302 | nevcairiel | 2023-05-03 07:00:09 +0000 (Wed, 03 May 2023) | 1 line
Changed paths:
M /trunk
M /trunk/Ace3.toc
A /trunk/Ace3_Wrath.toc

Update Retail TOC and add Wrath
Update TOC for 10.1
------------------------------------------------------------------------
r1270 | nevcairiel | 2022-07-24 15:29:03 +0000 (Sun, 24 Jul 2022) | 1 line
r1301 | funkehdude | 2023-03-22 02:53:32 +0000 (Wed, 22 Mar 2023) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua

AceGUI-3.0: MultiLineEditBox: Ensure the HitRect is consistent in all sizes
------------------------------------------------------------------------
r1269 | nevcairiel | 2022-07-24 14:44:51 +0000 (Sun, 24 Jul 2022) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
M /trunk/Ace3.toc

AceGUI-3.0: MultiLineEditBox: Remove redundant override
bump toc
------------------------------------------------------------------------
r1268 | nevcairiel | 2022-07-24 14:41:04 +0000 (Sun, 24 Jul 2022) | 1 line
r1300 | funkehdude | 2023-01-28 00:06:37 +0000 (Sat, 28 Jan 2023) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
M /trunk/Ace3.toc

AceGUI-3.0: MultiLineEditBox: Improve HitRect handling to update dynamically on size changes
bump toc
------------------------------------------------------------------------
r1267 | nevcairiel | 2022-07-24 09:20:39 +0000 (Sun, 24 Jul 2022) | 1 line
r1299 | funkehdude | 2023-01-22 03:36:39 +0000 (Sun, 22 Jan 2023) | 1 line
Changed paths:
M /trunk/changelog.txt
M /trunk/Ace3_Wrath.toc

Add missing changelog entry
bump toc
------------------------------------------------------------------------
r1266 | nevcairiel | 2022-07-24 09:18:44 +0000 (Sun, 24 Jul 2022) | 1 line
r1298 | nevcairiel | 2022-12-12 15:10:10 +0000 (Mon, 12 Dec 2022) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
M /trunk/changelog.txt
M /trunk
M /trunk/.luacheckrc
M /trunk/CallbackHandler-1.0/CallbackHandler-1.0.lua

AceGUI-3.0: MultiLineEditBox: Fixed an issue with mouse interactivity on re-cycled editboxes in certain circumstances.
Update CallbackHandler to rev 8
------------------------------------------------------------------------
r1265 | funkehdude | 2022-06-01 04:18:46 +0000 (Wed, 01 Jun 2022) | 1 line
r1297 | funkehdude | 2022-11-15 01:19:09 +0000 (Tue, 15 Nov 2022) | 1 line
Changed paths:
M /trunk/Ace3.toc

bump toc
------------------------------------------------------------------------
r1264 | funkehdude | 2022-04-22 00:25:11 +0000 (Fri, 22 Apr 2022) | 1 line
Changed paths:
M /trunk/Ace3_Vanilla.toc

bump toc
------------------------------------------------------------------------
r1263 | nevcairiel | 2022-04-08 14:06:09 +0000 (Fri, 08 Apr 2022) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Label.lua

AceGUI-3.0: Label: Use font objects to allow properly using fallback font mechanics to be used
------------------------------------------------------------------------
r1262 | funkehdude | 2022-04-07 23:00:32 +0000 (Thu, 07 Apr 2022) | 1 line
r1296 | nevcairiel | 2022-11-04 18:50:10 +0000 (Fri, 04 Nov 2022) | 4 lines
Changed paths:
M /trunk
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua

Remove compat code related to backdrops
------------------------------------------------------------------------
r1261 | funkehdude | 2022-04-07 22:38:19 +0000 (Thu, 07 Apr 2022) | 1 line
Changed paths:
A /trunk/Ace3_TBC.toc
A /trunk/Ace3_Vanilla.toc
M /trunk/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua

AceConfigDialog-3.0: Add support for displaying items on hover in GameTooltip

Add multi toc support
This adds a new element to the config table, "tooltipHyperlink", which
will be used to fill the tooltip when hovering over the element.
------------------------------------------------------------------------
r1260 | nevcairiel | 2022-02-23 09:53:31 +0000 (Wed, 23 Feb 2022) | 1 line
r1295 | funkehdude | 2022-10-26 01:18:39 +0000 (Wed, 26 Oct 2022) | 1 line
Changed paths:
M /trunk/changelog.txt
M /trunk/Ace3.toc

Fix date in changelog
bump toc
------------------------------------------------------------------------

Loading

0 comments on commit ce20a4d

Please sign in to comment.