From 1b69d86cc137856c39c893bfd72333306b21c604 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 10 Oct 2023 18:22:38 -0400 Subject: [PATCH] sagasu: Port to NovusMainWindow --- sagasu/include/mainwindow.h | 5 +++-- sagasu/src/mainwindow.cpp | 32 +++----------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/sagasu/include/mainwindow.h b/sagasu/include/mainwindow.h index a93d9e8..bcfae9c 100644 --- a/sagasu/include/mainwindow.h +++ b/sagasu/include/mainwindow.h @@ -3,14 +3,15 @@ #pragma once -#include #include #include #include +#include "novusmainwindow.h" + struct GameData; -class MainWindow : public QMainWindow +class MainWindow : public NovusMainWindow { public: MainWindow(GameData *data); diff --git a/sagasu/src/mainwindow.cpp b/sagasu/src/mainwindow.cpp index 3c263d8..e319bfb 100644 --- a/sagasu/src/mainwindow.cpp +++ b/sagasu/src/mainwindow.cpp @@ -19,36 +19,10 @@ #include "filetreewindow.h" MainWindow::MainWindow(GameData *data) - : data(data) + : NovusMainWindow() + , data(data) { - setWindowTitle(QStringLiteral("Sagasu")); - - auto fileMenu = menuBar()->addMenu(QStringLiteral("File")); - - auto quitAction = fileMenu->addAction(QStringLiteral("Quit")); - quitAction->setIcon(QIcon::fromTheme(QStringLiteral("gtk-quit"))); - connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit); - - auto helpMenu = menuBar()->addMenu(QStringLiteral("Help")); - - auto donateAction = helpMenu->addAction(QStringLiteral("Donate")); - connect(donateAction, &QAction::triggered, this, [] { - QDesktopServices::openUrl(QUrl(QStringLiteral("https://redstrate.com/fund"))); - }); - donateAction->setIcon(QIcon::fromTheme(QStringLiteral("help-donate"))); - - helpMenu->addSeparator(); - - auto aboutNovusAction = helpMenu->addAction(QStringLiteral("About Sagasu")); - aboutNovusAction->setIcon(QIcon::fromTheme(QStringLiteral("help-about"))); - connect(aboutNovusAction, &QAction::triggered, this, [this] { - auto window = new KAboutApplicationDialog(KAboutData::applicationData(), this); - window->show(); - }); - - auto aboutQtAction = helpMenu->addAction(QStringLiteral("About Qt")); - aboutQtAction->setIcon(QIcon(QStringLiteral(":/qt-project.org/qmessagebox/images/qtlogo-64.png"))); - connect(aboutQtAction, &QAction::triggered, QApplication::instance(), &QApplication::aboutQt); + setupMenubar(); mdiArea = new QMdiArea(); setCentralWidget(mdiArea);