Animated Themes. Subthemes. Custom default_theme. Overhaul asset paths. Fix a ton of asset resolution bugs. #466
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace QList<QString> with QStringList
Crystalwarrior
added
enhancement
…path all into a single get_theme_path func Add a default_theme variable which defines the currently recognized default theme Add a new "get_asset_path" that will be used to simplify asset resolution considerably
Begin working on the subtheme system
Implement get_asset_path for AOButton
…hing as get_design_element anyway) Get rid of get_char_shouts (use chat= instead) Use get_subtheme() instead of subtheme (because get_subtheme() can perform overrides based on the user's settings) Make get_color() use get_asset_path() Make get_design_element() use get_asset_path()
…od, fixing an enormous amount of invalid path resolutions Unfortunately I have to keep backwards compatibility for the backwards ass config.ini method for the chat markup (new way is chat_config.ini) Get rid of get_theme_effects and implement the stacking behavior into get_effects instead
Also implement safety checks for the asset path generator
…t not being generated, causing segfaults
…d resolve major inconsistencies (such as the bug where objection sfx wouldn't be playing despite the default theme or default misc folder having them)
…ient/bin/base/themes/default//objection.wav is a valid qt5 path...)
get_asset_paths - Return an untested list of universal paths from the provided args get_asset_path - Loop through the list of provided asset paths and return the first valid file get_image_path - Loop through the list of provided asset paths, apply get_image_suffix and return the first valid image file get_sfx_path - Loop through the list of provided asset paths, apply get_sfx_suffix and return the first valid sound file get_asset - return an asset (must contain file extension) from the get_asset_path() applied on the get_asset_paths() get_image - return an image with get_image_suffix() applied on the get_image_path() for the get_asset_paths() get_sfx - return a sfx from provided args with the uniquely constructed asset path list for sounds Rename old get_sfx to get_court_sfx for better clarity of its function This replaces previous asset stuff I implemented, as I think this is a better solution lol
…matches identifier Adjust all calls to get_asset() to actually look for a config identifier value instead, so even if a config.ini is found if it doesn't contain the identifier we want we keep looking
Remove debug text
…ingno, the viewport still doesn't freeze up due to waiting on Objections etc. due to signals.
… to make themes that inherit from other themes that are not default.
Crystalwarrior
changed the title
Crystalwarrior
changed the title
|
I will implement the subthemes in a separate PR. This PR is done but requires review and testing, especially since it overhauls the asset resolution system and introduces |
Crystalwarrior
added
bug
Move sounds folder path check last in get_sfx
…ss not, that annoying error will keep pestering us :(((
Fix static image Objections freezing the viewport due to done(); signal that never arrives
oldmud0
reviewed
Feb 12, 2021
…icator, and add support for custom WTCE
…of nasty issues due to done(); signal being sent as soon as playback begins if the image is invalid. This is done by removing the file_exists check, and letting the rest of the functionality handle this case - the system is robust enough and treats an invalid image as a static image.
Fix "Pixmap is null" console spam
Make it possible to have fully animated AOButton and AOImage
Add a "static image" toggle for get_image_suffix
…haivor with subthemes Add a settings option for subthemes Have AOImage keep track of its last valid path
…the client's theme to be reloaded. ST packet sets ao_app->subtheme no matter what. It will not reload theme unless the user has their subtheme set to "server". Fix showname widths by rearranging font metrics to do its calculations *after* the showname font is set, and not before (making it lag behind the correct display size by 1 msg)
Crystalwarrior
changed the title
Crystalwarrior
changed the title
in1tiate
reviewed
Feb 13, 2021
| @@ -7,6 +7,7 @@ | |||
|
|
|||
| #include <QDebug> | |||
| #include <QLabel> | |||
| #include <QMovie> | |||
in1tiate
approved these changes
Feb 13, 2021
I suck at documentation :(((( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This overhauls the asset/path resolution of AO2, making it much nicer and make a lot more sense. Most importantly, it drastically reduces code duplication, causing less inconsistencies and fixes a metric crapton of bugs related to that.
NEEDS TESTING!Closes #427
New asset resolution functions: