From adf0e621064cb95392ba4b476bbd394c0fdabef6 Mon Sep 17 00:00:00 2001 From: tastytea Date: Wed, 26 Feb 2020 06:29:22 +0100 Subject: [PATCH] Rename WindowMain back to MainWindow and DialogAdd to AddDialog. Looked weird. --- gui/src/dialog_about.cpp | 4 ++-- gui/src/dialog_about.hpp | 14 +++++++------- gui/src/main.cpp | 2 +- gui/src/window_main.cpp | 12 ++++++------ gui/src/window_main.hpp | 14 +++++++------- gui/ui/dialog_about.ui | 11 +++++++---- gui/ui/window_main.ui | 12 ++++++------ 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/gui/src/dialog_about.cpp b/gui/src/dialog_about.cpp index 9add30a..3b85c51 100644 --- a/gui/src/dialog_about.cpp +++ b/gui/src/dialog_about.cpp @@ -6,7 +6,7 @@ namespace FediPotato { -DialogAbout::DialogAbout(QDialog *parent) +AboutDialog::AboutDialog(QDialog *parent) : QDialog(parent) { setupUi(this); @@ -17,7 +17,7 @@ DialogAbout::DialogAbout(QDialog *parent) display_authors(); } -void DialogAbout::display_authors() const +void AboutDialog::display_authors() const { QFile file(":/AUTHORS"); if (file.open(QIODevice::ReadOnly)) diff --git a/gui/src/dialog_about.hpp b/gui/src/dialog_about.hpp index 85beeb3..33a174d 100644 --- a/gui/src/dialog_about.hpp +++ b/gui/src/dialog_about.hpp @@ -9,26 +9,26 @@ namespace FediPotato { -class DialogAbout : public QDialog, private Ui::DialogAbout +class AboutDialog : public QDialog, private Ui::AboutDialog { public: //! Default constructor - explicit DialogAbout(QDialog *parent = nullptr); + explicit AboutDialog(QDialog *parent = nullptr); //! Copy constructor - DialogAbout(const DialogAbout &other) = delete; + AboutDialog(const AboutDialog &other) = delete; //! Move constructor - DialogAbout(DialogAbout &&other) noexcept = delete; + AboutDialog(AboutDialog &&other) noexcept = delete; //! Destructor - ~DialogAbout() noexcept override = default; + ~AboutDialog() noexcept override = default; //! Copy assignment operator - DialogAbout& operator=(const DialogAbout &other) = delete; + AboutDialog& operator=(const AboutDialog &other) = delete; //! Move assignment operator - DialogAbout& operator=(DialogAbout &&other) noexcept = delete; + AboutDialog& operator=(AboutDialog &&other) noexcept = delete; public: diff --git a/gui/src/main.cpp b/gui/src/main.cpp index fb6b0ec..e972a1c 100644 --- a/gui/src/main.cpp +++ b/gui/src/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) QLibraryInfo::location(QLibraryInfo::TranslationsPath)); QGuiApplication::installTranslator(&appTranslator); - WindowMain win; + MainWindow win; win.show(); return QGuiApplication::exec(); diff --git a/gui/src/window_main.cpp b/gui/src/window_main.cpp index a2d76ae..3598be9 100644 --- a/gui/src/window_main.cpp +++ b/gui/src/window_main.cpp @@ -27,7 +27,7 @@ namespace FediPotato { -WindowMain::WindowMain(QMainWindow *parent) +MainWindow::MainWindow(QMainWindow *parent) : QMainWindow(parent) , _model_channel(new QStandardItemModel(this)) { @@ -36,7 +36,7 @@ WindowMain::WindowMain(QMainWindow *parent) add_account(); } -void WindowMain::add_account() +void MainWindow::add_account() { QStandardItem *item_root{_model_channel->invisibleRootItem()}; auto *item_account{new ChannelItem("@user@example.com", id_channel::none)}; @@ -69,18 +69,18 @@ void WindowMain::add_account() treeview_channel->setFont(font_channel); } -void WindowMain::show_about() +void MainWindow::show_about() { - auto *dlg{new DialogAbout()}; // NOLINT(cppcoreguidelines-owning-memory) + auto *dlg{new AboutDialog()}; // NOLINT(cppcoreguidelines-owning-memory) dlg->show(); } -void WindowMain::open_website() +void MainWindow::open_website() { QDesktopServices::openUrl(QUrl("http://fedipotato.org/")); } -void WindowMain::clicked_channel(const QModelIndex &index) +void MainWindow::clicked_channel(const QModelIndex &index) { auto item{dynamic_cast(_model_channel->itemFromIndex(index))}; diff --git a/gui/src/window_main.hpp b/gui/src/window_main.hpp index dcb2d25..6ff2f4c 100644 --- a/gui/src/window_main.hpp +++ b/gui/src/window_main.hpp @@ -13,28 +13,28 @@ namespace FediPotato { -class WindowMain : public QMainWindow, private Ui::WindowMain +class MainWindow : public QMainWindow, private Ui::MainWindow { Q_OBJECT public: //! Default constructor - explicit WindowMain(QMainWindow *parent = nullptr); + explicit MainWindow(QMainWindow *parent = nullptr); //! Copy constructor - WindowMain(const WindowMain &other) = delete; + MainWindow(const MainWindow &other) = delete; //! Move constructor - WindowMain(WindowMain &&other) noexcept = delete; + MainWindow(MainWindow &&other) noexcept = delete; //! Destructor - ~WindowMain() noexcept override = default; + ~MainWindow() noexcept override = default; //! Copy assignment operator - WindowMain& operator=(const WindowMain &other) = delete; + MainWindow& operator=(const MainWindow &other) = delete; //! Move assignment operator - WindowMain& operator=(WindowMain &&other) noexcept = delete; + MainWindow& operator=(MainWindow &&other) noexcept = delete; private: QStandardItemModel *_model_channel; diff --git a/gui/ui/dialog_about.ui b/gui/ui/dialog_about.ui index 42d4faa..89ff8eb 100644 --- a/gui/ui/dialog_about.ui +++ b/gui/ui/dialog_about.ui @@ -1,13 +1,13 @@ - DialogAbout - + AboutDialog + 0 0 400 - 187 + 200 @@ -76,6 +76,9 @@ true + + true + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -102,7 +105,7 @@ 0 0 358 - 116 + 129 diff --git a/gui/ui/window_main.ui b/gui/ui/window_main.ui index cea5535..a9935c2 100644 --- a/gui/ui/window_main.ui +++ b/gui/ui/window_main.ui @@ -1,7 +1,7 @@ - WindowMain - + MainWindow + 0 @@ -103,7 +103,7 @@ action_about triggered() - WindowMain + MainWindow show_about() @@ -119,7 +119,7 @@ action_quit triggered() - WindowMain + MainWindow close() @@ -135,7 +135,7 @@ action_website triggered() - WindowMain + MainWindow open_website() @@ -151,7 +151,7 @@ treeview_channel clicked(QModelIndex) - WindowMain + MainWindow clicked_channel(QModelIndex)