Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add custom image functionality for inline mod buttons. #5369

Merged
merged 42 commits into from
May 11, 2024
Merged

Add custom image functionality for inline mod buttons. #5369

merged 42 commits into from
May 11, 2024

Commits on Apr 28, 2024

  1. Clean up ModerationAction 

     - remove commented out code,
 - remove useless if
    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    1a9588b View commit details
    Browse the repository at this point in the history

  2. Add image path to ModerationAction

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    27d3e0a View commit details
    Browse the repository at this point in the history

  3. Allow editing the icon path

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    f10481a View commit details
    Browse the repository at this point in the history

  4. Render the emote image in settings dialog

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    43b5257 View commit details
    Browse the repository at this point in the history

  5. Move the image loading code to its own file

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    f2940b1 View commit details
    Browse the repository at this point in the history

  6. Update the image when selecting a new file

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    8b9cfb3 View commit details
    Browse the repository at this point in the history

  7. Allow for more file types

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    5450161 View commit details
    Browse the repository at this point in the history

  8. Changelog

    @Mm2PL
    Mm2PL committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    ec695b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Include QUrl in ModerationAction.cpp

    @Mm2PL
    Mm2PL committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    2b6bac6 View commit details
    Browse the repository at this point in the history

  2. Add a whole ton more includes

    @Mm2PL
    Mm2PL committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1de6306 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Move changelog

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    be3b595 View commit details
    Browse the repository at this point in the history

  2. Add table header for mod action icon

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    43b4057 View commit details
    Browse the repository at this point in the history

  3. Specify ModerationActionModel::Column values

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    569b24e View commit details
    Browse the repository at this point in the history

  4. Document loadPixmapFromUrlLazy

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    0c9b6c3 View commit details
    Browse the repository at this point in the history

  5. Use loadPixmapFromUrlLazy in TwitchBadges

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    2235418 View commit details
    Browse the repository at this point in the history

  6. Return image if we already have it in ModerationAction

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    baa4296 View commit details
    Browse the repository at this point in the history

  7. Don't translate

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a2981e8 View commit details
    Browse the repository at this point in the history

  8. Change error texts and reformat in LoadPixmapLazy.cpp

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    0aad901 View commit details
    Browse the repository at this point in the history

  9. Send pixmap to main thread

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    f511abb View commit details
    Browse the repository at this point in the history

  10. Rename loadPixmapFromUrl{Lazy,}

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    673d427 View commit details
    Browse the repository at this point in the history

  11. Document callback param

    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    d9ff6ca View commit details
    Browse the repository at this point in the history

  12. Correct callback in ModerationPage 

     - now uses QPointer to ensure the view is valid
 - now calls the code on the main thread to never hit an assertion
    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    ca5b62d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of github.com:Chatterino/chatterino2 into featu… 

    …re/inline-mod-button-custom-images
    @Mm2PL
    Mm2PL committed May 1, 2024
    Configuration menu
    Copy the full SHA
    8e62136 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Remove useless const_cast

    @Mm2PL
    Mm2PL committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6e4722f View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Get rid of None enum value

    @Mm2PL
    Mm2PL committed May 4, 2024
    Configuration menu
    Copy the full SHA
    918076d View commit details
    Browse the repository at this point in the history

  2. rename BuiltInImage to ActionIconType and TrashCan to Delete 

    i hate naming things
    @Mm2PL
    Mm2PL committed May 4, 2024
    Configuration menu
    Copy the full SHA
    0d27299 View commit details
    Browse the repository at this point in the history

  3. Add tests ensuring moderationaction parses ban/delete/timeouts properly 

    with their icon & line
    @pajlada
    pajlada committed May 4, 2024
    Configuration menu
    Copy the full SHA
    af30aac View commit details
    Browse the repository at this point in the history

  4. Make the icon type a full action type

    @pajlada
    pajlada committed May 4, 2024
    Configuration menu
    Copy the full SHA
    f28c97c View commit details
    Browse the repository at this point in the history

  5. Remove unused stuff from tests

    @pajlada
    pajlada committed May 4, 2024
    Configuration menu
    Copy the full SHA
    62730db View commit details
    Browse the repository at this point in the history

  6. Test custom icon path parsing

    @pajlada
    pajlada committed May 4, 2024
    Configuration menu
    Copy the full SHA
    23a141e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Merge branch 'master' into feature/inline-mod-button-custom-images

    @pajlada
    pajlada authored May 5, 2024
    Configuration menu
    Copy the full SHA
    12041df View commit details
    Browse the repository at this point in the history

  2. nit: add self-include to LoadPixmap

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    c22ccd4 View commit details
    Browse the repository at this point in the history

  3. nit: change LoadPixmap logging from chatterinoSettings to 

    chatterinoImage
    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    01c9b03 View commit details
    Browse the repository at this point in the history

  4. nit: remove unused Image include from LoadPixmap

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    ae669a5 View commit details
    Browse the repository at this point in the history

  5. use Url{} instead of Url() in tests

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    85d6798 View commit details
    Browse the repository at this point in the history

  6. Remove unused openImageDialog definition in ModerationPage

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    ff7e382 View commit details
    Browse the repository at this point in the history

  7. Scale icons down (or up) to fit within the row

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    81a477f View commit details
    Browse the repository at this point in the history

  8. Sort CMakeLists.txt sources

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    6da9cf1 View commit details
    Browse the repository at this point in the history

  9. Move iconPath to source file

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    e2ad5e2 View commit details
    Browse the repository at this point in the history

  10. Validate getImage return value before accessing it

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    786d1a6 View commit details
    Browse the repository at this point in the history

  11. clean up twitchbadges loademoteimage

    @pajlada
    pajlada committed May 5, 2024
    Configuration menu
    Copy the full SHA
    44dc2e3 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Merge branch 'master' into feature/inline-mod-button-custom-images

    @pajlada
    pajlada authored May 11, 2024
    Configuration menu
    Copy the full SHA
    90388cd View commit details
    Browse the repository at this point in the history