rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide writing actions when drive is read-only (#134)

Browse Source
This commit is contained in:
Pk11 2022-01-03 01:39:17 -06:00 committed by GitHub
parent cbb223a421
commit 574e5b26a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/source/driveMenu.cpp
View File

@ -160,7 +160,7 @@ void dm_drawBottomScreen(void) {
} else {
font->print(0, row--, false, flashcardMounted ? STR_UNMOUNT_FLASHCARD : STR_REMOUNT_FLASHCARD);
}
if (sdMounted || flashcardMounted) {
if ((sdMounted && driveWritable(Drive::sdCard)) || (flashcardMounted && driveWritable(Drive::flashcard))) {
font->print(0, row--, false, STR_SCREENSHOTTEXT);
}

3
arm9/source/fileOperations.h
View File

@ -11,9 +11,8 @@ struct ClipboardFile {
std::string name;
bool folder;
Drive drive;
bool nitro;
ClipboardFile(std::string path, std::string name, bool folder, Drive drive, bool nitro) : path(std::move(path)), name(std::move(name)), folder(folder), drive(drive), nitro(nitro) {}
ClipboardFile(std::string path, std::string name, bool folder, Drive drive) : path(std::move(path)), name(std::move(name)), folder(folder), drive(drive) {}
};
extern std::vector<ClipboardFile> clipboard;

26
arm9/source/file_browse.cpp
View File

@ -480,7 +480,7 @@ bool fileBrowse_paste(char dest[256]) {
int row = OPTIONS_ENTRIES_START_ROW, maxCursors = 0;
font->print(3, row++, false, STR_COPY_FILES);
for (auto &file : clipboard) {
if (file.nitro)
if (!driveWritable(file.drive))
continue;
maxCursors++;
font->print(3, row++, false, STR_MOVE_FILES);
@ -522,7 +522,7 @@ bool fileBrowse_paste(char dest[256]) {
if (file.path == destPath)
continue; // If the source and destination for the clipped file is the same skip it
if (optionOffset && !file.nitro ) { // Don't remove if from nitro
if (optionOffset && driveWritable(file.drive)) { // Don't remove if from read-only drive
if (currentDrive == file.drive) {
rename(file.path.c_str(), destPath.c_str());
} else {
@ -581,13 +581,17 @@ void fileBrowse_drawBottomScreen(DirEntry* entry) {
}
font->print(0, row--, false, STR_START_START_MENU);
font->print(0, row--, false, clipboardOn ? STR_CLEAR_CLIPBOARD : STR_RESTORE_CLIPBOARD);
if (sdMounted || flashcardMounted) {
if ((sdMounted && driveWritable(Drive::sdCard)) || (flashcardMounted && driveWritable(Drive::flashcard))) {
font->print(0, row--, false, STR_SCREENSHOTTEXT);
}
font->print(0, row--, false, STR_DIRECTORY_OPTIONS);
font->print(0, row--, false, clipboardOn ? STR_PASTE_FILES_CREATE_ENTRY : STR_COPY_FILES_CREATE_ENTRY);
if(driveWritable(currentDrive))
font->print(0, row--, false, clipboardOn ? STR_PASTE_FILES_CREATE_ENTRY : STR_COPY_FILES_CREATE_ENTRY);
else if(!clipboardOn)
font->print(0, row--, false, STR_COPY_FILE);
font->print(0, row--, false, entry->selected ? STR_DESELECT_FILES : STR_SELECT_FILES);
font->print(0, row--, false, STR_DELETE_RENAME_FILE);
if(driveWritable(currentDrive))
font->print(0, row--, false, STR_DELETE_RENAME_FILE);
font->print(0, row--, false, titleName);
// Load size if not loaded yet
@ -756,7 +760,7 @@ std::string browseForFile (void) {
}
// Rename file/folder
if ((held & KEY_R) && (pressed & KEY_X) && (entry->name != ".." && strncmp(path, "nitro:/", 7) != 0)) {
if ((held & KEY_R) && (pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) {
// Clear time
font->print(-1, 0, true, " ", Alignment::right, Palette::blackGreen);
font->update(true);
@ -788,7 +792,7 @@ std::string browseForFile (void) {
}
// Delete action
if ((pressed & KEY_X) && (entry->name != ".." && strncmp(path, "nitro:/", 7) != 0)) {
if ((pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) {
font->clear(false);
int selections = std::count_if(dirContents.begin(), dirContents.end(), [](const DirEntry &x){ return x.selected; });
if (entry->selected && selections > 1) {
@ -875,7 +879,7 @@ std::string browseForFile (void) {
}
// Create new folder
if ((held & KEY_R) && (pressed & KEY_Y) && (strncmp(path, "nitro:/", 7) != 0)) {
if ((held & KEY_R) && (pressed & KEY_Y) && driveWritable(currentDrive)) {
// Clear time
font->print(-1, 0, true, " ", Alignment::right, Palette::blackGreen);
font->update(true);
@ -978,16 +982,16 @@ std::string browseForFile (void) {
if (entry->selected) {
for (auto &item : dirContents) {
if(item.selected) {
clipboard.emplace_back(path + item.name, item.name, item.isDirectory, currentDrive, !strncmp(path, "nitro:/", 7));
clipboard.emplace_back(path + item.name, item.name, item.isDirectory, currentDrive);
item.selected = false;
}
}
} else {
clipboard.emplace_back(path + entry->name, entry->name, entry->isDirectory, currentDrive, !strncmp(path, "nitro:/", 7));
clipboard.emplace_back(path + entry->name, entry->name, entry->isDirectory, currentDrive);
}
}
// Paste
} else if (strncmp(path, "nitro:/", 7) != 0 && fileBrowse_paste(path)) {
} else if (driveWritable(currentDrive) && fileBrowse_paste(path)) {
getDirectoryContents (dirContents);
}
}

1
arm9/source/language.inl
View File

@ -73,6 +73,7 @@ STRING(SCREENSHOTTEXT, "\\R+\\L - Make a screenshot")
STRING(CLEAR_CLIPBOARD, "SELECT - Clear clipboard")
STRING(RESTORE_CLIPBOARD, "SELECT - Restore clipboard")
STRING(DIRECTORY_OPTIONS, "\\R+\\A - Directory options")
STRING(COPY_FILE, "\\Y - COPY file")
STRING(COPY_FILES_CREATE_ENTRY, "\\Y - COPY file/[+\\R] CREATE entry")
STRING(PASTE_FILES_CREATE_ENTRY, "\\Y - PASTE file/[+\\R] CREATE entry")
STRING(SELECT_FILES, "\\L - SELECT files (with \\D)")

15
arm9/source/screenshot.cpp
View File

@ -92,20 +92,21 @@ bool screenshotbmp(const char* filename) {
}
bool screenshot(void) {
if (!(sdMounted || flashcardMounted))
if (!((sdMounted && driveWritable(Drive::sdCard)) || (flashcardMounted && driveWritable(Drive::flashcard))))
return false;
if (access((sdMounted ? "sd:/gm9i" : "fat:/gm9i"), F_OK) != 0) {
mkdir((sdMounted ? "sd:/gm9i" : "fat:/gm9i"), 0777);
bool sdWritable = sdMounted && driveWritable(Drive::sdCard);
if (access((sdWritable ? "sd:/gm9i" : "fat:/gm9i"), F_OK) != 0) {
mkdir((sdWritable ? "sd:/gm9i" : "fat:/gm9i"), 0777);
}
if (access((sdMounted ? "sd:/gm9i/out" : "fat:/gm9i/out"), F_OK) != 0) {
mkdir((sdMounted ? "sd:/gm9i/out" : "fat:/gm9i/out"), 0777);
if (access((sdWritable ? "sd:/gm9i/out" : "fat:/gm9i/out"), F_OK) != 0) {
mkdir((sdWritable ? "sd:/gm9i/out" : "fat:/gm9i/out"), 0777);
}
std::string fileTimeText = RetTime("%H%M%S");
char snapPath[40];
// Take top screenshot
snprintf(snapPath, sizeof(snapPath), "%s:/gm9i/out/snap_%s_top.bmp", (sdMounted ? "sd" : "fat"), fileTimeText.c_str());
snprintf(snapPath, sizeof(snapPath), "%s:/gm9i/out/snap_%s_top.bmp", (sdWritable ? "sd" : "fat"), fileTimeText.c_str());
if(!screenshotbmp(snapPath))
return false;
@ -116,7 +117,7 @@ bool screenshot(void) {
lcdMainOnBottom();
// Take bottom screenshot
snprintf(snapPath, sizeof(snapPath), "%s:/gm9i/out/snap_%s_bot.bmp", (sdMounted ? "sd" : "fat"), fileTimeText.c_str());
snprintf(snapPath, sizeof(snapPath), "%s:/gm9i/out/snap_%s_bot.bmp", (sdWritable ? "sd" : "fat"), fileTimeText.c_str());
if(!screenshotbmp(snapPath))
return false;

1
nitrofiles/languages/en-US/language.ini
View File

@ -70,6 +70,7 @@ SCREENSHOTTEXT=\R+\L - Make a screenshot
CLEAR_CLIPBOARD=SELECT - Clear clipboard
RESTORE_CLIPBOARD=SELECT - Restore clipboard
DIRECTORY_OPTIONS=\R+\A - Directory options
COPY_FILE=\Y - COPY file
COPY_FILES_CREATE_ENTRY=\Y - COPY file/[+\R] CREATE entry
PASTE_FILES_CREATE_ENTRY=\Y - PASTE file/[+\R] CREATE entry
SELECT_FILES=\L - SELECT files (with \D)