diff --git a/CHANGELOG.md b/CHANGELOG.md index d0c745c4..60d4fbad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Minor: Show picked outcome in prediction badges. (#3357) - Minor: Add support for Emoji in IRC (#3354) - Minor: Moved `/live` logs to its own subdirectory. (Logs from before this change will still be available in `Channels -> live`). (#3393) +- Minor: Added clear button to settings search bar. (#3403) - Minor: Added autocompletion for default Twitch commands starting with the dot (e.g. `.mods` which does the same as `/mods`). (#3144) - Minor: Sorted usernames in `Users joined/parted` messages alphabetically. (#3421) - Minor: Mod list, VIP list, and Users joined/parted messages are now searchable. (#3426) diff --git a/resources/buttons/clearSearch.png b/resources/buttons/clearSearch.png new file mode 100644 index 00000000..881a0dd7 Binary files /dev/null and b/resources/buttons/clearSearch.png differ diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index 9589e171..f4dbb06e 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -15,6 +15,7 @@ buttons/addSplitDark.png buttons/ban.png buttons/banRed.png + buttons/clearSearch.png buttons/copyDark.png buttons/copyDark.svg buttons/copyLight.png diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp index 4c5906da..9c69228c 100644 --- a/src/autogenerated/ResourcesAutogen.cpp +++ b/src/autogenerated/ResourcesAutogen.cpp @@ -17,6 +17,7 @@ Resources2::Resources2() this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png"); this->buttons.ban = QPixmap(":/buttons/ban.png"); this->buttons.banRed = QPixmap(":/buttons/banRed.png"); + this->buttons.clearSearch = QPixmap(":/buttons/clearSearch.png"); this->buttons.copyDark = QPixmap(":/buttons/copyDark.png"); this->buttons.copyLight = QPixmap(":/buttons/copyLight.png"); this->buttons.menuDark = QPixmap(":/buttons/menuDark.png"); diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index 2c4ba6ce..43db450e 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -24,6 +24,7 @@ public: QPixmap addSplitDark; QPixmap ban; QPixmap banRed; + QPixmap clearSearch; QPixmap copyDark; QPixmap copyLight; QPixmap menuDark; diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp index d8210b32..00f2bd59 100644 --- a/src/widgets/dialogs/SettingsDialog.cpp +++ b/src/widgets/dialogs/SettingsDialog.cpp @@ -86,6 +86,9 @@ void SettingsDialog::initUi() .emplace() .assign(&this->ui_.search); edit->setPlaceholderText("Find in settings... (Ctrl+F by default)"); + edit->setClearButtonEnabled(true); + edit->findChild()->setIcon( + QPixmap(":/buttons/clearSearch.png")); QObject::connect(edit.getElement(), &QLineEdit::textChanged, this, &SettingsDialog::filterElements);