From 3152d4efd5bf07dca1dc61bf286da3e5638cd965 Mon Sep 17 00:00:00 2001 From: penfold42 Date: Tue, 7 Aug 2018 18:57:21 +1000 Subject: [PATCH] Browser: can a directory - all d64 in it are loaded into caddy --- src/FileBrowser.cpp | 25 +++++++++++++++++++++++++ src/FileBrowser.h | 1 + 2 files changed, 26 insertions(+) diff --git a/src/FileBrowser.cpp b/src/FileBrowser.cpp index ad47611..7951537 100644 --- a/src/FileBrowser.cpp +++ b/src/FileBrowser.cpp @@ -868,6 +868,31 @@ bool FileBrowser::FillCaddyWithSelections() } bool FileBrowser::AddToCaddy(FileBrowser::BrowsableList::Entry* current) +{ + if (!current) return false; + + else if (!(current->filImage.fattrib & AM_DIR) && DiskImage::IsDiskImageExtention(current->filImage.fname)) + { + return AddImageToCaddy(current); + } + else if (current->filImage.fattrib & AM_DIR) + { + bool ret = false; + f_chdir(current->filImage.fname); + RefreshFolderEntries(); + RefeshDisplay(); + + for (unsigned i = 0; i < folder.entries.size(); ++i) + ret |= AddImageToCaddy(&folder.entries[i]); + + RefeshDisplay(); + return ret; + } + return false; + +} + +bool FileBrowser::AddImageToCaddy(FileBrowser::BrowsableList::Entry* current) { bool added = false; diff --git a/src/FileBrowser.h b/src/FileBrowser.h index d6de6cc..f7e9c90 100644 --- a/src/FileBrowser.h +++ b/src/FileBrowser.h @@ -211,6 +211,7 @@ private: bool FillCaddyWithSelections(); bool AddToCaddy(FileBrowser::BrowsableList::Entry* current); + bool AddImageToCaddy(FileBrowser::BrowsableList::Entry* current); bool CheckForPNG(const char* filename, FILINFO& filIcon); void DisplayPNG();