From 2c5bd47647d55959869e066b76ae69dd7f625325 Mon Sep 17 00:00:00 2001 From: eshifri Date: Wed, 9 Jun 2021 18:45:34 -0700 Subject: [PATCH] formatting applied --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 98 +++++++++++----------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 4f5f11f13..290ae73aa 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -26,64 +26,66 @@ #include "io/bootloader_flash.h" #include "standalone_lua.h" -class FileNameEditWindow : public Page { +class FileNameEditWindow : public Page +{ public: - FileNameEditWindow(const std::string iName) : - Page(ICON_RADIO_SD_MANAGER), - name(std::move(iName)) - { - buildBody(&body); - buildHeader(&header); - }; + FileNameEditWindow(const std::string iName) : + Page(ICON_RADIO_SD_MANAGER), name(std::move(iName)) + { + buildBody(&body); + buildHeader(&header); + }; #if defined(DEBUG_WINDOWS) - std::string getName() const override - { - return "FileNameEditWindow"; - } + std::string getName() const override { return "FileNameEditWindow"; } #endif protected: - const std::string name; + const std::string name; - void buildHeader(Window * window) + void buildHeader(Window *window) + { + new StaticText(window, {70, 4, 180, 30}, STR_RENAME_FILE, MENU_BGCOLOR); + } + + void buildBody(Window *window) + { + GridLayout grid(window); + grid.spacer(8); + uint8_t nameLength; + uint8_t extLength; + char *ext = + (char *)getFileExtension(name.data(), 0, 0, &nameLength, &extLength); + + reusableBuffer.sdManager.ext[0] = 0; + if (ext) strncpy(reusableBuffer.sdManager.ext, ext, extLength); + + nameLength -= extLength; + if (nameLength > SD_SCREEN_FILE_LENGTH) nameLength = SD_SCREEN_FILE_LENGTH; + + strncpy(reusableBuffer.sdManager.originalName, name.c_str(), nameLength); + reusableBuffer.sdManager.originalName[nameLength] = 0; + + auto newFileName = new TextEdit(window, grid.getSlot(), + reusableBuffer.sdManager.originalName, + SD_SCREEN_FILE_LENGTH, LcdFlags(0)); { - new StaticText(window, {70, 4, 180, 30}, STR_RENAME_FILE, MENU_BGCOLOR); + char *newValue = newFileName->getData(); + size_t totalSize = + strlen(newValue); // sizeof(reusableBuffer.sdManager.changedName); + strncpy(reusableBuffer.sdManager.changedName, newValue, totalSize); + reusableBuffer.sdManager.changedName[totalSize] = 0; + if (extLength) { + strncpy(reusableBuffer.sdManager.changedName + totalSize, + reusableBuffer.sdManager.ext, + extLength); // totalSisze-strlen(newValue)); + } + reusableBuffer.sdManager.changedName[totalSize + extLength] = 0; + f_rename((const TCHAR *)name.c_str(), + reusableBuffer.sdManager.changedName); } - - void buildBody(Window * window) - { - GridLayout grid(window); - grid.spacer(8); - uint8_t nameLength; - uint8_t extLength; - char* ext = (char *)getFileExtension(name.data(), 0, 0, &nameLength, &extLength); - - reusableBuffer.sdManager.ext[0] = 0; - if(ext) - strncpy(reusableBuffer.sdManager.ext, ext, extLength); - - nameLength -= extLength; - if (nameLength > SD_SCREEN_FILE_LENGTH) nameLength = SD_SCREEN_FILE_LENGTH; - - strncpy(reusableBuffer.sdManager.originalName, name.c_str(), nameLength); - reusableBuffer.sdManager.originalName[nameLength] = 0; - - auto newFileName = new TextEdit(window, grid.getSlot(), reusableBuffer.sdManager.originalName, SD_SCREEN_FILE_LENGTH, LcdFlags(0)); - { - char* newValue = newFileName->getData(); - size_t totalSize = strlen(newValue);//sizeof(reusableBuffer.sdManager.changedName); - strncpy(reusableBuffer.sdManager.changedName, newValue, totalSize); - reusableBuffer.sdManager.changedName[totalSize] = 0; - if (extLength) { - strncpy(reusableBuffer.sdManager.changedName + totalSize, reusableBuffer.sdManager.ext, extLength);//totalSisze-strlen(newValue)); - } - reusableBuffer.sdManager.changedName[totalSize + extLength] = 0; - f_rename((const TCHAR*)name.c_str(), reusableBuffer.sdManager.changedName); - } - } + } }; - RadioSdManagerPage::RadioSdManagerPage() : PageTab(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, ICON_RADIO_SD_MANAGER) {