From 1d66a763c989fd953f6ff876adff9ea7d56f0df2 Mon Sep 17 00:00:00 2001 From: TheFloW Date: Fri, 9 Sep 2016 19:50:19 +0200 Subject: [PATCH] Update v1.00 --- Makefile | 2 +- README.md | 11 +++++++++++ main.c | 4 ++-- main.h | 4 ++-- pkg/sce_sys/livearea/contents/template.xml | 2 +- resources/colors.txt | 2 ++ text.c | 8 ++++---- theme.c | 4 ++++ theme.h | 2 ++ 9 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d8b7844f..1ed2d05b 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ ASFLAGS = $(CFLAGS) all: $(TARGET).vpk %.vpk: eboot.bin - vita-mksfoex -d PARENTAL_LEVEL=1 -s APP_VER=00.91 -s TITLE_ID=$(TITLE_ID) "$(TARGET)" param.sfo + vita-mksfoex -d PARENTAL_LEVEL=1 -s APP_VER=01.00 -s TITLE_ID=$(TITLE_ID) "$(TARGET)" param.sfo vita-pack-vpk -s param.sfo -b eboot.bin \ --add pkg/sce_sys/icon0.png=sce_sys/icon0.png \ --add pkg/sce_sys/livearea/contents/bg.png=sce_sys/livearea/contents/bg.png \ diff --git a/README.md b/README.md index 07332458..6d253a82 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,17 @@ https://github.com/xy2iii/vitashell-themes Be sure you pull request your customized design or language file there. +### Changelog 1.00 ### +- Added ability to install update files as .vpk (for Vitamin). +- Added patch to make .vpk installation appearing as full version instead of test version. +- Added text editor by BigBoot (WIP). +- Added 'More' entry to the context menu. +- Added 'Install all' feature to install all packages available in the folder (by ribbid987). +- Added 'Calculate SHA1' feature by xerpia64. +- Added support for ftp promoting for https://github.com/soywiz/vitaorganizer. +- Fixed 'Move' operation. Now it does integrate into folders and replace files. +- Dropped GENERAL_COLOR, now all colors are adjustable. + ### Changelog 0.91 ### - Added automatic network update. VitaShell will now notify you when there's a new update. You'll then be able to download it within the VitaShell application and it will update both diff --git a/main.c b/main.c index 11128282..9ece49d3 100644 --- a/main.c +++ b/main.c @@ -1362,14 +1362,14 @@ int shellMain() { break; case FILE_TYPE_SFO: - // color = SFO_COLOR; + color = SFO_COLOR; icon = sfo_icon; break; case FILE_TYPE_INI: case FILE_TYPE_TXT: case FILE_TYPE_XML: - // color = TXT_COLOR; + color = TXT_COLOR; icon = text_icon; break; diff --git a/main.h b/main.h index c4e07d81..7d8e930a 100644 --- a/main.h +++ b/main.h @@ -64,8 +64,8 @@ #define ENABLE_FILE_LOGGING 1 // VitaShell version major.minor -#define VITASHELL_VERSION_MAJOR 0x0 -#define VITASHELL_VERSION_MINOR 0x91 +#define VITASHELL_VERSION_MAJOR 0x1 +#define VITASHELL_VERSION_MINOR 0x00 #define VITASHELL_VERSION ((VITASHELL_VERSION_MAJOR << 0x18) | (VITASHELL_VERSION_MINOR << 0x10)) diff --git a/pkg/sce_sys/livearea/contents/template.xml b/pkg/sce_sys/livearea/contents/template.xml index 8ddb49f8..9bd1b5e2 100644 --- a/pkg/sce_sys/livearea/contents/template.xml +++ b/pkg/sce_sys/livearea/contents/template.xml @@ -28,7 +28,7 @@ - v0.91 + v1.00 diff --git a/resources/colors.txt b/resources/colors.txt index eaba7678..9e1fdc51 100644 --- a/resources/colors.txt +++ b/resources/colors.txt @@ -9,6 +9,8 @@ DATE_TIME_COLOR = 0xFFFFFFFF # White # File browser colors FOCUS_COLOR = 0xFF00FF00 # Green FILE_COLOR = 0xFFFFFFFF # White +SFO_COLOR = 0xFFFFFFFF # White +TXT_COLOR = 0xFFFFFFFF # White FOLDER_COLOR = 0xFFFFFF00 # Cyan IMAGE_COLOR = 0xFF7F00FF # Rose ARCHIVE_COLOR = 0xFF007FFF # Orange diff --git a/text.c b/text.c index 19d124e0..b3646f51 100644 --- a/text.c +++ b/text.c @@ -422,7 +422,7 @@ int textViewer(char *file) { } - if (hold_buttons & SCE_CTRL_SELECT) { + if (pressed_buttons & SCE_CTRL_SELECT) { initImeDialog(language_container[ENTER_SEARCH_TERM], "", MAX_LINE_CHARACTERS, SCE_IME_TYPE_DEFAULT, 0); search_term_input = 1; @@ -463,7 +463,7 @@ int textViewer(char *file) { // buffer modifying actions if (modify_allowed && !search_running) { - if(!edit_line && hold_buttons & SCE_CTRL_ENTER) { + if(!edit_line && pressed_buttons & SCE_CTRL_ENTER) { int line_start = offset_list[base_pos + rel_pos]; char line[MAX_LINE_CHARACTERS]; @@ -520,7 +520,7 @@ int textViewer(char *file) { } // Cut line - if (hold_buttons & SCE_CTRL_LEFT && copy_current_size < MAX_COPY_BUFFER_SIZE) { + if (pressed_buttons & SCE_CTRL_LEFT && copy_current_size < MAX_COPY_BUFFER_SIZE) { if (copy_reset) { copy_reset = 0; copy_current_size = 0; @@ -574,7 +574,7 @@ int textViewer(char *file) { } // Paste lines - if (hold_buttons & SCE_CTRL_RIGHT && copy_current_size > 0) { + if (pressed_buttons & SCE_CTRL_RIGHT && copy_current_size > 0) { int line_start = offset_list[base_pos + rel_pos]; // calculated size of pasted content diff --git a/theme.c b/theme.c index c0da6f84..2c6ef264 100644 --- a/theme.c +++ b/theme.c @@ -47,6 +47,8 @@ int DATE_TIME_COLOR; // File browser colors int FOCUS_COLOR; int FILE_COLOR; +int SFO_COLOR; +int TXT_COLOR; int FOLDER_COLOR; int IMAGE_COLOR; int ARCHIVE_COLOR; @@ -105,6 +107,8 @@ void loadTheme() { // File browser colors COLOR_ENTRY(FOCUS_COLOR), COLOR_ENTRY(FILE_COLOR), + COLOR_ENTRY(SFO_COLOR), + COLOR_ENTRY(TXT_COLOR), COLOR_ENTRY(FOLDER_COLOR), COLOR_ENTRY(IMAGE_COLOR), COLOR_ENTRY(ARCHIVE_COLOR), diff --git a/theme.h b/theme.h index 7ba04351..ebb678da 100644 --- a/theme.h +++ b/theme.h @@ -30,6 +30,8 @@ extern int DATE_TIME_COLOR; // File browser colors extern int FOCUS_COLOR; extern int FILE_COLOR; +extern int SFO_COLOR; +extern int TXT_COLOR; extern int FOLDER_COLOR; extern int IMAGE_COLOR; extern int ARCHIVE_COLOR;