chatterino2
Code Issues

Add parent to ChannelFilterEditorDialog (#2232)

Browse Source
This commit is contained in:
pajlada
2020-11-28 18:04:33 +01:00
committed by GitHub
parent 49fa9bfd72
commit 5258ddd84f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -33,7 +33,7 @@
- Minor: Improve UX of the "Login expired!" message (#2029) - Minor: Improve UX of the "Login expired!" message (#2029)
- Minor: PageUp and PageDown now scroll in the selected split (#2070, #2081) - Minor: PageUp and PageDown now scroll in the selected split (#2070, #2081)
- Minor: Allow highlights to be excluded from `/mentions`. Excluded highlights will not trigger tab highlights either. (#1793, #2036) - Minor: Allow highlights to be excluded from `/mentions`. Excluded highlights will not trigger tab highlights either. (#1793, #2036)
- Minor: Flag all popup dialogs as actual dialogs so they get the relevant window manager hints (#1843, #2182, #2185) - Minor: Flag all popup dialogs as actual dialogs so they get the relevant window manager hints (#1843, #2182, #2185, #2232)
- Minor: Don't show update button for nightly builds on macOS and Linux, this was already the case for Windows (#2163, #2164) - Minor: Don't show update button for nightly builds on macOS and Linux, this was already the case for Windows (#2163, #2164)
- Bugfix: Fix crash occurring when pressing Escape in the Color Picker Dialog (#1843) - Bugfix: Fix crash occurring when pressing Escape in the Color Picker Dialog (#1843)
- Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898) - Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898)
src/widgets/dialogs/ChannelFilterEditorDialog.hpp
+1 -1
View File
@@ -4,7 +4,7 @@ namespace chatterino {
class ChannelFilterEditorDialog : public QDialog class ChannelFilterEditorDialog : public QDialog
{ {
public: public:
ChannelFilterEditorDialog(QWidget *parent = nullptr); ChannelFilterEditorDialog(QWidget *parent);
const QString getFilter() const; const QString getFilter() const;
const QString getTitle() const; const QString getTitle() const;
src/widgets/settingspages/FiltersPage.cpp
+4 -1
View File
@@ -2,7 +2,9 @@
#include "controllers/filters/FilterModel.hpp" #include "controllers/filters/FilterModel.hpp"
#include "singletons/Settings.hpp" #include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "util/LayoutCreator.hpp" #include "util/LayoutCreator.hpp"
#include "widgets/Window.hpp"
#include "widgets/dialogs/ChannelFilterEditorDialog.hpp" #include "widgets/dialogs/ChannelFilterEditorDialog.hpp"
#include "widgets/helper/EditableModelView.hpp" #include "widgets/helper/EditableModelView.hpp"
@@ -40,7 +42,8 @@ FiltersPage::FiltersPage()
}); });
view->addButtonPressed.connect([] { view->addButtonPressed.connect([] {
ChannelFilterEditorDialog d; ChannelFilterEditorDialog d(
static_cast<QWidget *>(&(getApp()->windows->getMainWindow())));
if (d.exec() == QDialog::Accepted) if (d.exec() == QDialog::Accepted)
{ {
getSettings()->filterRecords.append( getSettings()->filterRecords.append(