Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
97ee953b19 | |||
a75d631423 | |||
551744a2eb | |||
68da0b15bb | |||
06a1f1177a | |||
475b2b3e1f | |||
e53900d2b1 | |||
45099a9a3b |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -38,6 +38,7 @@ obj/
|
|||||||
|
|
||||||
# Misc
|
# Misc
|
||||||
.bin/
|
.bin/
|
||||||
|
.release/
|
||||||
*.log
|
*.log
|
||||||
*.graphml
|
*.graphml
|
||||||
coverage.db*
|
coverage.db*
|
34
.pkgmeta
34
.pkgmeta
@@ -2,23 +2,29 @@ package-as: Grichelde
|
|||||||
|
|
||||||
enable-nolib-creation: no
|
enable-nolib-creation: no
|
||||||
|
|
||||||
externals:
|
embedded-libraries:
|
||||||
libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
|
Libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
|
||||||
libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
|
curse-slug: libstub
|
||||||
libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
|
Libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
|
||||||
libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
|
curse-slug: libdatabroker-1-1
|
||||||
libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
|
Libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
|
||||||
libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
|
curse-slug: libdbicon-1-0
|
||||||
libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
|
Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
|
||||||
libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
|
curse-slug: callbackhandler
|
||||||
libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
|
Libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
|
||||||
libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
|
curse-slug: ace3
|
||||||
libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
|
Libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
|
||||||
libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
|
Libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
|
||||||
libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
|
Libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
|
||||||
|
Libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
|
||||||
|
Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
|
||||||
|
Libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
|
||||||
|
Libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
|
||||||
|
Libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
|
||||||
|
|
||||||
ignore:
|
ignore:
|
||||||
- twitch
|
- twitch
|
||||||
|
- GricheldeTest.lua
|
||||||
|
|
||||||
manual-changelog:
|
manual-changelog:
|
||||||
filename: CHANGELOG.md
|
filename: CHANGELOG.md
|
||||||
|
311
.release/README.md
Normal file
311
.release/README.md
Normal file
@@ -0,0 +1,311 @@
|
|||||||
|
# release.sh
|
||||||
|
|
||||||
|
__release.sh__ generates an addon zip file from a Git, SVN, or Mercurial
|
||||||
|
checkout.
|
||||||
|
|
||||||
|
__release.sh__ works by creating a new project directory (*.release* by
|
||||||
|
default), copying files from the checkout into the project directory, checking
|
||||||
|
out external repositories then copying their files into the project directory,
|
||||||
|
then moves subdirectories into the project root. The project directory is then
|
||||||
|
zipped to create a distributable addon zip file which can also be uploaded to
|
||||||
|
CurseForge, WoWInterface, Wago, and GitHub (as a release).
|
||||||
|
|
||||||
|
__release.sh__ assumes that tags (Git annotated tags and SVN tags) are named for
|
||||||
|
the version numbers for the project. It will identify if the HEAD is tagged and
|
||||||
|
use that as the current version number. It will search back through parent
|
||||||
|
commits for the previous tag and generate a changelog containing the commits
|
||||||
|
since that tag.
|
||||||
|
|
||||||
|
## Building with GitHub Actions
|
||||||
|
|
||||||
|
For a full example workflow, please check out the [wiki page](https://github.com/BigWigsMods/packager/wiki/GitHub-Actions-workflow).
|
||||||
|
|
||||||
|
### Example using [options](#Usage)
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
- uses: BigWigsMods/packager@v1
|
||||||
|
with:
|
||||||
|
args: -g classic -m .pkgmeta-classic
|
||||||
|
```
|
||||||
|
|
||||||
|
## Customizing the build
|
||||||
|
|
||||||
|
__release.sh__ uses the TOC file to determine the package name for the project.
|
||||||
|
You can also set the CurseForge project id (`-p`), the WoWInterface addon
|
||||||
|
id (`-w`) or the Wago project id (`-a`) by adding the following to the TOC file:
|
||||||
|
|
||||||
|
```toc
|
||||||
|
## X-Curse-Project-ID: 1234
|
||||||
|
## X-WoWI-ID: 5678
|
||||||
|
## X-Wago-ID: he54k6bL
|
||||||
|
```
|
||||||
|
|
||||||
|
Your CurseForge project id can be found on the addon page in the "About Project"
|
||||||
|
side box.
|
||||||
|
|
||||||
|
Your WoWInterface addon id is in the url for the addon, eg, the "5678"
|
||||||
|
in <https://wowinterface.com/downloads/info5678-MyAddon>.
|
||||||
|
|
||||||
|
Your Wago project id can be found on the developer dashboard.
|
||||||
|
|
||||||
|
### The PackageMeta file
|
||||||
|
|
||||||
|
__release.sh__ can read a __.pkgmeta__ file and supports the following
|
||||||
|
directives. See the [wiki page](https://github.com/BigWigsMods/packager/wiki/Preparing-the-PackageMeta-File)
|
||||||
|
for more info.
|
||||||
|
|
||||||
|
- *externals* (Git, SVN, and Mercurial) Caveats: An external's .pkgmeta is only
|
||||||
|
parsed for ignore and externals will not have localization keywords replaced.
|
||||||
|
- *ignore*
|
||||||
|
- *changelog-title*
|
||||||
|
- *manual-changelog*
|
||||||
|
- *move-folders*
|
||||||
|
- *package-as*
|
||||||
|
- *enable-nolib-creation* (defaults to no) Caveats: nolib packages will only be
|
||||||
|
uploaded to GitHub and attached to a release. Unlike with the CurseForge
|
||||||
|
packager, manually uploaded nolib packages will not be used by the client when
|
||||||
|
users have enabled downloading libraries separately.
|
||||||
|
- *tools-used*
|
||||||
|
- *required-dependencies*
|
||||||
|
- *optional-dependencies*
|
||||||
|
- *embedded-libraries* Note: All fetched externals will be marked as embedded,
|
||||||
|
overriding any manually set relations in the pkgmeta.
|
||||||
|
|
||||||
|
You can also use a few directives for WoWInterface uploading.
|
||||||
|
|
||||||
|
- *wowi-archive-previous* : `yes|no` (defaults to yes) Archive the previous
|
||||||
|
release.
|
||||||
|
- *wowi-create-changelog* : `yes|no` (defaults to yes) Generate a changelog
|
||||||
|
using BBCode that will be set when uploading. A manual changelog will always
|
||||||
|
be used instead if set in the .pkgmeta.
|
||||||
|
- *wowi-convert-changelog* : `yes|no` (defaults to yes) Convert a manual
|
||||||
|
changelog in Markdown format to BBCode if you have [pandoc](http://pandoc.org/)
|
||||||
|
installed; otherwise, the manual changelog will be used as-is. If set to `no`
|
||||||
|
when using a generated changelog, Markdown will be used instead of BBCode.
|
||||||
|
**Note**: Markdown support is experimental and needs to be requested on a
|
||||||
|
per-project basis.
|
||||||
|
|
||||||
|
### String replacements
|
||||||
|
|
||||||
|
__release.sh__ supports the following repository substitution keywords when
|
||||||
|
copying the files from the checkout into the project directory. See the
|
||||||
|
[wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions)
|
||||||
|
for more info.
|
||||||
|
|
||||||
|
- *@[localization](https://github.com/BigWigsMods/packager/wiki/Localization-Substitution)(locale="locale", format="format", ...)@*
|
||||||
|
- *escape-non-ascii*
|
||||||
|
- *handle-unlocalized*
|
||||||
|
- *handle-subnamespaces="concat"*
|
||||||
|
- *key*
|
||||||
|
- *namespace*
|
||||||
|
- *same-key-is-true*
|
||||||
|
- *table-name*
|
||||||
|
- *@file-revision@*
|
||||||
|
- *@project-revision@*
|
||||||
|
- *@file-hash@*
|
||||||
|
- *@project-hash@*
|
||||||
|
- *@file-abbreviated-hash@*
|
||||||
|
- *@project-abbreviated-hash@*
|
||||||
|
- *@file-author@*
|
||||||
|
- *@project-author@*
|
||||||
|
- *@file-date-iso@*
|
||||||
|
- *@project-date-iso@*
|
||||||
|
- *@file-date-integer@*
|
||||||
|
- *@project-date-integer@*
|
||||||
|
- *@file-timestamp@*
|
||||||
|
- *@project-timestamp@*
|
||||||
|
- *@project-version@*
|
||||||
|
|
||||||
|
### Build type keywords
|
||||||
|
|
||||||
|
Specific keywords used in a comment at the start (`@keyword@`) and end
|
||||||
|
(`@end-keyword@`) of a block of code can be used to conditionally run that code
|
||||||
|
based on the build type. If the build type does not match, the block of code
|
||||||
|
is comment out so line numbers do not change.
|
||||||
|
|
||||||
|
Supported keywords and when the code block will run:
|
||||||
|
|
||||||
|
- `alpha`: in untagged builds.
|
||||||
|
- `debug`: never. Code will only run when using an unpackaged source.
|
||||||
|
- `do-not-package`: never. Same as `debug` except removed from the packaged
|
||||||
|
file.
|
||||||
|
- `no-lib-strip`: _(not supported in Lua files)_ in any build other than a
|
||||||
|
*nolib* build.
|
||||||
|
- `retail`,`version-retail`,`version-classic`,`version-bcc`: based on game
|
||||||
|
version.
|
||||||
|
|
||||||
|
`do-not-package` is a bit special. Everything between the tags, including the
|
||||||
|
tags themselves, will always be removed from the packaged file. This will cause
|
||||||
|
the line numbers of subsequent lines to change, which can result in bug report
|
||||||
|
line numbers not matching the source code. The typical usage is at the end of
|
||||||
|
Lua files surrounding debugging functions and other code that end users should
|
||||||
|
never see or execute.
|
||||||
|
|
||||||
|
All keywords except `do-not-package` can be prefixed with `non-` to inverse the
|
||||||
|
logic. When doing this, the keywords should start and end a **block comment**
|
||||||
|
as shown below.
|
||||||
|
|
||||||
|
More examples are available on the [wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions#debug-replacements).
|
||||||
|
|
||||||
|
#### In Lua files
|
||||||
|
|
||||||
|
`--@keyword@` and `--@end-keyword@`
|
||||||
|
turn into `--[===[@keyword` and `--@end-keyword]===]`.
|
||||||
|
|
||||||
|
`--[===[@non-keyword@` and `--@end-non-keyword@]===]`
|
||||||
|
turn into `--@non-keyword@` and `--@end-non-keyword@`.
|
||||||
|
|
||||||
|
#### In XML files
|
||||||
|
|
||||||
|
**Note:** XML doesn't allow nested comments so make sure not to nest keywords.
|
||||||
|
If you need to nest keywords, you can do so in the TOC instead.
|
||||||
|
|
||||||
|
`<!--@keyword@-->` and `<!--@end-keyword@-->`
|
||||||
|
turn into `<!--@keyword` and `@end-keyword@-->`.
|
||||||
|
|
||||||
|
`<!--@non-keyword@` and `@end-non-keyword@-->`
|
||||||
|
turn into `<!--@non-keyword@-->` and `<!--@end-non-keyword@-->`.
|
||||||
|
|
||||||
|
#### In TOC files
|
||||||
|
|
||||||
|
The lines with `#@keyword@` and `#@end-keyword@` get removed, as well as every
|
||||||
|
line in-between.
|
||||||
|
|
||||||
|
The lines with `#@non-keyword@` and `#@end-non-keyword@` get removed, as well as
|
||||||
|
removing a '# ' at the beginning of each line in-between.
|
||||||
|
|
||||||
|
### Changing the file name
|
||||||
|
|
||||||
|
__release.sh__ uses the file name template `"{package-name}-{project-version}{nolib}{classic}"`
|
||||||
|
for the addon zip file. This can be changed with the `-n` switch (`release.sh
|
||||||
|
-n "{package-name}-{project-version}"`).
|
||||||
|
|
||||||
|
These tokens are always replaced with their value:
|
||||||
|
|
||||||
|
- `{package-name}`
|
||||||
|
- `{project-revision}`
|
||||||
|
- `{project-hash}`
|
||||||
|
- `{project-abbreviated-hash}`
|
||||||
|
- `{project-author}`
|
||||||
|
- `{project-date-iso}`
|
||||||
|
- `{project-date-integer}`
|
||||||
|
- `{project-timestamp}`
|
||||||
|
- `{project-version}`
|
||||||
|
- `{game-type}`
|
||||||
|
- `{release-type}`
|
||||||
|
|
||||||
|
These tokens are "flags" and are conditionally shown prefixed with a dash based
|
||||||
|
on the build type:
|
||||||
|
|
||||||
|
- `{alpha}`
|
||||||
|
- `{beta}`
|
||||||
|
- `{nolib}`
|
||||||
|
- `{classic}`
|
||||||
|
|
||||||
|
`{classic}` has some additional magic:
|
||||||
|
|
||||||
|
1. It will show as the non-retail build type, so either `-classic` or `-bcc`.
|
||||||
|
2. It will not be shown if "-classic" or "-bcc" is in the project version.
|
||||||
|
3. If it is included in the file name (it is by default) and #2 does not apply,
|
||||||
|
it will also be appended to the file label (i.e., the name shown on
|
||||||
|
CurseForge).
|
||||||
|
|
||||||
|
## Building for multiple game versions
|
||||||
|
|
||||||
|
__release.sh__ needs to know what version of World of Warcraft the package is
|
||||||
|
targeting. This is normally automatically detected using the `## Interface:`
|
||||||
|
line of the addon's TOC file.
|
||||||
|
|
||||||
|
If your addon supports both retail and classic in the same branch, you can use
|
||||||
|
multiple `## Interface-Type:` lines in your TOC file. Only one `## Interface:`
|
||||||
|
line will be included in the packaged TOC file based on the targeted game
|
||||||
|
version.
|
||||||
|
|
||||||
|
```toc
|
||||||
|
## Interface: 90005
|
||||||
|
## Interface-Retail: 90005
|
||||||
|
## Interface-Classic: 11306
|
||||||
|
## Interface-BCC: 20501
|
||||||
|
```
|
||||||
|
|
||||||
|
You specify what version of the game you're targeting with the `-g` switch. You
|
||||||
|
can use a specific version (`release.sh -g 1.13.6`) or you can use the game type
|
||||||
|
(`release.sh -g classic`). Using a game type will set the game version based on
|
||||||
|
the appropriate TOC `## Interface` value.
|
||||||
|
|
||||||
|
You can also set multiple specific versions as a comma delimited list using the
|
||||||
|
`-g` switch (`release.sh -g 1.13.6,2.5.1,9.0.5`). This will still only build
|
||||||
|
one package, with the the last version listed used as the target version for
|
||||||
|
the build.
|
||||||
|
|
||||||
|
**Setting multiple versions is not recommended!** The addon will always be
|
||||||
|
marked "Out of date" in-game for versions that do not match the TOC interface
|
||||||
|
value for the last version set. So even if you don't need any special file
|
||||||
|
processing, it will always be best to run the packager multiple times so the TOC
|
||||||
|
interface value is correct for each game version.
|
||||||
|
|
||||||
|
## Building locally
|
||||||
|
|
||||||
|
The recommended way to include __release.sh__ in a project is to:
|
||||||
|
|
||||||
|
1. Create a *.release* subdirectory in your top-level checkout.
|
||||||
|
2. Copy __release.sh__ into the *.release* directory.
|
||||||
|
3. Ignore the *.release* subdirectory in __.gitignore__.
|
||||||
|
4. Run __release.sh__.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```text
|
||||||
|
Usage: release.sh [options]
|
||||||
|
-c Skip copying files into the package directory.
|
||||||
|
-d Skip uploading.
|
||||||
|
-e Skip checkout of external repositories.
|
||||||
|
-l Skip @localization@ keyword replacement.
|
||||||
|
-L Only do @localization@ keyword replacement (skip upload to CurseForge).
|
||||||
|
-o Keep existing package directory, overwriting its contents.
|
||||||
|
-s Create a stripped-down "nolib" package.
|
||||||
|
-u Use Unix line-endings.
|
||||||
|
-z Skip zip file creation.
|
||||||
|
-t topdir Set top-level directory of checkout.
|
||||||
|
-r releasedir Set directory containing the package directory. Defaults to "$topdir/.release".
|
||||||
|
-p curse-id Set the project id used on CurseForge for localization and uploading. (Use 0 to unset the TOC value)
|
||||||
|
-w wowi-id Set the addon id used on WoWInterface for uploading. (Use 0 to unset the TOC value)
|
||||||
|
-a wago-id Set the project id used on Wago Addons for uploading. (Use 0 to unset the TOC value)
|
||||||
|
-g game-version Set the game version to use for uploading.
|
||||||
|
-m pkgmeta.yaml Set the pkgmeta file to use.
|
||||||
|
-n package-name Set the package zip file name. Use "-n help" for more info.
|
||||||
|
```
|
||||||
|
|
||||||
|
### Uploading
|
||||||
|
|
||||||
|
__release.sh__ uses following environment variables for uploading:
|
||||||
|
|
||||||
|
- `CF_API_KEY` - a [CurseForge API token](https://wow.curseforge.com/account/api-tokens),
|
||||||
|
required for the CurseForge API to fetch localization and upload files.
|
||||||
|
- `WOWI_API_TOKEN` - a [WoWInterface API token](https://www.wowinterface.com/downloads/filecpl.php?action=apitokens),
|
||||||
|
required for uploading to WoWInterface.
|
||||||
|
- `WAGO_API_TOKEN` - a [Wago Addons API token](https://addons.wago.io/account/apikeys),
|
||||||
|
required for uploading to Wago Addons.
|
||||||
|
- `GITHUB_OAUTH` - a [GitHub personal access token](https://github.com/settings/tokens),
|
||||||
|
required for uploading to GitHub.
|
||||||
|
|
||||||
|
__release.sh__ will attempt to load environment variables from a `.env` file in
|
||||||
|
the topdir or current working directory. You can also edit __release.sh__ and
|
||||||
|
enter the tokens near the top of the file.
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
__release.sh__ is mostly POSIX-compatible, so it should run in any Unix-like
|
||||||
|
environment provided the following are available:
|
||||||
|
|
||||||
|
- bash >= 4.3
|
||||||
|
- awk
|
||||||
|
- sed
|
||||||
|
- curl
|
||||||
|
- zip
|
||||||
|
- version control software as needed:
|
||||||
|
- git >= 2.13.0
|
||||||
|
- subversion >= 1.7.0
|
||||||
|
- mercurial >= 3.9.0 (pre-3.9 will have issues with [secure connections](https://www.mercurial-scm.org/wiki/SecureConnections))
|
||||||
|
- [jq](https://stedolan.github.io/jq/download/) >= 1.5 (when uploading)
|
||||||
|
- [pandoc](https://pandoc.org/installing.html) >= 1.19.2 (optional)
|
53
CHANGELOG.md
53
CHANGELOG.md
@@ -3,6 +3,55 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## Version 1.1.4 - 2022-09-28
|
||||||
|
### Changed
|
||||||
|
- typos in descriptions
|
||||||
|
- ambiguous variable definitions
|
||||||
|
- bumped version for all versions of WoW (Classic Era, WotLK, Retail)
|
||||||
|
|
||||||
|
## Version 1.1.3 - 2021-10-06
|
||||||
|
### Changed
|
||||||
|
- bumped version for all versions of WoW (Classic Era, Season of Mastery, BCC, Retail)
|
||||||
|
### Fixed
|
||||||
|
- error on missing options at first start
|
||||||
|
- updated Ace3.0 libraries for latest Shadowlands patch
|
||||||
|
|
||||||
|
## Version 1.1.2 - 2021-05-23
|
||||||
|
### Changed
|
||||||
|
- adopted to BigWigs release script to better support different game packages
|
||||||
|
|
||||||
|
## Version 1.1.1 - 2021-04-22
|
||||||
|
### Changed
|
||||||
|
- bumped versions for WoW Classic and Shadowlands
|
||||||
|
|
||||||
|
## Version 1.1.0 - 2020-12-08
|
||||||
|
### Added
|
||||||
|
- split of messages preserves item links, textures, substitutions and raid target markers
|
||||||
|
- added safety measures to prevent endless replacement loops
|
||||||
|
### Changed
|
||||||
|
- bumped version for Shadowlands
|
||||||
|
- bumped version for Naxxramas
|
||||||
|
### Fixed
|
||||||
|
- split of messages with excessive length no longer causes errors or broken texts
|
||||||
|
- proper handling of umlauts
|
||||||
|
|
||||||
|
## Version 1.0.1 - 2020-10-17
|
||||||
|
### Changed
|
||||||
|
- bumped version for Shadowlands Pre-Patch
|
||||||
|
|
||||||
|
## Version 1.0.0 - 2020-09-01 [First Release]
|
||||||
|
### Added
|
||||||
|
- info section with contact and thanks
|
||||||
|
### Fixed
|
||||||
|
- minor clarifications and spellings errors on help texts
|
||||||
|
|
||||||
|
## Version 0.9.1-rc - 2020-08-01 [Release Candidate]
|
||||||
|
### Fixed
|
||||||
|
- emote detection mixed in other channels
|
||||||
|
- minimap button and dialog no longer resets active state after profile change
|
||||||
|
- default entries are no longer shown after example import
|
||||||
|
- better handling of capture groups and character sets
|
||||||
|
|
||||||
## Version 0.9.0-rc - 2020-07-25 [Release Candidate]
|
## Version 0.9.0-rc - 2020-07-25 [Release Candidate]
|
||||||
### Added
|
### Added
|
||||||
- enable/disable from slash command
|
- enable/disable from slash command
|
||||||
@@ -20,7 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- stop replacements per mapping
|
- stop replacements per mapping
|
||||||
- more ooc recognition patterns
|
- more ooc recognition patterns
|
||||||
### Fixed
|
### Fixed
|
||||||
- keep cases of over-long replacements
|
- keep cases of replacements with excessive length
|
||||||
|
|
||||||
## Version 0.8.0-beta - 2020-06-14 [Feature Complete]
|
## Version 0.8.0-beta - 2020-06-14 [Feature Complete]
|
||||||
### Added
|
### Added
|
||||||
@@ -88,7 +137,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## Version 0.3.0 - 2020-05-27
|
## Version 0.3.0 - 2020-05-27
|
||||||
### Fixed
|
### Fixed
|
||||||
- fixed DB storange and debug printing
|
- fixed DB storage and debug printing
|
||||||
|
|
||||||
## Version 0.2.2 (unreleased) - 2020-05-26
|
## Version 0.2.2 (unreleased) - 2020-05-26
|
||||||
### Added
|
### Added
|
||||||
|
@@ -21,8 +21,9 @@ local _G = _G
|
|||||||
-- initialize addon
|
-- initialize addon
|
||||||
local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
|
local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
|
||||||
Grichelde.version = GetAddOnMetadata(AddonName, "Version")
|
Grichelde.version = GetAddOnMetadata(AddonName, "Version")
|
||||||
Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Experimental"
|
Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Development"
|
||||||
Grichelde.classic = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
|
--Grichelde.era = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
|
||||||
|
--Grichelde.bcc = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_BURNING_CRUSADE_CLASSIC
|
||||||
Grichelde.logLevel = 0 -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
|
Grichelde.logLevel = 0 -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
|
||||||
|
|
||||||
-- publish to global env
|
-- publish to global env
|
||||||
@@ -42,9 +43,9 @@ function Grichelde:OnEnable()
|
|||||||
self:RawHook("SendChatMessage", true)
|
self:RawHook("SendChatMessage", true)
|
||||||
|
|
||||||
self.options, self.dialog = self:SetupOptions()
|
self.options, self.dialog = self:SetupOptions()
|
||||||
self:RefreshOptions("OnProfileChanged")
|
|
||||||
|
|
||||||
self.ldb, self.icon = self:MinimapButton()
|
self.ldb, self.icon = self:MinimapButton()
|
||||||
|
|
||||||
|
self:RefreshProfiles("OnEnable")
|
||||||
self:SetupSlashCommands()
|
self:SetupSlashCommands()
|
||||||
|
|
||||||
-- tell the world we are listening
|
-- tell the world we are listening
|
||||||
|
@@ -1,13 +1,17 @@
|
|||||||
## Interface: 11305
|
## Interface: 90207
|
||||||
|
|
||||||
## Title: Grichelde
|
## Title: Grichelde
|
||||||
## Notes: Replaces characters from the chat box
|
## Notes: Replaces characters of your chat input line before sending.
|
||||||
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile
|
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
|
||||||
## Version: 0.9.0-rc
|
## Version: 1.1.4
|
||||||
## Author: Teilzeit-Jedi
|
## Author: Teilzeit-Jedi
|
||||||
## eMail: tj@teilzeit-jedi.de
|
## eMail: tj@teilzeit-jedi.de
|
||||||
|
|
||||||
## X-Build: Classic
|
## X-Build: Retail
|
||||||
|
## X-Compatible: 11403
|
||||||
|
## X-Compatible: 20504
|
||||||
|
## X-Compatible: 30400
|
||||||
|
|
||||||
## X-Curse-Project-ID: 385480
|
## X-Curse-Project-ID: 385480
|
||||||
## X-License: GPLv3
|
## X-License: GPLv3
|
||||||
## X-Category: Chat/Communication
|
## X-Category: Chat/Communication
|
||||||
@@ -17,7 +21,19 @@
|
|||||||
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
## SavedVariables: GricheldeDB
|
## SavedVariables: GricheldeDB
|
||||||
|
|
||||||
libs.xml
|
Libs\LibStub\LibStub.lua
|
||||||
|
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||||
|
Libs\AceAddon-3.0\AceAddon-3.0.xml
|
||||||
|
Libs\AceLocale-3.0\AceLocale-3.0.xml
|
||||||
|
Libs\AceEvent-3.0\AceEvent-3.0.xml
|
||||||
|
Libs\AceHook-3.0\AceHook-3.0.xml
|
||||||
|
Libs\AceConsole-3.0\AceConsole-3.0.xml
|
||||||
|
Libs\AceDB-3.0\AceDB-3.0.xml
|
||||||
|
Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||||
|
Libs\AceGUI-3.0\AceGUI-3.0.xml
|
||||||
|
Libs\AceConfig-3.0\AceConfig-3.0.xml
|
||||||
|
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
|
||||||
|
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
|
||||||
|
|
||||||
Grichelde.lua
|
Grichelde.lua
|
||||||
GricheldeConstants.lua
|
GricheldeConstants.lua
|
||||||
@@ -30,5 +46,3 @@ GricheldeUpgrade.lua
|
|||||||
GricheldeOptions.lua
|
GricheldeOptions.lua
|
||||||
GricheldeMinimap.lua
|
GricheldeMinimap.lua
|
||||||
GricheldeChat.lua
|
GricheldeChat.lua
|
||||||
|
|
||||||
GricheldeTest.lua
|
|
@@ -2,45 +2,139 @@
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
local Grichelde = _G.Grichelde or {}
|
local Grichelde = _G.Grichelde or {}
|
||||||
|
|
||||||
local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tConcat, tSize, tIsEmpty, find, sub, gsub, gmatch, getNextCharUtf8, isUpper, isLower, toUpper, toLower, capitalize, trim, length, lengthUtf8
|
local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tIsEmpty, find, sub, gsub, getNextCharUtf8, isUtf8MultiByte, getUtf8Sequence, isUpper, isLower, toUpper, toLower, bytes2Char, trim, length, lengthUtf8
|
||||||
= Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tConcat, Grichelde.F.tSize, Grichelde.F.tIsEmpty,
|
= Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tIsEmpty,
|
||||||
Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.gmatch, Grichelde.F.getNextCharUtf8, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.capitalize, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
|
Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.getNextCharUtf8, Grichelde.F.isUtf8MultiByte, Grichelde.F.getUtf8Sequence, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
|
||||||
|
|
||||||
--- Splits a long text in longest possible chunks of <= 255 length, split at last available space
|
--- Splits a long text in longest possible chunks of <= 255 length, split at last available space
|
||||||
-- @param text string
|
-- @param text string
|
||||||
-- @return table
|
-- @return array of chunks
|
||||||
function Grichelde:SplitText(text)
|
function Grichelde:SplitText(text)
|
||||||
local chunks = {}
|
local chunks = {}
|
||||||
local splitText = text
|
local leftGuillemet = bytes2Char(194, 171) .. " "
|
||||||
local textSize = length(splitText or "")
|
local rightGuillemet = " " .. bytes2Char(194, 187)
|
||||||
|
local chunkSize = Grichelde.INPUT_LIMIT - length(leftGuillemet) - length(rightGuillemet)
|
||||||
|
|
||||||
while (textSize > 255) do
|
local function preserveText(newText, chunk, blockText, posEnd)
|
||||||
local chunk = sub(splitText, 1, 255)
|
-- link found, block completed
|
||||||
local remaining = ""
|
self:TracePrint("SplitText : Found preservable text up to %s", posEnd)
|
||||||
|
local preserved = sub(newText, 1, posEnd)
|
||||||
|
|
||||||
-- special case: if space is the start of the next chunk, don't split this chunk
|
if ((length(chunk) > 0) and (length(chunk .. blockText) > chunkSize)) then
|
||||||
if (sub(splitText, 256, 256) ~= ' ') then
|
-- block exceeds chunk, chunkify previous blocks
|
||||||
-- split at last space, don't assign directly as nil might be returned
|
self:DebugPrint("SplitText : add chunk:", chunk)
|
||||||
local left, right = self:SplitOnLastMatch(chunk)
|
tInsert(chunks, chunk .. rightGuillemet)
|
||||||
if (left ~= nil) then
|
chunk = leftGuillemet .. trim(blockText)
|
||||||
chunk = left
|
else
|
||||||
end
|
chunk = chunk .. blockText
|
||||||
if (right ~= nil) then
|
end
|
||||||
remaining = right
|
|
||||||
|
if ((length(chunk) > 0) and (length(chunk .. preserved) > chunkSize)) then
|
||||||
|
-- block exceeds chunk, chunkify previous blocks
|
||||||
|
self:DebugPrint("SplitText : add chunk:", chunk)
|
||||||
|
tInsert(chunks, chunk .. rightGuillemet)
|
||||||
|
chunk = leftGuillemet .. trim(preserved)
|
||||||
|
else
|
||||||
|
chunk = chunk .. preserved
|
||||||
|
end
|
||||||
|
|
||||||
|
blockText = ""
|
||||||
|
newText = sub(newText, posEnd + 1)
|
||||||
|
|
||||||
|
return newText, chunk, blockText, posEnd
|
||||||
|
end
|
||||||
|
|
||||||
|
if (length(text or "") <= Grichelde.INPUT_LIMIT) then
|
||||||
|
self:DebugPrint("SplitText : no chunk:", text)
|
||||||
|
tInsert(chunks, text)
|
||||||
|
else
|
||||||
|
local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
|
||||||
|
|
||||||
|
local newText = text or ""
|
||||||
|
local chunk, blockText = "", ""
|
||||||
|
local currentChar
|
||||||
|
local escape = 0
|
||||||
|
|
||||||
|
-- must not enforce UTF-8 support here, as the positions are used
|
||||||
|
while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
|
||||||
|
escape = escape + 1
|
||||||
|
local first, textAhead = getNextCharUtf8(newText)
|
||||||
|
currentChar = first
|
||||||
|
self:DebugPrint("SplitText : currentChar, escape: %s, %s", currentChar, escape)
|
||||||
|
self:TracePrint("SplitText : chunk:", chunk)
|
||||||
|
self:TracePrint("SplitText : newText:", newText)
|
||||||
|
|
||||||
|
-- as there is not OR in Luas pattern matching, search for all of the exclude patterns after another is
|
||||||
|
-- cumbersome and inefficient -> look for each char consecutively if it matches the starting pattern only
|
||||||
|
-- and if if matches do full pattern matching
|
||||||
|
if (currentChar == ' ') then
|
||||||
|
self:TracePrint("SplitText : block completed")
|
||||||
|
|
||||||
|
if ((length(chunk) > 0) and (length(chunk .. blockText) > chunkSize)) then
|
||||||
|
-- block exceeds chunk, chunkify previous blocks
|
||||||
|
self:DebugPrint("SplitText : add chunk:", chunk)
|
||||||
|
tInsert(chunks, chunk .. rightGuillemet)
|
||||||
|
chunk = leftGuillemet .. trim(blockText)
|
||||||
|
else
|
||||||
|
chunk = chunk .. blockText
|
||||||
|
end
|
||||||
|
|
||||||
|
blockText = currentChar
|
||||||
|
newText = textAhead
|
||||||
|
elseif (tContains(lookAheads, currentChar)) then
|
||||||
|
-- lookahead-check for all preservable patterns (itemLinks, textures, emotes, ooc, etc.)
|
||||||
|
|
||||||
|
-- link detection
|
||||||
|
local linkPosEnd = self:CheckForLink(newText, currentChar)
|
||||||
|
if (linkPosEnd ~= nil) then
|
||||||
|
-- link found, block completed
|
||||||
|
newText, chunk, blockText = preserveText(newText, chunk, blockText, linkPosEnd)
|
||||||
|
else
|
||||||
|
-- substitution detection
|
||||||
|
local substPosEnd = self:CheckForSubstitutions(newText, currentChar)
|
||||||
|
if (substPosEnd ~= nil) then
|
||||||
|
-- substitution found, block completed
|
||||||
|
newText, chunk, blockText = preserveText(newText, chunk, blockText, substPosEnd)
|
||||||
|
else
|
||||||
|
-- raid target marker detection
|
||||||
|
local rtmPosEnd = self:CheckForRaidTargetMarkers(newText, currentChar)
|
||||||
|
if (rtmPosEnd ~= nil) then
|
||||||
|
-- raid target marker found, block completed
|
||||||
|
newText, chunk, blockText = preserveText(newText, chunk, blockText, rtmPosEnd)
|
||||||
|
else
|
||||||
|
blockText = blockText .. currentChar
|
||||||
|
newText = textAhead
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
blockText = blockText .. currentChar
|
||||||
|
newText = textAhead
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self:DebugPrint("SplitText : chunk:", chunk)
|
self:TracePrint("SplitText : main loop completed")
|
||||||
|
if (length(chunk .. blockText) > 0) then
|
||||||
|
-- catchup remaining text at the end
|
||||||
|
if (length(chunk .. blockText) > chunkSize) then
|
||||||
|
-- block exceeds chunk, chunkify previous blocks
|
||||||
|
if (length(chunk) > 0) then
|
||||||
|
self:DebugPrint("SplitText : add chunk:", chunk)
|
||||||
|
tInsert(chunks, chunk .. rightGuillemet)
|
||||||
|
chunk = leftGuillemet .. trim(blockText)
|
||||||
|
else
|
||||||
|
chunk = chunk .. blockText
|
||||||
|
end
|
||||||
|
else
|
||||||
|
chunk = chunk .. blockText
|
||||||
|
end
|
||||||
|
|
||||||
tInsert(chunks, chunk)
|
self:DebugPrint("SplitText : last chunk:", chunk)
|
||||||
splitText = remaining .. sub(splitText, 256)
|
-- sub(chunk, 1, 255) can result in broken UTF8 chars and error message
|
||||||
textSize = length(splitText)
|
tInsert(chunks, chunk)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- pickup remaining text < 255
|
|
||||||
self:DebugPrint("SplitText : last chunk:", splitText)
|
|
||||||
tInsert(chunks, splitText)
|
|
||||||
|
|
||||||
return chunks
|
return chunks
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -59,14 +153,33 @@ function Grichelde:SendChunkifiedChatMessage(message, ...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, replacedTexts)
|
function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, replacedTexts)
|
||||||
|
local function convertToCaseInsensitivePatternGroup(p)
|
||||||
|
local upperP, lowerP = toUpper(p), toLower(p)
|
||||||
|
--[[
|
||||||
|
if (isUtf8MultiByte(p)) then
|
||||||
|
local sequence = nil
|
||||||
|
for _, byteSequence in spairs(getUtf8Table(upperP)) do
|
||||||
|
sequence = sequence .. byteSequence
|
||||||
|
end
|
||||||
|
else
|
||||||
|
]]
|
||||||
|
if (upperP ~= lowerP) then
|
||||||
|
return upperP .. lowerP
|
||||||
|
else
|
||||||
|
return p
|
||||||
|
end
|
||||||
|
--end
|
||||||
|
end
|
||||||
|
|
||||||
local function convertToCaseInsensitivePattern(pattern)
|
local function convertToCaseInsensitivePattern(pattern)
|
||||||
local ciPattern = ""
|
local ciPattern = ""
|
||||||
local ignored = {'^', '$', '(', ')', '.'}
|
local ignored = {'^', '$', '(', ')', '.'}
|
||||||
local quantifiers = {'*', '+', '-', '?'}
|
local quantifiers = {'*', '+', '-', '?'}
|
||||||
local pos = 1
|
|
||||||
local p, patRest = getNextCharUtf8(pattern)
|
local p, patRest = getNextCharUtf8(pattern)
|
||||||
|
local escape = 0
|
||||||
|
|
||||||
while (p ~= nil) do
|
while ((p ~= nil) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
|
||||||
|
escape = escape + 1
|
||||||
if (tContains(ignored, p) or tContains(quantifiers, p)) then
|
if (tContains(ignored, p) or tContains(quantifiers, p)) then
|
||||||
-- ignore
|
-- ignore
|
||||||
ciPattern = ciPattern .. p
|
ciPattern = ciPattern .. p
|
||||||
@@ -81,12 +194,20 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
|
|||||||
ciPattern = ciPattern .. "["
|
ciPattern = ciPattern .. "["
|
||||||
p, patRest = getNextCharUtf8(patRest)
|
p, patRest = getNextCharUtf8(patRest)
|
||||||
while ((p ~= nil) and (p ~= "]")) do
|
while ((p ~= nil) and (p ~= "]")) do
|
||||||
ciPattern = ciPattern .. Grichelde.F.toUpper(p) .. Grichelde.F.toLower(p)
|
if (p == "%") then
|
||||||
|
-- ignore capture references
|
||||||
|
p, patRest = getNextCharUtf8(patRest)
|
||||||
|
if (p ~= nil) then
|
||||||
|
ciPattern = ciPattern .. "%" .. p
|
||||||
|
end
|
||||||
|
else
|
||||||
|
ciPattern = ciPattern .. convertToCaseInsensitivePatternGroup(p)
|
||||||
|
end
|
||||||
p, patRest = getNextCharUtf8(patRest)
|
p, patRest = getNextCharUtf8(patRest)
|
||||||
end
|
end
|
||||||
ciPattern = ciPattern .. "]"
|
ciPattern = ciPattern .. "]"
|
||||||
else
|
else
|
||||||
ciPattern = ciPattern .. "[" .. Grichelde.F.toUpper(p) .. Grichelde.F.toLower(p) .. "]"
|
ciPattern = ciPattern .. "[" .. convertToCaseInsensitivePatternGroup(p) .. "]"
|
||||||
end
|
end
|
||||||
|
|
||||||
p, patRest = getNextCharUtf8(patRest)
|
p, patRest = getNextCharUtf8(patRest)
|
||||||
@@ -95,9 +216,9 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
|
|||||||
return ciPattern
|
return ciPattern
|
||||||
end
|
end
|
||||||
|
|
||||||
local function replaceCaptures(text, replaceText, captures)
|
local function replaceCaptures(txt, replaceText, captures)
|
||||||
local replText = replaceText
|
local replText = replaceText
|
||||||
self:TracePrint("replaceCaptures : text: %s, #captures: %d", text, #captures)
|
self:TracePrint("replaceCaptures : txt: %s, #captures: %d", txt, #captures)
|
||||||
|
|
||||||
if (#captures > 0) then
|
if (#captures > 0) then
|
||||||
for i, cap in ipairs(captures) do
|
for i, cap in ipairs(captures) do
|
||||||
@@ -176,9 +297,6 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
|
|||||||
self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
|
self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
|
||||||
self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
|
self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
|
||||||
while (pos1 ~= nil) and (pos2 ~= nil) and (pos1 <= pos2) do
|
while (pos1 ~= nil) and (pos2 ~= nil) and (pos1 <= pos2) do
|
||||||
-- continue from that position later
|
|
||||||
pos = pos2 + 1
|
|
||||||
|
|
||||||
if doStopOnMatch then
|
if doStopOnMatch then
|
||||||
stopOnMatch = true
|
stopOnMatch = true
|
||||||
end
|
end
|
||||||
@@ -188,6 +306,24 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
|
|||||||
local post = sub(result, pos2 + 1)
|
local post = sub(result, pos2 + 1)
|
||||||
local wordStart = sub(pre, -1, -1)
|
local wordStart = sub(pre, -1, -1)
|
||||||
local wordEnd = sub(post, 1, 1)
|
local wordEnd = sub(post, 1, 1)
|
||||||
|
self:TracePrint("ReplaceCharacters : result: %s", result)
|
||||||
|
self:TracePrint("ReplaceCharacters : pre: %s, match: %s, post: %s, wordStart: %s, wordEnd: %s", pre, match, post, wordStart, wordEnd)
|
||||||
|
|
||||||
|
--[[
|
||||||
|
self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
|
||||||
|
while (not isChar(match) and pos2 < length(result)) do
|
||||||
|
pos2 = pos2 + 1
|
||||||
|
pre = sub(result, 1, pos1 - 1)
|
||||||
|
match = sub(result, pos1, pos2)
|
||||||
|
post = sub(result, pos2 + 1)
|
||||||
|
wordStart = sub(pre, -1, -1)
|
||||||
|
wordEnd = sub(post, 1, 1)
|
||||||
|
self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
|
||||||
|
end
|
||||||
|
]]
|
||||||
|
|
||||||
|
-- continue from that position later
|
||||||
|
pos = pos2 + 1
|
||||||
|
|
||||||
-- additional checks for word boundaries
|
-- additional checks for word boundaries
|
||||||
local doesMatchWhen = false
|
local doesMatchWhen = false
|
||||||
@@ -313,6 +449,8 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
|
|||||||
findText = result
|
findText = result
|
||||||
-- update values for next iteration
|
-- update values for next iteration
|
||||||
pos1, pos2, cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9 = find(findText, searchText, pos)
|
pos1, pos2, cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9 = find(findText, searchText, pos)
|
||||||
|
self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
|
||||||
|
self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
|
||||||
end
|
end
|
||||||
|
|
||||||
if (text ~= result) then
|
if (text ~= result) then
|
||||||
@@ -330,8 +468,8 @@ end
|
|||||||
-- @param text string
|
-- @param text string
|
||||||
-- @param replacements table of mappings
|
-- @param replacements table of mappings
|
||||||
-- @return string
|
-- @return string
|
||||||
function Grichelde:ReplaceAndConsolidate(text, replacements)
|
function Grichelde:ReplaceAndConsolidate(text, _replacements)
|
||||||
local replacements = replacements or self.db.profile.replacements or {}
|
local replacements = _replacements or self.db.profile.replacements or {}
|
||||||
self:TracePrint("ReplaceAndConsolidate : replacements")
|
self:TracePrint("ReplaceAndConsolidate : replacements")
|
||||||
self:TracePrint(replacements)
|
self:TracePrint(replacements)
|
||||||
|
|
||||||
@@ -414,47 +552,42 @@ function Grichelde:ReplaceAndConsolidate(text, replacements)
|
|||||||
return result
|
return result
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Checks if the text starts with a preversable ignore pattern, such as itemLinks, textures, raid target icons,
|
--- looks for colored items, item links or textures
|
||||||
--- emotes, ooc or %-substitutons and returns the end location of the match, or 0 if no pattern was found
|
function Grichelde:CheckForLink(text, currentChar)
|
||||||
-- @param text string
|
if (currentChar == "|") then
|
||||||
-- @param currentChar string(1) current character (first one) of the text, given for performance reasons
|
|
||||||
-- @param previousChar string(1) previous character of the text, otherwise unreachable
|
|
||||||
-- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
|
|
||||||
-- @return number
|
|
||||||
function Grichelde:CheckForPreversableText(text, currentChar, previousChar, replaceEmotes)
|
|
||||||
self:DebugPrint("CheckForPreversableText : text:", text)
|
|
||||||
local replaceEmotes = replaceEmotes or self.db.profile.channels.emote or false
|
|
||||||
|
|
||||||
-- Calling find on ever pattern might be inefficient but its way less code than marching over every character
|
|
||||||
if (currentChar == "|" ) then
|
|
||||||
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.LINKS) do
|
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.LINKS) do
|
||||||
local pos1, pos2 = find(text, "^" .. pattern)
|
local pos1, pos2 = find(text, "^" .. pattern)
|
||||||
if (pos1 == 1) and (pos2 ~= nil) then
|
if (pos1 == 1) and (pos2 ~= nil) then
|
||||||
self:DebugPrint("CheckForPreversableText : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
|
self:DebugPrint("CheckForLink : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
|
||||||
return pos2
|
return pos2
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
-- emote detection
|
--- looks for emotes
|
||||||
|
function Grichelde:CheckForEmote(text, currentChar, replaceEmotes)
|
||||||
if (currentChar == "*" or currentChar == "<") then
|
if (currentChar == "*" or currentChar == "<") then
|
||||||
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.EMOTES) do
|
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.EMOTES) do
|
||||||
local pos1, pos2 = find(text, "^" .. pattern)
|
local pos1, pos2 = find(text, "^" .. pattern)
|
||||||
if (pos1 == 1) and (pos2 ~= nil) then
|
if (pos1 == 1) and (pos2 ~= nil) then
|
||||||
local emote = sub(text, pos1, pos2)
|
local emote = sub(text, pos1, pos2)
|
||||||
if (replaceEmotes) then
|
if (not replaceEmotes) then
|
||||||
self:DebugPrint("CheckForPreversableText : Found emote \"%s\" but preserved it", emote)
|
self:DebugPrint("CheckForEmote : Found emote \"%s\" at (%d, %d), but preserved it", emote, pos1, pos2)
|
||||||
return pos2
|
return pos2
|
||||||
else
|
else
|
||||||
self:DebugPrint("CheckForPreversableText : Found emote \"%s\" at (%d, %d)", emote, pos1, pos2)
|
self:DebugPrint("CheckForEmote : Processing emote \"%s\" at (%d, %d)", emote, pos1, pos2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
--- looks for %-substitutions
|
||||||
|
function Grichelde:CheckForSubstitutions(text, currentChar)
|
||||||
local lowerText = toLower(text)
|
local lowerText = toLower(text)
|
||||||
|
|
||||||
-- %-substitutions
|
|
||||||
if (currentChar == "%") then
|
if (currentChar == "%") then
|
||||||
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.SUBSTITUTES) do
|
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.SUBSTITUTES) do
|
||||||
local pos1, pos2 = find(lowerText, "^" .. pattern)
|
local pos1, pos2 = find(lowerText, "^" .. pattern)
|
||||||
@@ -464,8 +597,12 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
-- raid target markers
|
--- looks for general and localized raid target markers
|
||||||
|
function Grichelde:CheckForRaidTargetMarkers(text, currentChar)
|
||||||
|
local lowerText = toLower(text)
|
||||||
if (currentChar == "{") then
|
if (currentChar == "{") then
|
||||||
-- rt1-9
|
-- rt1-9
|
||||||
local pattern = Grichelde.IGNORE_PATTERNS.RAID_TARGETS[1]
|
local pattern = Grichelde.IGNORE_PATTERNS.RAID_TARGETS[1]
|
||||||
@@ -479,15 +616,19 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
|
|||||||
local translation = toLower(self.L["IgnorePattern_" .. localizedRT])
|
local translation = toLower(self.L["IgnorePattern_" .. localizedRT])
|
||||||
local localizedPattern = "^{" .. translation .. "}"
|
local localizedPattern = "^{" .. translation .. "}"
|
||||||
self:TracePrint("CheckForPreversableText : localizedPattern:", localizedPattern)
|
self:TracePrint("CheckForPreversableText : localizedPattern:", localizedPattern)
|
||||||
local pos1, pos2 = find(lowerText, localizedPattern)
|
local p1, p2 = find(lowerText, localizedPattern)
|
||||||
if (pos1 == 1) and (pos2 ~= nil) then
|
if (p1 == 1) and (p2 ~= nil) then
|
||||||
self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, pos1, pos2)
|
self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, p1, p2)
|
||||||
return pos2
|
return p2
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
-- ooc bracket detection
|
--- looks for ooc with brackets
|
||||||
|
function Grichelde:CheckForOocBrackets(text, currentChar)
|
||||||
|
local lowerText = toLower(text)
|
||||||
if (currentChar == "(") then
|
if (currentChar == "(") then
|
||||||
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.OOC_BRACKETS) do
|
for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.OOC_BRACKETS) do
|
||||||
local pos1, pos2 = find(lowerText, "^" .. pattern)
|
local pos1, pos2 = find(lowerText, "^" .. pattern)
|
||||||
@@ -497,15 +638,63 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
-- ooc without brackets: remaing text is treated as ooc completely!
|
--- looks for ooc without brackets
|
||||||
|
function Grichelde:CheckForOocNoBrackets(text, currentChar, previousChar)
|
||||||
|
local lowerText = toLower(text)
|
||||||
if (currentChar == "o") then
|
if (currentChar == "o") then
|
||||||
local pattern = Grichelde.IGNORE_PATTERNS.OOC_NO_BRACKETS[1]
|
local pattern = Grichelde.IGNORE_PATTERNS.OOC_NO_BRACKETS[1]
|
||||||
if ((previousChar == nil) or (find(previousChar, "%s") ~= nil)) and (find(lowerText, pattern) ~= nil) then
|
if ((previousChar == nil) or (find(previousChar, "%s") ~= nil)) and (find(lowerText, pattern) ~= nil) then
|
||||||
self:DebugPrint("CheckForPreversableText : ooc for remaing text")
|
self:DebugPrint("CheckForPreversableText : ooc for remaing text")
|
||||||
|
-- remaing text is treated as ooc completely!
|
||||||
return length(text)
|
return length(text)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
--- Checks if the text starts with a preversable ignore pattern, such as itemLinks, textures, raid target icons,
|
||||||
|
--- emotes, ooc or %-substitutons and returns the end location of the match, or 0 if no pattern was found
|
||||||
|
-- @param text string
|
||||||
|
-- @param currentChar string(1) current character (first one) of the text, given for performance reasons
|
||||||
|
-- @param previousChar string(1) previous character of the text, otherwise unreachable
|
||||||
|
-- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
|
||||||
|
-- @return number
|
||||||
|
function Grichelde:CheckForPreversableText(text, currentChar, previousChar, _replaceEmotes)
|
||||||
|
self:DebugPrint("CheckForPreversableText : text:", text)
|
||||||
|
local replaceEmotes = _replaceEmotes or self.db.profile.channels.emote or false
|
||||||
|
|
||||||
|
local linkPos = self:CheckForLink(text, currentChar)
|
||||||
|
if (linkPos ~= nil) then
|
||||||
|
return linkPos
|
||||||
|
end
|
||||||
|
|
||||||
|
local emotePos = self:CheckForEmote(text, currentChar, replaceEmotes)
|
||||||
|
if (emotePos ~= nil) then
|
||||||
|
return emotePos
|
||||||
|
end
|
||||||
|
|
||||||
|
local substPos = self:CheckForSubstitutions(text, currentChar)
|
||||||
|
if (substPos ~= nil) then
|
||||||
|
return substPos
|
||||||
|
end
|
||||||
|
|
||||||
|
local rtmPos = self:CheckForRaidTargetMarkers(text, currentChar)
|
||||||
|
if (rtmPos ~= nil) then
|
||||||
|
return rtmPos
|
||||||
|
end
|
||||||
|
|
||||||
|
local oocBracketPos = self:CheckForOocBrackets(text, currentChar)
|
||||||
|
if (oocBracketPos ~= nil) then
|
||||||
|
return oocBracketPos
|
||||||
|
end
|
||||||
|
|
||||||
|
local oocNoBracketPos = self:CheckForOocNoBrackets(text, currentChar, previousChar)
|
||||||
|
if (oocNoBracketPos ~= nil) then
|
||||||
|
return oocNoBracketPos
|
||||||
|
end
|
||||||
|
|
||||||
self:DebugPrint("CheckForPreversableText : no ignore pattern found")
|
self:DebugPrint("CheckForPreversableText : no ignore pattern found")
|
||||||
return 0
|
return 0
|
||||||
@@ -516,54 +705,54 @@ end
|
|||||||
-- @param text string the text to apply the mappings on
|
-- @param text string the text to apply the mappings on
|
||||||
-- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
|
-- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
|
||||||
-- @return string
|
-- @return string
|
||||||
function Grichelde:ReplaceText(text, replacements, replaceEmotes)
|
function Grichelde:ReplaceText(text, _replacements, _replaceEmotes)
|
||||||
local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
|
local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
|
||||||
local newText = text
|
local newText = text
|
||||||
local preserveEmotes = replaceEmotes or self.db.profile.channels.emote or false
|
local preserveEmotes = _replaceEmotes or self.db.profile.channels.emote or false
|
||||||
local replacements = replacements or self.db.profile.replacements or {}
|
local replacements = _replacements or self.db.profile.replacements or {}
|
||||||
local finalText = ""
|
local finalText, replaceText = "", ""
|
||||||
|
local currentChar
|
||||||
|
local escape = 0
|
||||||
|
|
||||||
local currentChar, previousChar
|
-- must not enforce UTF-8 support here, as the positions are used
|
||||||
local current = 1
|
while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
|
||||||
local lastStart = 1
|
escape = escape + 1
|
||||||
|
local previousChar = currentChar
|
||||||
-- no UTF-8 support required here, as the positions are used
|
local first, textAhead = getNextCharUtf8(newText)
|
||||||
while current <= length(newText) do
|
currentChar = first
|
||||||
previousChar = currentChar
|
self:TracePrint("ReplaceText : currentChar : %s", currentChar)
|
||||||
currentChar = sub(newText, current, current)
|
|
||||||
self:TracePrint("ReplaceText : current/char : %s,%s", current, currentChar)
|
|
||||||
|
|
||||||
-- as there is not OR in Luas pattern matching, search for all of the exclude patterns after another is
|
-- as there is not OR in Luas pattern matching, search for all of the exclude patterns after another is
|
||||||
-- cumbersome and inefficient -> look for each char consecutively if it matches the starting pattern only
|
-- cumbersome and inefficient -> look for each char consecutively if it matches the starting pattern only
|
||||||
-- and if if matches do full pattern matching
|
-- and if if matches do full pattern matching
|
||||||
if (not tContains(lookAheads, currentChar)) then
|
if (tContains(lookAheads, currentChar)) then
|
||||||
current = current + 1
|
|
||||||
else
|
|
||||||
-- lookahead-check for all preservable patterns (itemLinks, textures, emotes, ooc, etc.)
|
-- lookahead-check for all preservable patterns (itemLinks, textures, emotes, ooc, etc.)
|
||||||
local textAhead = sub(newText, current)
|
--local textAhead = sub(newText, current)
|
||||||
local posEnd = self:CheckForPreversableText(textAhead, currentChar, previousChar, preserveEmotes)
|
local posEnd = self:CheckForPreversableText(newText, currentChar, previousChar, preserveEmotes)
|
||||||
if (posEnd > 0) then
|
if (posEnd > 0) then
|
||||||
self:DebugPrint("ReplaceText : Found an ignore pattern")
|
self:DebugPrint("ReplaceText : Found an ignore pattern")
|
||||||
|
|
||||||
-- split text and continue after preserved text
|
-- replace all text up until now
|
||||||
local textBefore = sub(newText, lastStart, current - 1)
|
local replacement = self:ReplaceAndConsolidate(replaceText, replacements)
|
||||||
local replacement = self:ReplaceAndConsolidate(textBefore, replacements)
|
local preserved = sub(newText, 1, posEnd)
|
||||||
local preservedText = sub(textAhead, 1, posEnd)
|
|
||||||
|
|
||||||
finalText = finalText .. replacement .. preservedText
|
finalText = finalText .. replacement .. preserved
|
||||||
current = current + posEnd
|
replaceText = ""
|
||||||
lastStart = current
|
newText = sub(newText, posEnd + 1)
|
||||||
self:DebugPrint("ReplaceText : restarting at", lastStart)
|
self:DebugPrint("ReplaceText : remaining text", newText)
|
||||||
else
|
else
|
||||||
-- no corresponding end was found to start pattern, continue loop with next char
|
-- no corresponding end was found to start pattern, continue loop with next char
|
||||||
current = current + 1
|
replaceText = replaceText .. currentChar
|
||||||
|
newText = textAhead
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
replaceText = replaceText .. currentChar
|
||||||
|
newText = textAhead
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- catchup remaining text to the end
|
-- catchup remaining text to the end
|
||||||
local remainingText = sub(newText, lastStart)
|
local replacement = self:ReplaceAndConsolidate(replaceText, replacements)
|
||||||
local replacement = self:ReplaceAndConsolidate(remainingText, replacements)
|
|
||||||
finalText = finalText .. replacement
|
finalText = finalText .. replacement
|
||||||
|
|
||||||
self:DebugPrint("ReplaceText : replaced \"%s\"", text)
|
self:DebugPrint("ReplaceText : replaced \"%s\"", text)
|
||||||
@@ -577,22 +766,24 @@ function Grichelde:IsOneBigEmote(text)
|
|||||||
|
|
||||||
-- emote detection
|
-- emote detection
|
||||||
local isEmote = false
|
local isEmote = false
|
||||||
-- scheme *emote*
|
local firstChar, rest = getNextCharUtf8(firstWord)
|
||||||
if (sub(firstWord, 1, 1) == "<") then
|
|
||||||
|
-- scheme <emote>
|
||||||
|
if (firstChar == "<") then
|
||||||
-- search for emote end
|
-- search for emote end
|
||||||
local _, emoteEnd = find(text, "%>", 2)
|
local _, emoteEnd = find(text, "%>", 2)
|
||||||
isEmote = (emoteEnd == length(text))
|
isEmote = (emoteEnd == lengthUtf8(text))
|
||||||
end
|
end
|
||||||
if (not isEmote and (sub(firstWord, 1, 1) == "*")) then
|
if (not isEmote and (firstChar == "*")) then
|
||||||
-- search for emote end
|
if (getNextCharUtf8(rest) == "*") then
|
||||||
local _, emoteEnd = find(text, "%*", 2)
|
-- scheme **emote**
|
||||||
isEmote = (emoteEnd == length(text))
|
local _, emoteEnd = find(text, "%*%*", 3)
|
||||||
end
|
isEmote = (emoteEnd == lengthUtf8(text))
|
||||||
-- scheme **emote**
|
else
|
||||||
if (not isEmote and (sub(firstWord, 1, 2) == "**")) then
|
-- scheme *emote*
|
||||||
-- search for emote end
|
local _, emoteEnd = find(text, "%*", 2)
|
||||||
local _, emoteEnd = find(text, "%*%*", 3)
|
isEmote = (emoteEnd == lengthUtf8(text))
|
||||||
isEmote = (emoteEnd == length(text))
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- the whole text is one big emote
|
-- the whole text is one big emote
|
||||||
@@ -644,7 +835,7 @@ function Grichelde:CheckReplacementAllowed(text, channel)
|
|||||||
assert(firstWord ~= nil, "firstWord is never nil")
|
assert(firstWord ~= nil, "firstWord is never nil")
|
||||||
|
|
||||||
-- don't replace slash commands
|
-- don't replace slash commands
|
||||||
if (sub(firstWord, 1, 1) == "/") then
|
if (getNextCharUtf8(firstWord) == "/") then
|
||||||
self:DebugPrint("CheckReplacementAllowed : skip other slash commands:", firstWord)
|
self:DebugPrint("CheckReplacementAllowed : skip other slash commands:", firstWord)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -676,7 +867,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- first word should be a chat command
|
-- first word should be a chat command
|
||||||
if (sub(message, 1, 1) == "/") then
|
if (getNextCharUtf8(message) == "/") then
|
||||||
-- extract chat command
|
-- extract chat command
|
||||||
local chatCmd, targetAndText = self:SplitOnFirstMatch(message)
|
local chatCmd, targetAndText = self:SplitOnFirstMatch(message)
|
||||||
assert(chatCmd ~= nil, "chatCmd is never nil")
|
assert(chatCmd ~= nil, "chatCmd is never nil")
|
||||||
|
@@ -5,6 +5,10 @@ local Grichelde = _G.Grichelde or {}
|
|||||||
-- constants and upvalues
|
-- constants and upvalues
|
||||||
Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }
|
Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }
|
||||||
|
|
||||||
|
-- chat input in client is limited to 255 bytes (unicode length is less)
|
||||||
|
Grichelde.INPUT_LIMIT = 255
|
||||||
|
-- safety measure in case malformed user input causes infinite loops on string parsing
|
||||||
|
Grichelde.ENDLESS_LOOP_LIMIT = 10000
|
||||||
Grichelde.MAPPING_OFFSET = 10
|
Grichelde.MAPPING_OFFSET = 10
|
||||||
Grichelde.MINIMAP_ENABLED = 1.0
|
Grichelde.MINIMAP_ENABLED = 1.0
|
||||||
Grichelde.MINIMAP_DARKENDED = 0.5
|
Grichelde.MINIMAP_DARKENDED = 0.5
|
||||||
@@ -39,6 +43,8 @@ Grichelde.COLOR_CODES = {
|
|||||||
YELLOW = _G.YELLOW_FONT_COLOR_CODE or "|cffffff00",
|
YELLOW = _G.YELLOW_FONT_COLOR_CODE or "|cffffff00",
|
||||||
LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a",
|
LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a",
|
||||||
ORANGE = _G.ORANGE_FONT_COLOR_CODE or "|cffff7f3f",
|
ORANGE = _G.ORANGE_FONT_COLOR_CODE or "|cffff7f3f",
|
||||||
|
BLUE = "|cff0000ff",
|
||||||
|
HYPERLINK = "|cff4040ff",
|
||||||
CLOSE = _G.FONT_COLOR_CODE_CLOSE or "|r",
|
CLOSE = _G.FONT_COLOR_CODE_CLOSE or "|r",
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +120,7 @@ Grichelde.BLIZZ_TYPE_TO_OPTIONS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- do not replace these patterns
|
-- do not replace these patterns
|
||||||
|
-- combined item links in the chat will look like this: |cff9d9d9d|Hitem:3299::::::::20:257::::::|h[Fractured Canine]|h|r
|
||||||
Grichelde.IGNORE_PATTERNS = {
|
Grichelde.IGNORE_PATTERNS = {
|
||||||
LINKS = {
|
LINKS = {
|
||||||
"|[Cc]%x%x%x%x%x%x%x%x.-|r", -- colored items (or links)
|
"|[Cc]%x%x%x%x%x%x%x%x.-|r", -- colored items (or links)
|
||||||
@@ -164,11 +171,11 @@ local function nilOrEmpty(s)
|
|||||||
return s == nil or s:trim() == ""
|
return s == nil or s:trim() == ""
|
||||||
end
|
end
|
||||||
|
|
||||||
local function spairs(t, orderFunc)
|
local function spairs(tbl, orderFunc)
|
||||||
-- collect the keys
|
-- collect the keys
|
||||||
local sortedKeys = {}
|
local sortedKeys = {}
|
||||||
-- for every non-nil value
|
-- for every non-nil value
|
||||||
for key, _ in Grichelde.F.pairs(t) do
|
for key, _ in Grichelde.F.pairs(tbl) do
|
||||||
Grichelde.F.tInsert(sortedKeys, key)
|
Grichelde.F.tInsert(sortedKeys, key)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -184,22 +191,22 @@ local function spairs(t, orderFunc)
|
|||||||
return function()
|
return function()
|
||||||
it = it + 1
|
it = it + 1
|
||||||
if (sortedKeys[it] ~= nil) then
|
if (sortedKeys[it] ~= nil) then
|
||||||
return sortedKeys[it], t[sortedKeys[it]]
|
return sortedKeys[it], tbl[sortedKeys[it]]
|
||||||
else
|
else
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function tFilter(t, condition, extract)
|
local function tFilter(type, condition, extract)
|
||||||
local filtered = {}
|
local filtered = {}
|
||||||
for key, value in Grichelde.F.pairs(t) do
|
for key, value in Grichelde.F.pairs(type) do
|
||||||
local cond = false
|
local cond = false
|
||||||
if (condition) then
|
if (condition) then
|
||||||
local t = Grichelde.F.type(condition)
|
local typ = Grichelde.F.type(condition)
|
||||||
if (t == "function") then
|
if (typ == "function") then
|
||||||
cond = condition(t, key, value)
|
cond = condition(typ, key, value)
|
||||||
elseif (t == "string") or (t == "number") then
|
elseif (typ == "string") or (typ == "number") then
|
||||||
cond = (value == condition)
|
cond = (value == condition)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -207,7 +214,7 @@ local function tFilter(t, condition, extract)
|
|||||||
if (cond) then
|
if (cond) then
|
||||||
local val = value
|
local val = value
|
||||||
if (extract and (Grichelde.F.type(extract) == "function")) then
|
if (extract and (Grichelde.F.type(extract) == "function")) then
|
||||||
val = extract(t, key, value)
|
val = extract(type, key, value)
|
||||||
end
|
end
|
||||||
Grichelde.F.tInsert(filtered, val)
|
Grichelde.F.tInsert(filtered, val)
|
||||||
end
|
end
|
||||||
@@ -215,20 +222,20 @@ local function tFilter(t, condition, extract)
|
|||||||
return filtered
|
return filtered
|
||||||
end
|
end
|
||||||
|
|
||||||
local function tSize(t)
|
local function tSize(tbl)
|
||||||
local size = 0
|
local size = 0
|
||||||
if (t ~= nil) then
|
if (tbl ~= nil) then
|
||||||
-- for every non-nil value
|
-- for every non-nil value
|
||||||
for _, _ in Grichelde.F.pairs(t) do
|
for _, _ in Grichelde.F.pairs(tbl) do
|
||||||
size = size + 1
|
size = size + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return size
|
return size
|
||||||
end
|
end
|
||||||
|
|
||||||
local function tIsEmpty(t)
|
local function tIsEmpty(tbl)
|
||||||
if (not t) then return true end
|
if (not tbl) then return true end
|
||||||
return Grichelde.F.tNext(t) == nil
|
return Grichelde.F.tNext(tbl) == nil
|
||||||
end
|
end
|
||||||
|
|
||||||
local function tClone(orig)
|
local function tClone(orig)
|
||||||
@@ -318,11 +325,11 @@ local function isCapital(word)
|
|||||||
return false
|
return false
|
||||||
else
|
else
|
||||||
local first, rest = Grichelde.F.getNextCharUtf8(word)
|
local first, rest = Grichelde.F.getNextCharUtf8(word)
|
||||||
local isCapital = Grichelde.F.isUpper(first)
|
local isCap = Grichelde.F.isUpper(first)
|
||||||
if (rest ~= nil) then
|
if (rest ~= nil) then
|
||||||
return isCapital and Grichelde.F.isLower(rest)
|
return isCap and Grichelde.F.isLower(rest)
|
||||||
else
|
else
|
||||||
return isCapital
|
return isCap
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -341,8 +348,8 @@ local function capitalize(word)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function color(color, text)
|
local function color(colour, text)
|
||||||
return color .. text .. Grichelde.COLOR_CODES.CLOSE
|
return colour .. text .. Grichelde.COLOR_CODES.CLOSE
|
||||||
end
|
end
|
||||||
|
|
||||||
local function cPrefix(text)
|
local function cPrefix(text)
|
||||||
@@ -373,6 +380,10 @@ local function cRed(text)
|
|||||||
return Grichelde.F.color(Grichelde.COLOR_CODES.RED, text)
|
return Grichelde.F.color(Grichelde.COLOR_CODES.RED, text)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function cHyperlink(text)
|
||||||
|
return Grichelde.F.color(Grichelde.COLOR_CODES.HYPERLINK, text)
|
||||||
|
end
|
||||||
|
|
||||||
-- faster function lookups by mapping to local refs
|
-- faster function lookups by mapping to local refs
|
||||||
Grichelde.F = {
|
Grichelde.F = {
|
||||||
IsAddOnLoaded = _G.IsAddOnLoaded,
|
IsAddOnLoaded = _G.IsAddOnLoaded,
|
||||||
@@ -421,6 +432,7 @@ Grichelde.F = {
|
|||||||
cGreen = cGreen,
|
cGreen = cGreen,
|
||||||
cOrange = cOrange,
|
cOrange = cOrange,
|
||||||
cRed = cRed,
|
cRed = cRed,
|
||||||
|
cHyperlink = cHyperlink,
|
||||||
toByte = _G.string.byte,
|
toByte = _G.string.byte,
|
||||||
bytes2Char = _G.string.char,
|
bytes2Char = _G.string.char,
|
||||||
format = _G.string.format,
|
format = _G.string.format,
|
||||||
|
@@ -24,7 +24,7 @@ function Grichelde.getDefaultConfig()
|
|||||||
},
|
},
|
||||||
replacements = {
|
replacements = {
|
||||||
["**"] = {
|
["**"] = {
|
||||||
order = 9999,
|
order = 999,
|
||||||
searchText = "",
|
searchText = "",
|
||||||
replaceText = "",
|
replaceText = "",
|
||||||
exactCase = false,
|
exactCase = false,
|
||||||
@@ -32,34 +32,52 @@ function Grichelde.getDefaultConfig()
|
|||||||
matchWhen = 2,
|
matchWhen = 2,
|
||||||
stopOnMatch = false,
|
stopOnMatch = false,
|
||||||
},
|
},
|
||||||
replacement_10 = {
|
|
||||||
order = 10,
|
|
||||||
searchText = "s",
|
|
||||||
replaceText = "ch",
|
|
||||||
},
|
|
||||||
replacement_11 = {
|
|
||||||
order = 11,
|
|
||||||
searchText = "t",
|
|
||||||
replaceText = "ck",
|
|
||||||
},
|
|
||||||
replacement_12 = {
|
|
||||||
order = 12,
|
|
||||||
searchText = "p",
|
|
||||||
replaceText = "b",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Grichelde.getDefaultSampleMappings()
|
||||||
|
return {
|
||||||
|
replacement_10 = {
|
||||||
|
order = 10,
|
||||||
|
searchText = "s",
|
||||||
|
replaceText = "ch",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = true,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
},
|
||||||
|
replacement_11 = {
|
||||||
|
order = 11,
|
||||||
|
searchText = "t",
|
||||||
|
replaceText = "ck",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = true,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
},
|
||||||
|
replacement_12 = {
|
||||||
|
order = 12,
|
||||||
|
searchText = "p",
|
||||||
|
replaceText = "b",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = true,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
function Grichelde:LoadDatabase()
|
function Grichelde:LoadDatabase()
|
||||||
local db = LibStub("AceDB-3.0"):New(self.name .."DB", self.getDefaultConfig(), true)
|
local db = LibStub("AceDB-3.0"):New(self.name .."DB", self.getDefaultConfig(), true)
|
||||||
|
|
||||||
db.RegisterCallback(self, "OnNewProfile", "RefreshOptions")
|
db.RegisterCallback(self, "OnNewProfile", "RefreshProfiles")
|
||||||
db.RegisterCallback(self, "OnProfileChanged", "RefreshOptions")
|
db.RegisterCallback(self, "OnProfileChanged", "RefreshProfiles")
|
||||||
db.RegisterCallback(self, "OnProfileDeleted", "RefreshOptions")
|
db.RegisterCallback(self, "OnProfileDeleted", "RefreshProfiles")
|
||||||
db.RegisterCallback(self, "OnProfileCopied", "RefreshOptions")
|
db.RegisterCallback(self, "OnProfileCopied", "RefreshProfiles")
|
||||||
db.RegisterCallback(self, "OnProfileReset", "RefreshOptions")
|
db.RegisterCallback(self, "OnProfileReset", "RefreshProfiles")
|
||||||
|
db.RegisterCallback(self, "OnProfileShutdown", "RefreshProfiles")
|
||||||
|
|
||||||
return db
|
return db
|
||||||
end
|
end
|
||||||
@@ -104,15 +122,15 @@ end
|
|||||||
|
|
||||||
--- Sorts a replacements table by order sub-field and rename.
|
--- Sorts a replacements table by order sub-field and rename.
|
||||||
--- Do NOT reassign self.db.profile.replacements here or with its output as it will break defaults
|
--- Do NOT reassign self.db.profile.replacements here or with its output as it will break defaults
|
||||||
function Grichelde:ReorderReplacements()
|
function Grichelde:ReorderReplacements(replacements)
|
||||||
local replacements = self.db.profile.replacements or {}
|
local repls = replacements or self.db.profile.replacements or {}
|
||||||
|
|
||||||
self:TracePrint("ReorderReplacements : unsorted table")
|
self:TracePrint("ReorderReplacements : unsorted table")
|
||||||
self:TracePrint(replacements)
|
self:TracePrint(repls)
|
||||||
|
|
||||||
local orderToName = {}
|
local orderToName = {}
|
||||||
local size = 0
|
local size = 0
|
||||||
for replName, replTable in pairs(replacements) do
|
for replName, replTable in pairs(repls) do
|
||||||
size = size + 1
|
size = size + 1
|
||||||
tInsert(orderToName, replTable.order, replName)
|
tInsert(orderToName, replTable.order, replName)
|
||||||
end
|
end
|
||||||
@@ -125,31 +143,19 @@ function Grichelde:ReorderReplacements()
|
|||||||
|
|
||||||
while count < size do
|
while count < size do
|
||||||
local replName = orderToName[index]
|
local replName = orderToName[index]
|
||||||
if (replName ~= nil) and (replacements[replName] ~= nil) then
|
if (replName ~= nil) and (repls[replName] ~= nil) then
|
||||||
self:TracePrint("ReorderReplacements : replName: %s, replTable", replName)
|
self:TracePrint("ReorderReplacements : replName: %s, replTable", replName)
|
||||||
self:TracePrint(replacements[replName])
|
self:TracePrint(repls[replName])
|
||||||
local order = Grichelde.MAPPING_OFFSET + count
|
local order = Grichelde.MAPPING_OFFSET + count
|
||||||
sorted["replacement_" .. order] = tClone(replacements[replName])
|
sorted["replacement_" .. order] = tClone(repls[replName])
|
||||||
sorted["replacement_" .. order].order = order
|
sorted["replacement_" .. order].order = order
|
||||||
count = count + 1
|
count = count + 1
|
||||||
end
|
end
|
||||||
index = index + 1
|
index = index + 1
|
||||||
if ( index > 10000) then break end
|
if (index > 999) then break end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- self:TracePrint("ReorderReplacements : sorted")
|
-- self:TracePrint("ReorderReplacements : sorted")
|
||||||
-- self:TracePrint(sorted)
|
-- self:TracePrint(sorted)
|
||||||
|
return sorted
|
||||||
-- do NOT set self.db.profile.replacements = {} it will break defaults
|
|
||||||
for replName, _ in pairs(replacements) do
|
|
||||||
replacements[replName] = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
-- copy over sorted replacements
|
|
||||||
for replName, replTable in pairs(sorted) do
|
|
||||||
replacements[replName] = replTable
|
|
||||||
end
|
|
||||||
|
|
||||||
self:DebugPrint("ReorderReplacements : sorted table")
|
|
||||||
self:DebugPrint(self.db.profile.replacements)
|
|
||||||
end
|
end
|
||||||
|
@@ -2,6 +2,10 @@
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
local Grichelde = _G.Grichelde or {}
|
local Grichelde = _G.Grichelde or {}
|
||||||
|
|
||||||
|
local cGreen, cRed
|
||||||
|
= Grichelde.F.cGreen, Grichelde.F.cRed
|
||||||
|
|
||||||
|
|
||||||
--- add Minimap button
|
--- add Minimap button
|
||||||
function Grichelde:MinimapButton()
|
function Grichelde:MinimapButton()
|
||||||
local function clickHandler(_, button)
|
local function clickHandler(_, button)
|
||||||
@@ -84,26 +88,42 @@ end
|
|||||||
|
|
||||||
function Grichelde:ToggleActivation()
|
function Grichelde:ToggleActivation()
|
||||||
if (self.db.profile.enabled == true) then
|
if (self.db.profile.enabled == true) then
|
||||||
|
if (self.dialog == nil) or (self.dialog.OpenFrames[self.name] == nil) then
|
||||||
|
self:PrefixedPrint(self.L.Profiles_Deactivated, cRed(self.db:GetCurrentProfile()))
|
||||||
|
end
|
||||||
self:Deactivate()
|
self:Deactivate()
|
||||||
else
|
else
|
||||||
|
if (self.dialog == nil) or (self.dialog.OpenFrames[self.name] == nil) then
|
||||||
|
self:PrefixedPrint(self.L.Profiles_Activated, cGreen(self.db:GetCurrentProfile()))
|
||||||
|
end
|
||||||
self:Activate()
|
self:Activate()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Grichelde:RefreshMinimap()
|
||||||
|
if (self.db.profile.enabled == true) then
|
||||||
|
self:Activate()
|
||||||
|
else
|
||||||
|
self:Deactivate()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function Grichelde:Activate()
|
function Grichelde:Activate()
|
||||||
self.db.profile.enabled = true
|
self.db.profile.enabled = true
|
||||||
|
|
||||||
-- refresh option UI if open at the moment
|
-- refresh option UI if open at the moment
|
||||||
if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
|
if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
|
||||||
self.dialog:SelectGroup(self.name, "enabled")
|
self.dialog:SelectGroup(self.name)
|
||||||
local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
|
local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
|
||||||
local statusText = self:Format(self.L.AddonLoaded, namePlusVersion)
|
local statusText = self:Format(self.L.AddonLoaded, namePlusVersion)
|
||||||
self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
|
self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.ldb.iconR = Grichelde.MINIMAP_ENABLED
|
if (self.ldb ~= nil) then
|
||||||
self.ldb.iconG = Grichelde.MINIMAP_ENABLED
|
self.ldb.iconR = Grichelde.MINIMAP_ENABLED
|
||||||
self.ldb.iconB = Grichelde.MINIMAP_ENABLED
|
self.ldb.iconG = Grichelde.MINIMAP_ENABLED
|
||||||
|
self.ldb.iconB = Grichelde.MINIMAP_ENABLED
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:Deactivate()
|
function Grichelde:Deactivate()
|
||||||
@@ -111,14 +131,16 @@ function Grichelde:Deactivate()
|
|||||||
|
|
||||||
-- refresh option UI if open at the moment
|
-- refresh option UI if open at the moment
|
||||||
if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
|
if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
|
||||||
self.dialog:SelectGroup(self.name, "enabled")
|
self.dialog:SelectGroup(self.name)
|
||||||
local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
|
local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
|
||||||
local statusText = self:Format(self.L.AddonUnloaded, namePlusVersion)
|
local statusText = self:Format(self.L.AddonUnloaded, namePlusVersion)
|
||||||
self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
|
self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.ldb.iconR = Grichelde.MINIMAP_DARKENDED
|
if (self.ldb ~= nil) then
|
||||||
self.ldb.iconG = Grichelde.MINIMAP_DARKENDED
|
self.ldb.iconR = Grichelde.MINIMAP_DARKENDED
|
||||||
self.ldb.iconB = Grichelde.MINIMAP_DARKENDED
|
self.ldb.iconG = Grichelde.MINIMAP_DARKENDED
|
||||||
|
self.ldb.iconB = Grichelde.MINIMAP_DARKENDED
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -164,9 +164,23 @@ function Grichelde:CreateOptionsUI()
|
|||||||
desc = self.L.Options_Help_Group_Desc,
|
desc = self.L.Options_Help_Group_Desc,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
args = {
|
args = {
|
||||||
basics = {
|
info = {
|
||||||
order = 10,
|
order = 10,
|
||||||
type = "group",
|
type = "group",
|
||||||
|
name = self.L.Options_Help_Tab_Info_Name,
|
||||||
|
desc = self.L.Options_Help_Tab_Info_Desc,
|
||||||
|
args = {
|
||||||
|
paragraph1 = {
|
||||||
|
order = 1,
|
||||||
|
type = "description",
|
||||||
|
name = self:Format(self.L.Options_Help_Info, self.L.AddonName),
|
||||||
|
fontSize = "medium",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
basics = {
|
||||||
|
order = 11,
|
||||||
|
type = "group",
|
||||||
name = self.L.Options_Help_Tab_Basics_Name,
|
name = self.L.Options_Help_Tab_Basics_Name,
|
||||||
desc = self.L.Options_Help_Tab_Basics_Desc,
|
desc = self.L.Options_Help_Tab_Basics_Desc,
|
||||||
args = {
|
args = {
|
||||||
@@ -179,7 +193,7 @@ function Grichelde:CreateOptionsUI()
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
expert = {
|
expert = {
|
||||||
order = 11,
|
order = 12,
|
||||||
type = "group",
|
type = "group",
|
||||||
name = self.L.Options_Help_Tab_Expert_Name,
|
name = self.L.Options_Help_Tab_Expert_Name,
|
||||||
desc = self.L.Options_Help_Tab_Expert_Desc,
|
desc = self.L.Options_Help_Tab_Expert_Desc,
|
||||||
@@ -193,7 +207,7 @@ function Grichelde:CreateOptionsUI()
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
examples = {
|
examples = {
|
||||||
order = 12,
|
order = 13,
|
||||||
type = "group",
|
type = "group",
|
||||||
name = self.L.Options_Help_Tab_Examples_Name,
|
name = self.L.Options_Help_Tab_Examples_Name,
|
||||||
desc = self.L.Options_Help_Tab_Examples_Desc,
|
desc = self.L.Options_Help_Tab_Examples_Desc,
|
||||||
@@ -240,7 +254,7 @@ function Grichelde:CreateOptionsUI()
|
|||||||
name = self.L.Options_Help_Examples_Import_Name,
|
name = self.L.Options_Help_Examples_Import_Name,
|
||||||
-- desc = self.L.Options_Help_Examples_Import_Desc,
|
-- desc = self.L.Options_Help_Examples_Import_Desc,
|
||||||
desc = function() return format(self.L.Options_Help_Examples_Import_Desc, cPrefix(self.L.Options_Help_Examples[selectedExample].name)) end,
|
desc = function() return format(self.L.Options_Help_Examples_Import_Desc, cPrefix(self.L.Options_Help_Examples[selectedExample].name)) end,
|
||||||
func = function(info) self:ImportExample(selectedExample) end,
|
func = function(_) self:ImportExample(selectedExample) end,
|
||||||
},
|
},
|
||||||
|
|
||||||
spacer4 = {
|
spacer4 = {
|
||||||
@@ -257,7 +271,7 @@ function Grichelde:CreateOptionsUI()
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
disclaimer = {
|
disclaimer = {
|
||||||
order = 20,
|
order = 14,
|
||||||
type = "description",
|
type = "description",
|
||||||
name = self.L.Options_Help_Disclaimer,
|
name = self.L.Options_Help_Disclaimer,
|
||||||
},
|
},
|
||||||
@@ -406,24 +420,48 @@ function Grichelde:SetupOptions()
|
|||||||
return options, dialog
|
return options, dialog
|
||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:RefreshOptions(event, _, profileName)
|
function Grichelde:RefreshProfiles(event, _, profileName)
|
||||||
self:DebugPrint("RefreshOptions : event:", event)
|
local function replaceReplacements(replacements)
|
||||||
|
-- do NOT set self.db.profile.replacements = {} it will break defaults
|
||||||
|
tWipe(self.db.profile.replacements)
|
||||||
|
|
||||||
|
-- copy over sorted replacements
|
||||||
|
for replName, replTable in pairs(replacements) do
|
||||||
|
self.db.profile.replacements[replName] = replTable
|
||||||
|
end
|
||||||
|
|
||||||
|
self:DebugPrint("RefreshProfiles : reorderReplacements : sorted table")
|
||||||
|
self:DebugPrint(self.db.profile.replacements)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function addEmptyMappingWithoutRefresh()
|
||||||
|
self:DebugPrint("RefreshProfiles : addEmptyMappingWithoutRefresh")
|
||||||
|
self.db.profile.replacements.replacement_10.order = 10
|
||||||
|
end
|
||||||
|
|
||||||
|
self:DebugPrint("RefreshProfiles : event:", event)
|
||||||
|
--- AceDB will call OnProfileShutdown, OnProfileChanged and OnNewProfile in this order
|
||||||
if (event == "OnNewProfile") then
|
if (event == "OnNewProfile") then
|
||||||
|
addEmptyMappingWithoutRefresh()
|
||||||
self:PrefixedPrint(self.L.Profiles_Created, cGreen(self.db:GetCurrentProfile()))
|
self:PrefixedPrint(self.L.Profiles_Created, cGreen(self.db:GetCurrentProfile()))
|
||||||
elseif (event == "OnProfileChanged") then
|
elseif (event == "OnProfileChanged") then
|
||||||
self:PrefixedPrint(self.L.Profiles_Loaded, cGreen(self.db:GetCurrentProfile()))
|
self:DebugPrint(self.L.Profiles_Loaded, cGreen(self.db:GetCurrentProfile()))
|
||||||
elseif (event == "OnProfileDeleted") then
|
elseif (event == "OnProfileDeleted") then
|
||||||
self:PrefixedPrint(self.L.Profiles_Deleted, cRed(profileName))
|
self:PrefixedPrint(self.L.Profiles_Deleted, cRed(profileName))
|
||||||
elseif (event == "OnProfileCopied") then
|
elseif (event == "OnProfileCopied") then
|
||||||
self:PrefixedPrint(self.L.Profiles_Copied, cOrange(profileName))
|
self:DebugPrint(self.L.Profiles_Copied, cOrange(profileName))
|
||||||
elseif (event == "OnProfileReset") then
|
elseif (event == "OnProfileReset") then
|
||||||
|
addEmptyMappingWithoutRefresh()
|
||||||
self:PrefixedPrint(self.L.Profiles_Reset, cOrange(self.db:GetCurrentProfile()))
|
self:PrefixedPrint(self.L.Profiles_Reset, cOrange(self.db:GetCurrentProfile()))
|
||||||
else
|
else
|
||||||
self:DebugPrint("Refreshing Profile %s on options change: %s", self.db:GetCurrentProfile(), event)
|
self:DebugPrint("Refreshing Profile %s on options change: %s", self.db:GetCurrentProfile(), event)
|
||||||
end
|
end
|
||||||
|
|
||||||
self:ReorderReplacements()
|
local repls = self:ReorderReplacements()
|
||||||
self:RefreshReplacements(self.db.profile.replacements)
|
replaceReplacements(repls)
|
||||||
|
self:RefreshOptions(repls)
|
||||||
|
self:RefreshDialog()
|
||||||
|
self:RefreshMinimap()
|
||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:ToggleOptions()
|
function Grichelde:ToggleOptions()
|
||||||
@@ -556,19 +594,17 @@ function Grichelde:ImportExample(num)
|
|||||||
self.db:SetProfile(profileName)
|
self.db:SetProfile(profileName)
|
||||||
assert(self.db:GetCurrentProfile() == profileName, "profile was not loaded")
|
assert(self.db:GetCurrentProfile() == profileName, "profile was not loaded")
|
||||||
|
|
||||||
local exampleProfile = self.db.profile
|
tWipe(self.db.profile.replacements)
|
||||||
tWipe(exampleProfile.replacements)
|
|
||||||
|
|
||||||
for replName, replTable in spairs(self.L.Options_Help_Examples[num].replacements) do
|
for replName, replTable in spairs(self.L.Options_Help_Examples[num].replacements) do
|
||||||
self:TracePrint("ImportExample : replacement: %s", replName)
|
self:TracePrint("ImportExample : replacement: %s", replName)
|
||||||
self:TracePrint(replTable)
|
self:TracePrint(replTable)
|
||||||
|
|
||||||
if (replName ~= nil) and (replTable ~= nil) and (replTable.searchText ~= nil) then
|
if (replName ~= nil) and (replTable ~= nil) and (replTable.searchText ~= nil) then
|
||||||
exampleProfile.replacements[replName] = tClone(replTable)
|
self.db.profile.replacements[replName] = tClone(replTable)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self:RefreshReplacements(self.db.profile.replacements)
|
self:RefreshProfiles("ImportExample" .. num)
|
||||||
else
|
else
|
||||||
self:ErrorPrint(self.L.Profiles_AlreadyExistsError, profileName)
|
self:ErrorPrint(self.L.Profiles_AlreadyExistsError, profileName)
|
||||||
end
|
end
|
||||||
@@ -577,27 +613,33 @@ end
|
|||||||
--- Create UI options for the given replacement table (from DB).
|
--- Create UI options for the given replacement table (from DB).
|
||||||
--- Usually called with with self.db.profile.replacements
|
--- Usually called with with self.db.profile.replacements
|
||||||
-- @param replacementsTable
|
-- @param replacementsTable
|
||||||
function Grichelde:RefreshReplacements(replacementsTable)
|
function Grichelde:RefreshOptions(replacementsTable)
|
||||||
self:TracePrint("RefreshReplacements : DB table:")
|
self:TracePrint("RefreshOptions : DB table:")
|
||||||
self:TracePrint(replacementsTable)
|
self:TracePrint(replacementsTable)
|
||||||
|
|
||||||
-- remove all previous replacements from options (not DB), except header and buttons
|
if (self.options ~= nil) then
|
||||||
local replacements = self.options.args.replacements.args or {}
|
-- remove all previous replacements from options (not DB), except header and buttons
|
||||||
for k, _ in pairs(replacements) do
|
local replacements = self.options.args.replacements.args or {}
|
||||||
if (k and (find(k, "^replacement_") ~= nil)) then
|
for k, _ in pairs(replacements) do
|
||||||
replacements[k] = nil
|
if (k and (find(k, "^replacement_") ~= nil)) then
|
||||||
|
replacements[k] = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
for replName, _ in pairs(replacementsTable or {}) do
|
||||||
|
local _, replNumber = self:SplitOnFirstMatch(replName, "_")
|
||||||
|
replacements[replName] = self:CreateMapping(toNumber(replNumber))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
for replName, _ in pairs(replacementsTable or {}) do
|
-- self:TracePrint("RefreshOptions : UI options:")
|
||||||
local _, replNumber = self:SplitOnFirstMatch(replName, "_")
|
|
||||||
replacements[replName] = self:CreateMapping(toNumber(replNumber))
|
|
||||||
end
|
|
||||||
|
|
||||||
-- self:TracePrint("RefreshReplacements : UI options:")
|
|
||||||
-- self:TracePrint(replacements)
|
-- self:TracePrint(replacements)
|
||||||
|
end
|
||||||
|
|
||||||
self.dialog:ConfigTableChanged(nil, self.name)
|
function Grichelde:RefreshDialog()
|
||||||
|
if (self.dialog ~= nil) then
|
||||||
|
self.dialog:ConfigTableChanged(nil, self.name)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:AddEmptyMapping()
|
function Grichelde:AddEmptyMapping()
|
||||||
@@ -606,7 +648,7 @@ function Grichelde:AddEmptyMapping()
|
|||||||
self:DebugPrint("AddEmptyMapping : old DB entries:")
|
self:DebugPrint("AddEmptyMapping : old DB entries:")
|
||||||
self:DebugPrint(replacements)
|
self:DebugPrint(replacements)
|
||||||
|
|
||||||
local maxRepl = Grichelde.MAPPING_OFFSET
|
local maxRepl = Grichelde.MAPPING_OFFSET - 1
|
||||||
for replName, _ in pairs(replacements) do
|
for replName, _ in pairs(replacements) do
|
||||||
local num = match(replName, "^replacement_(%d+)")
|
local num = match(replName, "^replacement_(%d+)")
|
||||||
if (num ~= nil) and (maxRepl < toNumber(num)) then
|
if (num ~= nil) and (maxRepl < toNumber(num)) then
|
||||||
@@ -622,7 +664,7 @@ function Grichelde:AddEmptyMapping()
|
|||||||
self:DebugPrint("AddEmptyMapping : new DB entries:")
|
self:DebugPrint("AddEmptyMapping : new DB entries:")
|
||||||
self:DebugPrint(replacements)
|
self:DebugPrint(replacements)
|
||||||
|
|
||||||
self:RefreshOptions("AddEmptyMapping " .. newMapping)
|
self:RefreshProfiles("AddEmptyMapping " .. newMapping)
|
||||||
self.dialog:SelectGroup(self.name, "replacements", newMapping)
|
self.dialog:SelectGroup(self.name, "replacements", newMapping)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -651,7 +693,7 @@ function Grichelde:MoveUp(info)
|
|||||||
replacements[swapName].order = currentOrder
|
replacements[swapName].order = currentOrder
|
||||||
replacements[currentName].order = currentOrder - 1
|
replacements[currentName].order = currentOrder - 1
|
||||||
|
|
||||||
self:RefreshOptions("MoveUp " .. currentName)
|
self:RefreshProfiles("MoveUp " .. currentName)
|
||||||
|
|
||||||
self:DebugPrint("MoveUp : refresh focus on %s", swapName)
|
self:DebugPrint("MoveUp : refresh focus on %s", swapName)
|
||||||
self.dialog:SelectGroup(self.name, "replacements", swapName)
|
self.dialog:SelectGroup(self.name, "replacements", swapName)
|
||||||
@@ -694,7 +736,7 @@ function Grichelde:MoveDown(info)
|
|||||||
replacements[swapName].order = currentOrder
|
replacements[swapName].order = currentOrder
|
||||||
replacements[currentName].order = currentOrder + 1
|
replacements[currentName].order = currentOrder + 1
|
||||||
|
|
||||||
self:RefreshOptions("MoveDown " .. currentName)
|
self:RefreshProfiles("MoveDown " .. currentName)
|
||||||
|
|
||||||
self:DebugPrint("MoveDown : refresh focus on %s", swapName)
|
self:DebugPrint("MoveDown : refresh focus on %s", swapName)
|
||||||
self.dialog:SelectGroup(self.name, "replacements", swapName)
|
self.dialog:SelectGroup(self.name, "replacements", swapName)
|
||||||
@@ -774,7 +816,7 @@ function Grichelde:DeleteMapping(info)
|
|||||||
self:DebugPrint("delete option: %s", currentName)
|
self:DebugPrint("delete option: %s", currentName)
|
||||||
self.db.profile.replacements[currentName] = nil
|
self.db.profile.replacements[currentName] = nil
|
||||||
|
|
||||||
self:RefreshOptions("DeleteMapping " .. currentName)
|
self:RefreshProfiles("DeleteMapping " .. currentName)
|
||||||
|
|
||||||
local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
|
local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
|
||||||
local newMapping = "replacement_" .. toNumber(replNumber - 1)
|
local newMapping = "replacement_" .. toNumber(replNumber - 1)
|
||||||
@@ -788,5 +830,5 @@ function Grichelde:DeleteAllMappings()
|
|||||||
tWipe(self.db.profile.replacements)
|
tWipe(self.db.profile.replacements)
|
||||||
self:AddEmptyMapping()
|
self:AddEmptyMapping()
|
||||||
|
|
||||||
self:RefreshOptions("DeleteAllMappings")
|
self:RefreshProfiles("DeleteAllMappings")
|
||||||
end
|
end
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
local Grichelde = _G.Grichelde or {}
|
local Grichelde = _G.Grichelde or {}
|
||||||
|
|
||||||
local find, pairs, tSize, cRed, cGreen, format = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen, Grichelde.F.format
|
local find, pairs, tSize, cRed, cGreen = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen
|
||||||
|
|
||||||
function Grichelde:TestMatch(text, pattern)
|
function Grichelde:TestMatch(text, pattern)
|
||||||
-- disable debug print out for testing
|
-- disable debug print out for testing
|
||||||
@@ -17,11 +17,12 @@ function Grichelde:TestMatch(text, pattern)
|
|||||||
Grichelde.logLevel = oldLogLevel
|
Grichelde.logLevel = oldLogLevel
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Invoke ingame with /run Grichelde:RunTests()
|
||||||
function Grichelde:RunTests()
|
function Grichelde:RunTests()
|
||||||
local function test(name, replacements, testData)
|
local function test(name, replacements, testData, replaceEmotes)
|
||||||
local i, ok, size = 0, 0, tSize(testData)
|
local i, ok, size = 0, 0, tSize(testData)
|
||||||
for input, expected in pairs(testData) do
|
for input, expected in pairs(testData) do
|
||||||
local actual = self:ReplaceText(input, replacements, false)
|
local actual = self:ReplaceText(input, replacements, replaceEmotes or false)
|
||||||
i = i + 1
|
i = i + 1
|
||||||
if (actual == expected) then
|
if (actual == expected) then
|
||||||
ok = ok + 1
|
ok = ok + 1
|
||||||
@@ -172,7 +173,7 @@ function Grichelde:RunTests()
|
|||||||
["abcdz"] = "aefgz",
|
["abcdz"] = "aefgz",
|
||||||
["abcd"] = "aefg",
|
["abcd"] = "aefg",
|
||||||
["bcdz"] = "efgz",
|
["bcdz"] = "efgz",
|
||||||
-- replacement_10
|
-- replacement_11
|
||||||
["uio"] = "bnm",
|
["uio"] = "bnm",
|
||||||
["auioz"] = "auioz",
|
["auioz"] = "auioz",
|
||||||
["auio"] = "auio",
|
["auio"] = "auio",
|
||||||
@@ -197,6 +198,19 @@ function Grichelde:RunTests()
|
|||||||
["awerz"] = "asdfz",
|
["awerz"] = "asdfz",
|
||||||
["awer"] = "awer",
|
["awer"] = "awer",
|
||||||
["werz"] = "werz",
|
["werz"] = "werz",
|
||||||
|
|
||||||
|
-- replacement_10
|
||||||
|
["bcd abcdz abcd bcdz"] = "efg aefgz aefg efgz",
|
||||||
|
-- replacement_11
|
||||||
|
["uio auioz auio uioz"] = "bnm auioz auio uioz",
|
||||||
|
-- replacement_12
|
||||||
|
["hij ahijz ahij hijz"] = "klm ahijz ahij klmz",
|
||||||
|
-- replacement_13
|
||||||
|
["nop anopz anop nopz"] = "qrs anopz aqrs nopz",
|
||||||
|
-- replacement_14
|
||||||
|
["tuv atuvz atuv tuvz"] = "wxy atuvz awxy wxyz",
|
||||||
|
-- replacement_15
|
||||||
|
["wer awerz awer werz"] = "wer asdfz awer werz",
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
ok = ok + o
|
ok = ok + o
|
||||||
@@ -411,21 +425,31 @@ function Grichelde:RunTests()
|
|||||||
all = all + a
|
all = all + a
|
||||||
|
|
||||||
o, a = test(
|
o, a = test(
|
||||||
"Stottern",
|
"Stottern 1",
|
||||||
{
|
{
|
||||||
replacement_10 = {
|
replacement_10 = {
|
||||||
order = 10,
|
order = 10,
|
||||||
searchText = "^([^aeiouy]*)([aeiouy])",
|
searchText = "^([^aeiouy]-)([aeiouy])",
|
||||||
replaceText = "%1%2-%1%2-%1%2",
|
replaceText = "%1%2-%1%2-%1%2",
|
||||||
exactCase = false,
|
exactCase = false,
|
||||||
consolidate = true,
|
consolidate = true,
|
||||||
matchWhen = 4,
|
matchWhen = 4,
|
||||||
stopOnMatch = false,
|
stopOnMatch = false,
|
||||||
},
|
},
|
||||||
|
replacement_11 = {
|
||||||
|
order = 11,
|
||||||
|
searchText = "([^bwp%s]-)([bwp])",
|
||||||
|
replaceText = "%1%2-%1%2-%1%2",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = true,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
["Ich mag dich."] = "I-I-Ich mag dich.",
|
["Ich mag dich."] = "I-I-Ich mag dich.",
|
||||||
["Dich mag ich."] = "Di-Di-Dich mag ich.",
|
["Dich mag ich."] = "Di-Di-Dich mag ich.",
|
||||||
|
["Bmm rrpss w"] = "B-B-Bmm rrp-rrp-rrpss w-w-w",
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
ok = ok + o
|
ok = ok + o
|
||||||
@@ -695,7 +719,7 @@ function Grichelde:RunTests()
|
|||||||
replacement_13 = {
|
replacement_13 = {
|
||||||
order = 13,
|
order = 13,
|
||||||
searchText = "youe",
|
searchText = "youe",
|
||||||
replaceText = "tho",
|
replaceText = "thou",
|
||||||
exactCase = false,
|
exactCase = false,
|
||||||
consolidate = true,
|
consolidate = true,
|
||||||
matchWhen = 3,
|
matchWhen = 3,
|
||||||
@@ -709,10 +733,53 @@ function Grichelde:RunTests()
|
|||||||
ok = ok + o
|
ok = ok + o
|
||||||
all = all + a
|
all = all + a
|
||||||
|
|
||||||
|
o, a = test(
|
||||||
|
"emote detection on",
|
||||||
|
{
|
||||||
|
replacement_10 = {
|
||||||
|
order = 10,
|
||||||
|
searchText = "r",
|
||||||
|
replaceText = "rr",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = false,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
["Der Herr Richter *schaut Herrn Richter an*"] = "Derr Herrrr Rrichterr *schaut Herrn Richter an*",
|
||||||
|
["*schaut Herrn Richter an*"] = "*schaut Herrn Richter an*",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
ok = ok + o
|
||||||
|
all = all + a
|
||||||
|
|
||||||
|
o, a = test(
|
||||||
|
"emote detection ignored",
|
||||||
|
{
|
||||||
|
replacement_10 = {
|
||||||
|
order = 10,
|
||||||
|
searchText = "r",
|
||||||
|
replaceText = "rr",
|
||||||
|
exactCase = false,
|
||||||
|
consolidate = false,
|
||||||
|
matchWhen = 2,
|
||||||
|
stopOnMatch = false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
["Der Herr Richter *schaut Herrn Richter an*"] = "Derr Herrrr Rrichterr *schaut Herrrrn Rrichterr an*",
|
||||||
|
["*schaut Herrn Richter an*"] = "*schaut Herrrrn Rrichterr an*",
|
||||||
|
},
|
||||||
|
true
|
||||||
|
)
|
||||||
|
ok = ok + o
|
||||||
|
all = all + a
|
||||||
|
|
||||||
if (ok == all) then
|
if (ok == all) then
|
||||||
self:PrefixedPrint("All %d tests %s", all, cGreen("passed"))
|
self:PrefixedPrint("All %d tests %s", all, cGreen("passed"))
|
||||||
else
|
else
|
||||||
self:PrefixedPrint("%d test %s, %d tests %s", all - ok, cRed("failed"), ok, cGreen("passed"))
|
self:PrefixedPrint("%d test%s %s, %d tests %s", all - ok, all - ok > 1 and "s" or "", cRed("failed"), ok, cGreen("passed"))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- restore old loglevel
|
-- restore old loglevel
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
local Grichelde = _G.Grichelde or {}
|
local Grichelde = _G.Grichelde or {}
|
||||||
|
|
||||||
local pairs, find, cGreen, cOrange, cRed, toNumber
|
local pairs, tClone, find, sub, cGreen, cOrange, cRed, toNumber
|
||||||
= Grichelde.F.pairs, Grichelde.F.find, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
|
= Grichelde.F.pairs, Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
|
||||||
|
|
||||||
function Grichelde:Upgrade_To_v060()
|
function Grichelde:Upgrade_To_v060()
|
||||||
self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.6.0"))
|
self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.6.0"))
|
||||||
@@ -90,67 +90,96 @@ function Grichelde:Upgrade_To_v090()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function Grichelde:UpgradeDatabase()
|
function Grichelde:UpgradeDatabase()
|
||||||
local dbVersion = self.db.global.version or "0.0.0"
|
local function parseVersion(version)
|
||||||
self:DebugPrint("Database version:", dbVersion)
|
local _, _, major, minor, patch, ext = find(version, "(%d+)%.(%d+)%.(%d+)(.*)")
|
||||||
|
local preBuild, build = ext, ""
|
||||||
local dbMajor, dbMinor, dbPatch = self:ParseVersion(dbVersion)
|
if (sub(ext, 1, 1) == "-") then
|
||||||
local gMajor, gMinor, gPatch = self:ParseVersion(self.version)
|
local b = find(ext, "+", 2)
|
||||||
|
if (b ~= nil) then
|
||||||
local downGrade = false
|
preBuild = sub(ext, 1, b)
|
||||||
if (dbMajor > gMajor) then
|
build = sub(ext, b + 1)
|
||||||
downGrade = true
|
else
|
||||||
elseif dbMajor == gMajor then
|
preBuild = sub(ext, 1, b)
|
||||||
if (dbMinor > gMinor) then
|
|
||||||
downGrade = true
|
|
||||||
elseif dbMinor == gMinor then
|
|
||||||
if (dbPatch > gPatch) then
|
|
||||||
downGrade = true
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return toNumber(major) or 0, toNumber(minor) or 0, toNumber(patch) or 0, preBuild, build
|
||||||
end
|
end
|
||||||
|
|
||||||
if downGrade then
|
local gMajor, gMinor, gPatch = parseVersion(self.version)
|
||||||
self:PrefixedPrint(cRed(self.L.Downgrade_Detected), self.L.AddonName)
|
local dbVersion = self.db.global.version
|
||||||
else
|
|
||||||
local upgrade = 0
|
|
||||||
local error = false
|
|
||||||
|
|
||||||
if (dbMajor == 0) then
|
if (dbVersion == nil) then
|
||||||
if (dbMinor < 6) then
|
self:DebugPrint("New installation detected, add sample mappings")
|
||||||
upgrade = upgrade + 1
|
-- do NOT set self.db.profile.replacements = {} it will break defaults
|
||||||
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v060(dbVersion)
|
local sampleRepl = self.getDefaultSampleMappings()
|
||||||
end
|
for replName, replTable in pairs(sampleRepl) do
|
||||||
if (dbMinor < 7) then
|
self:TracePrint("UpgradeDatabase : copySampleMappings %s", replName)
|
||||||
upgrade = upgrade + 1
|
self.db.profile.replacements[replName] = tClone(replTable)
|
||||||
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v070(dbVersion)
|
end
|
||||||
end
|
|
||||||
if (dbMinor == 7) then
|
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
|
||||||
if (dbPatch < 2) then
|
self:DebugPrint("Database version %s sucessfully created", self.db.global.version)
|
||||||
upgrade = upgrade + 1
|
else
|
||||||
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v072(dbVersion)
|
-- detect if upgrade is neccessary or downgrade was done
|
||||||
|
self:DebugPrint("Detected database version:", dbVersion)
|
||||||
|
|
||||||
|
local dbMajor, dbMinor, dbPatch = parseVersion(dbVersion)
|
||||||
|
local downGrade = false
|
||||||
|
if (dbMajor > gMajor) then
|
||||||
|
downGrade = true
|
||||||
|
elseif dbMajor == gMajor then
|
||||||
|
if (dbMinor > gMinor) then
|
||||||
|
downGrade = true
|
||||||
|
elseif dbMinor == gMinor then
|
||||||
|
if (dbPatch > gPatch) then
|
||||||
|
downGrade = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if (dbMinor < 8) then
|
|
||||||
upgrade = upgrade + 1
|
|
||||||
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v080(dbVersion)
|
|
||||||
end
|
|
||||||
if (dbMinor < 9) then
|
|
||||||
upgrade = upgrade + 1
|
|
||||||
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v090(dbVersion)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if (upgrade == 0) or (error == false) then
|
if downGrade then
|
||||||
-- bump version number even if no update is required
|
self:PrefixedPrint(cRed(self.L.Downgrade_Detected), self.L.AddonName)
|
||||||
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
|
|
||||||
end
|
|
||||||
|
|
||||||
if (upgrade == 0) then
|
|
||||||
self:DebugPrint("Database up-to-date")
|
|
||||||
elseif (error == false) then
|
|
||||||
self:PrefixedPrint(cGreen(self.L.Upgrade_Successful))
|
|
||||||
else
|
else
|
||||||
self:PrefixedPrint(cRed(self.L.Upgrade_Error))
|
local upgrade = 0
|
||||||
|
local error = false
|
||||||
|
|
||||||
|
if (dbMajor == 0) then
|
||||||
|
if (dbMinor < 6) then
|
||||||
|
upgrade = upgrade + 1
|
||||||
|
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v060(dbVersion)
|
||||||
|
end
|
||||||
|
if (dbMinor < 7) then
|
||||||
|
upgrade = upgrade + 1
|
||||||
|
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v070(dbVersion)
|
||||||
|
end
|
||||||
|
if (dbMinor == 7) then
|
||||||
|
if (dbPatch < 2) then
|
||||||
|
upgrade = upgrade + 1
|
||||||
|
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v072(dbVersion)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if (dbMinor < 8) then
|
||||||
|
upgrade = upgrade + 1
|
||||||
|
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v080(dbVersion)
|
||||||
|
end
|
||||||
|
if (dbMinor < 9) then
|
||||||
|
upgrade = upgrade + 1
|
||||||
|
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v090(dbVersion)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if (upgrade == 0) or (error == false) then
|
||||||
|
-- bump version number even if no update is required
|
||||||
|
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
|
||||||
|
end
|
||||||
|
|
||||||
|
if (upgrade == 0) then
|
||||||
|
self:DebugPrint("Database was up-to-date")
|
||||||
|
elseif (error == false) then
|
||||||
|
self:PrefixedPrint(cGreen(self.L.Upgrade_Successful))
|
||||||
|
else
|
||||||
|
self:PrefixedPrint(cRed(self.L.Upgrade_Error))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
@@ -2,23 +2,8 @@
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
local Grichelde = _G.Grichelde or {}
|
local Grichelde = _G.Grichelde or {}
|
||||||
|
|
||||||
local type, print, pairs, tSize, select, unpack, find, sub, gsub, cGray, cDarkgray, cRed, cPrefix, format, rep, toString, toNumber
|
local type, print, pairs, tSize, select, unpack, find, cGray, cDarkgray, cRed, cPrefix, format, rep, toString
|
||||||
= Grichelde.F.type, Grichelde.F.print, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.select, Grichelde.F.unpack, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.cGray, Grichelde.F.cDarkgray, Grichelde.F.cRed, Grichelde.F.cPrefix, Grichelde.F.format, Grichelde.F.rep, Grichelde.F.toString, Grichelde.F.toNumber
|
= Grichelde.F.type, Grichelde.F.print, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.select, Grichelde.F.unpack, Grichelde.F.find, Grichelde.F.cGray, Grichelde.F.cDarkgray, Grichelde.F.cRed, Grichelde.F.cPrefix, Grichelde.F.format, Grichelde.F.rep, Grichelde.F.toString
|
||||||
|
|
||||||
function Grichelde:ParseVersion(version)
|
|
||||||
local _, _, major, minor, patch, ext = find(version, "(%d+)%.(%d+)%.(%d+)(.*)")
|
|
||||||
local preBuild, build = ext, ""
|
|
||||||
if (sub(ext, 1, 1) == "-") then
|
|
||||||
local b = find(ext, "+", 2)
|
|
||||||
if (b ~= nil) then
|
|
||||||
preBuild = sub(ext, 1, b)
|
|
||||||
build = sub(ext, b + 1)
|
|
||||||
else
|
|
||||||
preBuild = sub(ext, 1, b)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return toNumber(major) or 0, toNumber(minor) or 0, toNumber(patch) or 0, preBuild, build
|
|
||||||
end
|
|
||||||
|
|
||||||
-- show strings differently to distinguish them from numbers
|
-- show strings differently to distinguish them from numbers
|
||||||
function Grichelde:plainValue(val)
|
function Grichelde:plainValue(val)
|
||||||
@@ -99,12 +84,6 @@ function Grichelde:SplitOnLastMatch(text, delimPattern, start)
|
|||||||
return left, right or text
|
return left, right or text
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Splits at last word of a text line
|
|
||||||
function Grichelde:TestMatch(text, pattern)
|
|
||||||
local pos1, pos2, left, right = find(text, pattern, 1)
|
|
||||||
self:DebugPrint("TestMatch : pos1: %d, pos2: %d, left: %s, right: %s", pos1, pos2, left, right)
|
|
||||||
end
|
|
||||||
|
|
||||||
function Grichelde:Format(message, ...)
|
function Grichelde:Format(message, ...)
|
||||||
if (message == nil) then
|
if (message == nil) then
|
||||||
return "<nil>"
|
return "<nil>"
|
||||||
|
48
Grichelde_TBC.toc
Normal file
48
Grichelde_TBC.toc
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
## Interface: 20504
|
||||||
|
|
||||||
|
## Title: Grichelde
|
||||||
|
## Notes: Replaces characters of your chat input line before sending.
|
||||||
|
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
|
||||||
|
## Version: 1.1.4
|
||||||
|
## Author: Teilzeit-Jedi
|
||||||
|
## eMail: tj@teilzeit-jedi.de
|
||||||
|
|
||||||
|
## X-Build: BCC
|
||||||
|
## X-Compatible: 11403
|
||||||
|
## X-Compatible: 30400
|
||||||
|
## X-Compatible: 90207
|
||||||
|
|
||||||
|
## X-Curse-Project-ID: 385480
|
||||||
|
## X-License: GPLv3
|
||||||
|
## X-Category: Chat/Communication
|
||||||
|
## X-Credits: Teilzeit-Jedi
|
||||||
|
## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
|
||||||
|
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
## SavedVariables: GricheldeDB
|
||||||
|
|
||||||
|
Libs\LibStub\LibStub.lua
|
||||||
|
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||||
|
Libs\AceAddon-3.0\AceAddon-3.0.xml
|
||||||
|
Libs\AceLocale-3.0\AceLocale-3.0.xml
|
||||||
|
Libs\AceEvent-3.0\AceEvent-3.0.xml
|
||||||
|
Libs\AceHook-3.0\AceHook-3.0.xml
|
||||||
|
Libs\AceConsole-3.0\AceConsole-3.0.xml
|
||||||
|
Libs\AceDB-3.0\AceDB-3.0.xml
|
||||||
|
Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||||
|
Libs\AceGUI-3.0\AceGUI-3.0.xml
|
||||||
|
Libs\AceConfig-3.0\AceConfig-3.0.xml
|
||||||
|
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
|
||||||
|
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
|
||||||
|
|
||||||
|
Grichelde.lua
|
||||||
|
GricheldeConstants.lua
|
||||||
|
|
||||||
|
localisation.xml
|
||||||
|
|
||||||
|
GricheldeUtils.lua
|
||||||
|
GricheldeDatabase.lua
|
||||||
|
GricheldeUpgrade.lua
|
||||||
|
GricheldeOptions.lua
|
||||||
|
GricheldeMinimap.lua
|
||||||
|
GricheldeChat.lua
|
48
Grichelde_Vanilla.toc
Normal file
48
Grichelde_Vanilla.toc
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
## Interface: 11403
|
||||||
|
|
||||||
|
## Title: Grichelde
|
||||||
|
## Notes: Replaces characters of your chat input line before sending.
|
||||||
|
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
|
||||||
|
## Version: 1.1.4
|
||||||
|
## Author: Teilzeit-Jedi
|
||||||
|
## eMail: tj@teilzeit-jedi.de
|
||||||
|
|
||||||
|
## X-Build: Classic
|
||||||
|
## X-Compatible: 20504
|
||||||
|
## X-Compatible: 30400
|
||||||
|
## X-Compatible: 90207
|
||||||
|
|
||||||
|
## X-Curse-Project-ID: 385480
|
||||||
|
## X-License: GPLv3
|
||||||
|
## X-Category: Chat/Communication
|
||||||
|
## X-Credits: Teilzeit-Jedi
|
||||||
|
## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
|
||||||
|
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
## SavedVariables: GricheldeDB
|
||||||
|
|
||||||
|
Libs\LibStub\LibStub.lua
|
||||||
|
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||||
|
Libs\AceAddon-3.0\AceAddon-3.0.xml
|
||||||
|
Libs\AceLocale-3.0\AceLocale-3.0.xml
|
||||||
|
Libs\AceEvent-3.0\AceEvent-3.0.xml
|
||||||
|
Libs\AceHook-3.0\AceHook-3.0.xml
|
||||||
|
Libs\AceConsole-3.0\AceConsole-3.0.xml
|
||||||
|
Libs\AceDB-3.0\AceDB-3.0.xml
|
||||||
|
Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||||
|
Libs\AceGUI-3.0\AceGUI-3.0.xml
|
||||||
|
Libs\AceConfig-3.0\AceConfig-3.0.xml
|
||||||
|
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
|
||||||
|
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
|
||||||
|
|
||||||
|
Grichelde.lua
|
||||||
|
GricheldeConstants.lua
|
||||||
|
|
||||||
|
localisation.xml
|
||||||
|
|
||||||
|
GricheldeUtils.lua
|
||||||
|
GricheldeDatabase.lua
|
||||||
|
GricheldeUpgrade.lua
|
||||||
|
GricheldeOptions.lua
|
||||||
|
GricheldeMinimap.lua
|
||||||
|
GricheldeChat.lua
|
48
Grichelde_Wrath.toc
Normal file
48
Grichelde_Wrath.toc
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
## Interface: 30400
|
||||||
|
|
||||||
|
## Title: Grichelde
|
||||||
|
## Notes: Replaces characters of your chat input line before sending.
|
||||||
|
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
|
||||||
|
## Version: 1.1.4
|
||||||
|
## Author: Teilzeit-Jedi
|
||||||
|
## eMail: tj@teilzeit-jedi.de
|
||||||
|
|
||||||
|
## X-Build: WotLK
|
||||||
|
## X-Compatible: 11403
|
||||||
|
## X-Compatible: 20504
|
||||||
|
## X-Compatible: 90207
|
||||||
|
|
||||||
|
## X-Curse-Project-ID: 385480
|
||||||
|
## X-License: GPLv3
|
||||||
|
## X-Category: Chat/Communication
|
||||||
|
## X-Credits: Teilzeit-Jedi
|
||||||
|
## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
|
||||||
|
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
|
||||||
|
## SavedVariables: GricheldeDB
|
||||||
|
|
||||||
|
Libs\LibStub\LibStub.lua
|
||||||
|
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||||
|
Libs\AceAddon-3.0\AceAddon-3.0.xml
|
||||||
|
Libs\AceLocale-3.0\AceLocale-3.0.xml
|
||||||
|
Libs\AceEvent-3.0\AceEvent-3.0.xml
|
||||||
|
Libs\AceHook-3.0\AceHook-3.0.xml
|
||||||
|
Libs\AceConsole-3.0\AceConsole-3.0.xml
|
||||||
|
Libs\AceDB-3.0\AceDB-3.0.xml
|
||||||
|
Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||||
|
Libs\AceGUI-3.0\AceGUI-3.0.xml
|
||||||
|
Libs\AceConfig-3.0\AceConfig-3.0.xml
|
||||||
|
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
|
||||||
|
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
|
||||||
|
|
||||||
|
Grichelde.lua
|
||||||
|
GricheldeConstants.lua
|
||||||
|
|
||||||
|
localisation.xml
|
||||||
|
|
||||||
|
GricheldeUtils.lua
|
||||||
|
GricheldeDatabase.lua
|
||||||
|
GricheldeUpgrade.lua
|
||||||
|
GricheldeOptions.lua
|
||||||
|
GricheldeMinimap.lua
|
||||||
|
GricheldeChat.lua
|
@@ -28,9 +28,9 @@
|
|||||||
-- end
|
-- end
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceAddon-3.0.lua
|
-- @name AceAddon-3.0.lua
|
||||||
-- @release $Id: AceAddon-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
-- @release $Id: AceAddon-3.0.lua 1238 2020-08-28 16:18:42Z nevcairiel $
|
||||||
|
|
||||||
local MAJOR, MINOR = "AceAddon-3.0", 12
|
local MAJOR, MINOR = "AceAddon-3.0", 13
|
||||||
local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not AceAddon then return end -- No Upgrade needed.
|
if not AceAddon then return end -- No Upgrade needed.
|
||||||
@@ -601,10 +601,20 @@ function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
|
|||||||
function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
|
function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
|
||||||
function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
|
function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
|
||||||
|
|
||||||
|
-- Blizzard AddOns which can load very early in the loading process and mess with Ace3 addon loading
|
||||||
|
local BlizzardEarlyLoadAddons = {
|
||||||
|
Blizzard_DebugTools = true,
|
||||||
|
Blizzard_TimeManager = true,
|
||||||
|
Blizzard_BattlefieldMap = true,
|
||||||
|
Blizzard_MapCanvas = true,
|
||||||
|
Blizzard_SharedMapDataProviders = true,
|
||||||
|
Blizzard_CombatLog = true,
|
||||||
|
}
|
||||||
|
|
||||||
-- Event Handling
|
-- Event Handling
|
||||||
local function onEvent(this, event, arg1)
|
local function onEvent(this, event, arg1)
|
||||||
-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
|
-- 2020-08-28 nevcairiel - ignore the load event of Blizzard addons which occur early in the loading process
|
||||||
if (event == "ADDON_LOADED" and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
|
if (event == "ADDON_LOADED" and (arg1 == nil or not BlizzardEarlyLoadAddons[arg1])) or event == "PLAYER_LOGIN" then
|
||||||
-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
|
-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
|
||||||
while(#AceAddon.initializequeue > 0) do
|
while(#AceAddon.initializequeue > 0) do
|
||||||
local addon = tremove(AceAddon.initializequeue, 1)
|
local addon = tremove(AceAddon.initializequeue, 1)
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
-- as well as associate it with a slash command.
|
-- as well as associate it with a slash command.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfig-3.0
|
-- @name AceConfig-3.0
|
||||||
-- @release $Id: AceConfig-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
|
-- @release $Id: AceConfig-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
AceConfig-3.0
|
AceConfig-3.0
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
|
--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfigCmd-3.0
|
-- @name AceConfigCmd-3.0
|
||||||
-- @release $Id: AceConfigCmd-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
|
-- @release $Id: AceConfigCmd-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
AceConfigCmd-3.0
|
AceConfigCmd-3.0
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
|
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfigDialog-3.0
|
-- @name AceConfigDialog-3.0
|
||||||
-- @release $Id: AceConfigDialog-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
|
-- @release $Id: AceConfigDialog-3.0.lua 1248 2021-02-05 14:27:49Z funkehdude $
|
||||||
|
|
||||||
local LibStub = LibStub
|
local LibStub = LibStub
|
||||||
local gui = LibStub("AceGUI-3.0")
|
local gui = LibStub("AceGUI-3.0")
|
||||||
local reg = LibStub("AceConfigRegistry-3.0")
|
local reg = LibStub("AceConfigRegistry-3.0")
|
||||||
|
|
||||||
local MAJOR, MINOR = "AceConfigDialog-3.0", 66
|
local MAJOR, MINOR = "AceConfigDialog-3.0", 81
|
||||||
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not AceConfigDialog then return end
|
if not AceConfigDialog then return end
|
||||||
@@ -15,22 +15,23 @@ if not AceConfigDialog then return end
|
|||||||
AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
|
AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
|
||||||
AceConfigDialog.Status = AceConfigDialog.Status or {}
|
AceConfigDialog.Status = AceConfigDialog.Status or {}
|
||||||
AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
|
AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
|
||||||
|
AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate")
|
||||||
|
|
||||||
AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
|
AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
|
||||||
AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
|
AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
|
||||||
AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
|
AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort
|
local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
|
||||||
local strmatch, format = string.match, string.format
|
local strmatch, format = string.match, string.format
|
||||||
local assert, loadstring, error = assert, loadstring, error
|
local error = error
|
||||||
local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
|
local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
|
||||||
local rawset, tostring, tonumber = rawset, tostring, tonumber
|
local tostring, tonumber = tostring, tonumber
|
||||||
local math_min, math_max, math_floor = math.min, math.max, math.floor
|
local math_min, math_max, math_floor = math.min, math.max, math.floor
|
||||||
|
|
||||||
-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
|
-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
|
||||||
-- List them here for Mikk's FindGlobals script
|
-- List them here for Mikk's FindGlobals script
|
||||||
-- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
|
-- GLOBALS: NORMAL_FONT_COLOR, ACCEPT, CANCEL
|
||||||
-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
|
-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
|
||||||
-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
|
-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
|
||||||
|
|
||||||
@@ -45,39 +46,10 @@ local function errorhandler(err)
|
|||||||
return geterrorhandler()(err)
|
return geterrorhandler()(err)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function CreateDispatcher(argCount)
|
|
||||||
local code = [[
|
|
||||||
local xpcall, eh = ...
|
|
||||||
local method, ARGS
|
|
||||||
local function call() return method(ARGS) end
|
|
||||||
|
|
||||||
local function dispatch(func, ...)
|
|
||||||
method = func
|
|
||||||
if not method then return end
|
|
||||||
ARGS = ...
|
|
||||||
return xpcall(call, eh)
|
|
||||||
end
|
|
||||||
|
|
||||||
return dispatch
|
|
||||||
]]
|
|
||||||
|
|
||||||
local ARGS = {}
|
|
||||||
for i = 1, argCount do ARGS[i] = "arg"..i end
|
|
||||||
code = code:gsub("ARGS", tconcat(ARGS, ", "))
|
|
||||||
return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
|
|
||||||
end
|
|
||||||
|
|
||||||
local Dispatchers = setmetatable({}, {__index=function(self, argCount)
|
|
||||||
local dispatcher = CreateDispatcher(argCount)
|
|
||||||
rawset(self, argCount, dispatcher)
|
|
||||||
return dispatcher
|
|
||||||
end})
|
|
||||||
Dispatchers[0] = function(func)
|
|
||||||
return xpcall(func, errorhandler)
|
|
||||||
end
|
|
||||||
|
|
||||||
local function safecall(func, ...)
|
local function safecall(func, ...)
|
||||||
return Dispatchers[select("#", ...)](func, ...)
|
if func then
|
||||||
|
return xpcall(func, errorhandler, ...)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local width_multiplier = 170
|
local width_multiplier = 170
|
||||||
@@ -85,18 +57,18 @@ local width_multiplier = 170
|
|||||||
--[[
|
--[[
|
||||||
Group Types
|
Group Types
|
||||||
Tree - All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree
|
Tree - All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree
|
||||||
- Descendant Groups with inline=true and thier children will not become nodes
|
- Descendant Groups with inline=true and thier children will not become nodes
|
||||||
|
|
||||||
Tab - Direct Child Groups will become tabs, direct child options will appear above the tab control
|
Tab - Direct Child Groups will become tabs, direct child options will appear above the tab control
|
||||||
- Grandchild groups will default to inline unless specified otherwise
|
- Grandchild groups will default to inline unless specified otherwise
|
||||||
|
|
||||||
Select- Same as Tab but with entries in a dropdown rather than tabs
|
Select- Same as Tab but with entries in a dropdown rather than tabs
|
||||||
|
|
||||||
|
|
||||||
Inline Groups
|
Inline Groups
|
||||||
- Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
|
- Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
|
||||||
- If declared on a direct child of a root node of a select group, they will appear above the group container control
|
- If declared on a direct child of a root node of a select group, they will appear above the group container control
|
||||||
- When a group is displayed inline, all descendants will also be inline members of the group
|
- When a group is displayed inline, all descendants will also be inline members of the group
|
||||||
|
|
||||||
]]
|
]]
|
||||||
|
|
||||||
@@ -325,7 +297,7 @@ local function compareOptions(a,b)
|
|||||||
return NameA:upper() < NameB:upper()
|
return NameA:upper() < NameB:upper()
|
||||||
end
|
end
|
||||||
if OrderA < 0 then
|
if OrderA < 0 then
|
||||||
if OrderB > 0 then
|
if OrderB >= 0 then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@@ -533,8 +505,9 @@ local function OptionOnMouseOver(widget, event)
|
|||||||
local options = user.options
|
local options = user.options
|
||||||
local path = user.path
|
local path = user.path
|
||||||
local appName = user.appName
|
local appName = user.appName
|
||||||
|
local tooltip = AceConfigDialog.tooltip
|
||||||
|
|
||||||
GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
|
tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
|
||||||
local name = GetOptionsMemberValue("name", opt, options, path, appName)
|
local name = GetOptionsMemberValue("name", opt, options, path, appName)
|
||||||
local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
|
local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
|
||||||
local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
|
local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
|
||||||
@@ -542,23 +515,23 @@ local function OptionOnMouseOver(widget, event)
|
|||||||
|
|
||||||
if descStyle and descStyle ~= "tooltip" then return end
|
if descStyle and descStyle ~= "tooltip" then return end
|
||||||
|
|
||||||
GameTooltip:SetText(name, 1, .82, 0, true)
|
tooltip:SetText(name, 1, .82, 0, true)
|
||||||
|
|
||||||
if opt.type == "multiselect" then
|
if opt.type == "multiselect" then
|
||||||
GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
|
tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
|
||||||
end
|
end
|
||||||
if type(desc) == "string" then
|
if type(desc) == "string" then
|
||||||
GameTooltip:AddLine(desc, 1, 1, 1, true)
|
tooltip:AddLine(desc, 1, 1, 1, true)
|
||||||
end
|
end
|
||||||
if type(usage) == "string" then
|
if type(usage) == "string" then
|
||||||
GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
|
tooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
GameTooltip:Show()
|
tooltip:Show()
|
||||||
end
|
end
|
||||||
|
|
||||||
local function OptionOnMouseLeave(widget, event)
|
local function OptionOnMouseLeave(widget, event)
|
||||||
GameTooltip:Hide()
|
AceConfigDialog.tooltip:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
local function GetFuncName(option)
|
local function GetFuncName(option)
|
||||||
@@ -569,71 +542,127 @@ local function GetFuncName(option)
|
|||||||
return "set"
|
return "set"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
|
do
|
||||||
if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
|
local frame = AceConfigDialog.popup
|
||||||
StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
|
if not frame or oldminor < 81 then
|
||||||
end
|
frame = CreateFrame("Frame", nil, UIParent)
|
||||||
local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
|
AceConfigDialog.popup = frame
|
||||||
for k in pairs(t) do
|
frame:Hide()
|
||||||
t[k] = nil
|
frame:SetPoint("CENTER", UIParent, "CENTER")
|
||||||
end
|
frame:SetSize(320, 72)
|
||||||
t.text = message
|
frame:EnableMouse(true) -- Do not allow click-through on the frame
|
||||||
t.button1 = ACCEPT
|
frame:SetFrameStrata("TOOLTIP")
|
||||||
t.button2 = CANCEL
|
frame:SetFrameLevel(100) -- Lots of room to draw under it
|
||||||
t.preferredIndex = STATICPOPUP_NUMDIALOGS
|
frame:SetScript("OnKeyDown", function(self, key)
|
||||||
local dialog, oldstrata
|
if key == "ESCAPE" then
|
||||||
t.OnAccept = function()
|
self:SetPropagateKeyboardInput(false)
|
||||||
safecall(func, unpack(t))
|
if self.cancel:IsShown() then
|
||||||
if dialog and oldstrata then
|
self.cancel:Click()
|
||||||
dialog:SetFrameStrata(oldstrata)
|
else -- Showing a validation error
|
||||||
end
|
self:Hide()
|
||||||
AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
|
end
|
||||||
del(info)
|
else
|
||||||
end
|
self:SetPropagateKeyboardInput(true)
|
||||||
t.OnCancel = function()
|
end
|
||||||
if dialog and oldstrata then
|
end)
|
||||||
dialog:SetFrameStrata(oldstrata)
|
|
||||||
end
|
|
||||||
AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
|
|
||||||
del(info)
|
|
||||||
end
|
|
||||||
for i = 1, select("#", ...) do
|
|
||||||
t[i] = select(i, ...) or false
|
|
||||||
end
|
|
||||||
t.timeout = 0
|
|
||||||
t.whileDead = 1
|
|
||||||
t.hideOnEscape = 1
|
|
||||||
|
|
||||||
dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
|
if not frame.SetFixedFrameStrata then -- API capability check (classic check)
|
||||||
if dialog then
|
frame:SetBackdrop({
|
||||||
oldstrata = dialog:GetFrameStrata()
|
bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
|
||||||
dialog:SetFrameStrata("TOOLTIP")
|
edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
|
||||||
|
tile = true,
|
||||||
|
tileSize = 32,
|
||||||
|
edgeSize = 32,
|
||||||
|
insets = { left = 11, right = 11, top = 11, bottom = 11 },
|
||||||
|
})
|
||||||
|
else
|
||||||
|
local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
|
||||||
|
border:SetAllPoints(frame)
|
||||||
|
frame:SetFixedFrameStrata(true)
|
||||||
|
frame:SetFixedFrameLevel(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
|
||||||
|
text:SetSize(290, 0)
|
||||||
|
text:SetPoint("TOP", 0, -16)
|
||||||
|
frame.text = text
|
||||||
|
|
||||||
|
local function newButton(text)
|
||||||
|
local button = CreateFrame("Button", nil, frame)
|
||||||
|
button:SetSize(128, 21)
|
||||||
|
button:SetNormalFontObject(GameFontNormal)
|
||||||
|
button:SetHighlightFontObject(GameFontHighlight)
|
||||||
|
button:SetNormalTexture(130763) -- "Interface\\Buttons\\UI-DialogBox-Button-Up"
|
||||||
|
button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
||||||
|
button:SetPushedTexture(130761) -- "Interface\\Buttons\\UI-DialogBox-Button-Down"
|
||||||
|
button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
||||||
|
button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
|
||||||
|
button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
||||||
|
button:SetText(text)
|
||||||
|
return button
|
||||||
|
end
|
||||||
|
|
||||||
|
local accept = newButton(ACCEPT)
|
||||||
|
accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
|
||||||
|
frame.accept = accept
|
||||||
|
|
||||||
|
local cancel = newButton(CANCEL)
|
||||||
|
cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0)
|
||||||
|
frame.cancel = cancel
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
|
||||||
|
local frame = AceConfigDialog.popup
|
||||||
|
frame:Show()
|
||||||
|
frame.text:SetText(message)
|
||||||
|
-- From StaticPopup.lua
|
||||||
|
-- local height = 32 + text:GetHeight() + 2;
|
||||||
|
-- height = height + 6 + accept:GetHeight()
|
||||||
|
-- We add 32 + 2 + 6 + 21 (button height) == 61
|
||||||
|
local height = 61 + frame.text:GetHeight()
|
||||||
|
frame:SetHeight(height)
|
||||||
|
|
||||||
|
frame.accept:ClearAllPoints()
|
||||||
|
frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
|
||||||
|
frame.cancel:Show()
|
||||||
|
|
||||||
|
local t = {...}
|
||||||
|
local tCount = select("#", ...)
|
||||||
|
frame.accept:SetScript("OnClick", function(self)
|
||||||
|
safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table)
|
||||||
|
AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
|
||||||
|
frame:Hide()
|
||||||
|
self:SetScript("OnClick", nil)
|
||||||
|
frame.cancel:SetScript("OnClick", nil)
|
||||||
|
del(info)
|
||||||
|
end)
|
||||||
|
frame.cancel:SetScript("OnClick", function(self)
|
||||||
|
AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
|
||||||
|
frame:Hide()
|
||||||
|
self:SetScript("OnClick", nil)
|
||||||
|
frame.accept:SetScript("OnClick", nil)
|
||||||
|
del(info)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
local function validationErrorPopup(message)
|
local function validationErrorPopup(message)
|
||||||
if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then
|
local frame = AceConfigDialog.popup
|
||||||
StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {}
|
frame:Show()
|
||||||
end
|
frame.text:SetText(message)
|
||||||
local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"]
|
-- From StaticPopup.lua
|
||||||
t.text = message
|
-- local height = 32 + text:GetHeight() + 2;
|
||||||
t.button1 = OKAY
|
-- height = height + 6 + accept:GetHeight()
|
||||||
t.preferredIndex = STATICPOPUP_NUMDIALOGS
|
-- We add 32 + 2 + 6 + 21 (button height) == 61
|
||||||
local dialog, oldstrata
|
local height = 61 + frame.text:GetHeight()
|
||||||
t.OnAccept = function()
|
frame:SetHeight(height)
|
||||||
if dialog and oldstrata then
|
|
||||||
dialog:SetFrameStrata(oldstrata)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
t.timeout = 0
|
|
||||||
t.whileDead = 1
|
|
||||||
t.hideOnEscape = 1
|
|
||||||
|
|
||||||
dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG")
|
frame.accept:ClearAllPoints()
|
||||||
if dialog then
|
frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16)
|
||||||
oldstrata = dialog:GetFrameStrata()
|
frame.cancel:Hide()
|
||||||
dialog:SetFrameStrata("TOOLTIP")
|
|
||||||
end
|
frame.accept:SetScript("OnClick", function()
|
||||||
|
frame:Hide()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function ActivateControl(widget, event, ...)
|
local function ActivateControl(widget, event, ...)
|
||||||
@@ -886,7 +915,7 @@ end
|
|||||||
|
|
||||||
local function MultiControlOnClosed(widget, event, ...)
|
local function MultiControlOnClosed(widget, event, ...)
|
||||||
local user = widget:GetUserDataTable()
|
local user = widget:GetUserDataTable()
|
||||||
if user.valuechanged then
|
if user.valuechanged and not widget:IsReleasing() then
|
||||||
local iscustom = user.rootframe:GetUserData("iscustom")
|
local iscustom = user.rootframe:GetUserData("iscustom")
|
||||||
local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
|
local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
|
||||||
if iscustom then
|
if iscustom then
|
||||||
@@ -1064,6 +1093,23 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
|
|||||||
control:SetCallback("OnEnter", OptionOnMouseOver)
|
control:SetCallback("OnEnter", OptionOnMouseOver)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function CreateControl(userControlType, fallbackControlType)
|
||||||
|
local control
|
||||||
|
if userControlType then
|
||||||
|
control = gui:Create(userControlType)
|
||||||
|
if not control then
|
||||||
|
geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(userControlType)))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if not control then
|
||||||
|
control = gui:Create(fallbackControlType)
|
||||||
|
end
|
||||||
|
return control
|
||||||
|
end
|
||||||
|
|
||||||
|
local function sortTblAsStrings(x,y)
|
||||||
|
return tostring(x) < tostring(y) -- Support numbers as keys
|
||||||
|
end
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
options - root of the options table being fed
|
options - root of the options table being fed
|
||||||
@@ -1112,8 +1158,9 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
|
local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
|
||||||
local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
|
local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
|
||||||
|
|
||||||
if type(image) == "string" or type(image) == "number" then
|
local iconControl = type(image) == "string" or type(image) == "number"
|
||||||
control = gui:Create("Icon")
|
control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button")
|
||||||
|
if iconControl then
|
||||||
if not width then
|
if not width then
|
||||||
width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
|
width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
|
||||||
end
|
end
|
||||||
@@ -1134,18 +1181,12 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
control:SetImageSize(width, height)
|
control:SetImageSize(width, height)
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
else
|
else
|
||||||
control = gui:Create("Button")
|
|
||||||
control:SetText(name)
|
control:SetText(name)
|
||||||
end
|
end
|
||||||
control:SetCallback("OnClick",ActivateControl)
|
control:SetCallback("OnClick",ActivateControl)
|
||||||
|
|
||||||
elseif v.type == "input" then
|
elseif v.type == "input" then
|
||||||
local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
|
control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox" or "EditBox")
|
||||||
control = gui:Create(controlType)
|
|
||||||
if not control then
|
|
||||||
geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
|
|
||||||
control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
|
|
||||||
end
|
|
||||||
|
|
||||||
if v.multiline and control.SetNumLines then
|
if v.multiline and control.SetNumLines then
|
||||||
control:SetNumLines(tonumber(v.multiline) or 4)
|
control:SetNumLines(tonumber(v.multiline) or 4)
|
||||||
@@ -1159,7 +1200,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
control:SetText(text)
|
control:SetText(text)
|
||||||
|
|
||||||
elseif v.type == "toggle" then
|
elseif v.type == "toggle" then
|
||||||
control = gui:Create("CheckBox")
|
control = CreateControl(v.dialogControl or v.control, "CheckBox")
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
control:SetTriState(v.tristate)
|
control:SetTriState(v.tristate)
|
||||||
local value = GetOptionsMemberValue("get",v, options, path, appName)
|
local value = GetOptionsMemberValue("get",v, options, path, appName)
|
||||||
@@ -1182,7 +1223,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif v.type == "range" then
|
elseif v.type == "range" then
|
||||||
control = gui:Create("Slider")
|
control = CreateControl(v.dialogControl or v.control, "Slider")
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
|
control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
|
||||||
control:SetIsPercent(v.isPercent)
|
control:SetIsPercent(v.isPercent)
|
||||||
@@ -1196,6 +1237,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
|
|
||||||
elseif v.type == "select" then
|
elseif v.type == "select" then
|
||||||
local values = GetOptionsMemberValue("values", v, options, path, appName)
|
local values = GetOptionsMemberValue("values", v, options, path, appName)
|
||||||
|
local sorting = GetOptionsMemberValue("sorting", v, options, path, appName)
|
||||||
if v.style == "radio" then
|
if v.style == "radio" then
|
||||||
local disabled = CheckOptionDisabled(v, options, path, appName)
|
local disabled = CheckOptionDisabled(v, options, path, appName)
|
||||||
local width = GetOptionsMemberValue("width",v,options,path,appName)
|
local width = GetOptionsMemberValue("width",v,options,path,appName)
|
||||||
@@ -1206,12 +1248,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
|
|
||||||
control:PauseLayout()
|
control:PauseLayout()
|
||||||
local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
|
local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
|
||||||
local t = {}
|
if not sorting then
|
||||||
for value, text in pairs(values) do
|
sorting = {}
|
||||||
t[#t+1]=value
|
for value, text in pairs(values) do
|
||||||
|
sorting[#sorting+1]=value
|
||||||
|
end
|
||||||
|
tsort(sorting, sortTblAsStrings)
|
||||||
end
|
end
|
||||||
tsort(t)
|
for k, value in ipairs(sorting) do
|
||||||
for k, value in ipairs(t) do
|
|
||||||
local text = values[value]
|
local text = values[value]
|
||||||
local radio = gui:Create("CheckBox")
|
local radio = gui:Create("CheckBox")
|
||||||
radio:SetLabel(text)
|
radio:SetLabel(text)
|
||||||
@@ -1238,19 +1282,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
control:ResumeLayout()
|
control:ResumeLayout()
|
||||||
control:DoLayout()
|
control:DoLayout()
|
||||||
else
|
else
|
||||||
local controlType = v.dialogControl or v.control or "Dropdown"
|
control = CreateControl(v.dialogControl or v.control, "Dropdown")
|
||||||
control = gui:Create(controlType)
|
|
||||||
if not control then
|
|
||||||
geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
|
|
||||||
control = gui:Create("Dropdown")
|
|
||||||
end
|
|
||||||
local itemType = v.itemControl
|
local itemType = v.itemControl
|
||||||
if itemType and not gui:GetWidgetVersion(itemType) then
|
if itemType and not gui:GetWidgetVersion(itemType) then
|
||||||
geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
|
geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
|
||||||
itemType = nil
|
itemType = nil
|
||||||
end
|
end
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
control:SetList(values, nil, itemType)
|
control:SetList(values, sorting, itemType)
|
||||||
local value = GetOptionsMemberValue("get",v, options, path, appName)
|
local value = GetOptionsMemberValue("get",v, options, path, appName)
|
||||||
if not values[value] then
|
if not values[value] then
|
||||||
value = nil
|
value = nil
|
||||||
@@ -1263,8 +1302,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
local values = GetOptionsMemberValue("values", v, options, path, appName)
|
local values = GetOptionsMemberValue("values", v, options, path, appName)
|
||||||
local disabled = CheckOptionDisabled(v, options, path, appName)
|
local disabled = CheckOptionDisabled(v, options, path, appName)
|
||||||
|
|
||||||
local controlType = v.dialogControl or v.control
|
|
||||||
|
|
||||||
local valuesort = new()
|
local valuesort = new()
|
||||||
if values then
|
if values then
|
||||||
for value, text in pairs(values) do
|
for value, text in pairs(values) do
|
||||||
@@ -1273,6 +1310,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
end
|
end
|
||||||
tsort(valuesort)
|
tsort(valuesort)
|
||||||
|
|
||||||
|
local controlType = v.dialogControl or v.control
|
||||||
if controlType then
|
if controlType then
|
||||||
control = gui:Create(controlType)
|
control = gui:Create(controlType)
|
||||||
if not control then
|
if not control then
|
||||||
@@ -1346,7 +1384,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
del(valuesort)
|
del(valuesort)
|
||||||
|
|
||||||
elseif v.type == "color" then
|
elseif v.type == "color" then
|
||||||
control = gui:Create("ColorPicker")
|
control = CreateControl(v.dialogControl or v.control, "ColorPicker")
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
|
control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
|
||||||
control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
|
control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
|
||||||
@@ -1354,18 +1392,18 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
|||||||
control:SetCallback("OnValueConfirmed",ActivateControl)
|
control:SetCallback("OnValueConfirmed",ActivateControl)
|
||||||
|
|
||||||
elseif v.type == "keybinding" then
|
elseif v.type == "keybinding" then
|
||||||
control = gui:Create("Keybinding")
|
control = CreateControl(v.dialogControl or v.control, "Keybinding")
|
||||||
control:SetLabel(name)
|
control:SetLabel(name)
|
||||||
control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
|
control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
|
||||||
control:SetCallback("OnKeyChanged",ActivateControl)
|
control:SetCallback("OnKeyChanged",ActivateControl)
|
||||||
|
|
||||||
elseif v.type == "header" then
|
elseif v.type == "header" then
|
||||||
control = gui:Create("Heading")
|
control = CreateControl(v.dialogControl or v.control, "Heading")
|
||||||
control:SetText(name)
|
control:SetText(name)
|
||||||
control.width = "fill"
|
control.width = "fill"
|
||||||
|
|
||||||
elseif v.type == "description" then
|
elseif v.type == "description" then
|
||||||
control = gui:Create("Label")
|
control = CreateControl(v.dialogControl or v.control, "Label")
|
||||||
control:SetText(name)
|
control:SetText(name)
|
||||||
|
|
||||||
local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
|
local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
|
||||||
@@ -1453,6 +1491,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
|
|||||||
local option = user.option
|
local option = user.option
|
||||||
local path = user.path
|
local path = user.path
|
||||||
local appName = user.appName
|
local appName = user.appName
|
||||||
|
local tooltip = AceConfigDialog.tooltip
|
||||||
|
|
||||||
local feedpath = new()
|
local feedpath = new()
|
||||||
for i = 1, #path do
|
for i = 1, #path do
|
||||||
@@ -1469,24 +1508,25 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
|
|||||||
local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
|
local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
|
||||||
local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
|
local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
|
||||||
|
|
||||||
GameTooltip:SetOwner(button, "ANCHOR_NONE")
|
tooltip:SetOwner(button, "ANCHOR_NONE")
|
||||||
|
tooltip:ClearAllPoints()
|
||||||
if widget.type == "TabGroup" then
|
if widget.type == "TabGroup" then
|
||||||
GameTooltip:SetPoint("BOTTOM",button,"TOP")
|
tooltip:SetPoint("BOTTOM",button,"TOP")
|
||||||
else
|
else
|
||||||
GameTooltip:SetPoint("LEFT",button,"RIGHT")
|
tooltip:SetPoint("LEFT",button,"RIGHT")
|
||||||
end
|
end
|
||||||
|
|
||||||
GameTooltip:SetText(name, 1, .82, 0, true)
|
tooltip:SetText(name, 1, .82, 0, true)
|
||||||
|
|
||||||
if type(desc) == "string" then
|
if type(desc) == "string" then
|
||||||
GameTooltip:AddLine(desc, 1, 1, 1, true)
|
tooltip:AddLine(desc, 1, 1, 1, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
GameTooltip:Show()
|
tooltip:Show()
|
||||||
end
|
end
|
||||||
|
|
||||||
local function TreeOnButtonLeave(widget, event, value, button)
|
local function TreeOnButtonLeave(widget, event, value, button)
|
||||||
GameTooltip:Hide()
|
AceConfigDialog.tooltip:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@@ -1533,10 +1573,6 @@ local function GroupSelected(widget, event, uniquevalue)
|
|||||||
end
|
end
|
||||||
|
|
||||||
BuildPath(feedpath, ("\001"):split(uniquevalue))
|
BuildPath(feedpath, ("\001"):split(uniquevalue))
|
||||||
local group = options
|
|
||||||
for i = 1, #feedpath do
|
|
||||||
group = GetSubOption(group, feedpath[i])
|
|
||||||
end
|
|
||||||
widget:ReleaseChildren()
|
widget:ReleaseChildren()
|
||||||
AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
|
AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
|
||||||
|
|
||||||
|
@@ -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".
|
-- :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
|
-- @class file
|
||||||
-- @name AceConfigRegistry-3.0
|
-- @name AceConfigRegistry-3.0
|
||||||
-- @release $Id: AceConfigRegistry-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
|
-- @release $Id: AceConfigRegistry-3.0.lua 1207 2019-06-23 12:08:33Z nevcairiel $
|
||||||
local CallbackHandler = LibStub("CallbackHandler-1.0")
|
local CallbackHandler = LibStub("CallbackHandler-1.0")
|
||||||
|
|
||||||
local MAJOR, MINOR = "AceConfigRegistry-3.0", 18
|
local MAJOR, MINOR = "AceConfigRegistry-3.0", 20
|
||||||
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not AceConfigRegistry then return end
|
if not AceConfigRegistry then return end
|
||||||
@@ -59,7 +59,6 @@ local optstring={["nil"]=true,["string"]=true, _="string"}
|
|||||||
local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
|
local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
|
||||||
local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
|
local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
|
||||||
local optnumber={["nil"]=true,["number"]=true, _="number"}
|
local optnumber={["nil"]=true,["number"]=true, _="number"}
|
||||||
local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"}
|
|
||||||
local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true}, _="methodname, funcref or false"}
|
local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true}, _="methodname, funcref or false"}
|
||||||
local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true, _="methodname, funcref or number"}
|
local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true, _="methodname, funcref or number"}
|
||||||
local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true, _="methodname, funcref or table"}
|
local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true, _="methodname, funcref or table"}
|
||||||
@@ -95,13 +94,20 @@ local basekeys={
|
|||||||
}
|
}
|
||||||
|
|
||||||
local typedkeys={
|
local typedkeys={
|
||||||
header={},
|
header={
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
|
},
|
||||||
description={
|
description={
|
||||||
image=optstringnumberfunc,
|
image=optstringnumberfunc,
|
||||||
imageCoords=optmethodtable,
|
imageCoords=optmethodtable,
|
||||||
imageHeight=optnumber,
|
imageHeight=optnumber,
|
||||||
imageWidth=optnumber,
|
imageWidth=optnumber,
|
||||||
fontSize=optstringfunc,
|
fontSize=optstringfunc,
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
group={
|
group={
|
||||||
args=istable,
|
args=istable,
|
||||||
@@ -118,6 +124,9 @@ local typedkeys={
|
|||||||
imageCoords=optmethodtable,
|
imageCoords=optmethodtable,
|
||||||
imageHeight=optnumber,
|
imageHeight=optnumber,
|
||||||
imageWidth=optnumber,
|
imageWidth=optnumber,
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
input={
|
input={
|
||||||
pattern=optstring,
|
pattern=optstring,
|
||||||
@@ -131,6 +140,9 @@ local typedkeys={
|
|||||||
tristate=optbool,
|
tristate=optbool,
|
||||||
image=optstringnumberfunc,
|
image=optstringnumberfunc,
|
||||||
imageCoords=optmethodtable,
|
imageCoords=optmethodtable,
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
tristate={
|
tristate={
|
||||||
},
|
},
|
||||||
@@ -142,9 +154,13 @@ local typedkeys={
|
|||||||
step=optnumber,
|
step=optnumber,
|
||||||
bigStep=optnumber,
|
bigStep=optnumber,
|
||||||
isPercent=optbool,
|
isPercent=optbool,
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
select={
|
select={
|
||||||
values=ismethodtable,
|
values=ismethodtable,
|
||||||
|
sorting=optmethodtable,
|
||||||
style={
|
style={
|
||||||
["nil"]=true,
|
["nil"]=true,
|
||||||
["string"]={dropdown=true,radio=true},
|
["string"]={dropdown=true,radio=true},
|
||||||
@@ -165,9 +181,14 @@ local typedkeys={
|
|||||||
},
|
},
|
||||||
color={
|
color={
|
||||||
hasAlpha=optmethodbool,
|
hasAlpha=optmethodbool,
|
||||||
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
keybinding={
|
keybinding={
|
||||||
-- TODO
|
control=optstring,
|
||||||
|
dialogControl=optstring,
|
||||||
|
dropdownControl=optstring,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -40,15 +40,15 @@
|
|||||||
-- end
|
-- end
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceDB-3.0.lua
|
-- @name AceDB-3.0.lua
|
||||||
-- @release $Id: AceDB-3.0.lua 1142 2016-07-11 08:36:19Z nevcairiel $
|
-- @release $Id: AceDB-3.0.lua 1217 2019-07-11 03:06:18Z funkydude $
|
||||||
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 26
|
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
|
||||||
local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
|
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
|
||||||
|
|
||||||
if not AceDB then return end -- No upgrade needed
|
if not AceDB then return end -- No upgrade needed
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local type, pairs, next, error = type, pairs, next, error
|
local type, pairs, next, error = type, pairs, next, error
|
||||||
local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
|
local setmetatable, rawset, rawget = setmetatable, rawset, rawget
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local _G = _G
|
local _G = _G
|
||||||
@@ -397,7 +397,7 @@ AceDB.frame:SetScript("OnEvent", logoutHandler)
|
|||||||
-- @param defaults A table of defaults for this database
|
-- @param defaults A table of defaults for this database
|
||||||
function DBObjectLib:RegisterDefaults(defaults)
|
function DBObjectLib:RegisterDefaults(defaults)
|
||||||
if defaults and type(defaults) ~= "table" then
|
if defaults and type(defaults) ~= "table" then
|
||||||
error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
|
error(("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
validateDefaults(defaults, self.keys)
|
validateDefaults(defaults, self.keys)
|
||||||
@@ -429,7 +429,7 @@ end
|
|||||||
-- @param name The name of the profile to set as the current profile
|
-- @param name The name of the profile to set as the current profile
|
||||||
function DBObjectLib:SetProfile(name)
|
function DBObjectLib:SetProfile(name)
|
||||||
if type(name) ~= "string" then
|
if type(name) ~= "string" then
|
||||||
error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
|
error(("Usage: AceDBObject:SetProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- changing to the same profile, dont do anything
|
-- changing to the same profile, dont do anything
|
||||||
@@ -471,7 +471,7 @@ end
|
|||||||
-- @param tbl A table to store the profile names in (optional)
|
-- @param tbl A table to store the profile names in (optional)
|
||||||
function DBObjectLib:GetProfiles(tbl)
|
function DBObjectLib:GetProfiles(tbl)
|
||||||
if tbl and type(tbl) ~= "table" then
|
if tbl and type(tbl) ~= "table" then
|
||||||
error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
|
error(("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected, got %q."):format(type(tbl)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Clear the container table
|
-- Clear the container table
|
||||||
@@ -509,15 +509,15 @@ end
|
|||||||
-- @param silent If true, do not raise an error when the profile does not exist
|
-- @param silent If true, do not raise an error when the profile does not exist
|
||||||
function DBObjectLib:DeleteProfile(name, silent)
|
function DBObjectLib:DeleteProfile(name, silent)
|
||||||
if type(name) ~= "string" then
|
if type(name) ~= "string" then
|
||||||
error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
|
error(("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.keys.profile == name then
|
if self.keys.profile == name then
|
||||||
error("Cannot delete the active profile in an AceDBObject.", 2)
|
error(("Cannot delete the active profile (%q) in an AceDBObject."):format(name), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not rawget(self.profiles, name) and not silent then
|
if not rawget(self.profiles, name) and not silent then
|
||||||
error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
|
error(("Cannot delete profile %q as it does not exist."):format(name), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.profiles[name] = nil
|
self.profiles[name] = nil
|
||||||
@@ -548,15 +548,15 @@ end
|
|||||||
-- @param silent If true, do not raise an error when the profile does not exist
|
-- @param silent If true, do not raise an error when the profile does not exist
|
||||||
function DBObjectLib:CopyProfile(name, silent)
|
function DBObjectLib:CopyProfile(name, silent)
|
||||||
if type(name) ~= "string" then
|
if type(name) ~= "string" then
|
||||||
error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
|
error(("Usage: AceDBObject:CopyProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if name == self.keys.profile then
|
if name == self.keys.profile then
|
||||||
error("Cannot have the same source and destination profiles.", 2)
|
error(("Cannot have the same source and destination profiles (%q)."):format(name), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not rawget(self.profiles, name) and not silent then
|
if not rawget(self.profiles, name) and not silent then
|
||||||
error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
|
error(("Cannot copy profile %q as it does not exist."):format(name), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Reset the profile before copying
|
-- Reset the profile before copying
|
||||||
@@ -611,7 +611,7 @@ end
|
|||||||
-- @param defaultProfile The profile name to use as the default
|
-- @param defaultProfile The profile name to use as the default
|
||||||
function DBObjectLib:ResetDB(defaultProfile)
|
function DBObjectLib:ResetDB(defaultProfile)
|
||||||
if defaultProfile and type(defaultProfile) ~= "string" then
|
if defaultProfile and type(defaultProfile) ~= "string" then
|
||||||
error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
|
error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected, got %q."):format(type(defaultProfile)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local sv = self.sv
|
local sv = self.sv
|
||||||
@@ -619,8 +619,6 @@ function DBObjectLib:ResetDB(defaultProfile)
|
|||||||
sv[k] = nil
|
sv[k] = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
local parent = self.parent
|
|
||||||
|
|
||||||
initdb(sv, self.defaults, defaultProfile, self)
|
initdb(sv, self.defaults, defaultProfile, self)
|
||||||
|
|
||||||
-- fix the child namespaces
|
-- fix the child namespaces
|
||||||
@@ -647,13 +645,13 @@ end
|
|||||||
-- @param defaults A table of values to use as defaults
|
-- @param defaults A table of values to use as defaults
|
||||||
function DBObjectLib:RegisterNamespace(name, defaults)
|
function DBObjectLib:RegisterNamespace(name, defaults)
|
||||||
if type(name) ~= "string" then
|
if type(name) ~= "string" then
|
||||||
error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
|
error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected, got %q."):format(type(name)), 2)
|
||||||
end
|
end
|
||||||
if defaults and type(defaults) ~= "table" then
|
if defaults and type(defaults) ~= "table" then
|
||||||
error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2)
|
error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
|
||||||
end
|
end
|
||||||
if self.children and self.children[name] then
|
if self.children and self.children[name] then
|
||||||
error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2)
|
error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace called %q already exists."):format(name), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local sv = self.sv
|
local sv = self.sv
|
||||||
@@ -677,10 +675,10 @@ end
|
|||||||
-- @return the namespace object if found
|
-- @return the namespace object if found
|
||||||
function DBObjectLib:GetNamespace(name, silent)
|
function DBObjectLib:GetNamespace(name, silent)
|
||||||
if type(name) ~= "string" then
|
if type(name) ~= "string" then
|
||||||
error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
|
error(("Usage: AceDBObject:GetNamespace(name): 'name' - string expected, got %q."):format(type(name)), 2)
|
||||||
end
|
end
|
||||||
if not silent and not (self.children and self.children[name]) then
|
if not silent and not (self.children and self.children[name]) then
|
||||||
error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
|
error(("Usage: AceDBObject:GetNamespace(name): 'name' - namespace %q does not exist."):format(name), 2)
|
||||||
end
|
end
|
||||||
if not self.children then self.children = {} end
|
if not self.children then self.children = {} end
|
||||||
return self.children[name]
|
return self.children[name]
|
||||||
@@ -719,15 +717,15 @@ function AceDB:New(tbl, defaults, defaultProfile)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if type(tbl) ~= "table" then
|
if type(tbl) ~= "table" then
|
||||||
error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
|
error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected, got %q."):format(type(tbl)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if defaults and type(defaults) ~= "table" then
|
if defaults and type(defaults) ~= "table" then
|
||||||
error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
|
error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected, got %q."):format(type(defaults)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
|
if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
|
||||||
error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
|
error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
return initdb(tbl, defaults, defaultProfile)
|
return initdb(tbl, defaults, defaultProfile)
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
|
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceDBOptions-3.0
|
-- @name AceDBOptions-3.0
|
||||||
-- @release $Id: AceDBOptions-3.0.lua 1140 2016-07-03 07:53:29Z nevcairiel $
|
-- @release $Id: AceDBOptions-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
||||||
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
|
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
|
||||||
local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
|
local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
|
||||||
|
|
||||||
if not AceDBOptions then return end -- No upgrade needed
|
if not AceDBOptions then return end -- No upgrade needed
|
||||||
|
|
||||||
|
@@ -24,14 +24,14 @@
|
|||||||
-- f:AddChild(btn)
|
-- f:AddChild(btn)
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceGUI-3.0
|
-- @name AceGUI-3.0
|
||||||
-- @release $Id: AceGUI-3.0.lua 1228 2019-09-06 08:51:17Z nevcairiel $
|
-- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $
|
||||||
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 40
|
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
|
||||||
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
|
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
|
||||||
|
|
||||||
if not AceGUI then return end -- No upgrade needed
|
if not AceGUI then return end -- No upgrade needed
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local tinsert = table.insert
|
local tinsert, wipe = table.insert, table.wipe
|
||||||
local select, pairs, next, type = select, pairs, next, type
|
local select, pairs, next, type = select, pairs, next, type
|
||||||
local error, assert = error, assert
|
local error, assert = error, assert
|
||||||
local setmetatable, rawget = setmetatable, rawget
|
local setmetatable, rawget = setmetatable, rawget
|
||||||
@@ -212,6 +212,22 @@ function AceGUI:Release(widget)
|
|||||||
delWidget(widget, widget.type)
|
delWidget(widget, widget.type)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Check if a widget is currently in the process of being released
|
||||||
|
-- This function check if this widget, or any of its parents (in which case it'll be released shortly as well)
|
||||||
|
-- are currently being released. This allows addon to handle any callbacks accordingly.
|
||||||
|
-- @param widget The widget to check
|
||||||
|
function AceGUI:IsReleasing(widget)
|
||||||
|
if widget.isQueuedForRelease then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
if widget.parent and widget.parent.AceGUIWidgetVersion then
|
||||||
|
return AceGUI:IsReleasing(widget.parent)
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Focus --
|
-- Focus --
|
||||||
-----------
|
-----------
|
||||||
@@ -338,6 +354,10 @@ do
|
|||||||
AceGUI:Release(self)
|
AceGUI:Release(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
WidgetBase.IsReleasing = function(self)
|
||||||
|
return AceGUI:IsReleasing(self)
|
||||||
|
end
|
||||||
|
|
||||||
WidgetBase.SetPoint = function(self, ...)
|
WidgetBase.SetPoint = function(self, ...)
|
||||||
return self.frame:SetPoint(...)
|
return self.frame:SetPoint(...)
|
||||||
end
|
end
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
BlizOptionsGroup Container
|
BlizOptionsGroup Container
|
||||||
Simple container widget for the integration of AceGUI into the Blizzard Interface Options
|
Simple container widget for the integration of AceGUI into the Blizzard Interface Options
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "BlizOptionsGroup", 21
|
local Type, Version = "BlizOptionsGroup", 22
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ local methods = {
|
|||||||
Constructor
|
Constructor
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local frame = CreateFrame("Frame")
|
local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
|
||||||
frame:Hide()
|
frame:Hide()
|
||||||
|
|
||||||
-- support functions for the Blizzard Interface Options
|
-- support functions for the Blizzard Interface Options
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
DropdownGroup Container
|
DropdownGroup Container
|
||||||
Container controlled by a dropdown on the top.
|
Container controlled by a dropdown on the top.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "DropdownGroup", 21
|
local Type, Version = "DropdownGroup", 22
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ local function Constructor()
|
|||||||
dropdown.frame:Show()
|
dropdown.frame:Show()
|
||||||
dropdown:SetLabel("")
|
dropdown:SetLabel("")
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame)
|
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
border:SetPoint("TOPLEFT", 0, -26)
|
border:SetPoint("TOPLEFT", 0, -26)
|
||||||
border:SetPoint("BOTTOMRIGHT", 0, 3)
|
border:SetPoint("BOTTOMRIGHT", 0, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
--[[-----------------------------------------------------------------------------
|
--[[-----------------------------------------------------------------------------
|
||||||
Frame Container
|
Frame Container
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Frame", 26
|
local Type, Version = "Frame", 28
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -83,6 +83,7 @@ local methods = {
|
|||||||
["OnAcquire"] = function(self)
|
["OnAcquire"] = function(self)
|
||||||
self.frame:SetParent(UIParent)
|
self.frame:SetParent(UIParent)
|
||||||
self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
|
self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
|
||||||
|
self.frame:SetFrameLevel(100) -- Lots of room to draw under it
|
||||||
self:SetTitle()
|
self:SetTitle()
|
||||||
self:SetStatusText()
|
self:SetStatusText()
|
||||||
self:ApplyStatus()
|
self:ApplyStatus()
|
||||||
@@ -179,13 +180,14 @@ local PaneBackdrop = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local frame = CreateFrame("Frame", nil, UIParent)
|
local frame = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
frame:Hide()
|
frame:Hide()
|
||||||
|
|
||||||
frame:EnableMouse(true)
|
frame:EnableMouse(true)
|
||||||
frame:SetMovable(true)
|
frame:SetMovable(true)
|
||||||
frame:SetResizable(true)
|
frame:SetResizable(true)
|
||||||
frame:SetFrameStrata("FULLSCREEN_DIALOG")
|
frame:SetFrameStrata("FULLSCREEN_DIALOG")
|
||||||
|
frame:SetFrameLevel(100) -- Lots of room to draw under it
|
||||||
frame:SetBackdrop(FrameBackdrop)
|
frame:SetBackdrop(FrameBackdrop)
|
||||||
frame:SetBackdropColor(0, 0, 0, 1)
|
frame:SetBackdropColor(0, 0, 0, 1)
|
||||||
frame:SetMinResize(400, 200)
|
frame:SetMinResize(400, 200)
|
||||||
@@ -201,7 +203,7 @@ local function Constructor()
|
|||||||
closebutton:SetWidth(100)
|
closebutton:SetWidth(100)
|
||||||
closebutton:SetText(CLOSE)
|
closebutton:SetText(CLOSE)
|
||||||
|
|
||||||
local statusbg = CreateFrame("Button", nil, frame)
|
local statusbg = CreateFrame("Button", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
statusbg:SetPoint("BOTTOMLEFT", 15, 15)
|
statusbg:SetPoint("BOTTOMLEFT", 15, 15)
|
||||||
statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
|
statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
|
||||||
statusbg:SetHeight(24)
|
statusbg:SetHeight(24)
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
InlineGroup Container
|
InlineGroup Container
|
||||||
Simple container widget that creates a visible "box" with an optional title.
|
Simple container widget that creates a visible "box" with an optional title.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "InlineGroup", 21
|
local Type, Version = "InlineGroup", 22
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -75,7 +75,7 @@ local function Constructor()
|
|||||||
titletext:SetJustifyH("LEFT")
|
titletext:SetJustifyH("LEFT")
|
||||||
titletext:SetHeight(18)
|
titletext:SetHeight(18)
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame)
|
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
border:SetPoint("TOPLEFT", 0, -17)
|
border:SetPoint("TOPLEFT", 0, -17)
|
||||||
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
@@ -2,12 +2,12 @@
|
|||||||
TabGroup Container
|
TabGroup Container
|
||||||
Container that uses tabs on top to switch between groups.
|
Container that uses tabs on top to switch between groups.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "TabGroup", 36
|
local Type, Version = "TabGroup", 37
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
|
local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, table.wipe
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local PlaySound = PlaySound
|
local PlaySound = PlaySound
|
||||||
@@ -316,7 +316,7 @@ local function Constructor()
|
|||||||
titletext:SetHeight(18)
|
titletext:SetHeight(18)
|
||||||
titletext:SetText("")
|
titletext:SetText("")
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame)
|
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
border:SetPoint("TOPLEFT", 1, -27)
|
border:SetPoint("TOPLEFT", 1, -27)
|
||||||
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
@@ -2,12 +2,10 @@
|
|||||||
TreeGroup Container
|
TreeGroup Container
|
||||||
Container that uses a tree control to switch between groups.
|
Container that uses a tree control to switch between groups.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "TreeGroup", 44
|
local Type, Version = "TreeGroup", 45
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
local WoW80 = select(4, GetBuildInfo()) >= 80000
|
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
|
local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
|
||||||
local math_min, math_max, floor = math.min, math.max, floor
|
local math_min, math_max, floor = math.min, math.max, floor
|
||||||
@@ -422,8 +420,7 @@ local methods = {
|
|||||||
local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
|
local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
|
||||||
if maxlines <= 0 then return end
|
if maxlines <= 0 then return end
|
||||||
|
|
||||||
-- workaround for lag spikes on WoW 8.0
|
if self.frame:GetParent() == UIParent and not fromOnUpdate then
|
||||||
if WoW80 and self.frame:GetParent() == UIParent and not fromOnUpdate then
|
|
||||||
self.frame:SetScript("OnUpdate", FirstFrameUpdate)
|
self.frame:SetScript("OnUpdate", FirstFrameUpdate)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@@ -632,7 +629,7 @@ local PaneBackdrop = {
|
|||||||
local DraggerBackdrop = {
|
local DraggerBackdrop = {
|
||||||
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
|
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
|
||||||
edgeFile = nil,
|
edgeFile = nil,
|
||||||
tile = true, tileSize = 16, edgeSize = 0,
|
tile = true, tileSize = 16, edgeSize = 1,
|
||||||
insets = { left = 3, right = 3, top = 7, bottom = 7 }
|
insets = { left = 3, right = 3, top = 7, bottom = 7 }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -640,7 +637,7 @@ local function Constructor()
|
|||||||
local num = AceGUI:GetNextWidgetNum(Type)
|
local num = AceGUI:GetNextWidgetNum(Type)
|
||||||
local frame = CreateFrame("Frame", nil, UIParent)
|
local frame = CreateFrame("Frame", nil, UIParent)
|
||||||
|
|
||||||
local treeframe = CreateFrame("Frame", nil, frame)
|
local treeframe = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
treeframe:SetPoint("TOPLEFT")
|
treeframe:SetPoint("TOPLEFT")
|
||||||
treeframe:SetPoint("BOTTOMLEFT")
|
treeframe:SetPoint("BOTTOMLEFT")
|
||||||
treeframe:SetWidth(DEFAULT_TREE_WIDTH)
|
treeframe:SetWidth(DEFAULT_TREE_WIDTH)
|
||||||
@@ -655,7 +652,7 @@ local function Constructor()
|
|||||||
treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
|
treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
|
||||||
treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
|
treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
|
||||||
|
|
||||||
local dragger = CreateFrame("Frame", nil, treeframe)
|
local dragger = CreateFrame("Frame", nil, treeframe, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
dragger:SetWidth(8)
|
dragger:SetWidth(8)
|
||||||
dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
|
dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
|
||||||
dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
|
dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
|
||||||
@@ -680,7 +677,7 @@ local function Constructor()
|
|||||||
scrollbg:SetAllPoints(scrollbar)
|
scrollbg:SetAllPoints(scrollbar)
|
||||||
scrollbg:SetColorTexture(0,0,0,0.4)
|
scrollbg:SetColorTexture(0,0,0,0.4)
|
||||||
|
|
||||||
local border = CreateFrame("Frame",nil,frame)
|
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
|
border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
|
||||||
border:SetPoint("BOTTOMRIGHT")
|
border:SetPoint("BOTTOMRIGHT")
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
--[[ $Id: AceGUIWidget-DropDown.lua 1209 2019-06-24 21:01:01Z nevcairiel $ ]]--
|
--[[ $Id: AceGUIWidget-DropDown.lua 1239 2020-09-20 10:22:02Z nevcairiel $ ]]--
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
@@ -39,7 +39,7 @@ end
|
|||||||
|
|
||||||
do
|
do
|
||||||
local widgetType = "Dropdown-Pullout"
|
local widgetType = "Dropdown-Pullout"
|
||||||
local widgetVersion = 3
|
local widgetVersion = 5
|
||||||
|
|
||||||
--[[ Static data ]]--
|
--[[ Static data ]]--
|
||||||
|
|
||||||
@@ -193,12 +193,7 @@ do
|
|||||||
|
|
||||||
local height = 8
|
local height = 8
|
||||||
for i, item in pairs(items) do
|
for i, item in pairs(items) do
|
||||||
if i == 1 then
|
item:SetPoint("TOP", itemFrame, "TOP", 0, -2 + (i - 1) * -16)
|
||||||
item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
|
|
||||||
else
|
|
||||||
item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
item:Show()
|
item:Show()
|
||||||
|
|
||||||
height = height + 16
|
height = height + 16
|
||||||
@@ -258,7 +253,7 @@ do
|
|||||||
|
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local count = AceGUI:GetNextWidgetNum(widgetType)
|
local count = AceGUI:GetNextWidgetNum(widgetType)
|
||||||
local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
|
local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
local self = {}
|
local self = {}
|
||||||
self.count = count
|
self.count = count
|
||||||
self.type = widgetType
|
self.type = widgetType
|
||||||
@@ -309,7 +304,7 @@ do
|
|||||||
scrollFrame.obj = self
|
scrollFrame.obj = self
|
||||||
itemFrame.obj = self
|
itemFrame.obj = self
|
||||||
|
|
||||||
local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
|
local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
slider:SetOrientation("VERTICAL")
|
slider:SetOrientation("VERTICAL")
|
||||||
slider:SetHitRectInsets(0, 0, -10, 0)
|
slider:SetHitRectInsets(0, 0, -10, 0)
|
||||||
slider:SetBackdrop(sliderBackdrop)
|
slider:SetBackdrop(sliderBackdrop)
|
||||||
@@ -356,7 +351,7 @@ end
|
|||||||
|
|
||||||
do
|
do
|
||||||
local widgetType = "Dropdown"
|
local widgetType = "Dropdown"
|
||||||
local widgetVersion = 34
|
local widgetVersion = 35
|
||||||
|
|
||||||
--[[ Static data ]]--
|
--[[ Static data ]]--
|
||||||
|
|
||||||
@@ -465,6 +460,7 @@ do
|
|||||||
self:SetWidth(200)
|
self:SetWidth(200)
|
||||||
self:SetLabel()
|
self:SetLabel()
|
||||||
self:SetPulloutWidth(nil)
|
self:SetPulloutWidth(nil)
|
||||||
|
self.list = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
-- exported, AceGUI callback
|
-- exported, AceGUI callback
|
||||||
@@ -535,9 +531,7 @@ do
|
|||||||
|
|
||||||
-- exported
|
-- exported
|
||||||
local function SetValue(self, value)
|
local function SetValue(self, value)
|
||||||
if self.list then
|
self:SetText(self.list[value] or "")
|
||||||
self:SetText(self.list[value] or "")
|
|
||||||
end
|
|
||||||
self.value = value
|
self.value = value
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -601,7 +595,7 @@ do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
local function SetList(self, list, order, itemType)
|
local function SetList(self, list, order, itemType)
|
||||||
self.list = list
|
self.list = list or {}
|
||||||
self.pullout:Clear()
|
self.pullout:Clear()
|
||||||
self.hasClose = nil
|
self.hasClose = nil
|
||||||
if not list then return end
|
if not list then return end
|
||||||
@@ -629,10 +623,8 @@ do
|
|||||||
|
|
||||||
-- exported
|
-- exported
|
||||||
local function AddItem(self, value, text, itemType)
|
local function AddItem(self, value, text, itemType)
|
||||||
if self.list then
|
self.list[value] = text
|
||||||
self.list[value] = text
|
AddListItem(self, value, text, itemType)
|
||||||
AddListItem(self, value, text, itemType)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- exported
|
-- exported
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
Keybinding Widget
|
Keybinding Widget
|
||||||
Set Keybindings in the Config UI.
|
Set Keybindings in the Config UI.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Keybinding", 25
|
local Type, Version = "Keybinding", 26
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -214,7 +214,7 @@ local function Constructor()
|
|||||||
label:SetJustifyH("CENTER")
|
label:SetJustifyH("CENTER")
|
||||||
label:SetHeight(18)
|
label:SetHeight(18)
|
||||||
|
|
||||||
local msgframe = CreateFrame("Frame", nil, UIParent)
|
local msgframe = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
msgframe:SetHeight(30)
|
msgframe:SetHeight(30)
|
||||||
msgframe:SetBackdrop(ControlBackdrop)
|
msgframe:SetBackdrop(ControlBackdrop)
|
||||||
msgframe:SetBackdropColor(0,0,0)
|
msgframe:SetBackdropColor(0,0,0)
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
Label Widget
|
Label Widget
|
||||||
Displays text and optionally an icon.
|
Displays text and optionally an icon.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Label", 26
|
local Type, Version = "Label", 27
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -130,6 +130,7 @@ local methods = {
|
|||||||
|
|
||||||
["SetFont"] = function(self, font, height, flags)
|
["SetFont"] = function(self, font, height, flags)
|
||||||
self.label:SetFont(font, height, flags)
|
self.label:SetFont(font, height, flags)
|
||||||
|
UpdateImageAnchor(self)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["SetFontObject"] = function(self, font)
|
["SetFontObject"] = function(self, font)
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
local Type, Version = "MultiLineEditBox", 28
|
local Type, Version = "MultiLineEditBox", 29
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -297,7 +297,7 @@ local function Constructor()
|
|||||||
text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
|
text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
|
||||||
text:SetJustifyV("MIDDLE")
|
text:SetJustifyV("MIDDLE")
|
||||||
|
|
||||||
local scrollBG = CreateFrame("Frame", nil, frame)
|
local scrollBG = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
scrollBG:SetBackdrop(backdrop)
|
scrollBG:SetBackdrop(backdrop)
|
||||||
scrollBG:SetBackdropColor(0, 0, 0)
|
scrollBG:SetBackdropColor(0, 0, 0)
|
||||||
scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
Slider Widget
|
Slider Widget
|
||||||
Graphical Slider, like, for Range values.
|
Graphical Slider, like, for Range values.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Slider", 22
|
local Type, Version = "Slider", 23
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
@@ -225,7 +225,7 @@ local function Constructor()
|
|||||||
label:SetJustifyH("CENTER")
|
label:SetJustifyH("CENTER")
|
||||||
label:SetHeight(15)
|
label:SetHeight(15)
|
||||||
|
|
||||||
local slider = CreateFrame("Slider", nil, frame)
|
local slider = CreateFrame("Slider", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
slider:SetOrientation("HORIZONTAL")
|
slider:SetOrientation("HORIZONTAL")
|
||||||
slider:SetHeight(15)
|
slider:SetHeight(15)
|
||||||
slider:SetHitRectInsets(0, 0, -10, 0)
|
slider:SetHitRectInsets(0, 0, -10, 0)
|
||||||
@@ -247,7 +247,7 @@ local function Constructor()
|
|||||||
local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
|
local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
|
||||||
hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
|
hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
|
||||||
|
|
||||||
local editbox = CreateFrame("EditBox", nil, frame)
|
local editbox = CreateFrame("EditBox", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
||||||
editbox:SetAutoFocus(false)
|
editbox:SetAutoFocus(false)
|
||||||
editbox:SetFontObject(GameFontHighlightSmall)
|
editbox:SetFontObject(GameFontHighlightSmall)
|
||||||
editbox:SetPoint("TOP", slider, "BOTTOM")
|
editbox:SetPoint("TOP", slider, "BOTTOM")
|
||||||
|
@@ -9,8 +9,8 @@
|
|||||||
-- make into AceHook.
|
-- make into AceHook.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceHook-3.0
|
-- @name AceHook-3.0
|
||||||
-- @release $Id: AceHook-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
-- @release $Id: AceHook-3.0.lua 1243 2020-10-18 00:00:19Z nevcairiel $
|
||||||
local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 8
|
local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
|
||||||
local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
|
local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
|
||||||
|
|
||||||
if not AceHook then return end -- No upgrade needed
|
if not AceHook then return end -- No upgrade needed
|
||||||
@@ -478,10 +478,10 @@ function AceHook:UnhookAll()
|
|||||||
for key, value in pairs(registry[self]) do
|
for key, value in pairs(registry[self]) do
|
||||||
if type(key) == "table" then
|
if type(key) == "table" then
|
||||||
for method in pairs(value) do
|
for method in pairs(value) do
|
||||||
self:Unhook(key, method)
|
AceHook.Unhook(self, key, method)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
self:Unhook(key)
|
AceHook.Unhook(self, key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
--[[ $Id: CallbackHandler-1.0.lua 22 2018-07-21 14:17:22Z nevcairiel $ ]]
|
--[[ $Id: CallbackHandler-1.0.lua 1186 2018-07-21 14:19:18Z nevcairiel $ ]]
|
||||||
local MAJOR, MINOR = "CallbackHandler-1.0", 7
|
local MAJOR, MINOR = "CallbackHandler-1.0", 7
|
||||||
local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
|
local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
--
|
--
|
||||||
|
|
||||||
local DBICON10 = "LibDBIcon-1.0"
|
local DBICON10 = "LibDBIcon-1.0"
|
||||||
local DBICON10_MINOR = 43 -- Bump on changes
|
local DBICON10_MINOR = 44 -- Bump on changes
|
||||||
if not LibStub then error(DBICON10 .. " requires LibStub.") end
|
if not LibStub then error(DBICON10 .. " requires LibStub.") end
|
||||||
local ldb = LibStub("LibDataBroker-1.1", true)
|
local ldb = LibStub("LibDataBroker-1.1", true)
|
||||||
if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
|
if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
|
||||||
@@ -18,8 +18,8 @@ lib.callbackRegistered = lib.callbackRegistered or nil
|
|||||||
lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
|
lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
|
||||||
lib.notCreated = lib.notCreated or {}
|
lib.notCreated = lib.notCreated or {}
|
||||||
lib.radius = lib.radius or 5
|
lib.radius = lib.radius or 5
|
||||||
|
local next, Minimap, CreateFrame = next, Minimap, CreateFrame
|
||||||
lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
|
lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
|
||||||
local next, Minimap = next, Minimap
|
|
||||||
local isDraggingButton = false
|
local isDraggingButton = false
|
||||||
|
|
||||||
function lib:IconCallback(event, name, key, value)
|
function lib:IconCallback(event, name, key, value)
|
||||||
@@ -218,8 +218,14 @@ local function createButton(name, object, db)
|
|||||||
button.dataObject = object
|
button.dataObject = object
|
||||||
button.db = db
|
button.db = db
|
||||||
button:SetFrameStrata("MEDIUM")
|
button:SetFrameStrata("MEDIUM")
|
||||||
button:SetSize(31, 31)
|
if button.SetFixedFrameStrata then -- Classic support
|
||||||
|
button:SetFixedFrameStrata(true)
|
||||||
|
end
|
||||||
button:SetFrameLevel(8)
|
button:SetFrameLevel(8)
|
||||||
|
if button.SetFixedFrameLevel then -- Classic support
|
||||||
|
button:SetFixedFrameLevel(true)
|
||||||
|
end
|
||||||
|
button:SetSize(31, 31)
|
||||||
button:RegisterForClicks("anyUp")
|
button:RegisterForClicks("anyUp")
|
||||||
button:RegisterForDrag("LeftButton")
|
button:RegisterForDrag("LeftButton")
|
||||||
button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
|
button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
|
||||||
|
@@ -1,13 +1,22 @@
|
|||||||
|
-- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $
|
||||||
-- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info
|
-- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info
|
||||||
-- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
|
-- LibStub is hereby placed in the Public Domain
|
||||||
|
-- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
|
||||||
local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
|
local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
|
||||||
local LibStub = _G[LIBSTUB_MAJOR]
|
local LibStub = _G[LIBSTUB_MAJOR]
|
||||||
|
|
||||||
|
-- Check to see is this version of the stub is obsolete
|
||||||
if not LibStub or LibStub.minor < LIBSTUB_MINOR then
|
if not LibStub or LibStub.minor < LIBSTUB_MINOR then
|
||||||
LibStub = LibStub or {libs = {}, minors = {} }
|
LibStub = LibStub or {libs = {}, minors = {} }
|
||||||
_G[LIBSTUB_MAJOR] = LibStub
|
_G[LIBSTUB_MAJOR] = LibStub
|
||||||
LibStub.minor = LIBSTUB_MINOR
|
LibStub.minor = LIBSTUB_MINOR
|
||||||
|
|
||||||
|
-- LibStub:NewLibrary(major, minor)
|
||||||
|
-- major (string) - the major version of the library
|
||||||
|
-- minor (string or number ) - the minor version of the library
|
||||||
|
--
|
||||||
|
-- returns nil if a newer or same version of the lib is already present
|
||||||
|
-- returns empty library object or old library object if upgrade is needed
|
||||||
function LibStub:NewLibrary(major, minor)
|
function LibStub:NewLibrary(major, minor)
|
||||||
assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
|
assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
|
||||||
minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
|
minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
|
||||||
@@ -18,6 +27,12 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
|
|||||||
return self.libs[major], oldminor
|
return self.libs[major], oldminor
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- LibStub:GetLibrary(major, [silent])
|
||||||
|
-- major (string) - the major version of the library
|
||||||
|
-- silent (boolean) - if true, library is optional, silently return nil if its not found
|
||||||
|
--
|
||||||
|
-- throws an error if the library can not be found (except silent is set)
|
||||||
|
-- returns the library object if found
|
||||||
function LibStub:GetLibrary(major, silent)
|
function LibStub:GetLibrary(major, silent)
|
||||||
if not self.libs[major] and not silent then
|
if not self.libs[major] and not silent then
|
||||||
error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
|
error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
|
||||||
@@ -25,6 +40,12 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
|
|||||||
return self.libs[major], self.minors[major]
|
return self.libs[major], self.minors[major]
|
||||||
end
|
end
|
||||||
|
|
||||||
function LibStub:IterateLibraries() return pairs(self.libs) end
|
-- LibStub:IterateLibraries()
|
||||||
|
--
|
||||||
|
-- Returns an iterator for the currently registered libraries
|
||||||
|
function LibStub:IterateLibraries()
|
||||||
|
return pairs(self.libs)
|
||||||
|
end
|
||||||
|
|
||||||
setmetatable(LibStub, { __call = LibStub.GetLibrary })
|
setmetatable(LibStub, { __call = LibStub.GetLibrary })
|
||||||
end
|
end
|
||||||
|
11
README.md
11
README.md
@@ -1,10 +1,9 @@
|
|||||||
# Grichelde - Text replacer
|
# Grichelde - Text replacer
|
||||||
|
|
||||||
Grichelde is a WoW Classic Addon that replaces any characters or words you typed in a chatbox according to your replacement rules and text.
|
Grichelde is a WoW Addon for Classic, Wrath of the Lich King Classic and Retail (Shadowlands) that replaces any characters or words you typed in a chat input line according to your replacement rules.
|
||||||
The replacement is done **before** the text is send to others/in the target channel. It does **not** change text others have written in the chat/channel,
|
The replacement is done **before** the text is send to other players/in the target channel. It does **not** change text other players have written in the chat, but the text they will see **from you**.
|
||||||
but the text they will see **from you** when you sent it.
|
|
||||||
|
|
||||||
Its purpose it to simulate a speaking disability of your toon and hereby strengthen immersion in roleplay.
|
Its purpose is to simulate a speaking disability of your toon and hereby strengthen immersion in roleplay.
|
||||||
Initially started as a helper addon for a roleplaying friend, Grichelde can be used for much more, like
|
Initially started as a helper addon for a roleplaying friend, Grichelde can be used for much more, like
|
||||||
|
|
||||||
* fixing your common spelling errors :)
|
* fixing your common spelling errors :)
|
||||||
@@ -40,7 +39,9 @@ Only slash commands, item links, textures, placeholders and ooc-markers are excl
|
|||||||
|
|
||||||
After entering a search or replacement text, you see a button "Okay" next to your input. This is **not** a validation message,
|
After entering a search or replacement text, you see a button "Okay" next to your input. This is **not** a validation message,
|
||||||
but the save button for text. This is a restriction from the UI library and can be seen in other addons as well.
|
but the save button for text. This is a restriction from the UI library and can be seen in other addons as well.
|
||||||
Please click on "Okay" to save the input permanently.
|
Please click on "Okay" to save the input permanently, otherwise it will not be stored.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
If it still does not work or gives you errors, please read the next question.
|
If it still does not work or gives you errors, please read the next question.
|
||||||
|
|
||||||
|
17
libs.xml
17
libs.xml
@@ -1,17 +0,0 @@
|
|||||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
|
||||||
..\FrameXML\UI.xsd">
|
|
||||||
|
|
||||||
<Script file="Libs\LibStub\LibStub.lua"/>
|
|
||||||
<Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
|
|
||||||
<Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceLocale-3.0\AceLocale-3.0.xml" />
|
|
||||||
<Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
|
|
||||||
<Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
|
|
||||||
<Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
|
|
||||||
<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua" />
|
|
||||||
<Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
|
|
||||||
</Ui>
|
|
@@ -6,15 +6,16 @@ local Grichelde = _G.Grichelde
|
|||||||
local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'deDE')
|
local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'deDE')
|
||||||
if not L then return end
|
if not L then return end
|
||||||
|
|
||||||
local cYellow = Grichelde.F.cYellow
|
local cYellow = Grichelde.F.cYellow
|
||||||
local cGray = Grichelde.F.cGray
|
local cGray = Grichelde.F.cGray
|
||||||
local cPrefix = Grichelde.F.cPrefix
|
local cHyperlink = Grichelde.F.cHyperlink
|
||||||
|
local cPrefix = Grichelde.F.cPrefix
|
||||||
|
|
||||||
-- system messages
|
-- system messages
|
||||||
L.AddonName = "Grichelde"
|
L.AddonName = "Grichelde"
|
||||||
L.AddonNamePlusVersion = "%s v%s"
|
L.AddonNamePlusVersion = "%s v%s"
|
||||||
L.AddonLoaded = "%s unterst\195\188tzt Euch jetzt bei euren Sprachschwierigkeiten."
|
L.AddonLoaded = "%s unterst\195\188tzt Euch jetzt bei euren Sprachschwierigkeiten."
|
||||||
L.AddonUnloaded = "%s wartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
|
L.AddonUnloaded = "%s erwartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
|
||||||
L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
|
L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
|
||||||
L.Upgrade_Successful = "Upgrade erfolgreich."
|
L.Upgrade_Successful = "Upgrade erfolgreich."
|
||||||
L.Upgrade_Error = "Upgrade fehlgeschlagen!"
|
L.Upgrade_Error = "Upgrade fehlgeschlagen!"
|
||||||
@@ -37,6 +38,8 @@ L.Error_UnsupportedChannel = "Nicht unterst\195\188tzter Kanal"
|
|||||||
L.Profiles_Available = "Verf\195\188gbare Profile:"
|
L.Profiles_Available = "Verf\195\188gbare Profile:"
|
||||||
L.Profiles_Created = "Neues Profil %s angelegt."
|
L.Profiles_Created = "Neues Profil %s angelegt."
|
||||||
L.Profiles_Loaded = "Profil %s geladen."
|
L.Profiles_Loaded = "Profil %s geladen."
|
||||||
|
L.Profiles_Activated = "Profil %s aktiviert."
|
||||||
|
L.Profiles_Deactivated = "Profil %s deaktiviert."
|
||||||
L.Profiles_Refreshed = "Profil %s aktualisiert."
|
L.Profiles_Refreshed = "Profil %s aktualisiert."
|
||||||
L.Profiles_Deleted = "Profil %s gel\195\182scht."
|
L.Profiles_Deleted = "Profil %s gel\195\182scht."
|
||||||
L.Profiles_Copied = "Einstellungen von Profil %s \195\188bernommen."
|
L.Profiles_Copied = "Einstellungen von Profil %s \195\188bernommen."
|
||||||
@@ -135,6 +138,8 @@ L.Options_Help_Group_Desc = "Hilfstellungen zu den Suchmustern und zur Ersetzung
|
|||||||
L.Options_Help_Disclaimer = cYellow("Haftungsausschlu\195\159:") .. " Das Addon wird im reinen Ist-Zustand zur Verf\195\188gung gestellt, ohne Garantie auf Funktion und Fehlerfreiheit (f\195\188r mehr Details siehe GPL 3 Lizenzdokument). "
|
L.Options_Help_Disclaimer = cYellow("Haftungsausschlu\195\159:") .. " Das Addon wird im reinen Ist-Zustand zur Verf\195\188gung gestellt, ohne Garantie auf Funktion und Fehlerfreiheit (f\195\188r mehr Details siehe GPL 3 Lizenzdokument). "
|
||||||
.. "Ferner \195\188bernimmt der Autor keinerlei Haftung oder Gew\195\164hrleistung f\195\188r durch das Addon oder dessen Nutzung entstandene Fehler oder Sch\195\164den, "
|
.. "Ferner \195\188bernimmt der Autor keinerlei Haftung oder Gew\195\164hrleistung f\195\188r durch das Addon oder dessen Nutzung entstandene Fehler oder Sch\195\164den, "
|
||||||
.. "insb. den Verlust von Spielfortschritt oder Daten aufgrund von Abst\195\188rzen des WoW-Clients."
|
.. "insb. den Verlust von Spielfortschritt oder Daten aufgrund von Abst\195\188rzen des WoW-Clients."
|
||||||
|
L.Options_Help_Tab_Info_Name = "Info"
|
||||||
|
L.Options_Help_Tab_Info_Desc = "\195\156ber dieses Addon."
|
||||||
L.Options_Help_Tab_Basics_Name = "Grundlagen"
|
L.Options_Help_Tab_Basics_Name = "Grundlagen"
|
||||||
L.Options_Help_Tab_Basics_Desc = "Erl\195\164utert die Grundlagen des Addons"
|
L.Options_Help_Tab_Basics_Desc = "Erl\195\164utert die Grundlagen des Addons"
|
||||||
L.Options_Help_Tab_Expert_Name = "Experte"
|
L.Options_Help_Tab_Expert_Name = "Experte"
|
||||||
@@ -142,33 +147,42 @@ L.Options_Help_Tab_Expert_Desc = "Beleuchtet die Besonderheiten bei der Textsuch
|
|||||||
L.Options_Help_Tab_Examples_Name = "Beispiele"
|
L.Options_Help_Tab_Examples_Name = "Beispiele"
|
||||||
L.Options_Help_Tab_Examples_Desc = "Beispiele f\195\188r bestimmte Szenarien."
|
L.Options_Help_Tab_Examples_Desc = "Beispiele f\195\188r bestimmte Szenarien."
|
||||||
|
|
||||||
|
L.Options_Help_Info = cYellow("\195\156ber dieses Addon")
|
||||||
|
.. "|n%s ersetzt beliebige, selbstdefinierte Zeichenfolgen durch andere selbstdefinierte Zeichenfolgen, die ihr eingebt. Die Ersetzung findet vor dem Versenden an andere Spieler oder Kanäle statt. "
|
||||||
|
.. "Es \195\164ndert nicht den Text den andere Spieler im Chat geschrieben haben, nur eure eigenen Eingaben. Es soll den individuellen Sprachfehler eures Charakters simulieren und dadurch die Immersion erh\195\182hen."
|
||||||
|
.. "|n|nNat\195\188rlich kann man es auch f\195\188r andere Dinge zweckentfremden (Trollifizierer, Abk\195\188rzungen, Kosenamen, etc.). Eine ausf\195\188hrliche Beschreibung aller Optionen, der Funktionsweise und viele Beispiele befinden sich auf den nachfolgenden Reitern."
|
||||||
|
.. "|n|n" .. cYellow("Kontakt")
|
||||||
|
.. "|nBitte Fehler und Erfahrungsberichte direkt als Kommentar auf der Projektwebseite bei " .. cPrefix("CurseForge") .. " (" .. cHyperlink("https://www.curseforge.com/wow/addons/grichelde") .. ") einmelden. "
|
||||||
|
.. "Ihr k\195\182nnt auch gern Screenshots der Fehlermeldungen und eurer Zuweisungen anh\195\164ngen. Ein \195\156bersichtsfenster aller Mappings kann mit dem Kommando " .. cPrefix("\"/gri mappings\"") .. " aufgerufen und herauskopiert werden. "
|
||||||
|
.. "|nIch freue mich \195\188ber euere Erfahrungsberichte und Fehlerreports."
|
||||||
|
.. "|n|n" .. cYellow("Dank")
|
||||||
|
.. "|nMein Dank geht an meine lieben Beta-Tester " .. cPrefix("Chamera") .. ", " .. cPrefix("Tabenoca") .. " und " .. cPrefix("Nordraka") .. ", und besondereren Dank an " .. cPrefix("Shinue") .. " f\195\188r die Inspiration und lustigen Momente."
|
||||||
L.Options_Help_Basics = cYellow("Reihenfolge")
|
L.Options_Help_Basics = cYellow("Reihenfolge")
|
||||||
.. "|nEs sind unbegrenzt viele Textersetzung m\195\182glich, und sie werden in der Reihenfolge der definierten Zuordnungen abgearbeitet, von oben nach unten. "
|
.. "|nEs sind unbegrenzt viele Textersetzung m\195\182glich, und sie werden in der Reihenfolge der definierten Zuordnungen abgearbeitet, von oben nach unten. "
|
||||||
.. "Ersetzungen sind transitiv, d.h. nachfolgende Zuordnungen beziehen sich nicht auf den Originaltext, sondern das Resultat der vorherigen Ersetzung. "
|
.. "Ersetzungen sind transitiv, d.h. nachfolgende Zuordnungen beziehen sich nicht auf den Originaltext, sondern das Resultat der vorherigen Ersetzung. "
|
||||||
.. "|nMit der Zuordnung " .. cPrefix("\"a\" => \"b\"") .. " und " .. cPrefix("\"b\" => \"c\"") .. " wird bei Eingabe von " .. cPrefix("\"a\" => \"c\"") .. "."
|
.. "|nMit der Zuordnung " .. cPrefix("\"a\" => \"b\"") .. " und " .. cPrefix("\"b\" => \"c\"") .. " wird bei Eingabe von " .. cPrefix("\"a\" => \"c\"") .. "."
|
||||||
.. "|n|n" .. cYellow("Exakte Gro\195\159- und Kleinschreibung")
|
.. "|n|n" .. cYellow("Exakte Gro\195\159- und Kleinschreibung")
|
||||||
.. "|nBei exakter Gro\195\159- und Kleinschreibung muss die Schreibweise genau \195\188berstimmen, sonst findet keine Textersetzug f\195\188r diese Zuordnung statt. "
|
.. "|nBei exakter Gro\195\159- und Kleinschreibung muss die Schreibweise genau \195\188berstimmen, sonst wird diese Zuordnung \195\188bersprungen. "
|
||||||
.. "Wird die Gro\195\159- und Kleinschreibung ignoriert, wird die Gro\195\159schreibung jedes Zeichens bei der Ersetzung \195\188bernommen. "
|
.. "Wird die Gro\195\159- und Kleinschreibung ignoriert, wird die Gro\195\159schreibung jedes Zeichens bei der Ersetzung \195\188bernommen. "
|
||||||
.. "|nMit der Zuordnung " .. cPrefix("\"aBcDeF\" => \"uvWXYz\"") .. " wird aus " .. cPrefix("\"abcdef\" => \"uvwxyz\"") .. ", "
|
.. "|nMit der Zuordnung " .. cPrefix("\"aBcDeF\" => \"uvWXYz\"") .. " wird aus " .. cPrefix("\"abcdef\" => \"uvwxyz\"") .. ", "
|
||||||
.."aus " .. cPrefix("\"ABCDEF\" => \"UVWXYZ\"") .. " und aus " .. cPrefix("\"AbCdEf\" => \"UvWxYz\"") .. "."
|
.."aus " .. cPrefix("\"ABCDEF\" => \"UVWXYZ\"") .. " und aus " .. cPrefix("\"AbCdEf\" => \"UvWxYz\"") .. "."
|
||||||
.. "|n|n" .. cYellow("Zusammenfassen aufeinanderfolgender Treffer")
|
.. "|n|n" .. cYellow("Zusammenfassen aufeinanderfolgender Treffer")
|
||||||
.. "|nDas Zusammenfassen aufeinanderfolgender Treffer vermeidet unsch\195\182ne Wiederholungen, die durch die Ersetzung entstehen k\195\182nnen. "
|
.. "|nDas Zusammenfassen aufeinanderfolgender Treffer vermeidet unsch\195\182ne Wiederholungen, die durch die Ersetzung entstehen k\195\182nnen. "
|
||||||
.. "Die Zusammenfassung wird erst nach der Ersetzung vorgenommen, d.h. am vollst\195\164ndig ersetzten Text f\195\188r jede Zuordnung. "
|
.. "Die Zusammenfassung wird erst nach der Ersetzung vorgenommen, d.h. am vollst\195\164ndig ersetzten Text f\195\188r alle Zuordnungen. "
|
||||||
.. "|nMit der Zuordnung " .. cPrefix("\"s\" => \"sch\"") .. " wird aus " .. cPrefix("\"Tasse\" => \"Tasche\"") .. " statt " .. cPrefix("\"Taschsche\"") .. ", "
|
.. "|nMit der Zuordnung " .. cPrefix("\"s\" => \"sch\"") .. " wird aus " .. cPrefix("\"Tasse\" => \"Tasche\"") .. " statt " .. cPrefix("\"Taschsche\"") .. ", "
|
||||||
.. "aber " .. cPrefix("\"schmeissen\" => \"schchmeichen\"") .. ". Solche Randbedingungen beseitigt in der Regel eine weitere Zuordnung wie " .. cPrefix("\"schch\" => \"sch\"") .. "."
|
.. "aber aus " .. cPrefix("\"schmeissen\" => \"schchmeischen\"") .. ". Solche Randbedingungen beseitigt in der Regel eine weitere Zuordnung: " .. cPrefix("\"schch\" => \"sch\"") .. "."
|
||||||
.. "|n|n" .. cYellow("Anhalten nach Treffer")
|
.. "|n|n" .. cYellow("Anhalten nach Treffer")
|
||||||
.. "|nEs werden keine weiteren Ersetzungen mehr vorgenommen, wenn die aktuelle Zuordnung zutreffend ist. Alle nachfolgenden Zuordnungen werden dann \195\188bersprungen. "
|
.. "|nAlle nachfolgenden Ersetzungen mehr \195\188bersprungen, wenn die aktuelle Zuordnung zutreffend ist. Wenn bei der aktuelle Zuordnung kein Treffer vorliegt, werden die restlichen Zuordnung ganz normal weiter abgearbeitet."
|
||||||
.. "Wenn kein Treffer vorliegt, werden die restlichen Zuordnung ganz normal weiter abgearbeitet."
|
|
||||||
L.Options_Help_Expert = cYellow("verk\195\188rzende/verl\195\163ngernde Ersetzungen")
|
L.Options_Help_Expert = cYellow("verk\195\188rzende/verl\195\163ngernde Ersetzungen")
|
||||||
.. "|nIst der Ersetzungstext k\195\188rzer als der eigentliche Suchtext, werden die \195\188bersch\195\188\195\159igen Zeichen des Suchtreffers entfernt. "
|
.. "|nIst der Ersetzungstext k\195\188rzer als der eigentliche Suchtext, werden die \195\188bersch\195\188\195\159igen Zeichen des Suchtreffers entfernt. "
|
||||||
.. "Ist der Ersetzungstext l\195\163nger, werden die \195\188brigen Zeichen nach dem Treffer hinten drangehangen. Dabei wird die Gro\195\159- und Kleinschreibung des letzten Zeichens ber\195\188cksichtigt, "
|
.. "Ist der Ersetzungstext l\195\163nger, werden die \195\188brigen Zeichen nach dem Treffer hinten drangehangen. Dabei wird die Gro\195\159- und Kleinschreibung des letzten Zeichens ber\195\188cksichtigt, "
|
||||||
.. "ebenso wie die Gro\195\159- und Kleinschreibung des nachfolgenden Zeichens. Gro\195\159geschriebene Abk\195\188rzungen und Ausdr\195\188cke bleiben so einheitlich. "
|
.. "ebenso wie die Gro\195\159- und Kleinschreibung des nachfolgenden Zeichens. Gro\195\159geschriebene Abk\195\188rzungen und Ausdr\195\188cke bleiben so einheitlich. "
|
||||||
.. "|nMit der Zuordnung " .. cPrefix("\"Kr\195\164uter\" => \"Gr\195\188nzeugs\"") .. " wird aus " .. cPrefix("\"KR\195\132UTER\" => \"GR\195\156NZEUGS\"") .. " statt " .. cPrefix("\"GR\195\156NZEUgs\"") .. " "
|
.. "|nMit der Zuordnung " .. cPrefix("\"Kr\195\164uter\" => \"Gr\195\188nzeugs\"") .. " wird aus " .. cPrefix("\"KR\195\132UTER\" => \"GR\195\156NZEUGS\"") .. " statt " .. cPrefix("\"GR\195\156NZEUgs\"") .. " "
|
||||||
.. "unter Beibehaltung von absichtlicher Gro\195\159schreibung wie " .. cPrefix("\"Kr\195\132utERGarten\" => \"Gr195\156nzEUGSgarten\"") .. " statt " .. cPrefix("\"Gr\195\188nzeugsGarten\"") .. "."
|
.. "unter Beibehaltung von absichtlicher Gro\195\159schreibung wie " .. cPrefix("\"Kr\195\132utERGarten\" => \"Gr\195\156nzEUGSgarten\"") .. " statt " .. cPrefix("\"Gr\195\188nzeugsGarten\"") .. "."
|
||||||
.. "|n|n" .. cYellow("Standby")
|
.. "|n|n" .. cYellow("Standby")
|
||||||
.. "|nErsetzungen k\195\182nnen auch nur bei Bedarf durchgef\195\188hrt werden, selbst wenn das Addon oder ein Kanal deaktivert wurde. "
|
.. "|nErsetzungen k\195\182nnen auch nur bei Bedarf durchgef\195\188hrt werden, selbst wenn das Addon oder ein Kanal deaktivert wurde. "
|
||||||
.. "Vor der Eingabe in der Chatbox schreibt man " .. cPrefix("/gri").. " oder " .. cPrefix("/grichelde").. " und optional noch den Zielkanal "
|
.. "Vor der Eingabe in der Chatbox schreibt man " .. cPrefix("/gri").. " oder " .. cPrefix("/grichelde").. " und optional noch den Zielkanal "
|
||||||
.. "z.B. " .. cPrefix("\"/gri /g hallo leute\"") .. " und alle aktiven Zuordnungen werden ersetzt, selbst wenn der Gildenkanal oder das Addon nicht aktiv sind."
|
.. "z.B. " .. cPrefix("\"/gri /g Hallo Leute\"") .. " und alle aktiven Zuordnungen werden ersetzt, selbst wenn der Gildenkanal oder das Addon nicht aktiv sind."
|
||||||
.. "|n|n" .. cYellow("Regul\195\164re Ausdr\195\188cke")
|
.. "|n|n" .. cYellow("Regul\195\164re Ausdr\195\188cke")
|
||||||
.. "|nRegEx sind sehr m\195\163chtige Such- und Ersetzunsgmuster die h\195\163ufig in der Programmierung verwendet werden. Generell werden RegEx in den Suchtexten \195\188bernommen, "
|
.. "|nRegEx sind sehr m\195\163chtige Such- und Ersetzunsgmuster die h\195\163ufig in der Programmierung verwendet werden. Generell werden RegEx in den Suchtexten \195\188bernommen, "
|
||||||
.. "aber Lua unterst\195\188tzt nicht den vollst\195\163ndigen Umfang von PCRE. Trotzdem funktionieren viele Muster wie Anker bei Zeilenanfang " .. cPrefix("\"^\"") .. " oder Zeilenende " .. cPrefix("\"$\"")
|
.. "aber Lua unterst\195\188tzt nicht den vollst\195\163ndigen Umfang von PCRE. Trotzdem funktionieren viele Muster wie Anker bei Zeilenanfang " .. cPrefix("\"^\"") .. " oder Zeilenende " .. cPrefix("\"$\"")
|
||||||
@@ -549,7 +563,7 @@ L.Options_Help_Examples = {
|
|||||||
replacements = {
|
replacements = {
|
||||||
replacement_10 = {
|
replacement_10 = {
|
||||||
order = 10,
|
order = 10,
|
||||||
searchText = "^([^aeiouy]*)([aeiouy])",
|
searchText = "^([^aeiouy]-)([aeiouy])",
|
||||||
replaceText = "%1%2-%1%2-%1%2",
|
replaceText = "%1%2-%1%2-%1%2",
|
||||||
exactCase = false,
|
exactCase = false,
|
||||||
consolidate = true,
|
consolidate = true,
|
||||||
|
@@ -6,15 +6,16 @@ local Grichelde = _G.Grichelde
|
|||||||
local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'enUS', true)
|
local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'enUS', true)
|
||||||
if not L then return end
|
if not L then return end
|
||||||
|
|
||||||
local cYellow = Grichelde.F.cYellow
|
local cYellow = Grichelde.F.cYellow
|
||||||
local cGray = Grichelde.F.cGray
|
local cGray = Grichelde.F.cGray
|
||||||
local cPrefix = Grichelde.F.cPrefix
|
local cHyperlink = Grichelde.F.cHyperlink
|
||||||
|
local cPrefix = Grichelde.F.cPrefix
|
||||||
|
|
||||||
-- system messages
|
-- system messages
|
||||||
L.AddonName = "Grichelde"
|
L.AddonName = "Grichelde"
|
||||||
L.AddonNamePlusVersion = "%s v%s"
|
L.AddonNamePlusVersion = "%s v%s"
|
||||||
L.AddonLoaded = "%s happily assists you with your spelling disabilities now."
|
L.AddonLoaded = "%s happily assists you with your spelling disabilities now."
|
||||||
L.AddonUnloaded = "%s patiently waits to support you again when needed."
|
L.AddonUnloaded = "%s patiently awaits to support you again."
|
||||||
L.Upgrade_ToVersion = "Upgrade database to version %s."
|
L.Upgrade_ToVersion = "Upgrade database to version %s."
|
||||||
L.Upgrade_Successful = "Upgrade successful."
|
L.Upgrade_Successful = "Upgrade successful."
|
||||||
L.Upgrade_Error = "Upgrade failed!"
|
L.Upgrade_Error = "Upgrade failed!"
|
||||||
@@ -37,10 +38,12 @@ L.Error_UnsupportedChannel = "Unsupported channel"
|
|||||||
L.Profiles_Available = "Available profiles:"
|
L.Profiles_Available = "Available profiles:"
|
||||||
L.Profiles_Created = "New profile %s created."
|
L.Profiles_Created = "New profile %s created."
|
||||||
L.Profiles_Loaded = "Profile %s is loaded."
|
L.Profiles_Loaded = "Profile %s is loaded."
|
||||||
L.Profiles_Refreshed = "Profil %s refreshed."
|
L.Profiles_Activated = "Profile %s activated."
|
||||||
|
L.Profiles_Deactivated = "Profile %s deactivated."
|
||||||
|
L.Profiles_Refreshed = "Profile %s refreshed."
|
||||||
L.Profiles_Deleted = "Profile %s deleted."
|
L.Profiles_Deleted = "Profile %s deleted."
|
||||||
L.Profiles_Copied = "Settings applied from profile %s."
|
L.Profiles_Copied = "Settings applied from profile %s."
|
||||||
L.Profiles_Reset = "Profil %s reset."
|
L.Profiles_Reset = "Profile %s reset."
|
||||||
L.Profiles_Invalid = "Invalid profile %s!"
|
L.Profiles_Invalid = "Invalid profile %s!"
|
||||||
L.Profiles_DeleteError = "The active profile cannot be deleted!"
|
L.Profiles_DeleteError = "The active profile cannot be deleted!"
|
||||||
L.Profiles_AlreadyExistsError = "The profile %s already exists!"
|
L.Profiles_AlreadyExistsError = "The profile %s already exists!"
|
||||||
@@ -135,6 +138,8 @@ L.Options_Help_Group_Desc = "Guideance to search patterns and replacement logic.
|
|||||||
L.Options_Help_Disclaimer = cYellow("Disclaimer of warranty:") .. " The addon is provided \"AS IS\" and comes without warranty of any kind of function or correctness (for more details, consult the GPL 3 license). "
|
L.Options_Help_Disclaimer = cYellow("Disclaimer of warranty:") .. " The addon is provided \"AS IS\" and comes without warranty of any kind of function or correctness (for more details, consult the GPL 3 license). "
|
||||||
.."Also the author is not held responsible for any risk or damage the addon or its use might cause, especially lost of progress or data due to crashes of the WoW client."
|
.."Also the author is not held responsible for any risk or damage the addon or its use might cause, especially lost of progress or data due to crashes of the WoW client."
|
||||||
|
|
||||||
|
L.Options_Help_Tab_Info_Name = "Info"
|
||||||
|
L.Options_Help_Tab_Info_Desc = "About this addon."
|
||||||
L.Options_Help_Tab_Basics_Name = "Basics"
|
L.Options_Help_Tab_Basics_Name = "Basics"
|
||||||
L.Options_Help_Tab_Basics_Desc = "Some explanatory notes the the basic behaviour."
|
L.Options_Help_Tab_Basics_Desc = "Some explanatory notes the the basic behaviour."
|
||||||
L.Options_Help_Tab_Expert_Name = "Expert"
|
L.Options_Help_Tab_Expert_Name = "Expert"
|
||||||
@@ -142,6 +147,16 @@ L.Options_Help_Tab_Expert_Desc = "More details on special search options."
|
|||||||
L.Options_Help_Tab_Examples_Name = "Examples"
|
L.Options_Help_Tab_Examples_Name = "Examples"
|
||||||
L.Options_Help_Tab_Examples_Desc = "Templates for particular scenarios."
|
L.Options_Help_Tab_Examples_Desc = "Templates for particular scenarios."
|
||||||
|
|
||||||
|
L.Options_Help_Info = cYellow("About this addon")
|
||||||
|
.. "|n%s replaces any characters or words you typed in a chatbox according to your replacement rules and text. The replacement is done before the text is send to other players/in the target channel. "
|
||||||
|
.. "It does not change text other players have written in the chat, but the text they will see from you. Its purpose is to simulate a speaking disability of your toon and to strengthen immersion in roleplay."
|
||||||
|
.. "|n|nOf course it can be used for many other things, too (trollifier, abbreviations, nick names, etc.). A extensive description of all options, the general replacement workflow and a lot of examples can be found on the next tabs."
|
||||||
|
.. "|n|n" .. cYellow("Contact")
|
||||||
|
.. "|nPlease report errors and your experiences directly as a comment on the project website at " .. cPrefix("CurseForge") .. " (" .. cHyperlink("https://www.curseforge.com/wow/addons/grichelde") .. "). "
|
||||||
|
.. "You are encouraged to attach screenshots of error messages and your mappings. An overview of all your mappings is shnown by using the command " .. cPrefix("\"/gri mappings\"") .. " and copy it out. "
|
||||||
|
.. "|nI'm looking forward for your feedback and reports."
|
||||||
|
.. "|n|n" .. cYellow("Thanks")
|
||||||
|
.. "|Many thanks to my beta testers " .. cPrefix("Chamera") .. ", " .. cPrefix("Tabenoca") .. " and " .. cPrefix("Nordraka") .. ", and very special thanks to " .. cPrefix("Shinue") .. " for the inspiration and hilarious moments."
|
||||||
L.Options_Help_Basics = cYellow("Ordering")
|
L.Options_Help_Basics = cYellow("Ordering")
|
||||||
.. "|nYou can have an unlimited number of replacements. All mappings will be processed in same order as defined, from top down. "
|
.. "|nYou can have an unlimited number of replacements. All mappings will be processed in same order as defined, from top down. "
|
||||||
.. "Replacements are also transitive, so consecutive mappings do not work on the original input but the resulting text from the previous replacements. "
|
.. "Replacements are also transitive, so consecutive mappings do not work on the original input but the resulting text from the previous replacements. "
|
||||||
@@ -157,7 +172,7 @@ L.Options_Help_Basics = cYellow("Ordering")
|
|||||||
.. "|nWith mapping " .. cPrefix("\"s\" => \"sh\"") .. " text becomes " .. cPrefix("\"tossing\" => \"toshing\"") .. " instead of " .. cPrefix("\"toshshing\"") .. ", yet still " .. cPrefix("\"paths\" => \"pathsh\"") .. ". "
|
.. "|nWith mapping " .. cPrefix("\"s\" => \"sh\"") .. " text becomes " .. cPrefix("\"tossing\" => \"toshing\"") .. " instead of " .. cPrefix("\"toshshing\"") .. ", yet still " .. cPrefix("\"paths\" => \"pathsh\"") .. ". "
|
||||||
.. "Such edge cases can usually be mitigated with an additional mapping at the end: " .. cPrefix("\"thsh\" => \"thz\"") .. "."
|
.. "Such edge cases can usually be mitigated with an additional mapping at the end: " .. cPrefix("\"thsh\" => \"thz\"") .. "."
|
||||||
.. "|n|n" .. cYellow("stop on match")
|
.. "|n|n" .. cYellow("stop on match")
|
||||||
.. "|nNo other replacements are done, when the current mapping matched. This will skip any other consecutive mappings when hit. When no match ocurred, the remaining mappings are processed as usual."
|
.. "|nAll other consecutive replacements are skipped, when the current mapping matched. When the current mapping does not match, the remaining mappings are processed as usual."
|
||||||
L.Options_Help_Expert = cYellow("shortening/lengthening replacements")
|
L.Options_Help_Expert = cYellow("shortening/lengthening replacements")
|
||||||
.. "|nIf the replacement is shorter than the actual match, all remaining characters will be skipped. If the replacement is longer, all remaining characters will be appended. "
|
.. "|nIf the replacement is shorter than the actual match, all remaining characters will be skipped. If the replacement is longer, all remaining characters will be appended. "
|
||||||
.. "The case of the replaced character is considered as well as the case of the next character in the original text. That way capital case abbreviations and expressions will not be distorted. "
|
.. "The case of the replaced character is considered as well as the case of the next character in the original text. That way capital case abbreviations and expressions will not be distorted. "
|
||||||
@@ -592,7 +607,7 @@ L.Options_Help_Examples = {
|
|||||||
replacements = {
|
replacements = {
|
||||||
replacement_10 = {
|
replacement_10 = {
|
||||||
order = 10,
|
order = 10,
|
||||||
searchText = "^([^aeiouy]*)([aeiouy])",
|
searchText = "^([^aeiouy]-)([aeiouy])",
|
||||||
replaceText = "%1%2-%1%2-%1%2",
|
replaceText = "%1%2-%1%2-%1%2",
|
||||||
exactCase = false,
|
exactCase = false,
|
||||||
consolidate = true,
|
consolidate = true,
|
||||||
|
17
twitch/announcements.txt
Normal file
17
twitch/announcements.txt
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
https://wow.gamepedia.com/Localizing_an_addon
|
||||||
|
https://wow.gamepedia.com/Pattern_matching
|
||||||
|
https://wow.gamepedia.com/Lua_functions#String_Functions
|
||||||
|
https://wow.gamepedia.com/API_SetRaidTarget
|
||||||
|
https://www.wowace.com/projects/ace3/pages/ace-db-3-0-tutorial
|
||||||
|
https://www.wowace.com/projects/ace3/pages/api/ace-db-3-0
|
||||||
|
https://wowwiki.fandom.com/wiki/Events_A-Z_(full_list)
|
||||||
|
|
||||||
|
|
||||||
|
Liebe RP-Gemeinde, ich benötige eure Mithilfe beim Test meines ersten WoW-Addons. :handshake:
|
||||||
|
|
||||||
|
Es heißt "Grichelde" und ersetzt beliebige, selbstdefinierte Zeichenfolgen durch andere selbstdefinierte Zeichenfolgen, die ihr eingebt. Es ändert nicht den Text den andere im Chat geschrieben haben, nur eure eigenen Eingaben. Die Idee wurde nach mehreren lustigen RP-Sitzungen mit einer Untoten ohne Unterkiefer geboren, deren Spielerin den Sprachfehler immer mühsam per Hand eintippen musste. Es soll den individuellen Sprachfehler eures Charakters simulieren und dadurch die Immersion erhöhen. Auf der Webseite findet ihr ein paar Screenshots, die euch die Funktion einfach verbildlichen sollten: https://www.curseforge.com/wow/addons/grichelde/screenshots
|
||||||
|
|
||||||
|
Natürlich kann man es auch für andere Dinge zweckentfremden (Trollifizierer :dragon_face: , Abkürzungen, Kosenamen, etc.). Es gibt ein nettes UI zum Konfigurieren der Ersetzungen und der aktiven Kanäle und auch eine großzügige Hilfesektion mit vielen Beispielen. Die Suchtreffer können auf ganze Wörter oder am Anfang, der Mitte und/oder am Ende eines Wortes eingeschränkt werden. Für die Profis gibt es sogar Unterstützung für reguläre Ausdrücke :sunglasses:, das ermöglicht auch schwierigere Ersetzungen mit Wiederholungen, wie Stottern. Für Rollenspieler gibts auch eine eigene Emote- und OOC-Erkennung.
|
||||||
|
|
||||||
|
Installieren kann man es über Twitch, dort muss aktuell noch die Suche und Installation von Beta-Versionen aktiviert sein, oder manuell über diesen Link runterladen und in den WoW\Interface\Addons Ordner kopieren: https://www.curseforge.com/wow/addons/grichelde
|
||||||
|
Bitte Fehler auf der Projektwebseite bei CurseForge einmelden, damit wir den Discord nicht zweckentfremden. Ich freue mich über euere Erfahrungsberichte und Fehlerreports.
|
@@ -19,13 +19,16 @@ Templates for various situations, now also with import possibility
|
|||||||
Help
|
Help
|
||||||
Built-in help texts
|
Built-in help texts
|
||||||
|
|
||||||
|
Confirm text changes
|
||||||
|
When you enter a search or replacement text, please confirm your input with the Okay button. Otherwise its not saved.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Beispielersetzung
|
Beispielersetzung
|
||||||
Eine Texteingabe wird im "Sagen"-Kanal ersetzt.
|
Eine Texteingabe wird im "Sagen"-Kanal ersetzt.
|
||||||
|
|
||||||
Zeichenersetzung
|
Zeichenersetzung
|
||||||
Erzeuge bedingte Zuordnungen zwischen Such- und Ersetzungetext.
|
Erzeuge bedingte Zuordnungen zwischen Such- und Ersetzungstext.
|
||||||
|
|
||||||
Kanälekonfiguration
|
Kanälekonfiguration
|
||||||
einzeln pro Kanal aktivierbar
|
einzeln pro Kanal aktivierbar
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 100 KiB |
Binary file not shown.
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 97 KiB |
BIN
twitch/text-okay.jpg
Normal file
BIN
twitch/text-okay.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
Reference in New Issue
Block a user