From 5aa9b03288cbdacf129e9a81852fb780ea7ef5c1 Mon Sep 17 00:00:00 2001 From: Quildra Date: Mon, 21 Nov 2022 17:40:39 +0000 Subject: [PATCH] Regular auto-commit at 17:40:39 on 21/11/2022 --- .../AddOns/AngryKeystones/AngryKeystones.toc | 2 +- Interface/AddOns/AngryKeystones/Keystone.lua | 4 +- Interface/AddOns/AngryKeystones/Locale.lua | 1 + .../BattlePetBreedID/BattlePetBreedID.toc | 6 +- .../AddOns/BattlePetBreedID/CHANGELOG.md | 9 +- Interface/AddOns/BattlePetBreedID/PetData.lua | 340 +++++++++++++++++- Interface/AddOns/Postal/CHANGES.txt | 12 +- Interface/AddOns/Postal/Localization.lua | 10 + Interface/AddOns/Postal/Modules/Express.lua | 6 +- .../AddOns/Postal/Modules/QuickAttach.lua | 18 +- Interface/AddOns/Postal/Postal.lua | 1 + Interface/AddOns/Postal/Postal.toc | 8 +- Interface/AddOns/Postal/Postal_TBC.toc | 8 +- Interface/AddOns/Postal/Postal_Vanilla.toc | 8 +- Interface/AddOns/Postal/Postal_Wrath.toc | 8 +- Interface/AddOns/WIM/CHANGELOG.md | 9 +- Interface/AddOns/WIM/Modules/Emoticons.lua | 2 +- Interface/AddOns/WIM/Modules/Filters.lua | 6 +- Interface/AddOns/WIM/Modules/Menu.lua | 2 +- Interface/AddOns/WIM/Modules/ShortcutBar.lua | 2 +- .../AddOns/WIM/Modules/TabManagement.lua | 13 + .../AddOns/WIM/Modules/WhisperEngine.lua | 2 +- .../AddOns/WIM/Sources/MessageWindows.lua | 2 +- .../AddOns/WIM/Sources/WindowHandler.lua | 4 +- Interface/AddOns/WIM/WIM.lua | 2 +- Interface/AddOns/WIM/WIM.toc | 2 +- Interface/AddOns/WIM/WIM_TBC.toc | 2 +- Interface/AddOns/WIM/WIM_Vanilla.toc | 2 +- Interface/AddOns/WIM/WIM_Wrath.toc | 2 +- 29 files changed, 436 insertions(+), 57 deletions(-) diff --git a/Interface/AddOns/AngryKeystones/AngryKeystones.toc b/Interface/AddOns/AngryKeystones/AngryKeystones.toc index d1db6415f..3d8f926d4 100644 --- a/Interface/AddOns/AngryKeystones/AngryKeystones.toc +++ b/Interface/AddOns/AngryKeystones/AngryKeystones.toc @@ -4,7 +4,7 @@ ## Author: Ermad ## SavedVariables: AngryKeystones_Config, AngryKeystones_Data ## SavedVariablesPerCharacter: AngryKeystones_CharacterConfig -## X-Packaged-Version: v0.26.2 +## X-Packaged-Version: v0.26.3 embeds.xml diff --git a/Interface/AddOns/AngryKeystones/Keystone.lua b/Interface/AddOns/AngryKeystones/Keystone.lua index 0cec3a7e7..ff47f2df9 100644 --- a/Interface/AddOns/AngryKeystones/Keystone.lua +++ b/Interface/AddOns/AngryKeystones/Keystone.lua @@ -48,9 +48,9 @@ local Mod = Addon:NewModule('Keystone') local function SlotKeystone() for container=BACKPACK_CONTAINER, NUM_BAG_SLOTS do - local slots = GetContainerNumSlots(container) + local slots = C_Container.GetContainerNumSlots(container) for slot=1, slots do - local _, _, _, _, _, _, slotLink, _, _, slotItemID = GetContainerItemInfo(container, slot) + local _, _, _, _, _, _, slotLink, _, _, slotItemID = C_Container.GetContainerItemInfo(container, slot) if slotLink and slotLink:match("|Hkeystone:") then PickupContainerItem(container, slot) if (CursorHasItem()) then diff --git a/Interface/AddOns/AngryKeystones/Locale.lua b/Interface/AddOns/AngryKeystones/Locale.lua index a26d09cfc..917f334a1 100644 --- a/Interface/AddOns/AngryKeystones/Locale.lua +++ b/Interface/AddOns/AngryKeystones/Locale.lua @@ -255,6 +255,7 @@ langs.zhCN = { newKeystoneAnnounce = "新钥石：%s", currentKeystoneText = "当前钥石：|cFFFFFFFF%s|r", config_announceKeystones = "在队伍里通报获得的新钥石", + config_schedule = "显示钥石等级和队伍钥石 (需要重载界面)", } langs.zhTW = { config_characterConfig = "為角色進行獨立的配置", diff --git a/Interface/AddOns/BattlePetBreedID/BattlePetBreedID.toc b/Interface/AddOns/BattlePetBreedID/BattlePetBreedID.toc index ae49241fd..2e22a9d0f 100644 --- a/Interface/AddOns/BattlePetBreedID/BattlePetBreedID.toc +++ b/Interface/AddOns/BattlePetBreedID/BattlePetBreedID.toc @@ -1,10 +1,10 @@ -## Interface: 100000 +## Interface: 100002 ## Title: Battle Pet BreedID ## Author: Simca@Malfurion ## Notes: Battle Pet BreedID displays the BreedID of pets in your journal, in battle, in chat links, and in AH tooltips. -## Version: v1.22.3 +## Version: v1.22.4 ## X-Category: Pet Battles -## X-Date: 2022-11-01T01:16:49Z +## X-Date: 2022-11-21T04:52:27Z ## X-License: BSD ## X-Localizations: enUS ## X-Curse-Project-ID: 45935 diff --git a/Interface/AddOns/BattlePetBreedID/CHANGELOG.md b/Interface/AddOns/BattlePetBreedID/CHANGELOG.md index 690cae7bd..69b0b7e8a 100644 --- a/Interface/AddOns/BattlePetBreedID/CHANGELOG.md +++ b/Interface/AddOns/BattlePetBreedID/CHANGELOG.md @@ -1,6 +1,9 @@ # Battle Pet BreedID -## [v1.22.3](https://github.com/MMOSimca/BattlePetBreedID/tree/v1.22.3) (2022-11-01) -[Full Changelog](https://github.com/MMOSimca/BattlePetBreedID/compare/v1.22.2...v1.22.3) [Previous Releases](https://github.com/MMOSimca/BattlePetBreedID/releases) +## [v1.22.4](https://github.com/MMOSimca/BattlePetBreedID/tree/v1.22.4) (2022-11-21) +[Full Changelog](https://github.com/MMOSimca/BattlePetBreedID/compare/v1.22.3...v1.22.4) [Previous Releases](https://github.com/MMOSimca/BattlePetBreedID/releases) -- Disabled broken PetJournal rarity coloring setting. +- Added initial Dragonflight pet data. +- Updated TOC for Patch 10.0.2. +- Rename secret token in Workflow Action. +- Create release.yml \ No newline at end of file diff --git a/Interface/AddOns/BattlePetBreedID/PetData.lua b/Interface/AddOns/BattlePetBreedID/PetData.lua index b419bdd4f..9d9b2b3cd 100644 --- a/Interface/AddOns/BattlePetBreedID/PetData.lua +++ b/Interface/AddOns/BattlePetBreedID/PetData.lua @@ -1,6 +1,6 @@ --[[ BattlePetBreedID: Pet Data Module -Last Update: Patch 9.2.7 PTR; 2022-10-31T05:47:02Z +Last Update: Patch 10.0.2 Live; 2022-11-21T04:52:27Z If you would like a copy of this data in a different format for your own purposes or to be informed of future updates: Contact MMOSimca / Simca@Malfurion-US - either through MMO-Champion, through CurseForge, or in-game @@ -2524,7 +2524,7 @@ function BPBID_Arrays.InitializeArrays() BPBID_Arrays.BasePetStats[2477] = {8, 8, 8} BPBID_Arrays.BasePetStats[2478] = {8.375, 8, 7.625} BPBID_Arrays.BasePetStats[2479] = {8.375, 8, 7.625} - BPBID_Arrays.BasePetStats[2480] = false + BPBID_Arrays.BasePetStats[2480] = {10.5, 8, 8} BPBID_Arrays.BasePetStats[2481] = false BPBID_Arrays.BasePetStats[2482] = {8, 8, 8} BPBID_Arrays.BasePetStats[2483] = {8, 8, 8} @@ -3294,6 +3294,174 @@ function BPBID_Arrays.InitializeArrays() BPBID_Arrays.BasePetStats[3247] = {8, 8, 8} BPBID_Arrays.BasePetStats[3248] = false BPBID_Arrays.BasePetStats[3249] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3250] = false + BPBID_Arrays.BasePetStats[3251] = false + BPBID_Arrays.BasePetStats[3252] = false + BPBID_Arrays.BasePetStats[3253] = false + BPBID_Arrays.BasePetStats[3254] = false + BPBID_Arrays.BasePetStats[3255] = false + BPBID_Arrays.BasePetStats[3256] = {8.5, 7.5, 8} + BPBID_Arrays.BasePetStats[3257] = {7.25, 8.5, 8.25} + BPBID_Arrays.BasePetStats[3258] = false + BPBID_Arrays.BasePetStats[3259] = {8, 7, 9} + BPBID_Arrays.BasePetStats[3260] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3261] = {7.65, 7.85, 8.5} + BPBID_Arrays.BasePetStats[3262] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3263] = {8.5, 7.5, 8} + BPBID_Arrays.BasePetStats[3264] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3265] = {8.375, 8, 7.625} + BPBID_Arrays.BasePetStats[3266] = {7.5, 8, 8.5} + BPBID_Arrays.BasePetStats[3267] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3268] = {24.25, 10.5, 8} + BPBID_Arrays.BasePetStats[3269] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3270] = {7.5, 8.375, 8.125} + BPBID_Arrays.BasePetStats[3271] = false + BPBID_Arrays.BasePetStats[3272] = {8, 7, 9} + BPBID_Arrays.BasePetStats[3273] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3274] = {8.75, 8.5, 6.75} + BPBID_Arrays.BasePetStats[3275] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3276] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3277] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3278] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3279] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3280] = {8.5, 7.5, 8} + BPBID_Arrays.BasePetStats[3281] = {8.75, 8, 7.25} + BPBID_Arrays.BasePetStats[3282] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3283] = {7, 9, 8} + BPBID_Arrays.BasePetStats[3284] = {8.75, 8, 7.25} + BPBID_Arrays.BasePetStats[3285] = {8.75, 8, 7.25} + BPBID_Arrays.BasePetStats[3286] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3287] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3288] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3289] = {8.25, 7.5, 8.25} + BPBID_Arrays.BasePetStats[3290] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3291] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3292] = {7.65, 7.85, 8.5} + BPBID_Arrays.BasePetStats[3293] = {7.65, 7.85, 8.5} + BPBID_Arrays.BasePetStats[3294] = {7.65, 7.85, 8.5} + BPBID_Arrays.BasePetStats[3295] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3296] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3297] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3298] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3299] = {8.25, 7.5, 8.25} + BPBID_Arrays.BasePetStats[3300] = {8.375, 8, 7.625} + BPBID_Arrays.BasePetStats[3301] = {7.625, 8.125, 8.25} + BPBID_Arrays.BasePetStats[3302] = {7.625, 8.125, 8.25} + BPBID_Arrays.BasePetStats[3303] = {7.625, 8.125, 8.25} + BPBID_Arrays.BasePetStats[3304] = false + BPBID_Arrays.BasePetStats[3305] = false + BPBID_Arrays.BasePetStats[3306] = {7.625, 8.375, 8} + BPBID_Arrays.BasePetStats[3307] = {7.625, 8.125, 8.25} + BPBID_Arrays.BasePetStats[3308] = {7.625, 8.125, 8.25} + BPBID_Arrays.BasePetStats[3309] = {8.375, 8, 7.625} + BPBID_Arrays.BasePetStats[3310] = {8.25, 7.5, 8.25} + BPBID_Arrays.BasePetStats[3311] = {7.625, 8, 8.375} + BPBID_Arrays.BasePetStats[3312] = {8.375, 8, 7.625} + BPBID_Arrays.BasePetStats[3313] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3314] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3315] = false + BPBID_Arrays.BasePetStats[3316] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3317] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3318] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3319] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3320] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3321] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3322] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3323] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3324] = false + BPBID_Arrays.BasePetStats[3325] = {7.5, 8.25, 8.25} + BPBID_Arrays.BasePetStats[3326] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3327] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3328] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3329] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3330] = {8.375, 7.625, 8} + BPBID_Arrays.BasePetStats[3331] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3332] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3333] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3334] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3335] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3336] = {7.5, 8.125, 8.375} + BPBID_Arrays.BasePetStats[3337] = false + BPBID_Arrays.BasePetStats[3338] = {7.75, 7.75, 8.5} + BPBID_Arrays.BasePetStats[3339] = false + BPBID_Arrays.BasePetStats[3340] = false + BPBID_Arrays.BasePetStats[3341] = false + BPBID_Arrays.BasePetStats[3342] = {8.25, 8.25, 7.5} + BPBID_Arrays.BasePetStats[3343] = false + BPBID_Arrays.BasePetStats[3344] = {7.5, 8, 8.5} + BPBID_Arrays.BasePetStats[3345] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3346] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3347] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3348] = {7.5, 8, 8.5} + BPBID_Arrays.BasePetStats[3349] = false + BPBID_Arrays.BasePetStats[3350] = {7.75, 7.75, 8.5} + BPBID_Arrays.BasePetStats[3351] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3352] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3353] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3354] = {8.75, 8, 7.25} + BPBID_Arrays.BasePetStats[3355] = {8.25, 7.5, 8.25} + BPBID_Arrays.BasePetStats[3356] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3357] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3358] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3359] = {8, 8, 8} + BPBID_Arrays.BasePetStats[3360] = {8.375, 8.375, 7.25} + BPBID_Arrays.BasePetStats[3361] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3362] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3363] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3364] = {7.5, 8.25, 8.25} + BPBID_Arrays.BasePetStats[3365] = {8.5, 7.5, 8} + BPBID_Arrays.BasePetStats[3366] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3367] = {8.5, 8, 7.5} + BPBID_Arrays.BasePetStats[3368] = {7, 8.5, 8.5} + BPBID_Arrays.BasePetStats[3369] = false + BPBID_Arrays.BasePetStats[3370] = false + BPBID_Arrays.BasePetStats[3371] = false + BPBID_Arrays.BasePetStats[3372] = false + BPBID_Arrays.BasePetStats[3373] = false + BPBID_Arrays.BasePetStats[3374] = false + BPBID_Arrays.BasePetStats[3375] = false + BPBID_Arrays.BasePetStats[3376] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3377] = {5.5, 5, 5} + BPBID_Arrays.BasePetStats[3378] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3379] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3380] = {7.875, 8.5, 7.625} + BPBID_Arrays.BasePetStats[3381] = {8.15, 7.575, 8.275} + BPBID_Arrays.BasePetStats[3382] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3383] = false + BPBID_Arrays.BasePetStats[3384] = {7.625, 8, 8.375} + BPBID_Arrays.BasePetStats[3385] = {8.375, 7.875, 7.75} + BPBID_Arrays.BasePetStats[3386] = {9.25, 9.25, 5.5} + BPBID_Arrays.BasePetStats[3387] = {7, 9, 8} + BPBID_Arrays.BasePetStats[3388] = {11, 9, 10.5} + BPBID_Arrays.BasePetStats[3389] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3390] = {7, 9, 8} + BPBID_Arrays.BasePetStats[3391] = {11, 8, 8} + BPBID_Arrays.BasePetStats[3392] = {8, 8, 6} + BPBID_Arrays.BasePetStats[3393] = {6.75, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3394] = {7.5, 8.5, 5.5} + BPBID_Arrays.BasePetStats[3395] = {5.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3396] = {10.5, 10.5, 8} + BPBID_Arrays.BasePetStats[3397] = {8.55, 7, 8.5} + BPBID_Arrays.BasePetStats[3398] = {8, 8.75, 8.75} + BPBID_Arrays.BasePetStats[3399] = false + BPBID_Arrays.BasePetStats[3400] = {9, 9, 8} + BPBID_Arrays.BasePetStats[3401] = {13, 9, 6.5} + BPBID_Arrays.BasePetStats[3402] = {10.5, 9, 8.5} + BPBID_Arrays.BasePetStats[3403] = {8.75, 7.25, 8} + BPBID_Arrays.BasePetStats[3404] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3405] = {8.5, 7.75, 7.75} + BPBID_Arrays.BasePetStats[3406] = {8, 7.5, 8.5} + BPBID_Arrays.BasePetStats[3407] = {7.5, 8.25, 8.25} + BPBID_Arrays.BasePetStats[3408] = {7.25, 8.5, 8.25} + BPBID_Arrays.BasePetStats[3409] = {7, 8, 9} + BPBID_Arrays.BasePetStats[3410] = {7.75, 8.5, 7.75} + BPBID_Arrays.BasePetStats[3411] = {8.75, 7.625, 7.625} + BPBID_Arrays.BasePetStats[3412] = {7.25, 8.25, 8.5} + BPBID_Arrays.BasePetStats[3413] = false + BPBID_Arrays.BasePetStats[3414] = {8, 8.75, 7.25} + BPBID_Arrays.BasePetStats[3415] = {8, 8.5, 7.5} + BPBID_Arrays.BasePetStats[3416] = {7.5, 8.5, 8} + BPBID_Arrays.BasePetStats[3417] = {8, 8, 8} -- AVAILABLE BREEDS @@ -6546,4 +6714,172 @@ function BPBID_Arrays.InitializeArrays() BPBID_Arrays.BreedsPerSpecies[3247] = {3} BPBID_Arrays.BreedsPerSpecies[3248] = false BPBID_Arrays.BreedsPerSpecies[3249] = {4} + BPBID_Arrays.BreedsPerSpecies[3250] = false + BPBID_Arrays.BreedsPerSpecies[3251] = false + BPBID_Arrays.BreedsPerSpecies[3252] = false + BPBID_Arrays.BreedsPerSpecies[3253] = false + BPBID_Arrays.BreedsPerSpecies[3254] = false + BPBID_Arrays.BreedsPerSpecies[3255] = false + BPBID_Arrays.BreedsPerSpecies[3256] = false + BPBID_Arrays.BreedsPerSpecies[3257] = false + BPBID_Arrays.BreedsPerSpecies[3258] = false + BPBID_Arrays.BreedsPerSpecies[3259] = false + BPBID_Arrays.BreedsPerSpecies[3260] = false + BPBID_Arrays.BreedsPerSpecies[3261] = false + BPBID_Arrays.BreedsPerSpecies[3262] = false + BPBID_Arrays.BreedsPerSpecies[3263] = false + BPBID_Arrays.BreedsPerSpecies[3264] = false + BPBID_Arrays.BreedsPerSpecies[3265] = false + BPBID_Arrays.BreedsPerSpecies[3266] = false + BPBID_Arrays.BreedsPerSpecies[3267] = false + BPBID_Arrays.BreedsPerSpecies[3268] = false + BPBID_Arrays.BreedsPerSpecies[3269] = false + BPBID_Arrays.BreedsPerSpecies[3270] = false + BPBID_Arrays.BreedsPerSpecies[3271] = false + BPBID_Arrays.BreedsPerSpecies[3272] = false + BPBID_Arrays.BreedsPerSpecies[3273] = false + BPBID_Arrays.BreedsPerSpecies[3274] = false + BPBID_Arrays.BreedsPerSpecies[3275] = false + BPBID_Arrays.BreedsPerSpecies[3276] = false + BPBID_Arrays.BreedsPerSpecies[3277] = false + BPBID_Arrays.BreedsPerSpecies[3278] = false + BPBID_Arrays.BreedsPerSpecies[3279] = false + BPBID_Arrays.BreedsPerSpecies[3280] = false + BPBID_Arrays.BreedsPerSpecies[3281] = false + BPBID_Arrays.BreedsPerSpecies[3282] = false + BPBID_Arrays.BreedsPerSpecies[3283] = false + BPBID_Arrays.BreedsPerSpecies[3284] = false + BPBID_Arrays.BreedsPerSpecies[3285] = false + BPBID_Arrays.BreedsPerSpecies[3286] = false + BPBID_Arrays.BreedsPerSpecies[3287] = false + BPBID_Arrays.BreedsPerSpecies[3288] = false + BPBID_Arrays.BreedsPerSpecies[3289] = false + BPBID_Arrays.BreedsPerSpecies[3290] = false + BPBID_Arrays.BreedsPerSpecies[3291] = false + BPBID_Arrays.BreedsPerSpecies[3292] = false + BPBID_Arrays.BreedsPerSpecies[3293] = false + BPBID_Arrays.BreedsPerSpecies[3294] = false + BPBID_Arrays.BreedsPerSpecies[3295] = false + BPBID_Arrays.BreedsPerSpecies[3296] = false + BPBID_Arrays.BreedsPerSpecies[3297] = false + BPBID_Arrays.BreedsPerSpecies[3298] = false + BPBID_Arrays.BreedsPerSpecies[3299] = false + BPBID_Arrays.BreedsPerSpecies[3300] = false + BPBID_Arrays.BreedsPerSpecies[3301] = false + BPBID_Arrays.BreedsPerSpecies[3302] = false + BPBID_Arrays.BreedsPerSpecies[3303] = false + BPBID_Arrays.BreedsPerSpecies[3304] = false + BPBID_Arrays.BreedsPerSpecies[3305] = false + BPBID_Arrays.BreedsPerSpecies[3306] = false + BPBID_Arrays.BreedsPerSpecies[3307] = false + BPBID_Arrays.BreedsPerSpecies[3308] = false + BPBID_Arrays.BreedsPerSpecies[3309] = false + BPBID_Arrays.BreedsPerSpecies[3310] = false + BPBID_Arrays.BreedsPerSpecies[3311] = false + BPBID_Arrays.BreedsPerSpecies[3312] = false + BPBID_Arrays.BreedsPerSpecies[3313] = false + BPBID_Arrays.BreedsPerSpecies[3314] = false + BPBID_Arrays.BreedsPerSpecies[3315] = false + BPBID_Arrays.BreedsPerSpecies[3316] = false + BPBID_Arrays.BreedsPerSpecies[3317] = false + BPBID_Arrays.BreedsPerSpecies[3318] = false + BPBID_Arrays.BreedsPerSpecies[3319] = false + BPBID_Arrays.BreedsPerSpecies[3320] = false + BPBID_Arrays.BreedsPerSpecies[3321] = false + BPBID_Arrays.BreedsPerSpecies[3322] = false + BPBID_Arrays.BreedsPerSpecies[3323] = false + BPBID_Arrays.BreedsPerSpecies[3324] = false + BPBID_Arrays.BreedsPerSpecies[3325] = false + BPBID_Arrays.BreedsPerSpecies[3326] = false + BPBID_Arrays.BreedsPerSpecies[3327] = false + BPBID_Arrays.BreedsPerSpecies[3328] = false + BPBID_Arrays.BreedsPerSpecies[3329] = false + BPBID_Arrays.BreedsPerSpecies[3330] = false + BPBID_Arrays.BreedsPerSpecies[3331] = false + BPBID_Arrays.BreedsPerSpecies[3332] = false + BPBID_Arrays.BreedsPerSpecies[3333] = false + BPBID_Arrays.BreedsPerSpecies[3334] = false + BPBID_Arrays.BreedsPerSpecies[3335] = false + BPBID_Arrays.BreedsPerSpecies[3336] = false + BPBID_Arrays.BreedsPerSpecies[3337] = false + BPBID_Arrays.BreedsPerSpecies[3338] = false + BPBID_Arrays.BreedsPerSpecies[3339] = false + BPBID_Arrays.BreedsPerSpecies[3340] = false + BPBID_Arrays.BreedsPerSpecies[3341] = false + BPBID_Arrays.BreedsPerSpecies[3342] = false + BPBID_Arrays.BreedsPerSpecies[3343] = false + BPBID_Arrays.BreedsPerSpecies[3344] = false + BPBID_Arrays.BreedsPerSpecies[3345] = false + BPBID_Arrays.BreedsPerSpecies[3346] = false + BPBID_Arrays.BreedsPerSpecies[3347] = false + BPBID_Arrays.BreedsPerSpecies[3348] = {8} + BPBID_Arrays.BreedsPerSpecies[3349] = false + BPBID_Arrays.BreedsPerSpecies[3350] = false + BPBID_Arrays.BreedsPerSpecies[3351] = false + BPBID_Arrays.BreedsPerSpecies[3352] = false + BPBID_Arrays.BreedsPerSpecies[3353] = false + BPBID_Arrays.BreedsPerSpecies[3354] = false + BPBID_Arrays.BreedsPerSpecies[3355] = false + BPBID_Arrays.BreedsPerSpecies[3356] = false + BPBID_Arrays.BreedsPerSpecies[3357] = false + BPBID_Arrays.BreedsPerSpecies[3358] = false + BPBID_Arrays.BreedsPerSpecies[3359] = false + BPBID_Arrays.BreedsPerSpecies[3360] = false + BPBID_Arrays.BreedsPerSpecies[3361] = false + BPBID_Arrays.BreedsPerSpecies[3362] = false + BPBID_Arrays.BreedsPerSpecies[3363] = false + BPBID_Arrays.BreedsPerSpecies[3364] = false + BPBID_Arrays.BreedsPerSpecies[3365] = false + BPBID_Arrays.BreedsPerSpecies[3366] = false + BPBID_Arrays.BreedsPerSpecies[3367] = false + BPBID_Arrays.BreedsPerSpecies[3368] = false + BPBID_Arrays.BreedsPerSpecies[3369] = false + BPBID_Arrays.BreedsPerSpecies[3370] = false + BPBID_Arrays.BreedsPerSpecies[3371] = false + BPBID_Arrays.BreedsPerSpecies[3372] = false + BPBID_Arrays.BreedsPerSpecies[3373] = false + BPBID_Arrays.BreedsPerSpecies[3374] = false + BPBID_Arrays.BreedsPerSpecies[3375] = false + BPBID_Arrays.BreedsPerSpecies[3376] = false + BPBID_Arrays.BreedsPerSpecies[3377] = false + BPBID_Arrays.BreedsPerSpecies[3378] = false + BPBID_Arrays.BreedsPerSpecies[3379] = false + BPBID_Arrays.BreedsPerSpecies[3380] = false + BPBID_Arrays.BreedsPerSpecies[3381] = false + BPBID_Arrays.BreedsPerSpecies[3382] = false + BPBID_Arrays.BreedsPerSpecies[3383] = false + BPBID_Arrays.BreedsPerSpecies[3384] = false + BPBID_Arrays.BreedsPerSpecies[3385] = false + BPBID_Arrays.BreedsPerSpecies[3386] = false + BPBID_Arrays.BreedsPerSpecies[3387] = false + BPBID_Arrays.BreedsPerSpecies[3388] = false + BPBID_Arrays.BreedsPerSpecies[3389] = false + BPBID_Arrays.BreedsPerSpecies[3390] = false + BPBID_Arrays.BreedsPerSpecies[3391] = false + BPBID_Arrays.BreedsPerSpecies[3392] = false + BPBID_Arrays.BreedsPerSpecies[3393] = false + BPBID_Arrays.BreedsPerSpecies[3394] = false + BPBID_Arrays.BreedsPerSpecies[3395] = false + BPBID_Arrays.BreedsPerSpecies[3396] = false + BPBID_Arrays.BreedsPerSpecies[3397] = false + BPBID_Arrays.BreedsPerSpecies[3398] = false + BPBID_Arrays.BreedsPerSpecies[3399] = false + BPBID_Arrays.BreedsPerSpecies[3400] = false + BPBID_Arrays.BreedsPerSpecies[3401] = false + BPBID_Arrays.BreedsPerSpecies[3402] = false + BPBID_Arrays.BreedsPerSpecies[3403] = false + BPBID_Arrays.BreedsPerSpecies[3404] = false + BPBID_Arrays.BreedsPerSpecies[3405] = false + BPBID_Arrays.BreedsPerSpecies[3406] = false + BPBID_Arrays.BreedsPerSpecies[3407] = false + BPBID_Arrays.BreedsPerSpecies[3408] = false + BPBID_Arrays.BreedsPerSpecies[3409] = false + BPBID_Arrays.BreedsPerSpecies[3410] = false + BPBID_Arrays.BreedsPerSpecies[3411] = false + BPBID_Arrays.BreedsPerSpecies[3412] = false + BPBID_Arrays.BreedsPerSpecies[3413] = false + BPBID_Arrays.BreedsPerSpecies[3414] = false + BPBID_Arrays.BreedsPerSpecies[3415] = false + BPBID_Arrays.BreedsPerSpecies[3416] = false + BPBID_Arrays.BreedsPerSpecies[3417] = false end diff --git a/Interface/AddOns/Postal/CHANGES.txt b/Interface/AddOns/Postal/CHANGES.txt index 0da31a945..c52fd4606 100644 --- a/Interface/AddOns/Postal/CHANGES.txt +++ b/Interface/AddOns/Postal/CHANGES.txt @@ -1,14 +1,10 @@ ------------------------------------------------------------------------ -r555 | Zimzarina | 2022-11-19 16:36:54 +0000 (Sat, 19 Nov 2022) | 1 line -Changed paths: - M /trunk/Postal.toc - -Re-enabled Express.lua ------------------------------------------------------------------------- -r554 | Zimzarina | 2022-11-19 16:35:31 +0000 (Sat, 19 Nov 2022) | 1 line +r557 | Zimzarina | 2022-11-21 08:36:04 +0000 (Mon, 21 Nov 2022) | 1 line Changed paths: M /trunk/Modules/Express.lua + M /trunk/Modules/QuickAttach.lua + M /trunk/Postal.lua -Fixed Express.lua for C_Container namespace changes in 10.0.2 patch +Added support for reagent bag in 10.0.2 release to Express.lua and QuickAttach.lua. ------------------------------------------------------------------------ diff --git a/Interface/AddOns/Postal/Localization.lua b/Interface/AddOns/Postal/Localization.lua index 7bbee927e..24a6a12d5 100644 --- a/Interface/AddOns/Postal/Localization.lua +++ b/Interface/AddOns/Postal/Localization.lua @@ -75,6 +75,7 @@ L["Enable for bag four"] = true L["Enable for bag one"] = true L["Enable for bag three"] = true L["Enable for bag two"] = true +L["Enable for reagent bag"] = true L["Enchanting"] = true L["Exclude randoms you interacted with"] = true L["Explosives"] = true @@ -229,6 +230,7 @@ L["Enable for bag four"] = "Für Tasche vier aktivieren" L["Enable for bag one"] = "Für Tasche eins aktivieren" L["Enable for bag three"] = "Für Tasche drei aktivieren" L["Enable for bag two"] = "Für Tasche zwei aktivieren" +L["Enable for reagent bag"] = "Für Reagenzbeutel aktivieren" L["Enchanting"] = "Verzauberung" L["Exclude randoms you interacted with"] = "Zufallsspieler, mit denen Du Kontakt hattest, ausschließen" L["Explosives"] = "Sprengstoffe" @@ -381,6 +383,7 @@ L["Enable for bag four"] = "Habilitar para la bolsa cuatro" L["Enable for bag one"] = "Habilitar para Bag one" L["Enable for bag three"] = "Habilitar para la bolsa tres" L["Enable for bag two"] = "Habilitar para la bolsa dos" +L["Enable for reagent bag"] = "Habilitar para bolsa de reactivo" L["Enchanting"] = "Encantador" L["Exclude randoms you interacted with"] = "Excluir aleatorios con los que tú interactuaste" L["Explosives"] = "Explosivos" @@ -532,6 +535,7 @@ L["Enable for bag four"] = "Activer pour le sac quatre" L["Enable for bag one"] = "Activer pour le premier sac" L["Enable for bag three"] = "Activer pour le sac trois" L["Enable for bag two"] = "Activer pour le sac deux" +L["Enable for reagent bag"] = "Activer pour le sac de réactif" L["Enchanting"] = "Enchantement" L["Exclude randoms you interacted with"] = "Exclure les inconnus avec qui vous avez interagi" L["Explosives"] = "Explosifs" @@ -684,6 +688,7 @@ L["Enable for bag four"] = "네번째 가방 사용" L["Enable for bag one"] = "첫번째 가방 사용" L["Enable for bag three"] = "세번째 가방 사용" L["Enable for bag two"] = "두번째 가방 사용" +L["Enable for reagent bag"] = "시약 백에 사용 가능" L["Enchanting"] = "마법부여" L["Exclude randoms you interacted with"] = "불규칙적인 거래자 제외" L["Explosives"] = "폭발물" @@ -836,6 +841,7 @@ L["Enable for bag four"] = "Включить для четвертой сумк L["Enable for bag one"] = "Включить для первой сумки" L["Enable for bag three"] = "Включить для третьей сумки" L["Enable for bag two"] = "Включить для второй сумки" +L["Enable for reagent bag"] = "Включить для реагентного мешка" L["Enchanting"] = "Наложение чар" L["Exclude randoms you interacted with"] = "Исключать ПУГов, с которыми Вы встречались." L["Explosives"] = "Взрывчатка" @@ -987,6 +993,7 @@ L["Enable for bag four"] = "为背包4启用" L["Enable for bag one"] = "为背包1启用" L["Enable for bag three"] = "为背包3启用" L["Enable for bag two"] = "为背包2启用" +L["Enable for reagent bag"] = "启用试剂袋" L["Enchanting"] = "附魔" L["Exclude randoms you interacted with"] = "防止你随意地受到影响" L["Explosives"] = "爆炸物" @@ -1139,6 +1146,7 @@ L["Enable for bag four"] = "在背包四啟用" L["Enable for bag one"] = "在背包一啟用" L["Enable for bag three"] = "在背包三啟用" L["Enable for bag two"] = "在背包二啟用" +L["Enable for reagent bag"] = "啟用試劑袋" L["Enchanting"] = "附魔" L["Exclude randoms you interacted with"] = "防止你隨意地受到影響" L["Explosives"] = "爆炸物" @@ -1291,6 +1299,7 @@ L["Enable for bag four"] = "Habilitar para saco quatro" L["Enable for bag one"] = "Habilitar para saco um" L["Enable for bag three"] = "Habilitar para saco três" L["Enable for bag two"] = "Habilitar para saco dois" +L["Enable for reagent bag"] = "Ativar para saco de reagente" L["Enchanting"] = "Encantadora" L["Exclude randoms you interacted with"] = "Excluir aleatórios com quem você interagiu" L["Explosives"] = "Explosivos" @@ -1441,6 +1450,7 @@ L["Enable for bag four"] = "Abilita per il sacchetto quattro" L["Enable for bag one"] = "Abilita per borsa uno" L["Enable for bag three"] = "Abilita per il sacchetto tre" L["Enable for bag two"] = "Abilita per il sacchetto due" +L["Enable for reagent bag"] = "Abilita per la sacca del reagente" L["Enchanting"] = "Incantevole" L["Exclude randoms you interacted with"] = "Esculdi persone a caso con cui hai interagito" L["Explosives"] = "Esplosivi" diff --git a/Interface/AddOns/Postal/Modules/Express.lua b/Interface/AddOns/Postal/Modules/Express.lua index 83ad0a071..1418f6318 100644 --- a/Interface/AddOns/Postal/Modules/Express.lua +++ b/Interface/AddOns/Postal/Modules/Express.lua @@ -188,7 +188,11 @@ function Postal_Express:ContainerFrameItemButtonOnModifiedClick(bag, slot, butto itemsc = itemc.."."..(itemsc or "") local added = (itemlocked and 0) or -1 for pass = 0,4 do - for b = 0,4 do + local bmax = NUM_BAG_FRAMES + if Postal.WOWRetail then + bmax = bmax + NUM_REAGENTBAG_FRAMES + end + for b = 0,bmax do local numberOfSlots if Postal.WOWClassic or Postal.WOWBCClassic or Postal.WOWWotLKClassic then numberOfSlots = GetContainerNumSlots(b) diff --git a/Interface/AddOns/Postal/Modules/QuickAttach.lua b/Interface/AddOns/Postal/Modules/QuickAttach.lua index 357ebb2f2..f96a84783 100644 --- a/Interface/AddOns/Postal/Modules/QuickAttach.lua +++ b/Interface/AddOns/Postal/Modules/QuickAttach.lua @@ -157,12 +157,17 @@ function Postal_QuickAttachLeftButtonClick(classID, subclassID) SendMailNameEditBox:SetText(name) SendMailNameEditBox:HighlightText() end - for bagID = 0, 4, 1 do + local bagIDmax = NUM_BAG_FRAMES + if Postal.WOWRetail then + bagIDmax = bagIDmax + NUM_REAGENTBAG_FRAMES + end + for bagID = 0, bagIDmax, 1 do if (bagID == 0) and Postal.db.profile.QuickAttach.EnableBag0 or (bagID == 1) and Postal.db.profile.QuickAttach.EnableBag1 or (bagID == 2) and Postal.db.profile.QuickAttach.EnableBag2 or (bagID == 3) and Postal.db.profile.QuickAttach.EnableBag3 or - (bagID == 4) and Postal.db.profile.QuickAttach.EnableBag4 + (bagID == 4) and Postal.db.profile.QuickAttach.EnableBag4 or + (bagID == 5) and Postal.db.profile.QuickAttach.EnableBag5 then if Postal.WOWClassic or Postal.WOWBCClassic or Postal.WOWWotLKClassic then numberOfSlots = GetContainerNumSlots(bagID) @@ -341,5 +346,14 @@ function Postal_QuickAttach.ModuleMenu(self, level) info.arg2 = "EnableBag4" info.checked = Postal.db.profile.QuickAttach.EnableBag4 UIDropDownMenu_AddButton(info, level) + + if Postal.WOWRetail then + info.text = L["Enable for reagent bag"] + info.func = Postal.SaveOption + info.arg1 = "QuickAttach" + info.arg2 = "EnableBag5" + info.checked = Postal.db.profile.QuickAttach.EnableBag5 + UIDropDownMenu_AddButton(info, level) + end end end diff --git a/Interface/AddOns/Postal/Postal.lua b/Interface/AddOns/Postal/Postal.lua index c34a552de..3a4b43ad4 100644 --- a/Interface/AddOns/Postal/Postal.lua +++ b/Interface/AddOns/Postal/Postal.lua @@ -57,6 +57,7 @@ local defaults = { EnableBag2 = true, EnableBag3 = true, EnableBag4 = true, + EnableBag5 = true, }, }, global = { diff --git a/Interface/AddOns/Postal/Postal.toc b/Interface/AddOns/Postal/Postal.toc index 82e3257f3..0465a9cd8 100644 --- a/Interface/AddOns/Postal/Postal.toc +++ b/Interface/AddOns/Postal/Postal.toc @@ -1,9 +1,9 @@ ## Interface: 100002 ## Title: Postal -## Version: v3.9.0 -## X-Build: 555 -## X-ReleaseDate: 2022-11-19T16:36:54Z -## X-Revision: 555 +## Version: v3.9.1 +## X-Build: 557 +## X-ReleaseDate: 2022-11-21T8:36:04Z +## X-Revision: 557 ## Author: Xinhuan ## X-Credits: Ammo, Rabbit, Grennon, Mikk, oscarucb, Jonny aka The_Original_Manbot ## X-Category: Mail diff --git a/Interface/AddOns/Postal/Postal_TBC.toc b/Interface/AddOns/Postal/Postal_TBC.toc index 995b06ba5..9d58ef08f 100644 --- a/Interface/AddOns/Postal/Postal_TBC.toc +++ b/Interface/AddOns/Postal/Postal_TBC.toc @@ -1,9 +1,9 @@ ## Interface: 20504 ## Title: Postal -## Version: v3.9.0 -## X-Build: 555 -## X-ReleaseDate: 2022-11-19T16:36:54Z -## X-Revision: 555 +## Version: v3.9.1 +## X-Build: 557 +## X-ReleaseDate: 2022-11-21T8:36:04Z +## X-Revision: 557 ## Author: Xinhuan ## X-Credits: Ammo, Rabbit, Grennon, Mikk, oscarucb, Jonny aka The_Original_Manbot ## X-Category: Mail diff --git a/Interface/AddOns/Postal/Postal_Vanilla.toc b/Interface/AddOns/Postal/Postal_Vanilla.toc index 8f1f3a3e9..1dd827575 100644 --- a/Interface/AddOns/Postal/Postal_Vanilla.toc +++ b/Interface/AddOns/Postal/Postal_Vanilla.toc @@ -1,9 +1,9 @@ ## Interface: 11403 ## Title: Postal -## Version: v3.9.0 -## X-Build: 555 -## X-ReleaseDate: 2022-11-19T16:36:54Z -## X-Revision: 555 +## Version: v3.9.1 +## X-Build: 557 +## X-ReleaseDate: 2022-11-21T8:36:04Z +## X-Revision: 557 ## Author: Xinhuan ## X-Credits: Ammo, Rabbit, Grennon, Mikk, oscarucb, Jonny aka The_Original_Manbot ## X-Category: Mail diff --git a/Interface/AddOns/Postal/Postal_Wrath.toc b/Interface/AddOns/Postal/Postal_Wrath.toc index 8b98c4325..49adbecc7 100644 --- a/Interface/AddOns/Postal/Postal_Wrath.toc +++ b/Interface/AddOns/Postal/Postal_Wrath.toc @@ -1,9 +1,9 @@ ## Interface: 30400 ## Title: Postal -## Version: v3.9.0 -## X-Build: 555 -## X-ReleaseDate: 2022-11-19T16:36:54Z -## X-Revision: 555 +## Version: v3.9.1 +## X-Build: 557 +## X-ReleaseDate: 2022-11-21T8:36:04Z +## X-Revision: 557 ## Author: Xinhuan ## X-Credits: Ammo, Rabbit, Grennon, Mikk, oscarucb, Jonny aka The_Original_Manbot ## X-Category: Mail diff --git a/Interface/AddOns/WIM/CHANGELOG.md b/Interface/AddOns/WIM/CHANGELOG.md index 6432d6824..d251b473e 100644 --- a/Interface/AddOns/WIM/CHANGELOG.md +++ b/Interface/AddOns/WIM/CHANGELOG.md @@ -1,8 +1,7 @@ # WIM -## [3.9.12](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/tree/3.9.12) (2022-11-18) -[Full Changelog](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/compare/3.9.11...3.9.12) [Previous Releases](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/releases) +## [3.9.13](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/tree/3.9.13) (2022-11-21) +[Full Changelog](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/compare/3.9.12...3.9.13) [Previous Releases](https://github.com/Legacy-of-Sylvanaar/wow-instant-messenger/releases) -- implement LibDropDownMenu in options. -- implement LibDropDownMenu to avoid tainting issues -- include LibDropDownMenu +- fix some missing connections to libDropDownMenu +- Fix: Whispers were not always being grouped with chat windows correctly. diff --git a/Interface/AddOns/WIM/Modules/Emoticons.lua b/Interface/AddOns/WIM/Modules/Emoticons.lua index 136fdff4b..bf1022ad2 100644 --- a/Interface/AddOns/WIM/Modules/Emoticons.lua +++ b/Interface/AddOns/WIM/Modules/Emoticons.lua @@ -229,7 +229,7 @@ local msgBoxMenu = AddContextMenu(info.text, info); local emoticonsMenu = msgBoxMenu:AddSubItem(AddContextMenu("EMOTICON_LIST", info), 2); local function emoteMenuClicked(self) - _G.CloseDropDownMenus(); + libs.DropDownMenu.CloseDropDownMenus(); if(MSG_CONTEXT_MENU_EDITBOX) then MSG_CONTEXT_MENU_EDITBOX:Insert(self.value); end diff --git a/Interface/AddOns/WIM/Modules/Filters.lua b/Interface/AddOns/WIM/Modules/Filters.lua index eceb83d73..2049f9d01 100644 --- a/Interface/AddOns/WIM/Modules/Filters.lua +++ b/Interface/AddOns/WIM/Modules/Filters.lua @@ -668,7 +668,8 @@ local function createFilterFrame() win.level.classText:SetText(L["Apply to:"]); win.level.classText:SetPoint("TOPLEFT", 20, -70); win.level.classText:SetTextColor(_G.GameFontNormal:GetTextColor()); - win.level.class = CreateFrame("Frame", win:GetName().."ClassList", win.level, "UIDropDownMenuTemplate"); + win.level.class = DDM.Create_DropDownMenu(win:GetName().."ClassList", win.level) + win.level.class:SetParent(win.level); win.level.class:SetPoint("TOPLEFT", win.level.classText, "TOPLEFT", win.level.classText:GetStringWidth()+8, 8); win.level.class.click = function(self) self = self or _G.this; @@ -730,7 +731,8 @@ local function createFilterFrame() win.actionText:SetText(L["Action to Perform:"]); win.actionText:SetTextColor(_G.GameFontNormal:GetTextColor()); win.actionText:SetPoint("TOPLEFT", win.received, "BOTTOMLEFT", 0, -20); - win.action = CreateFrame("Frame", win:GetName().."Action", win, "UIDropDownMenuTemplate"); + win.action = DDM.Create_DropDownMenu(win:GetName().."Action", win); + win.action:SetParent(win); win.action:SetPoint("TOPLEFT", win.actionText, "TOPLEFT", win.actionText:GetStringWidth()+8, 8); win.action.click = function(self) self = self or _G.this; diff --git a/Interface/AddOns/WIM/Modules/Menu.lua b/Interface/AddOns/WIM/Modules/Menu.lua index 079cf1482..7354c3eaf 100644 --- a/Interface/AddOns/WIM/Modules/Menu.lua +++ b/Interface/AddOns/WIM/Modules/Menu.lua @@ -270,7 +270,7 @@ local function createMenu() end); menu:SetScript("OnShow", function(self) self.mouseStamp = _G.time(); - _G.CloseDropDownMenus(); + libs.DropDownMenu.CloseDropDownMenus(); end); return menu; diff --git a/Interface/AddOns/WIM/Modules/ShortcutBar.lua b/Interface/AddOns/WIM/Modules/ShortcutBar.lua index ebbde0dbf..5ca10c2c7 100644 --- a/Interface/AddOns/WIM/Modules/ShortcutBar.lua +++ b/Interface/AddOns/WIM/Modules/ShortcutBar.lua @@ -303,7 +303,7 @@ end -- Register default buttons. RegisterShortcut("location", L["Player Location"], { OnClick = function(self, button) - _G.CloseDropDownMenus(); + libs.DropDownMenu.CloseDropDownMenus(); if(button == "LeftButton") then self.parentWindow:SendWho(); else diff --git a/Interface/AddOns/WIM/Modules/TabManagement.lua b/Interface/AddOns/WIM/Modules/TabManagement.lua index ebe6e42e0..c3261d02d 100644 --- a/Interface/AddOns/WIM/Modules/TabManagement.lua +++ b/Interface/AddOns/WIM/Modules/TabManagement.lua @@ -125,9 +125,22 @@ function Tabs:OnWindowCreated(win) end return; end + + -- look for whisper group group = getAvailableWhisperGroup(); + + -- if it exists, attach if(group) then group:Attach(win); + + -- otherwise, first check if we are grouping whisers and chats together, if so look for chat + elseif (db.tabs.chat.aswhisper) then + group = getAvailableChatGroup(); + + -- if there's a chat group, attach to it. + if (group) then + group:Attach(win); + end end elseif(db.tabs.chat.enabled and win.type == "chat") then local group = db.tabs.chat.aswhisper and getAvailableWhisperGroup() or getAvailableChatGroup(); diff --git a/Interface/AddOns/WIM/Modules/WhisperEngine.lua b/Interface/AddOns/WIM/Modules/WhisperEngine.lua index b5e829cb3..a6f904062 100644 --- a/Interface/AddOns/WIM/Modules/WhisperEngine.lua +++ b/Interface/AddOns/WIM/Modules/WhisperEngine.lua @@ -776,7 +776,7 @@ local msgBoxMenu = AddContextMenu(info.text, info); end local function recentMenuClick(self) - _G.CloseDropDownMenus(); + libs.DropDownMenu.CloseDropDownMenus(); if(MSG_CONTEXT_MENU_EDITBOX) then if(_G.IsShiftKeyDown()) then MSG_CONTEXT_MENU_EDITBOX:Insert(self.value); diff --git a/Interface/AddOns/WIM/Sources/MessageWindows.lua b/Interface/AddOns/WIM/Sources/MessageWindows.lua index bcdef4de5..153123c1e 100644 --- a/Interface/AddOns/WIM/Sources/MessageWindows.lua +++ b/Interface/AddOns/WIM/Sources/MessageWindows.lua @@ -356,7 +356,7 @@ local function MessageWindow_ScrollingMessageFrame_OnMouseUp() end local function MessageWindow_MsgBox_OnMouseUp() - CloseDropDownMenus(); + WIM.libs.DropDownMenu.CloseDropDownMenus(); if(arg1 == "RightButton") then WIM_MSGBOX_MENU_CUR_USER = this:GetParent().theUser; DDM.UIDropDownMenu_Initialize(WIM_MsgBoxMenu, WIM_MsgBoxMenu_Initialize); diff --git a/Interface/AddOns/WIM/Sources/WindowHandler.lua b/Interface/AddOns/WIM/Sources/WindowHandler.lua index 84d54c923..b00e95274 100644 --- a/Interface/AddOns/WIM/Sources/WindowHandler.lua +++ b/Interface/AddOns/WIM/Sources/WindowHandler.lua @@ -2005,7 +2005,7 @@ RegisterWidgetTrigger("msg_box", "whisper,chat,w2w", "OnEditFocusLost", function -- _G.ACTIVE_CHAT_EDIT_BOX = nil; end); RegisterWidgetTrigger("msg_box", "whisper,chat,w2w", "OnMouseUp", function(self, button) - _G.CloseDropDownMenus(); + libs.DropDownMenu.CloseDropDownMenus(); if(button == "RightButton") then PopContextMenu("MENU_MSGBOX", self); else @@ -2149,5 +2149,5 @@ local msgBoxMenu = AddContextMenu(info.text, info); info = {}; info.text = _G.CANCEL; info.notCheckable = true; - info.func = function() _G.CloseDropDownMenus(); end + info.func = function() libs.DropDownMenu.CloseDropDownMenus(); end msgBoxMenu:AddSubItem(AddContextMenu("MENU_CANCEL", info)); diff --git a/Interface/AddOns/WIM/WIM.lua b/Interface/AddOns/WIM/WIM.lua index 36fba6826..b01a9f6ae 100644 --- a/Interface/AddOns/WIM/WIM.lua +++ b/Interface/AddOns/WIM/WIM.lua @@ -15,7 +15,7 @@ setfenv(1, WIM); -- Core information addonTocName = "WIM"; -version = "3.9.12"; +version = "3.9.13"; beta = false; -- flags current version as beta. debug = false; -- turn debugging on and off. useProtocol2 = true; -- test switch for new W2W Protocol. (Dev use only) diff --git a/Interface/AddOns/WIM/WIM.toc b/Interface/AddOns/WIM/WIM.toc index eca8e9058..d65e2aaf9 100644 --- a/Interface/AddOns/WIM/WIM.toc +++ b/Interface/AddOns/WIM/WIM.toc @@ -5,7 +5,7 @@ ## Title: WIM ## Author: Pazza (Bronzebeard), (Updated by Sylvanaar/MysticalOS/Humfras) -## Version: 3.9.12 +## Version: 3.9.13 ## Notes: Give whispers an instant messenger feel. ## Notes-esES: Dale a los susurros una sensación de mensajería instantánea. ## Notes-esMX: Dale a los susurros una sensación de mensajería instantánea. diff --git a/Interface/AddOns/WIM/WIM_TBC.toc b/Interface/AddOns/WIM/WIM_TBC.toc index 0761f4cb6..00ca4dffd 100644 --- a/Interface/AddOns/WIM/WIM_TBC.toc +++ b/Interface/AddOns/WIM/WIM_TBC.toc @@ -5,7 +5,7 @@ ## Title: WIM ## Author: Pazza (Bronzebeard), (Updated by Sylvanaar/MysticalOS/Humfras) -## Version: 3.9.12 +## Version: 3.9.13 ## Notes: Give whispers an instant messenger feel. ## Notes-esES: Dale a los susurros una sensación de mensajería instantánea. ## Notes-esMX: Dale a los susurros una sensación de mensajería instantánea. diff --git a/Interface/AddOns/WIM/WIM_Vanilla.toc b/Interface/AddOns/WIM/WIM_Vanilla.toc index c27d9a570..48e6bbdb6 100644 --- a/Interface/AddOns/WIM/WIM_Vanilla.toc +++ b/Interface/AddOns/WIM/WIM_Vanilla.toc @@ -5,7 +5,7 @@ ## Title: WIM ## Author: Pazza (Bronzebeard), (Updated by Sylvanaar/MysticalOS/Humfras) -## Version: 3.9.12 +## Version: 3.9.13 ## Notes: Give whispers an instant messenger feel. ## Notes-esES: Dale a los susurros una sensación de mensajería instantánea. ## Notes-esMX: Dale a los susurros una sensación de mensajería instantánea. diff --git a/Interface/AddOns/WIM/WIM_Wrath.toc b/Interface/AddOns/WIM/WIM_Wrath.toc index 6183d0cbb..fcb216ab5 100644 --- a/Interface/AddOns/WIM/WIM_Wrath.toc +++ b/Interface/AddOns/WIM/WIM_Wrath.toc @@ -5,7 +5,7 @@ ## Title: WIM ## Author: Pazza (Bronzebeard), (Updated by Sylvanaar/MysticalOS/Humfras) -## Version: 3.9.12 +## Version: 3.9.13 ## Notes: Give whispers an instant messenger feel. ## Notes-esES: Dale a los susurros una sensación de mensajería instantánea. ## Notes-esMX: Dale a los susurros una sensación de mensajería instantánea.