diff --git a/Makefile b/Makefile index a537287..6cca0aa 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,10 @@ umenu: arc pu @build_romfs projects/uMenu/romfs SdOut/ulaunch/bin/uMenu/romfs.bin umanager: arc pu - @$(MAKE) -C libs/Plutonium/ + @$(MAKE) -C projects/uManager + @mkdir -p SdOut/ulaunch/lang/uManager + @mkdir -p SdOut/switch + @cp projects/uManager/uManager.nro SdOut/switch/uManager.nro uscreen: @cd projects/uScreen && mvn package diff --git a/docs/udesigner.data b/docs/udesigner.data index af44e0b..982ea6e 100644 Binary files a/docs/udesigner.data and b/docs/udesigner.data differ diff --git a/docs/udesigner.js b/docs/udesigner.js index c156e51..3c85c78 100644 --- a/docs/udesigner.js +++ b/docs/udesigner.js @@ -39,7 +39,7 @@ if (ENVIRONMENT_IS_NODE) { // --pre-jses are emitted after the Module integration code, so that they can // refer to Module (if they choose; they can also define Module) -// include: /tmp/tmpcdp3wo0a.js +// include: /tmp/tmptdtwqfll.js if (!Module.expectedDataFileDownloads) { Module.expectedDataFileDownloads = 0; @@ -220,21 +220,21 @@ Module['FS_createPath']("/", "assets", true, true); })(); -// end include: /tmp/tmpcdp3wo0a.js -// include: /tmp/tmpuzehj2xx.js +// end include: /tmp/tmptdtwqfll.js +// include: /tmp/tmpyzue98uc.js // All the pre-js content up to here must remain later on, we need to run // it. if (Module['$ww'] || (typeof ENVIRONMENT_IS_PTHREAD != 'undefined' && ENVIRONMENT_IS_PTHREAD)) Module['preRun'] = []; var necessaryPreJSTasks = Module['preRun'].slice(); - // end include: /tmp/tmpuzehj2xx.js -// include: /tmp/tmpdd5eooui.js + // end include: /tmp/tmpyzue98uc.js +// include: /tmp/tmp7emfte1w.js if (!Module['preRun']) throw 'Module.preRun should exist because file support used it; did a pre-js delete it?'; necessaryPreJSTasks.forEach((task) => { if (Module['preRun'].indexOf(task) < 0) throw 'All preRun tasks that exist before user pre-js code should remain after; did you replace Module or modify Module.preRun?'; }); - // end include: /tmp/tmpdd5eooui.js + // end include: /tmp/tmp7emfte1w.js // Sometimes an existing Module object exists with properties diff --git a/projects/uManager/source/ul/man/ui/ui_MainMenuLayout.cpp b/projects/uManager/source/ul/man/ui/ui_MainMenuLayout.cpp index a8ab3a3..7ef8f8a 100644 --- a/projects/uManager/source/ul/man/ui/ui_MainMenuLayout.cpp +++ b/projects/uManager/source/ul/man/ui/ui_MainMenuLayout.cpp @@ -170,7 +170,7 @@ namespace ul::man::ui { } const auto last_ver = Version::FromString(last_id); - const auto cur_ver = Version::FromString("0.3.1"); + const auto cur_ver = Version::FromString(UL_VERSION); if(last_ver.IsEqual(cur_ver)) { g_MainApplication->CreateShowDialog(GetLanguageString("update_title"), GetLanguageString("update_equal"), { GetLanguageString("ok") }, true); } diff --git a/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp b/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp index e04c999..6cfef35 100644 --- a/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp +++ b/projects/uMenu/source/ul/menu/ui/ui_ThemesMenuLayout.cpp @@ -99,7 +99,8 @@ namespace ul::menu::ui { } else { std::string theme_conf_msg = selected_theme.manifest.name + "\n"; - theme_conf_msg += selected_theme.manifest.release + ", " + selected_theme.manifest.author + "\n\n"; + theme_conf_msg += selected_theme.manifest.description + "\n"; + theme_conf_msg += "(" + selected_theme.manifest.release + ", " + selected_theme.manifest.author + ")\n\n"; theme_conf_msg += GetLanguageString("theme_set_conf"); const auto option = g_MenuApplication->DisplayDialog(selected_theme.manifest.name, theme_conf_msg, { GetLanguageString("yes"), GetLanguageString("cancel") }, true, this->loaded_theme_icons.at(idx));