Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

424 add versioning information to about window #428

Merged
merged 6 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./)
60 changes: 40 additions & 20 deletions Source/Core/Editor/Windows/GUI_Window_About/GUI_Window_About.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:");
Expand All @@ -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();
}

}


}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down