From 260c6a76f77b9877525c58851b1047a913ab1091 Mon Sep 17 00:00:00 2001 From: TheFloW Date: Sat, 30 Dec 2017 11:43:37 +0100 Subject: [PATCH] Improved position correction code --- CMakeLists.txt | 2 +- archive.c | 2 +- archive.h | 2 +- audio/lrcparse.c | 2 +- audio/lrcparse.h | 2 +- audio/player.c | 2 +- audio/player.h | 2 +- audioplayer.c | 2 +- audioplayer.h | 2 +- config.c | 2 +- config.h | 2 +- context_menu.c | 2 +- context_menu.h | 2 +- coredump.c | 2 +- coredump.h | 2 +- elf.c | 2 +- file.c | 8 +- file.h | 2 +- hex.c | 2 +- hex.h | 2 +- ime_dialog.c | 4 +- ime_dialog.h | 2 +- init.c | 2 +- init.h | 2 +- io_process.c | 2 +- io_process.h | 2 +- language.c | 2 +- language.h | 2 +- main.c | 111 ++++++++------------- main.h | 4 +- main_context.c | 2 +- main_context.h | 2 +- makezip.c | 2 +- makezip.h | 2 +- message_dialog.c | 2 +- message_dialog.h | 2 +- modules/kernel/main.c | 2 +- modules/kernel/vitashell_kernel.h | 2 +- modules/patch/main.c | 2 +- modules/usbdevice/main.c | 2 +- modules/user/main.c | 2 +- modules/user/vitashell_user.h | 2 +- network_download.c | 2 +- network_download.h | 2 +- network_update.c | 2 +- network_update.h | 2 +- package_installer.c | 2 +- package_installer.h | 2 +- photo.c | 2 +- photo.h | 2 +- pkg/sce_sys/livearea/contents/template.xml | 2 +- property_dialog.c | 2 +- property_dialog.h | 2 +- qr.c | 2 +- qr.h | 2 +- refresh.c | 2 +- refresh.h | 2 +- settings.c | 2 +- settings.h | 2 +- sfo.c | 2 +- sfo.h | 2 +- text.c | 2 +- text.h | 2 +- theme.c | 2 +- theme.h | 2 +- uncommon_dialog.c | 2 +- uncommon_dialog.h | 2 +- updater/main.c | 2 +- usb.c | 2 +- usb.h | 2 +- utils.c | 2 +- utils.h | 2 +- vitashell_config.h | 2 +- 73 files changed, 121 insertions(+), 144 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b69b246..f4cd91c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(VitaShell) include("${VITASDK}/share/vita.cmake" REQUIRED) set(VITA_APP_NAME "VitaShell") set(VITA_TITLEID "VITASHELL") -set(VITA_VERSION "01.76") +set(VITA_VERSION "01.77") # Flags and includes set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-format-truncation -fno-lto") diff --git a/archive.c b/archive.c index 1cc2670..b433271 100644 --- a/archive.c +++ b/archive.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/archive.h b/archive.h index 3c888ec..b8d010a 100644 --- a/archive.h +++ b/archive.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audio/lrcparse.c b/audio/lrcparse.c index 161c110..7ae0141 100644 --- a/audio/lrcparse.c +++ b/audio/lrcparse.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audio/lrcparse.h b/audio/lrcparse.h index 6f30cec..3e2023a 100644 --- a/audio/lrcparse.h +++ b/audio/lrcparse.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audio/player.c b/audio/player.c index 8f44da2..a1b3c7d 100644 --- a/audio/player.c +++ b/audio/player.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audio/player.h b/audio/player.h index 4b59e0d..b5214b3 100644 --- a/audio/player.h +++ b/audio/player.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audioplayer.c b/audioplayer.c index fcf20c1..6abed02 100644 --- a/audioplayer.c +++ b/audioplayer.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/audioplayer.h b/audioplayer.h index a3f4b60..c75e8f4 100644 --- a/audioplayer.h +++ b/audioplayer.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/config.c b/config.c index 0c24394..621f611 100644 --- a/config.c +++ b/config.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/config.h b/config.h index 1ecf3c2..3ccf3be 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/context_menu.c b/context_menu.c index 82c3769..c11d1bd 100644 --- a/context_menu.c +++ b/context_menu.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/context_menu.h b/context_menu.h index 9a3b5f7..e39c942 100644 --- a/context_menu.h +++ b/context_menu.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/coredump.c b/coredump.c index 4c774c7..c20c80f 100644 --- a/coredump.c +++ b/coredump.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/coredump.h b/coredump.h index 8dfd1a8..644a6bc 100644 --- a/coredump.h +++ b/coredump.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/elf.c b/elf.c index 4e0bb6b..3aa9055 100644 --- a/elf.c +++ b/elf.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/file.c b/file.c index d1b3156..991840f 100644 --- a/file.c +++ b/file.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -670,7 +670,7 @@ FileListEntry *fileListGetNthEntry(FileList *list, int n) { int fileListGetNumberByName(FileList *list, const char *name) { if (!list) - return 0; + return -1; FileListEntry *entry = list->head; @@ -680,13 +680,13 @@ int fileListGetNumberByName(FileList *list, const char *name) { while (entry) { if (entry->name_length == name_length && strcasecmp(entry->name, name) == 0) - break; + return n; n++; entry = entry->next; } - return n; + return -1; } void fileListAddEntry(FileList *list, FileListEntry *entry, int sort) { diff --git a/file.h b/file.h index d3ab0bd..049b76a 100644 --- a/file.h +++ b/file.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/hex.c b/hex.c index e55fc2e..de32193 100644 --- a/hex.c +++ b/hex.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/hex.h b/hex.h index 5275986..35a2e7c 100644 --- a/hex.h +++ b/hex.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ime_dialog.c b/ime_dialog.c index a269b70..85df013 100644 --- a/ime_dialog.c +++ b/ime_dialog.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ static void utf8_to_utf16(const uint8_t *src, uint16_t *dst) { int i; for (i = 0; src[i];) { if ((src[i] & 0xE0) == 0xE0) { - *(dst++) = ((src[i] & 0x0F) << 12) | ((src[i + 1] & 0x3F) << 6) | (src[i+2] & 0x3F); + *(dst++) = ((src[i] & 0x0F) << 12) | ((src[i + 1] & 0x3F) << 6) | (src[i + 2] & 0x3F); i += 3; } else if ((src[i] & 0xC0) == 0xC0) { *(dst++) = ((src[i] & 0x1F) << 6) | (src[i + 1] & 0x3F); diff --git a/ime_dialog.h b/ime_dialog.h index d15c985..e3d2227 100644 --- a/ime_dialog.h +++ b/ime_dialog.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/init.c b/init.c index 0d3b9bc..af973d7 100644 --- a/init.c +++ b/init.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/init.h b/init.h index e6de127..79b1159 100644 --- a/init.h +++ b/init.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/io_process.c b/io_process.c index a802651..9c2a1d8 100644 --- a/io_process.c +++ b/io_process.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/io_process.h b/io_process.h index 73f9c90..0e19278 100644 --- a/io_process.h +++ b/io_process.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/language.c b/language.c index 250936f..250f8f2 100644 --- a/language.c +++ b/language.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/language.h b/language.h index 32bd7a6..253033c 100644 --- a/language.h +++ b/language.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/main.c b/main.c index 9b4e222..38c44e4 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,8 +63,8 @@ static char focus_name[MAX_NAME_LENGTH], compress_name[MAX_NAME_LENGTH]; // Position int base_pos = 0, rel_pos = 0; -static uint8_t base_pos_list[MAX_DIR_LEVELS]; -static uint8_t rel_pos_list[MAX_DIR_LEVELS]; +static int base_pos_list[MAX_DIR_LEVELS]; +static int rel_pos_list[MAX_DIR_LEVELS]; static int dir_level = 0; // Modes @@ -99,7 +99,7 @@ int use_custom_config = 1; int getDialogStep() { sceKernelLockLwMutex(&dialog_mutex, 1, NULL); - int step = dialog_step; + volatile int step = dialog_step; sceKernelUnlockLwMutex(&dialog_mutex, 1); return step; } @@ -111,8 +111,8 @@ void setDialogStep(int step) { } void dirLevelUp() { - base_pos_list[dir_level] = (uint8_t)base_pos; - rel_pos_list[dir_level] = (uint8_t)rel_pos; + base_pos_list[dir_level] = base_pos; + rel_pos_list[dir_level] = rel_pos; dir_level++; base_pos_list[dir_level] = 0; rel_pos_list[dir_level] = 0; @@ -144,8 +144,8 @@ void dirUpCloseArchive() { static void dirUp() { if (pfs_mounted_path[0] && - strcmp(file_list.path, pfs_mounted_path) == 0 && // we're about to leave the pfs path - !strstr(copy_list.path, pfs_mounted_path)) { // nothing has been copied from pfs path + strcmp(file_list.path, pfs_mounted_path) == 0 && // we're about to leave the pfs path + !strstr(copy_list.path, pfs_mounted_path)) { // nothing has been copied from pfs path // Then umount gameDataUmount(); } @@ -181,30 +181,17 @@ DIR_UP_RETURN: static void setFocusOnFilename(const char *name) { int name_pos = fileListGetNumberByName(&file_list, name); - if (name_pos < file_list.length) { - while (1) { - int index = base_pos + rel_pos; - if (index == name_pos) - break; - - if (index > name_pos) { - if (rel_pos > 0) { - rel_pos--; - } else if (base_pos > 0) { - base_pos--; - } - } - - if (index < name_pos) { - if ((rel_pos + 1) < file_list.length) { - if ((rel_pos + 1) < MAX_POSITION) { - rel_pos++; - } else if ((base_pos + rel_pos + 1) < file_list.length) { - base_pos++; - } - } - } - } + if (name_pos < 0 || name_pos >= file_list.length) + return; + + if (name_pos >= base_pos && name_pos < (base_pos + MAX_POSITION)) { + rel_pos = name_pos - base_pos; + } else if (name_pos < base_pos) { + base_pos = name_pos; + rel_pos = 0; + } else if (name_pos >= (base_pos + MAX_POSITION)) { + rel_pos = MAX_POSITION - 1; + base_pos = name_pos - rel_pos; } } @@ -223,20 +210,20 @@ int refreshFileList() { } while (res < 0); // Position correction - if ((base_pos + rel_pos) >= file_list.length) { - if (file_list.length >= MAX_POSITION) { - base_pos = file_list.length - MAX_POSITION; + if (file_list.length >= MAX_POSITION) { + if ((base_pos + rel_pos) >= file_list.length) { rel_pos = MAX_POSITION - 1; - } else { - base_pos = 0; + } + + if ((base_pos + MAX_POSITION - 1) >= file_list.length) { + base_pos = file_list.length - MAX_POSITION; + } + } else { + if ((base_pos + rel_pos) >= file_list.length) { rel_pos = file_list.length - 1; } - } - - if ((base_pos + MAX_POSITION - 1) >= file_list.length) { - if (file_list.length >= MAX_POSITION) { - base_pos = file_list.length - MAX_POSITION; - } + + base_pos = 0; } return ret; @@ -581,19 +568,10 @@ static int dialogSteps() { if (fileListFindEntry(&mark_list, file_entry->name)) { fileListEmpty(&mark_list); } - - // The name of the newly created zip - char *name = (char *)getImeDialogInputTextUTF8(); - - // Mark that entry - FileListEntry *mark_entry = malloc(sizeof(FileListEntry)); - strcpy(mark_entry->name, name); - mark_entry->name_length = strlen(name); - fileListAddEntry(&mark_list, mark_entry, SORT_NONE); - + // Focus - strcpy(focus_name, name); - + strcpy(focus_name, compress_name); + refresh = REFRESH_MODE_SETFOCUS; setDialogStep(DIALOG_STEP_NONE); } @@ -608,10 +586,10 @@ static int dialogSteps() { if (msg_result == MESSAGE_DIALOG_RESULT_NONE || msg_result == MESSAGE_DIALOG_RESULT_FINISHED) { // Empty mark list fileListEmpty(&mark_list); - + // Copy copy list to mark list FileListEntry *copy_entry = copy_list.head; - + int i; for (i = 0; i < copy_list.length; i++) { FileListEntry *mark_entry = malloc(sizeof(FileListEntry)); @@ -621,7 +599,7 @@ static int dialogSteps() { // Next copy_entry = copy_entry->next; } - + // Focus strcpy(focus_name, copy_list.head->name); @@ -919,7 +897,11 @@ static int dialogSteps() { if (res < 0) { errorDialog(res); } else { - refresh = REFRESH_MODE_NORMAL; + // Focus + strcpy(focus_name, name); + addEndSlash(focus_name); + + refresh = REFRESH_MODE_SETFOCUS; setDialogStep(DIALOG_STEP_NONE); } } @@ -1311,9 +1293,7 @@ static int fileBrowserMenuCtrl() { setDialogStep(DIALOG_STEP_QR); } - // Move - int moved = 0; - + // Move if (hold_buttons & SCE_CTRL_UP || hold2_buttons & SCE_CTRL_LEFT_ANALOG_UP) { int old_pos = base_pos + rel_pos; @@ -1324,7 +1304,6 @@ static int fileBrowserMenuCtrl() { } if (old_pos != base_pos + rel_pos) { - moved = 1; scroll_count = 0; } } else if (hold_buttons & SCE_CTRL_DOWN || hold2_buttons & SCE_CTRL_LEFT_ANALOG_DOWN) { @@ -1339,7 +1318,6 @@ static int fileBrowserMenuCtrl() { } if (old_pos != base_pos + rel_pos) { - moved = 1; scroll_count = 0; } } @@ -1362,8 +1340,7 @@ static int fileBrowserMenuCtrl() { // Not at 'home' if (dir_level > 0) { // Mark entry - if (pressed_buttons & SCE_CTRL_SQUARE || - (moved && (current_buttons & SCE_CTRL_SQUARE))) { + if (pressed_buttons & SCE_CTRL_SQUARE) { FileListEntry *file_entry = fileListGetNthEntry(&file_list, base_pos + rel_pos); if (file_entry && strcmp(file_entry->name, DIR_UP) != 0) { if (!fileListFindEntry(&mark_list, file_entry->name)) { @@ -1422,7 +1399,7 @@ static int fileBrowserMenuCtrl() { int type = handleFile(cur_file, file_entry); // Archive mode - if ((type == FILE_TYPE_ZIP) || (type == FILE_TYPE_RAR)) { + if (type == FILE_TYPE_ZIP || type == FILE_TYPE_RAR) { is_in_archive = 1; archive_type = type; dir_level_archive = dir_level; diff --git a/main.h b/main.h index cf8b4cd..f18efa5 100644 --- a/main.h +++ b/main.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -83,7 +83,7 @@ // VitaShell version major.minor #define VITASHELL_VERSION_MAJOR 0x01 -#define VITASHELL_VERSION_MINOR 0x76 +#define VITASHELL_VERSION_MINOR 0x77 #define VITASHELL_VERSION ((VITASHELL_VERSION_MAJOR << 0x18) | (VITASHELL_VERSION_MINOR << 0x10)) diff --git a/main_context.c b/main_context.c index 7cbcb5f..c20c0a7 100644 --- a/main_context.c +++ b/main_context.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/main_context.h b/main_context.h index d57b9c7..dfa188b 100644 --- a/main_context.h +++ b/main_context.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/makezip.c b/makezip.c index 39304b1..e533fa4 100644 --- a/makezip.c +++ b/makezip.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/makezip.h b/makezip.h index 51f1c50..41f18aa 100644 --- a/makezip.h +++ b/makezip.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/message_dialog.c b/message_dialog.c index 65fda69..8f3faa6 100644 --- a/message_dialog.c +++ b/message_dialog.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/message_dialog.h b/message_dialog.h index afabd1c..2fe2868 100644 --- a/message_dialog.h +++ b/message_dialog.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/kernel/main.c b/modules/kernel/main.c index 5b641e4..92cc085 100644 --- a/modules/kernel/main.c +++ b/modules/kernel/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/kernel/vitashell_kernel.h b/modules/kernel/vitashell_kernel.h index a36ee54..ec6fda3 100644 --- a/modules/kernel/vitashell_kernel.h +++ b/modules/kernel/vitashell_kernel.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/patch/main.c b/modules/patch/main.c index a5cc82d..26132dd 100644 --- a/modules/patch/main.c +++ b/modules/patch/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/usbdevice/main.c b/modules/usbdevice/main.c index 909cec0..afa58d7 100644 --- a/modules/usbdevice/main.c +++ b/modules/usbdevice/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/user/main.c b/modules/user/main.c index f0b1a0e..11894b8 100644 --- a/modules/user/main.c +++ b/modules/user/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/modules/user/vitashell_user.h b/modules/user/vitashell_user.h index 7f24af4..287ec98 100644 --- a/modules/user/vitashell_user.h +++ b/modules/user/vitashell_user.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/network_download.c b/network_download.c index f1d642e..a16f13c 100644 --- a/network_download.c +++ b/network_download.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/network_download.h b/network_download.h index 470dfec..9961202 100644 --- a/network_download.h +++ b/network_download.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/network_update.c b/network_update.c index e09ad45..f1dc6f7 100644 --- a/network_update.c +++ b/network_update.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/network_update.h b/network_update.h index 7cce0f3..5b596db 100644 --- a/network_update.h +++ b/network_update.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/package_installer.c b/package_installer.c index fbf165f..fc0eb0b 100644 --- a/package_installer.c +++ b/package_installer.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/package_installer.h b/package_installer.h index ab6ae6c..4b8f3b0 100644 --- a/package_installer.h +++ b/package_installer.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/photo.c b/photo.c index 7d02be2..7540c5d 100644 --- a/photo.c +++ b/photo.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/photo.h b/photo.h index dafd3b9..34367ea 100644 --- a/photo.h +++ b/photo.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/pkg/sce_sys/livearea/contents/template.xml b/pkg/sce_sys/livearea/contents/template.xml index fad0a56..aa4b642 100644 --- a/pkg/sce_sys/livearea/contents/template.xml +++ b/pkg/sce_sys/livearea/contents/template.xml @@ -28,7 +28,7 @@ - v1.76 + v1.77 diff --git a/property_dialog.c b/property_dialog.c index 6840578..931628a 100644 --- a/property_dialog.c +++ b/property_dialog.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/property_dialog.h b/property_dialog.h index 0394ecc..ca9754d 100644 --- a/property_dialog.h +++ b/property_dialog.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qr.c b/qr.c index 2a85e3e..fb73a06 100644 --- a/qr.c +++ b/qr.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qr.h b/qr.h index fb3d2f0..fd78a22 100644 --- a/qr.h +++ b/qr.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/refresh.c b/refresh.c index bcae180..283cf84 100644 --- a/refresh.c +++ b/refresh.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW Copyright (C) 2017, VitaSmith This program is free software: you can redistribute it and/or modify diff --git a/refresh.h b/refresh.h index 634ed5e..cf9212c 100644 --- a/refresh.h +++ b/refresh.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/settings.c b/settings.c index 6b412f3..a5d4e90 100644 --- a/settings.c +++ b/settings.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/settings.h b/settings.h index a125be3..a725a3b 100644 --- a/settings.h +++ b/settings.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sfo.c b/sfo.c index 097fb6f..2d78c63 100644 --- a/sfo.c +++ b/sfo.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sfo.h b/sfo.h index 4eb34e0..b94720f 100644 --- a/sfo.h +++ b/sfo.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/text.c b/text.c index 72a75e7..68d7f66 100644 --- a/text.c +++ b/text.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/text.h b/text.h index 280e139..809822a 100644 --- a/text.h +++ b/text.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/theme.c b/theme.c index 14cdd3f..f738253 100644 --- a/theme.c +++ b/theme.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/theme.h b/theme.h index 8a3bc31..56fc890 100644 --- a/theme.h +++ b/theme.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/uncommon_dialog.c b/uncommon_dialog.c index 1a618e3..2606e0d 100644 --- a/uncommon_dialog.c +++ b/uncommon_dialog.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/uncommon_dialog.h b/uncommon_dialog.h index 2717f68..155464e 100644 --- a/uncommon_dialog.h +++ b/uncommon_dialog.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/updater/main.c b/updater/main.c index 7152a15..c0da0cd 100644 --- a/updater/main.c +++ b/updater/main.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/usb.c b/usb.c index eac84ec..3223ac7 100644 --- a/usb.c +++ b/usb.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/usb.h b/usb.h index 1109c9f..9a756bc 100644 --- a/usb.h +++ b/usb.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils.c b/utils.c index f43f46d..cd6ee34 100644 --- a/utils.c +++ b/utils.c @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils.h b/utils.h index 935a379..313b10a 100644 --- a/utils.h +++ b/utils.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/vitashell_config.h b/vitashell_config.h index f338a1f..bd4f64b 100644 --- a/vitashell_config.h +++ b/vitashell_config.h @@ -1,6 +1,6 @@ /* VitaShell - Copyright (C) 2015-2017, TheFloW + Copyright (C) 2015-2018, TheFloW This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by