mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-29 05:47:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched to ImGui::TextUnfort

Browse Source
This commit is contained in:
AlexandreRouma
2022-01-26 14:50:16 +01:00
parent e158eabbf4
commit 03f0704dff
14 changed files with 42 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/gui/dialogs/credits.cpp
View File

@ -22,7 +22,7 @@ namespace credits {
ImGui::BeginPopupModal("Credits", NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove);
ImGui::PushFont(style::hugeFont);
ImGui::Text("SDR++ ");
ImGui::TextUnformatted("SDR++ ");
ImGui::PopFont();
ImGui::SameLine();
ImGui::Image(icons::LOGO, ImVec2(128, 128));
@ -30,29 +30,29 @@ namespace credits {
ImGui::Spacing();
ImGui::Spacing();
ImGui::Text("This software is brought to you by Alexandre Rouma (ON5RYZ) with the help of\n\n");
ImGui::TextUnformatted("This software is brought to you by Alexandre Rouma (ON5RYZ) with the help of\n\n");
ImGui::Columns(4, "CreditColumns", true);
ImGui::Text("Contributors");
ImGui::TextUnformatted("Contributors");
for (int i = 0; i < sdrpp_credits::contributorCount; i++) {
ImGui::BulletText("%s", sdrpp_credits::contributors[i]);
}
ImGui::NextColumn();
ImGui::Text("Libraries");
ImGui::TextUnformatted("Libraries");
for (int i = 0; i < sdrpp_credits::libraryCount; i++) {
ImGui::BulletText("%s", sdrpp_credits::libraries[i]);
}
ImGui::NextColumn();
ImGui::Text("Hardware Donators");
ImGui::TextUnformatted("Hardware Donators");
for (int i = 0; i < sdrpp_credits::hardwareDonatorCount; i++) {
ImGui::BulletText("%s", sdrpp_credits::hardwareDonators[i]);
}
ImGui::NextColumn();
ImGui::Text("Patrons");
ImGui::TextUnformatted("Patrons");
for (int i = 0; i < sdrpp_credits::patronCount; i++) {
ImGui::BulletText("%s", sdrpp_credits::patrons[i]);
}
@ -62,7 +62,7 @@ namespace credits {
ImGui::Spacing();
ImGui::Spacing();
ImGui::Spacing();
ImGui::Text("SDR++ v" VERSION_STR " (Built at " __TIME__ ", " __DATE__ ")");
ImGui::TextUnformatted("SDR++ v" VERSION_STR " (Built at " __TIME__ ", " __DATE__ ")");
ImGui::EndPopup();
ImGui::PopStyleColor();

31
core/src/gui/dialogs/loading_screen.cpp
View File

@ -30,40 +30,11 @@ namespace LoadingScreen {
ImGui::BeginPopupModal("Credits", NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground);
ImGui::PushFont(style::hugeFont);
ImGui::Text("SDR++ ");
ImGui::TextUnformatted("SDR++ ");
ImGui::PopFont();
ImGui::SameLine();
ImGui::Image(icons::LOGO, ImVec2(128, 128));
// ImGui::Spacing();
// ImGui::Spacing();
// ImGui::Spacing();
// ImGui::Text("This software is brought to you by\n\n");
// ImGui::Columns(3, "CreditColumns", true);
// ImGui::Text("Contributors");
// for (int i = 0; i < sdrpp_credits::contributorCount; i++) {
// ImGui::BulletText("%s", sdrpp_credits::contributors[i]);
// }
// ImGui::NextColumn();
// ImGui::Text("Libraries");
// for (int i = 0; i < sdrpp_credits::libraryCount; i++) {
// ImGui::BulletText("%s", sdrpp_credits::libraries[i]);
// }
// ImGui::NextColumn();
// ImGui::Text("Patrons");
// for (int i = 0; i < sdrpp_credits::patronCount; i++) {
// ImGui::BulletText("%s", sdrpp_credits::patrons[i]);
// }
// ImGui::Columns(1, "CreditColumnsEnd", true);
// ImGui::Spacing();
// ImGui::Spacing();
// ImGui::Spacing();
ImVec2 origPos = ImGui::GetCursorPos();
ImGui::SetCursorPosY(origPos.y + 50);
ImGui::Text("%s", msg.c_str());