diff --git a/chatterino.pro b/chatterino.pro index 413d11e04..81d985e39 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -227,8 +227,8 @@ SOURCES += \ src/controllers/moderationactions/ModerationActionModel.cpp \ src/widgets/settingspages/LookPage.cpp \ src/widgets/settingspages/FeelPage.cpp \ - src/widgets/dialogs/UpdatePromptDialog.cpp \ - src/util/InitUpdateButton.cpp + src/util/InitUpdateButton.cpp \ + src/widgets/dialogs/UpdateDialog.cpp HEADERS += \ src/Application.hpp \ @@ -403,8 +403,8 @@ HEADERS += \ src/controllers/moderationactions/ModerationActionModel.hpp \ src/widgets/settingspages/LookPage.hpp \ src/widgets/settingspages/FeelPage.hpp \ - src/widgets/dialogs/UpdatePromptDialog.hpp \ - src/util/InitUpdateButton.hpp + src/util/InitUpdateButton.hpp \ + src/widgets/dialogs/UpdateDialog.hpp RESOURCES += \ resources/resources.qrc \ diff --git a/src/util/InitUpdateButton.cpp b/src/util/InitUpdateButton.cpp index 818e9bdce..9c719bd3f 100644 --- a/src/util/InitUpdateButton.cpp +++ b/src/util/InitUpdateButton.cpp @@ -1,11 +1,11 @@ #include "InitUpdateButton.hpp" -#include "widgets/dialogs/UpdatePromptDialog.hpp" +#include "widgets/dialogs/UpdateDialog.hpp" #include "widgets/helper/RippleEffectButton.hpp" namespace chatterino { -void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdatePromptDialog> &handle, +void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdateDialog> &handle, pajlada::Signals::SignalHolder &signalHolder) { button.hide(); @@ -14,7 +14,7 @@ void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdatePromptDi QObject::connect(&button, &RippleEffectButton::clicked, [&button, &handle] { (void)(handle); - auto dialog = new UpdatePromptDialog(); + auto dialog = new UpdateDialog(); dialog->setActionOnFocusLoss(BaseWindow::Delete); dialog->move(button.mapToGlobal(QPoint(int(-100 * button.getScale()), button.height()))); dialog->show(); @@ -22,7 +22,7 @@ void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdatePromptDi dialog->buttonClicked.connect([&button](auto buttonType) { switch (buttonType) { - case UpdatePromptDialog::Dismiss: { + case UpdateDialog::Dismiss: { button.hide(); } break; } diff --git a/src/util/InitUpdateButton.hpp b/src/util/InitUpdateButton.hpp index 53e962783..6a0966e54 100644 --- a/src/util/InitUpdateButton.hpp +++ b/src/util/InitUpdateButton.hpp @@ -11,9 +11,9 @@ class SignalHolder; namespace chatterino { class RippleEffectButton; -class UpdatePromptDialog; +class UpdateDialog; -void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdatePromptDialog> &handle, +void initUpdateButton(RippleEffectButton &button, std::unique_ptr<UpdateDialog> &handle, pajlada::Signals::SignalHolder &signalHolder); } // namespace chatterino diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp index bce01f20a..224f5aa7b 100644 --- a/src/widgets/Notebook.hpp +++ b/src/widgets/Notebook.hpp @@ -2,7 +2,7 @@ #include "pajlada/signals/signal.hpp" #include "widgets/BaseWidget.hpp" -#include "widgets/dialogs/UpdatePromptDialog.hpp" +#include "widgets/dialogs/UpdateDialog.hpp" #include "widgets/helper/NotebookButton.hpp" #include "widgets/helper/NotebookTab.hpp" #include "widgets/splits/SplitContainer.hpp" @@ -94,7 +94,7 @@ private: void addCustomButtons(); pajlada::Signals::SignalHolder signalHolder_; - std::unique_ptr<UpdatePromptDialog> updateDialogHandle_; + std::unique_ptr<UpdateDialog> updateDialogHandle_; std::vector<pajlada::Signals::ScopedConnection> uniqueConnections; }; diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 16b1db7d0..41306e6c5 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -12,7 +12,7 @@ #include "widgets/AccountSwitchPopupWidget.hpp" #include "widgets/Notebook.hpp" #include "widgets/dialogs/SettingsDialog.hpp" -#include "widgets/dialogs/UpdatePromptDialog.hpp" +#include "widgets/dialogs/UpdateDialog.hpp" #include "widgets/dialogs/WelcomeDialog.hpp" #include "widgets/helper/Shortcut.hpp" #include "widgets/splits/Split.hpp" diff --git a/src/widgets/Window.hpp b/src/widgets/Window.hpp index 00d8455ab..a2a74c9ff 100644 --- a/src/widgets/Window.hpp +++ b/src/widgets/Window.hpp @@ -3,7 +3,7 @@ #include "util/Helpers.hpp" #include "widgets/BaseWindow.hpp" #include "widgets/Notebook.hpp" -#include "widgets/dialogs/UpdatePromptDialog.hpp" +#include "widgets/dialogs/UpdateDialog.hpp" //#ifdef USEWINSDK //#include <platform/borderless/qwinwidget.h> @@ -46,7 +46,7 @@ private: void loadGeometry(); RippleEffectLabel *userLabel = nullptr; - std::unique_ptr<UpdatePromptDialog> updateDialogHandle_; + std::unique_ptr<UpdateDialog> updateDialogHandle_; WindowType type; float dpi; diff --git a/src/widgets/dialogs/UpdatePromptDialog.cpp b/src/widgets/dialogs/UpdateDialog.cpp similarity index 87% rename from src/widgets/dialogs/UpdatePromptDialog.cpp rename to src/widgets/dialogs/UpdateDialog.cpp index a8b36c388..9796c34c7 100644 --- a/src/widgets/dialogs/UpdatePromptDialog.cpp +++ b/src/widgets/dialogs/UpdateDialog.cpp @@ -1,4 +1,4 @@ -#include "UpdatePromptDialog.hpp" +#include "UpdateDialog.hpp" #include "singletons/Updates.hpp" #include "util/LayoutCreator.hpp" @@ -10,11 +10,11 @@ namespace chatterino { -UpdatePromptDialog::UpdatePromptDialog() +UpdateDialog::UpdateDialog() : BaseWindow(nullptr, BaseWindow::Flags(BaseWindow::Frameless | BaseWindow::TopMost | BaseWindow::EnableCustomFrame)) { - auto layout = LayoutCreator<UpdatePromptDialog>(this).setLayoutType<QVBoxLayout>(); + auto layout = LayoutCreator<UpdateDialog>(this).setLayoutType<QVBoxLayout>(); layout.emplace<Label>("You shouldn't be seeing this dialog.").assign(&this->ui_.label); @@ -34,7 +34,7 @@ UpdatePromptDialog::UpdatePromptDialog() [this](auto status) { this->updateStatusChanged(status); }); } -void UpdatePromptDialog::updateStatusChanged(Updates::Status status) +void UpdateDialog::updateStatusChanged(Updates::Status status) { this->ui_.installButton->setVisible(status == Updates::UpdateAvailable); diff --git a/src/widgets/dialogs/UpdatePromptDialog.hpp b/src/widgets/dialogs/UpdateDialog.hpp similarity index 84% rename from src/widgets/dialogs/UpdatePromptDialog.hpp rename to src/widgets/dialogs/UpdateDialog.hpp index 48e4eda33..56f662087 100644 --- a/src/widgets/dialogs/UpdatePromptDialog.hpp +++ b/src/widgets/dialogs/UpdateDialog.hpp @@ -9,12 +9,12 @@ class QPushButton; namespace chatterino { -class UpdatePromptDialog : public BaseWindow +class UpdateDialog : public BaseWindow { public: enum Button { Dismiss }; - UpdatePromptDialog(); + UpdateDialog(); pajlada::Signals::Signal<Button> buttonClicked;