Changeset View
Changeset View
Standalone View
Standalone View
app/mainwindow.h
Show All 24 Lines | |||||
25 | 25 | | |||
26 | // KDE | 26 | // KDE | ||
27 | #include <KXmlGuiWindow> | 27 | #include <KXmlGuiWindow> | ||
28 | 28 | | |||
29 | class QModelIndex; | 29 | class QModelIndex; | ||
30 | 30 | | |||
31 | class QUrl; | 31 | class QUrl; | ||
32 | 32 | | |||
33 | class QMouseEvent; | ||||
34 | | ||||
33 | namespace Gwenview | 35 | namespace Gwenview | ||
34 | { | 36 | { | ||
35 | 37 | | |||
36 | class ViewMainPage; | 38 | class ViewMainPage; | ||
37 | class ContextManager; | 39 | class ContextManager; | ||
38 | 40 | | |||
39 | class MainWindow : public KXmlGuiWindow | 41 | class MainWindow : public KXmlGuiWindow | ||
40 | { | 42 | { | ||
Show All 33 Lines | |||||
74 | protected: | 76 | protected: | ||
75 | bool queryClose() override; | 77 | bool queryClose() override; | ||
76 | QSize sizeHint() const override; | 78 | QSize sizeHint() const override; | ||
77 | void showEvent(QShowEvent*) override; | 79 | void showEvent(QShowEvent*) override; | ||
78 | void resizeEvent(QResizeEvent*) override; | 80 | void resizeEvent(QResizeEvent*) override; | ||
79 | void saveProperties(KConfigGroup&) override; | 81 | void saveProperties(KConfigGroup&) override; | ||
80 | void readProperties(const KConfigGroup&) override; | 82 | void readProperties(const KConfigGroup&) override; | ||
81 | bool eventFilter(QObject *, QEvent *) override; | 83 | bool eventFilter(QObject *, QEvent *) override; | ||
84 | void mousePressEvent(QMouseEvent *) override; | ||||
rkflx: Current master is using `override` instead of `Q_DECL_OVERRIDE;`, meaning your patch does not… | |||||
@ngraham wants it for 18.08 anthonyfieroni: @ngraham wants it for 18.08 | |||||
We are past the Beta (even past the RC), so it will be in 18.12. You are adding a new event handler to MainWindow, that's not material for stable. rkflx: We are past the Beta (even past the RC), so it will be in 18.12.
You are adding a new event… | |||||
I don't recall saying that. :) This should land on master since it's a new feature. Besides, if you intended this for 18.08, it would be nice to use arc so that the parent branch is specified automatically. :) ngraham: I don't recall saying that. :) This should land on master since it's a new feature. Besides, if… | |||||
I'm not a big fan of PHP, so arc and other PHP scripts are not welcome to me. anthonyfieroni: I'm not a big fan of PHP, so arc and other PHP scripts are not welcome to me. | |||||
You could at least add more context to your diff for future Diffs (there should be an argument to diff for that), so Phabricator would not show "Context not available", which makes reviewing harder. rkflx: You could at least add more context to your diff for future Diffs (there should be an argument… | |||||
85 | void mouseDoubleClickEvent(QMouseEvent *) override; | ||||
82 | 86 | | |||
83 | private Q_SLOTS: | 87 | private Q_SLOTS: | ||
84 | void setActiveViewModeAction(QAction* action); | 88 | void setActiveViewModeAction(QAction* action); | ||
85 | void openDirUrl(const QUrl&); | 89 | void openDirUrl(const QUrl&); | ||
86 | void slotThumbnailViewIndexActivated(const QModelIndex&); | 90 | void slotThumbnailViewIndexActivated(const QModelIndex&); | ||
87 | 91 | | |||
88 | void slotStartMainPageUrlSelected(const QUrl&); | 92 | void slotStartMainPageUrlSelected(const QUrl&); | ||
89 | 93 | | |||
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s) | |||||
132 | private: | 136 | private: | ||
133 | struct Private; | 137 | struct Private; | ||
134 | MainWindow::Private* const d; | 138 | MainWindow::Private* const d; | ||
135 | 139 | | |||
136 | void openSelectedDocuments(); | 140 | void openSelectedDocuments(); | ||
137 | void saveConfig(); | 141 | void saveConfig(); | ||
138 | void configureShortcuts(); | 142 | void configureShortcuts(); | ||
139 | 143 | | |||
144 | void mouseButtonNavigate(QMouseEvent *); | ||||
145 | | ||||
140 | void folderViewUrlChanged(const QUrl &url); | 146 | void folderViewUrlChanged(const QUrl &url); | ||
141 | }; | 147 | }; | ||
142 | 148 | | |||
143 | } // namespace | 149 | } // namespace | ||
144 | 150 | | |||
145 | #endif /* MAINWINDOW_H */ | 151 | #endif /* MAINWINDOW_H */ |
Current master is using override instead of Q_DECL_OVERRIDE;, meaning your patch does not apply.
Please rebase on master.