Change some more functions to accept the new input

This commit is contained in:
Such Meme, Many Skill
2020-05-02 14:06:56 +02:00
parent 0d98f65f99
commit 2cac144ba8
11 changed files with 26 additions and 21 deletions

View File

@@ -2,7 +2,6 @@
#include "entrymenu.h"
#include "../common/common.h"
#include "../../libs/fatfs/ff.h"
#include "../../utils/btn.h"
#include "../../gfx/gfx.h"
#include "fsutils.h"
#include "fsactions.h"
@@ -25,8 +24,8 @@ extern int launch_payload(char *path);
int delfile(const char *path, const char *filename){
gfx_clearscreen();
SWAPCOLOR(COLOR_ORANGE);
gfx_printf("Are you sure you want to delete:\n%s\n\nPress vol+/- to cancel\n", filename);
if (gfx_makewaitmenu("Press power to delete", 3)){
gfx_printf("Are you sure you want to delete:\n%s\n\nPress B to cancel\n", filename);
if (gfx_makewaitmenu("Press A to delete", 3)){
f_unlink(path);
fsreader_readfolder(currentpath);
return 0;
@@ -177,7 +176,7 @@ int filemenu(menu_entry file){
gfx_clearscreen();
extract_bis_file(fsutil_getnextloc(currentpath, file.name), currentpath);
fsreader_readfolder(currentpath);
btn_wait();
hidWait();
break;
case -1:
return -1;

View File

@@ -7,7 +7,7 @@
#include "../gfx/gfxutils.h"
#include "../utils/utils.h"
#include "../../mem/heap.h"
#include "../../utils/btn.h"
#include "../../hid/hid.h"
#include "fsutils.h"
int fsact_copy(const char *locin, const char *locout, u8 options){
@@ -71,7 +71,7 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
i = 0;
if (options & COPY_MODE_CANCEL)
if (btn_read() & BTN_VOL_DOWN){
if (hidRead()->buttons & (KEY_VOLP | KEY_VOLM)){
f_unlink(locout);
break;
}

View File

@@ -7,7 +7,6 @@
#include "../common/common.h"
#include "../../libs/fatfs/ff.h"
#include "../../utils/sprintf.h"
#include "../../utils/btn.h"
#include "../../mem/heap.h"
#include "../../storage/nx_emmc.h"
#include "../common/types.h"

View File

@@ -46,8 +46,10 @@ void createfileobjects(int size, menu_entry **menu){
}
void addobject(char* name, int spot, u8 attribs){
/*
u64 size = 0;
int sizes = 0;
*/
fsreader_files[spot].property = 0;
if (fsreader_files[spot].name != NULL){