From 6761201ce0d320ebc5e1a7085b92bead257c4e7a Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 9 Jul 2023 12:14:32 -0400
Subject: [PATCH] Add quit action to all applications, add more icons to
 existing actions

---
 armoury/src/fullmodelviewer.cpp | 1 +
 armoury/src/mainwindow.cpp      | 7 +++++++
 exdviewer/src/mainwindow.cpp    | 6 ++++++
 explorer/src/mainwindow.cpp     | 6 ++++++
 mdlviewer/src/mainwindow.cpp    | 7 +++++++
 5 files changed, 27 insertions(+)

diff --git a/armoury/src/fullmodelviewer.cpp b/armoury/src/fullmodelviewer.cpp
index 3d1c42d..3afdde6 100644
--- a/armoury/src/fullmodelviewer.cpp
+++ b/armoury/src/fullmodelviewer.cpp
@@ -26,6 +26,7 @@ FullModelViewer::FullModelViewer(GameData* data, FileCache& cache) : data(data)
     auto fileMenu = menuBar()->addMenu("File");
 
     auto datOpenAction = fileMenu->addAction("Load character DAT...");
+    datOpenAction->setIcon(QIcon::fromTheme("document-open"));
     connect(datOpenAction, &QAction::triggered, [=] {
         auto fileName = QFileDialog::getOpenFileName(nullptr,
                                                      "Open DAT File",
diff --git a/armoury/src/mainwindow.cpp b/armoury/src/mainwindow.cpp
index 03230cf..57c7e58 100644
--- a/armoury/src/mainwindow.cpp
+++ b/armoury/src/mainwindow.cpp
@@ -29,9 +29,16 @@ MainWindow::MainWindow(GameData* in_data) : data(*in_data), cache(FileCache{*in_
     setWindowTitle("Armoury Editor");
     setMinimumSize(QSize(800, 600));
 
+    auto fileMenu = menuBar()->addMenu("File");
+
+    auto quitAction = fileMenu->addAction("Quit");
+    quitAction->setIcon(QIcon::fromTheme("gtk-quit"));
+    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
+
     auto toolsMenu = menuBar()->addMenu("Tools");
 
     auto cmpEditorMenu = toolsMenu->addAction("CMP Editor");
+    cmpEditorMenu->setIcon(QIcon::fromTheme("document-edit"));
     connect(cmpEditorMenu, &QAction::triggered, [=] {
         auto cmpEditor = new CmpEditor(in_data);
         cmpEditor->show();
diff --git a/exdviewer/src/mainwindow.cpp b/exdviewer/src/mainwindow.cpp
index fc0c04f..ad0a5be 100644
--- a/exdviewer/src/mainwindow.cpp
+++ b/exdviewer/src/mainwindow.cpp
@@ -20,6 +20,12 @@
 MainWindow::MainWindow(GameData* data) : data(data) {
     setWindowTitle("exdviewer");
 
+    auto fileMenu = menuBar()->addMenu("File");
+
+    auto quitAction = fileMenu->addAction("Quit");
+    quitAction->setIcon(QIcon::fromTheme("gtk-quit"));
+    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
+
     auto helpMenu = menuBar()->addMenu("Help");
 
     auto donateAction = helpMenu->addAction("Donate");
diff --git a/explorer/src/mainwindow.cpp b/explorer/src/mainwindow.cpp
index f52055c..715362e 100644
--- a/explorer/src/mainwindow.cpp
+++ b/explorer/src/mainwindow.cpp
@@ -20,6 +20,12 @@
 MainWindow::MainWindow(GameData* data) : data(data) {
     setWindowTitle("explorer");
 
+    auto fileMenu = menuBar()->addMenu("File");
+
+    auto quitAction = fileMenu->addAction("Quit");
+    quitAction->setIcon(QIcon::fromTheme("gtk-quit"));
+    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
+
     auto helpMenu = menuBar()->addMenu("Help");
 
     auto donateAction = helpMenu->addAction("Donate");
diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp
index 5c6a0b2..abad69e 100644
--- a/mdlviewer/src/mainwindow.cpp
+++ b/mdlviewer/src/mainwindow.cpp
@@ -24,6 +24,7 @@ MainWindow::MainWindow(GameData* data) : data(data), cache(FileCache{*data}) {
     auto fileMenu = menuBar()->addMenu("File");
 
     auto openMDLFile = fileMenu->addAction("Open MDL...");
+    openMDLFile->setIcon(QIcon::fromTheme("document-open"));
     connect(openMDLFile, &QAction::triggered, [=] {
         auto fileName = QFileDialog::getOpenFileName(nullptr,
                                                      "Open MDL File",
@@ -35,6 +36,12 @@ MainWindow::MainWindow(GameData* data) : data(data), cache(FileCache{*data}) {
         part->addModel(physis_mdl_parse(buffer.size, buffer.data), {}, 0);
     });
 
+    fileMenu->addSeparator();
+
+    auto quitAction = fileMenu->addAction("Quit");
+    quitAction->setIcon(QIcon::fromTheme("gtk-quit"));
+    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
+
     auto helpMenu = menuBar()->addMenu("Help");
 
     auto donateAction = helpMenu->addAction("Donate");