From 8b3c200470472b5d1076eade2030fec13f500fcd Mon Sep 17 00:00:00 2001 From: XorTroll Date: Sat, 26 Oct 2019 16:21:58 +0200 Subject: [PATCH] Small changes --- .../RomFs/default/ui/USBIcon.png | Bin 692 -> 0 bytes SystemAppletQDaemon/Source/Main.cpp | 3 -- TODO.md | 2 + Themes.md | 39 +++++++++++------- 4 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 LibraryAppletQMenu/RomFs/default/ui/USBIcon.png diff --git a/LibraryAppletQMenu/RomFs/default/ui/USBIcon.png b/LibraryAppletQMenu/RomFs/default/ui/USBIcon.png deleted file mode 100644 index 0e899cad4808e381859cfcf686f76dd8464b822e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 692 zcmV;l0!#ggP)+I)Ao28O;W+%9$`y4;!o%x<* zzJz6gh=_r}f`nhbsVy?Fn>rdH(DietPTW(?8$k|d#P)&VXplX8dj){&Xd()*bk^0wxy?cI~u zCQ_}v!_SRPU+whqV_HOp=4uU%h?c9BG{-PEJMF8*W3g@PGBan;as4xrG{HTBaOzYX<62&ZQDOo@=DJm zmStT5a0`H*pPVh$8Dm#VrP3YQptMLfn>{Inr~pXFW_QS@5MriWF4y`m-9masJkOiQ z;3NPb!8xCo4XF(KghECN&iO&<%pe;1A4DQyBN7Q4kx1BxM8d}I74bZ;Gl)jIA)*c0 zjI;>n{F7`(fse8QX%QjBGuezJzYN28A{&wxaUAD009!V 0x%X", RES_QUERY(Db, InvalidPasswordLength)) - CONSOLE_OUT("RES_QUERY_DESC(Db, InvalidPasswordLength) -> '" << RES_QUERY_DESC(Db, InvalidPasswordLength) << "'") - CONSOLE_FMT("") CONSOLE_FMT("(A) -> Dump system save data to sd:/ulaunch/save_dump") CONSOLE_FMT("(B) -> Delete everything in save data (except official HOME menu's content)") CONSOLE_FMT("(X) -> Reboot system") diff --git a/TODO.md b/TODO.md index 9381377..3a28f4a 100644 --- a/TODO.md +++ b/TODO.md @@ -6,6 +6,8 @@ All the stuff to do before first release: - Settings menu -> both console ones (device name, etc) and uLaunch's ones (also TODO ^) +- "All titles" menu + - Theme menu -> browse themes in the SD card and select which one to use - Document entry system (adding custom NROs with possible custom argv to main menu) diff --git a/Themes.md b/Themes.md index 70e4d4e..b6101b6 100644 --- a/Themes.md +++ b/Themes.md @@ -1,26 +1,24 @@ # Theme system -## **IMPORTANT!** Don't use this system yet. Wait until this warning is removed (when the system is finally decided) - -> Current theme format version: none (unreleased yet) +> Current theme format version: 0 (will be first release's one, unreleased yet) Themes consist on plain directories replacing RomFs content. -- Themes are place in `sd:/ulaunch/themes` directory. +- Themes are placed in `sd:/ulaunch/themes` directory. - A valid theme must, at least, contain a `/theme` subdirectory and a `/theme/Manifest.json` within it (icon or actual modifications aren't neccessary) -Thus, a theme named `DemoTheme` should have its manifest JSON in `sd:/ulaunch/themes/DemoTheme/theme/Manifest.json`. Other assets (like UI) would go inside `sd:/ulaunch/themes/DemoTheme/ui`, `/sound`... +Thus, a theme named `DemoTheme` should have its manifest JSON in `sd:/ulaunch/themes/DemoTheme/theme/Manifest.json`. Other assets, like UI, would go inside `sd:/ulaunch/themes/DemoTheme/ui`, for instance. **Important note:** any content (sound or UI) not found in the theme will be loaded from the default config, thus there is no need to provide every file (for instance, when making UI-only or sound-only changes) -## Metadata +## Manifest -Metadata is stored inside `/theme` directory. It is required for the theme to be recognized as a valid one. +A theme's manifest is stored inside `/theme` directory. It is required for the theme to be recognized as a valid one. -- `theme/Manifest.json` -> JSON containing theme information +- `theme/Manifest.json` -> JSON containing theme manifest - Demo JSON: + Sample manifest JSON: ```json { @@ -32,11 +30,13 @@ Metadata is stored inside `/theme` directory. It is required for the theme to be } ``` + Note that the name in the manifest doesn't have to match the theme's folder's one. + Properties: - **name**: Theme name - - **format_version**: Theme format version (qlaunch updates might introduce changes to themes, thus a new format version would be out). + - **format_version**: Theme format version (new updates might introduce changes to themes, thus a new format version would be out). - **release**: Theme version string @@ -52,7 +52,7 @@ Sound consists on custom *background music* and *sound effects* via files inside - `sound/BGM.json` -> JSON file with BGM settings - Demo JSON (with default values): + Sample sound JSON (with default values): ```json { @@ -84,18 +84,29 @@ Can be customized via files in `/ui`. - `ui/UI.json` -> JSON file with UI settings - Demo JSON (with default values): + Sample UI JSON (with default values): ```json { - "suspended_final_alpha": 80 + "suspended_final_alpha": 80, + "text_color": "#e1e1e1ff", + "menu_focus_color": "#5ebcffff", + "menu_bg_color": "#0094ffff", } ``` + Note: colors are in "#RRGGBBAA" hex-RGBA format. + Properties: - **suspended_final_alpha**: Final alpha the suspended title's capture will have (0 would be to fully hide it, default is 80) + - **text_color**: Color all UI's texts will use. + + - **menu_focus_color**: Color menu's items will have when they're on focus. + + - **menu_bg_color**: All menus' bg color. + ## General - `ui/Font.ttf` -> TTF font used for all the UI. @@ -122,6 +133,6 @@ All the menu icons ({...}Icon.png) are 50x50 icons, except battery ones (Battery - `ui/TopMenu.png` -> Background of menu (1220x85 PNG) -- Icon list (50x50): ConnectionIcon, NoConnectionIcon, SettingsIcon, ThemesIcon, USBIcon +- Icons in top menu (50x50 PNGs): ConnectionIcon, NoConnectionIcon, SettingsIcon, ThemesIcon, WebIcon > *TODO: more menu icons* \ No newline at end of file