eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 11:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Message improvement Warning Change XML version

Browse Source
This commit is contained in:
Bruno Herbelin
2022-04-16 23:52:13 +02:00
parent 1e7dbb5331
commit 1fe63b68ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Log.cpp
View File

@@ -281,10 +281,10 @@ void Log::Render(bool *showWarnings)
ImGui::OpenPopup("Warning"); ImGui::OpenPopup("Warning");
if (ImGui::BeginPopupModal("Warning", NULL, ImGuiWindowFlags_AlwaysAutoResize)) if (ImGui::BeginPopupModal("Warning", NULL, ImGuiWindowFlags_AlwaysAutoResize))
{ {
ImGuiToolkit::Icon(9, 4); ImGuiToolkit::Icon(7, 14);
ImGui::SameLine(0, IMGUI_SAME_LINE); ImGui::SameLine(0, IMGUI_SAME_LINE);
ImGui::SetNextItemWidth(width); ImGui::SetNextItemWidth(width);
ImGui::TextColored(ImVec4(1.0f,0.6f,0.0f,1.0f), "%ld error(s) occurred.\n\n", warnings.size()); ImGui::TextColored(ImVec4(1.0f,0.6f,0.0f,1.0f), "%ld problem(s) occurred.\n\n", warnings.size());
ImGui::Dummy(ImVec2(width, 0)); ImGui::Dummy(ImVec2(width, 0));
ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + width); ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + width);

6
SessionCreator.cpp
View File

@@ -130,9 +130,9 @@ void SessionCreator::load(const std::string& filename)
header->QueryIntAttribute("major", &version_major); header->QueryIntAttribute("major", &version_major);
header->QueryIntAttribute("minor", &version_minor); header->QueryIntAttribute("minor", &version_minor);
if (version_major != XML_VERSION_MAJOR || version_minor != XML_VERSION_MINOR){ if (version_major != XML_VERSION_MAJOR || version_minor != XML_VERSION_MINOR){
Log::Warning("%s session file is in version v%d.%d. but this vimix program expects v%d.%d.\n" Log::Warning("%s is an older version of vimix session (v%d.%d instead of v%d.%d).\n"
"Loading might fail or lead to different or incomplete configuration.\n" "Loading might lead to different or incomplete configuration.\n"
"You can save this session again to avoid this warning.", "Save the session to avoid further warning.",
filename.c_str(), version_major, version_minor, XML_VERSION_MAJOR, XML_VERSION_MINOR); filename.c_str(), version_major, version_minor, XML_VERSION_MAJOR, XML_VERSION_MINOR);
// return; // return;
} }