From 10522ed3140e35ac504ad43b7eedeee0de8abd88 Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Sun, 20 Sep 2020 18:29:52 +0200
Subject: [PATCH] more work

---
 Source/RMG/CMakeLists.txt                     | 21 +++++++++++++++----
 Source/RMG/{Config.hpp => Config.hpp.in}      |  2 +-
 Source/RMG/UserInterface/MainWindow.cpp       |  8 +++----
 Source/RMG/UserInterface/RomBrowserWidget.cpp |  2 +-
 Source/RMG/Utilities/Logger.hpp               |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)
 rename Source/RMG/{Config.hpp => Config.hpp.in} (94%)

diff --git a/Source/RMG/CMakeLists.txt b/Source/RMG/CMakeLists.txt
index 9b6bc88b..adef7e6e 100644
--- a/Source/RMG/CMakeLists.txt
+++ b/Source/RMG/CMakeLists.txt
@@ -5,9 +5,22 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 find_package(Qt5 COMPONENTS Widgets Core REQUIRED)
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(SDL2 REQUIRED sdl2)
 
+find_package(Git REQUIRED)
+
+execute_process(
+    COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    OUTPUT_VARIABLE GIT_VERSION
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+configure_file(Config.hpp.in Config.hpp)
+
 add_executable(RMG
     UserInterface/MainWindow.cpp
     UserInterface/RomBrowserWidget.cpp
@@ -30,12 +43,12 @@ add_executable(RMG
     main.cpp
 )
 
+target_link_libraries(RMG ${SDL2_LIBRARIES})
+
+target_include_directories(RMG PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SDL2_INCLUDE_DIRS})
+
 if(UNIX)
     target_link_libraries(RMG dl)
 endif(UNIX)
 
-target_link_libraries(RMG ${SDL2_LIBRARIES})
-
-target_include_directories(RMG PRIVATE ${SDL2_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
-
 target_link_libraries(RMG Qt5::Widgets)
diff --git a/Source/RMG/Config.hpp b/Source/RMG/Config.hpp.in
similarity index 94%
rename from Source/RMG/Config.hpp
rename to Source/RMG/Config.hpp.in
index 0a5ef964..3e53998e 100644
--- a/Source/RMG/Config.hpp
+++ b/Source/RMG/Config.hpp.in
@@ -1,7 +1,7 @@
 #ifndef CONFIG_HPP
 #define CONFIG_HPP
 
-#define WINDOW_TITLE "Rosalie's Mupen GUI"
+#define WINDOW_TITLE "Rosalie's Mupen GUI ${GIT_VERSION}"
 #define WINDOW_WIDGET_SIZE_W 640
 #define WINDOW_WIDGET_SIZE_H 480
 
diff --git a/Source/RMG/UserInterface/MainWindow.cpp b/Source/RMG/UserInterface/MainWindow.cpp
index 5b9d9f30..cddedf2e 100644
--- a/Source/RMG/UserInterface/MainWindow.cpp
+++ b/Source/RMG/UserInterface/MainWindow.cpp
@@ -8,7 +8,7 @@
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 #include "MainWindow.hpp"
-#include "../Config.hpp"
+#include "Config.hpp"
 
 #include <QMenuBar>
 #include <QStatusBar>
@@ -317,7 +317,7 @@ void MainWindow::on_Action_File_OpenRom(void)
     QString dir;
 
     dialog.setFileMode(QFileDialog::FileMode::ExistingFile);
-    dialog.setNameFilter("N64 Roms (*.n64 *.z64 *.z64)");
+    dialog.setNameFilter("N64 Roms (*.n64 *.z64 *.v64)");
     dialog.setWindowIcon(this->ui_Icon);
     dialog.show();
 
@@ -341,13 +341,13 @@ void MainWindow::on_Action_File_ChooseDirectory(void)
     QFileDialog dialog;
     int ret;
     QString dir;
-    dialog.setParent(this);
+
     dialog.setFileMode(QFileDialog::Directory);
     dialog.setOption(QFileDialog::ShowDirsOnly, true);
     dialog.setWindowIcon(this->ui_Icon);
     dialog.show();
-    ret = dialog.exec();
 
+    ret = dialog.exec();
     if (ret)
     {
         dir = dialog.selectedFiles().first();
diff --git a/Source/RMG/UserInterface/RomBrowserWidget.cpp b/Source/RMG/UserInterface/RomBrowserWidget.cpp
index 7cc6426f..c8865cf1 100644
--- a/Source/RMG/UserInterface/RomBrowserWidget.cpp
+++ b/Source/RMG/UserInterface/RomBrowserWidget.cpp
@@ -9,7 +9,7 @@
 */
 #include "RomBrowserWidget.hpp"
 #include "../Globals.hpp"
-#include "../Config.hpp"
+#include "Config.hpp"
 
 #include <QDir>
 
diff --git a/Source/RMG/Utilities/Logger.hpp b/Source/RMG/Utilities/Logger.hpp
index 897c8e81..6e357344 100644
--- a/Source/RMG/Utilities/Logger.hpp
+++ b/Source/RMG/Utilities/Logger.hpp
@@ -10,7 +10,7 @@
 #ifndef LOGGER_HPP
 #define LOGGER_HPP
 
-#include "../Config.hpp"
+#include "Config.hpp"
 
 #include <QString>
 #include <QFile>