SaveTool: various UI tweaks.

src/ProfileManager/ProfileManager.cpp

@@ -127,9 +127,10 @@ auto ProfileManager::deleteProfile(std::size_t index, bool delete_builds) -> boo
 auto ProfileManager::backupProfile(std::size_t index, bool backup_builds) -> bool {
     std::time_t timestamp = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
     std::tm* time = std::localtime(&timestamp);
+    auto& profile = _profiles[index];
 
     auto filename = Utility::format("{}_{}{:.2d}{:.2d}_{:.2d}{:.2d}{:.2d}.mbprofbackup",
-                                    Utility::String::replaceAll(_profiles[index].companyName().data(), " ", "_").c_str(),
+                                    Utility::String::replaceAll(profile.companyName().data(), " ", "_").c_str(),
                                     time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
                                     time->tm_hour, time->tm_min, time->tm_sec);
 
@@ -142,31 +143,32 @@ auto ProfileManager::backupProfile(std::size_t index, bool backup_builds) -> boo
         return false;
     }
 
-    zip_source_t* profile_source = zip_source_file(zip, Utility::Path::toNativeSeparators(Utility::Path::join(_saveDirectory, _profiles[index].filename())).data(), 0, 0);
+    zip_source_t* profile_source = zip_source_file(zip, Utility::Path::toNativeSeparators(Utility::Path::join(_saveDirectory, profile.filename())).data(), 0, 0);
     if(profile_source == nullptr) {
         _lastError = zip_strerror(zip);
         zip_source_free(profile_source);
         return false;
     }
 
-    if(zip_file_add(zip, _profiles[index].filename().data(), profile_source, ZIP_FL_ENC_UTF_8) == -1) {
+    if(zip_file_add(zip, profile.filename().data(), profile_source, ZIP_FL_ENC_UTF_8) == -1) {
         _lastError = zip_strerror(zip);
         zip_source_free(profile_source);
         return false;
     }
 
-    auto comment = "|"_s.join({_profiles[index].companyName(),
+    auto comment = Utility::format("{}|{}{}|{}-{:.2d}-{:.2d}-{:.2d}-{:.2d}-{:.2d}",
-                               _profiles[index].type() == ProfileType::Demo ? "demo"_s : "full"_s,
+                                   profile.companyName(),
-                               Utility::format("{}-{:.2d}-{:.2d}-{:.2d}-{:.2d}-{:.2d}",
+                                   profile.isDemo() ? "demo"_s : "full"_s,
+                                   profile.isLegacy() ? ""_s : "_new"_s,
                                    time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                                               time->tm_hour, time->tm_min, time->tm_sec)});
+                                   time->tm_hour, time->tm_min, time->tm_sec);
     zip_set_archive_comment(zip, comment.data(), comment.size());
 
     if(backup_builds) {
         for(UnsignedByte i = 0; i < 32; ++i) {
             auto build_filename = Utility::format("{}Unit{:.2d}{}.sav",
-                                                  _profiles[index].type() == ProfileType::Demo ? "Demo"_s : ""_s, i,
+                                                  profile.isDemo() ? "Demo"_s : ""_s, i,
-                                                  _profiles[index].account());
+                                                  profile.account());
 
             if(!Utility::Path::exists(Utility::Path::join(_saveDirectory, build_filename))) {
                 continue;
@@ -252,9 +254,19 @@ void ProfileManager::refreshBackups() {
 
         if(info[1] == "full") {
             backup.type = ProfileType::FullGame;
+            backup.version = ProfileVersion::Legacy;
         }
         else if(info[1] == "demo") {
             backup.type = ProfileType::Demo;
+            backup.version = ProfileVersion::Legacy;
+        }
+        else if(info[1] == "full_new") {
+            backup.type = ProfileType::FullGame;
+            backup.version = ProfileVersion::Normal;
+        }
+        else if(info[1] == "demo_new") {
+            backup.type = ProfileType::Demo;
+            backup.version = ProfileVersion::Normal;
         }
         else {
             continue;

src/ProfileManager/ProfileManager.h

@@ -29,6 +29,7 @@ struct Backup {
     Containers::String filename;
     Containers::String company;
     ProfileType type;
+    ProfileVersion version;
     struct {
         int year;
         int month;

src/SaveTool/SaveTool_MainManager.cpp

@@ -404,6 +404,7 @@ void SaveTool::drawMaterialRow(Containers::StringView name, Int tier, Getter get
                 (var) = getter();
                 ImGui::OpenPopup("int_edit");
             }
+            drawTooltip("Edit");
             if(drawIntEditPopup(&(var), 9999)) {
                 if(!setter(var)) {
                     _queue.addToast(Toast::Type::Error, _currentProfile->lastError());
@@ -532,17 +533,19 @@ void SaveTool::drawMassManager() {
                         _currentMass = &_massManager->hangar(i);
                         _uiState = UiState::MassViewer;
                     }
-                    ImGui::SameLine(0.0f, 2.0f);
+                    drawTooltip("Open in M.A.S.S. editor");
                 }
                 else{
                     ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.0f);
                     ImGui::SmallButton(ICON_FA_SEARCH);
                     ImGui::PopStyleVar();
                 }
+                ImGui::SameLine(0.0f, 2.0f);
                 if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
                     mass_to_delete = i;
                     ImGui::OpenPopup(mass_deletion_popup_ID);
                 }
+                drawTooltip("Delete");
                 ImGui::PopID();
             }
         }
@@ -594,6 +597,7 @@ void SaveTool::drawMassManager() {
                 staged_mass_to_delete = pair.first;
                 ImGui::OpenPopup(staged_mass_deletion_popup_ID);
             }
+            drawTooltip("Delete");
             ImGui::PopID();
         }
 

src/SaveTool/SaveTool_MassViewer_Armour.cpp

@@ -30,7 +30,7 @@ void SaveTool::drawArmour() {
         _currentMass->getArmourParts();
     }
 
-    if(!ImGui::BeginChild("##ArmourParts")) {
+    if(!ImGui::BeginChild("##ArmourParts", {0.0f, 0.0f}, true)) {
         ImGui::EndChild();
         return;
     }

src/SaveTool/SaveTool_ProfileManager.cpp

@@ -101,11 +101,13 @@ void SaveTool::drawProfileManager() {
                     profile_index = i;
                     ImGui::OpenPopup(backup_popup_id);
                 }
+                drawTooltip("Backup");
                 ImGui::SameLine(0.0f, 2.0f);
                 if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
                     profile_index = i;
                     ImGui::OpenPopup(delete_popup_id);
                 }
+                drawTooltip("Delete");
                 ImGui::PopID();
             }
             ImGui::EndTable();
@@ -250,13 +252,14 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
         ImGui::TextUnformatted("Actions");
 
         for(std::size_t i = 0; i < _profileManager->backups().size(); ++i) {
+            auto& backup = _profileManager->backups()[i];
             ImGui::TableNextRow();
 
             ImGui::TableSetColumnIndex(0);
-            ImGui::TextUnformatted(_profileManager->backups()[i].company.data());
+            ImGui::TextUnformatted(backup.company.data());
             if(ImGui::IsItemHovered()) {
                 ImGui::BeginTooltip();
-                for(const auto& file : _profileManager->backups()[i].includedFiles) {
+                for(const auto& file : backup.includedFiles) {
                     ImGui::TextUnformatted(file.data());
                 }
                 ImGui::EndTooltip();
@@ -264,15 +267,17 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
 
             ImGui::TableSetColumnIndex(1);
             ImGui::Text("%.4i-%.2i-%.2i %.2i:%.2i:%.2i",
-                        _profileManager->backups()[i].timestamp.year,
+                        backup.timestamp.year,
-                        _profileManager->backups()[i].timestamp.month,
+                        backup.timestamp.month,
-                        _profileManager->backups()[i].timestamp.day,
+                        backup.timestamp.day,
-                        _profileManager->backups()[i].timestamp.hour,
+                        backup.timestamp.hour,
-                        _profileManager->backups()[i].timestamp.minute,
+                        backup.timestamp.minute,
-                        _profileManager->backups()[i].timestamp.second);
+                        backup.timestamp.second);
 
             ImGui::TableSetColumnIndex(2);
-            ImGui::TextUnformatted(_profileManager->backups()[i].type == ProfileType::Demo ? "Demo" : "Full");
+            ImGui::Text("%s%s",
+                        backup.type == ProfileType::Demo ? "Demo" : "Full",
+                        backup.version == ProfileVersion::Legacy ? " (legacy)" : "");
 
             ImGui::TableSetColumnIndex(3);
             ImGui::PushID(i);
@@ -280,11 +285,13 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
                 backup_index = i;
                 ImGui::OpenPopup(restore_backup_popup_id);
             }
+            drawTooltip("Restore");
             ImGui::SameLine(0.0f, 2.0f);
             if(ImGui::SmallButton(ICON_FA_TRASH_ALT)) {
                 backup_index = i;
                 ImGui::OpenPopup(delete_backup_popup_id);
             }
+            drawTooltip("Delete");
             ImGui::PopID();
         }
         ImGui::EndTable();

src/SaveTool/SaveTool_drawMainMenu.cpp

@@ -179,7 +179,7 @@ void SaveTool::drawMainMenu() {
 #endif
 
         if(ImGui::BeginMenu("Help")) {
-            if(ImGui::BeginMenu(ICON_FA_BOOK " ImGui user guide")) {
+            if(ImGui::BeginMenu(ICON_FA_KEYBOARD " Keyboard shortcuts")) {
                 ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text.");
                 ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
                 ImGui::BulletText("While inputing text:\n");