More final fixes

Author: XorTroll

Goldleaf/include/cnt/cnt_Content.hpp

@@ -72,7 +72,8 @@ namespace cnt {
 
     constexpr size_t MaxContentCount = 7;
 
-    struct ApplicationContentEntry {
+    struct ApplicationContent {
+        NcmContentMetaKey meta_key;
         std::optional<NcmContentId> cnt_ids[MaxContentCount];
     };
 
@@ -89,7 +90,7 @@ namespace cnt {
         NsExtApplicationView view;
         NsApplicationControlData control_data;
         std::vector<NsApplicationContentMetaStatus> meta_status_list;
-        std::vector<ApplicationContentEntry> contents;
+        std::vector<ApplicationContent> contents;
         NsExtApplicationOccupiedSize occupied_size;
         u32 max_version;
         u32 launch_required_version;
@@ -109,17 +110,18 @@ namespace cnt {
         ApplicationPlayStats GetUserPlayStats(const AccountUid user_id) const;
     };
 
-    constexpr u32 MaxApplicationCount = 64000;
-
     void InitializeApplications();
     void FinalizeApplications();
 
     void NotifyApplicationsChanged();
 
     std::vector<Application> &GetApplications();
-    std::optional<std::reference_wrapper<Application>> ExistsApplicationContent(const u64 app_id);
+    
+    std::optional<std::reference_wrapper<Application>> ExistsApplicationContent(const u64 program_id, const NcmContentMetaType content_type);
+    std::optional<std::reference_wrapper<Application>> ExistsApplicationAnyContents(const u64 app_id);
 
     void RemoveApplicationById(const u64 app_id);
+    void RemoveApplicationContentById(const Application &app, const u32 cnt_idx);
     Result UpdateApplicationVersion(const Application &app);
     std::string GetExportedApplicationIconPath(const u64 app_id);
     std::string GetExportedApplicationNacpPath(const u64 app_id);

Goldleaf/include/cnt/cnt_Ticket.hpp

@@ -51,7 +51,7 @@ namespace cnt {
         TicketType type;
 
         inline std::optional<std::reference_wrapper<Application>> IsUsed() const {
-            return ExistsApplicationContent(esGetRightsIdApplicationId(&this->rights_id));
+            return ExistsApplicationAnyContents(esGetRightsIdApplicationId(&this->rights_id));
         }
 
         std::string ToString() const;

Goldleaf/include/nsp/nsp_Installer.hpp

@@ -45,7 +45,7 @@ namespace nsp {
     using OnStartWriteFunction = std::function<void(const ContentWriteProgress&)>;
     using OnContentWriteFunction = std::function<void(const ContentWriteProgress&)>;
 
-    struct InstallableProgram {
+    struct InstallableContent {
         NcmContentMetaKey meta_key;
         NacpStruct nacp_data;
         std::string icon_path;
@@ -71,12 +71,12 @@ namespace nsp {
             std::string cert_file_name;
             NcmContentInfo meta_cnt_info;
             std::vector<NcmContentInfo> contents;
-            std::vector<InstallableProgram> programs;
+            std::vector<InstallableContent> inst_contents;
 
-            Result StartProgramInstallation(const InstallableProgram &program);
+            Result StartProgramInstallation(const InstallableContent &program);
 
         public:
-            Installer(const std::string &path, fs::Explorer *exp, const NcmStorageId st_id) : pfs0_file(exp, path), storage_id(st_id), contents(), programs() {}
+            Installer(const std::string &path, fs::Explorer *exp, const NcmStorageId st_id) : pfs0_file(exp, path), storage_id(st_id), contents(), inst_contents() {}
             ~Installer();
 
             Result PrepareInstallation();
@@ -94,8 +94,8 @@ namespace nsp {
                 return this->keygen;
             }
 
-            inline std::vector<InstallableProgram> &GetPrograms() {
-                return this->programs;
+            inline std::vector<InstallableContent> &GetInstallablePrograms() {
+                return this->inst_contents;
             }
 
             inline std::vector<NcmContentInfo> &GetContents() {

Goldleaf/include/ui/ui_ApplicationListLayout.hpp

@@ -36,6 +36,7 @@ namespace ui {
             ApplicationListLayout();
             PU_SMART_CTOR(ApplicationListLayout)
 
+            void ReloadApplications();
             void Reload();
 
             inline void NotifyApplicationsChanged() {

Goldleaf/include/ui/ui_FileContentLayout.hpp

@@ -27,23 +27,16 @@ namespace ui {
     class FileContentLayout : public pu::ui::Layout {
         private:
             u32 line_offset;
+            u32 x_offset;
             u32 available_line_count;
+            u32 max_line_length;
             std::vector<std::string> read_lines;
+            size_t cur_read_lines_max_length;
             bool read_hex;
             std::string path;
             pu::ui::elm::TextBlock::Ref cnt_text;
             fs::Explorer *file_exp;
 
-            void OnInput(const u64 keys_down, const u64 keys_up, const u64 keys_held, const pu::ui::TouchPoint touch_pos);
-
-        public:
-            FileContentLayout();
-            PU_SMART_CTOR(FileContentLayout)
-
-            void LoadFile(const std::string &path, const std::string &pres_path, fs::Explorer *exp, const bool read_hex);
-            void ScrollUp();
-            void ScrollDown();
-
             inline std::vector<std::string> ReadLines(const u32 line_offset, const u32 count) {
                 if(this->read_hex) {
                     return this->file_exp->ReadFileFormatHex(this->path, line_offset, count);
@@ -53,13 +46,19 @@ namespace ui {
                 }
             }
 
-            inline void UpdateLines() {
-                std::string new_cnt;
-                for(auto &line: this->read_lines) {
-                    new_cnt += line + "\n";
-                }
-                this->cnt_text->SetText(new_cnt);
-            }
+            void OnInput(const u64 keys_down, const u64 keys_up, const u64 keys_held, const pu::ui::TouchPoint touch_pos);
+            bool ScrollUp();
+            bool ScrollDown();
+            bool MoveLeft();
+            bool MoveRight();
+            void UpdateLineLimits();
+            void UpdateLines();
+
+        public:
+            FileContentLayout();
+            PU_SMART_CTOR(FileContentLayout)
+
+            void LoadFile(const std::string &path, const std::string &pres_path, fs::Explorer *exp, const bool read_hex);
     };
 
 }

Goldleaf/romfs/Strings/de.json

@@ -493,7 +493,7 @@
     "Update ID:",
     "Application record last event:",
     "Application view flags:",
-    "View occupied size",
+    "View size",
     "View play stats",
     "Total",
     "Occupied size",

Goldleaf/romfs/Strings/en-US.json

@@ -493,7 +493,7 @@
     "Update ID:",
     "Application record last event:",
     "Application view flags:",
-    "View occupied size",
+    "View size",
     "View play stats",
     "Total",
     "Occupied size",

Goldleaf/romfs/Strings/es.json

@@ -493,7 +493,7 @@
     "Update ID:",
     "Application record last event:",
     "Application view flags:",
-    "View occupied size",
+    "View size",
     "View play stats",
     "Total",
     "Occupied size",

Goldleaf/romfs/Strings/fr.json

@@ -493,7 +493,7 @@
     "Update ID:",
     "Application record last event:",
     "Application view flags:",
-    "View occupied size",
+    "View size",
     "View play stats",
     "Total",
     "Occupied size",

Goldleaf/romfs/Strings/it.json

@@ -493,7 +493,7 @@
     "Update ID:",
     "Application record last event:",
     "Application view flags:",
-    "View occupied size",
+    "View size",
     "View play stats",
     "Total",
     "Occupied size",