Merge pull request #428 from carboncopies/424-add-versioning-informat…

…ion-to-about-window 424 add versioning information to about window
carboncopies · Sep 30, 2022 · a8ebbc2 · a8ebbc2
2 parents 847e767 + cd0cef4
commit a8ebbc2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 20 deletions.
diff --git a/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(GUI_Window_About
 # Link Internal Libs
 target_link_libraries(GUI_Window_About
     ERS_STRUCT_SystemUtils
+    ERS_VersioningSystem
     )
 
 target_include_directories(GUI_Window_About PUBLIC ./)
diff --git a/Source/Core/Editor/Windows/GUI_Window_About/GUI_Window_About.cpp b/Source/Core/Editor/Windows/GUI_Window_About/GUI_Window_About.cpp
@@ -35,13 +35,6 @@ void GUI_Window_About::Draw() {
                 "rendering system with realtime physics, cloth and more. [Note: This project"
                 " is currently in development].");
 
-            // Write Text
-            ImGui::Separator();
-            ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Branch:");
-            ImGui::Text("Unstable-Development");
-
-            // Version Info?
-
             // Operating System Status
             ImGui::Separator();
             ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Feature Status:");
@@ -53,19 +46,46 @@ void GUI_Window_About::Draw() {
 
             // License Info
             ImGui::Separator();
-            ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "License:");
-            ImGui::TextWrapped("This program is free software: you can redistribute it and/or modify "
-                        "it under the terms of the GNU Affero General Public License as "
-                        "published by the Free Software Foundation, either version 3 of the "
-                        "License, or (at your option) any later version. "
-
-                        "This program is distributed in the hope that it will be useful, "
-                        "but WITHOUT ANY WARRANTY; without even the implied warranty of "
-                        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
-                        "GNU Affero General Public License for more details. "
-
-                        "You should have received a copy of the GNU Affero General Public License "
-                        "along with this program. If not, see <https://www.gnu.org/licenses/>.");
+            ImGui::Separator();
+            ImGui::Separator();
+            if (ImGui::CollapsingHeader("License")) {
+
+                if (ImGui::BeginChild("InfoSubWindow")) {
+
+                    ImGui::Separator();
+                    ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "License:");
+                    ImGui::TextWrapped("This program is free software: you can redistribute it and/or modify "
+                                "it under the terms of the GNU Affero General Public License as "
+                                "published by the Free Software Foundation, either version 3 of the "
+                                "License, or (at your option) any later version. "
+
+                                "This program is distributed in the hope that it will be useful, "
+                                "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                                "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
+                                "GNU Affero General Public License for more details. "
+
+                                "You should have received a copy of the GNU Affero General Public License "
+                                "along with this program. If not, see <https://www.gnu.org/licenses/>.");
+
+                ImGui::EndChild();
+                }
+            }
+
+            // Write Text
+            if (ImGui::CollapsingHeader("Info", ImGuiTreeNodeFlags_DefaultOpen)) {
+
+                if (ImGui::BeginChild("InfoSubWindow")) {
+
+                    ImGui::Separator();
+                    ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Version:");
+                    ImGui::SameLine();
+                    ImGui::Text(ERS_VERSION);
+
+
+                ImGui::EndChild();
+                }
+
+            }
 
 
         }

diff --git a/Source/Core/Editor/Windows/GUI_Window_About/GUI_Window_About.h b/Source/Core/Editor/Windows/GUI_Window_About/GUI_Window_About.h
@@ -17,6 +17,8 @@
 // Internal Libraries (BG convention: use <> instead of "")
 #include <ERS_STRUCT_SystemUtils.h>
 
+#include <ERS_Version.h>
+
 
 /**
  * @brief Window for the Import progress bar.