From 4b59d57f899823f595087ff7e0289997d72c5560 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 21 Dec 2020 11:24:27 +0100
Subject: [PATCH] Added version info to about page

---
 CMakeLists.txt             | 18 +++++++++---------
 source/views/view_help.cpp | 16 ++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb32de728..d2a4ced55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(HexEditor)
+project(imhex VERSION 1.5.0)
 
 SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
 SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
@@ -46,10 +46,10 @@ if (WIN32)
     SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wl,-subsystem,windows")
 endif (WIN32)
 
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE")
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}\"\\\"")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}-Debug\"\\\"")
 
-add_executable(ImHex
+add_executable(imhex
         source/main.cpp
         source/window.cpp
 
@@ -97,14 +97,14 @@ add_executable(ImHex
         resource.rc
         )
 
-set_target_properties(ImHex PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(imhex PROPERTIES CXX_VISIBILITY_PRESET hidden)
 
-target_link_directories(ImHex PRIVATE ${GLFW_LIBRARY_DIRS} ${CRYPTO_LIBRARY_DIRS} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+target_link_directories(imhex PRIVATE ${GLFW_LIBRARY_DIRS} ${CRYPTO_LIBRARY_DIRS} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
 
 if (WIN32)
-    target_link_libraries(ImHex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib libcrypto.a libwinpthread.a libcapstone.a LLVMDemangle ${Python_LIBRARIES} nlohmann_json::nlohmann_json Freetype::Freetype)
+    target_link_libraries(imhex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib libcrypto.a libwinpthread.a libcapstone.a LLVMDemangle ${Python_LIBRARIES} nlohmann_json::nlohmann_json Freetype::Freetype)
 elseif (UNIX)
-    target_link_libraries(ImHex glfw magic crypto ${CMAKE_DL_LIBS} capstone LLVMDemangle ${Python_LIBRARIES} nlohmann_json::nlohmann_json Freetype::Freetype)
+    target_link_libraries(imhex glfw magic crypto ${CMAKE_DL_LIBS} capstone LLVMDemangle ${Python_LIBRARIES} nlohmann_json::nlohmann_json Freetype::Freetype)
 endif()
 
-install(TARGETS ImHex DESTINATION bin)
+install(TARGETS imhex DESTINATION bin)
diff --git a/source/views/view_help.cpp b/source/views/view_help.cpp
index edfc8c73b..381e8e7fd 100644
--- a/source/views/view_help.cpp
+++ b/source/views/view_help.cpp
@@ -27,22 +27,17 @@ namespace hex {
     };
 
 
-
     void ViewHelp::drawAboutPopup() {
         if (ImGui::BeginPopupModal("About", &this->m_aboutWindowOpen, ImGuiWindowFlags_AlwaysAutoResize)) {
-            ImGui::Text("ImHex Hex Editor");
-            ImGui::Text("by WerWolv");
-            ImGui::Separator();
+            ImGui::Text("ImHex Hex Editor v%s by WerWolv", IMHEX_VERSION);
+            ImGui::NewLine();
+            ImGui::Text("Source code available on GitHub:"); ImGui::SameLine();
+            ImGui::TextColored(ImVec4(0.4F, 0.4F, 0.8F, 1.0F), "WerWolv/ImHex   ");
             ImGui::NewLine();
 
-            ImGui::Text("Source code found at"); ImGui::SameLine();
-            ImGui::TextColored(ImVec4(0.4F, 0.4F, 0.8F, 1.0F), "https://github.com/WerWolv/ImHex");
-            ImGui::NewLine();
-
-            ImGui::Separator();
             ImGui::Text("Libraries used");
+            ImGui::Separator();
             ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.2F, 0.2F, 0.2F, 0.3F));
-            ImGui::NewLine();
             ImGui::BulletText("ImGui by ocornut");
             ImGui::BulletText("imgui_club by ocornut");
             ImGui::BulletText("ImGui-Addons by gallickgunner");
@@ -55,6 +50,7 @@ namespace hex {
             ImGui::BulletText("GLFW3");
             ImGui::BulletText("LLVM");
             ImGui::BulletText("Python 3");
+            ImGui::BulletText("FreeType");
 
             ImGui::PopStyleColor();
             ImGui::EndPopup();