drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

[studio] Add a file explorer to NewMenu to choose where new files go
All checks were successful
Build / build (push) Successful in 4m16s
Details

Browse Source
This commit is contained in:
Gary Talent
2025-01-22 23:11:08 -06:00
parent d15a0df7da
commit 1cc1d561e2
13 changed files with 329 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/olympic/studio/applib/src/newmenu.cpp
View File

@ -12,9 +12,8 @@
namespace studio {
NewMenu::NewMenu() noexcept {
NewMenu::NewMenu(keel::Context &kctx) noexcept: m_kctx{kctx} {
setTitle("New Item");
setSize({280, 180});
}
void NewMenu::open() noexcept {
@ -23,6 +22,11 @@ void NewMenu::open() noexcept {
m_itemName = "";
m_typeName = "";
m_path = "";
m_explorer.setModel(buildFileTreeModel(
m_explorer,
[](ox::StringViewCR, ox::FileStat const&s) {
return s.fileType == ox::FileType::Directory;
}).or_value(ox::UPtr<FileTreeModel>{}));
}
void NewMenu::openPath(ox::StringParam path) noexcept {
@ -49,8 +53,8 @@ void NewMenu::draw(StudioContext &sctx) noexcept {
case Stage::NewItemType:
drawNewItemType(sctx);
break;
case Stage::NewItemName:
drawNewItemName(sctx);
case Stage::NewItemPath:
drawNewItemPath(sctx);
break;
case Stage::NewItemTemplate:
drawNewItemTemplate(sctx);
@ -79,32 +83,45 @@ void NewMenu::installItemTemplate(ox::UPtr<ItemTemplate> &tmplt) noexcept {
}
void NewMenu::drawNewItemType(StudioContext const&sctx) noexcept {
setSize({280, 180});
drawWindow(sctx.tctx, m_open, [this] {
ig::ListBox("Item Type", [&](size_t const i) -> ox::CStringView {
return m_types[i]->typeDisplayName();
}, m_types.size(), m_selectedType, {200, 100});
auto const&im = *m_types[m_selectedType];
drawFirstPageButtons(im.itemTemplates().size() == 1 ?
Stage::NewItemName : Stage::NewItemTemplate);
Stage::NewItemPath : Stage::NewItemTemplate);
if (m_stage == Stage::NewItemPath) {
if (m_path.len() == 0) {
m_path = im.defaultPath();
}
std::ignore = m_explorer.setSelectedPath(m_path);
}
});
}
void NewMenu::drawNewItemTemplate(StudioContext &sctx) noexcept {
void NewMenu::drawNewItemTemplate(StudioContext const&sctx) noexcept {
setSize({280, 180});
drawWindow(sctx.tctx, m_open, [this] {
auto const&templates =
m_types[m_selectedType]->itemTemplates();
ig::ListBox("Template", [&](size_t const i) -> ox::CStringView {
return templates[i]->name();
}, templates.size(), m_selectedTemplate, {200, 100});
drawButtons(Stage::NewItemType, Stage::NewItemName);
drawButtons(Stage::NewItemType, Stage::NewItemPath);
});
}
void NewMenu::drawNewItemName(StudioContext &sctx) noexcept {
void NewMenu::drawNewItemPath(StudioContext &sctx) noexcept {
setSize({380, 340});
drawWindow(sctx.tctx, m_open, [this, &sctx] {
if (m_selectedType < m_types.size()) {
ig::InputText("Name", m_itemName);
}
ImGui::NewLine();
ImGui::Text("Path");
auto const vp = ImGui::GetContentRegionAvail();
m_explorer.draw(sctx, {vp.x, vp.y - 50});
drawLastPageButtons(sctx);
});
}
@ -165,8 +182,10 @@ void NewMenu::finish(StudioContext &sctx) noexcept {
return;
}
auto const&im = *m_types[m_selectedType];
auto const path = m_path.len() ?
im.itemPath(m_itemName, m_path) : im.itemPath(m_itemName);
if (auto p = m_explorer.selectedPath()) {
m_path = std::move(*p);
}
auto const path = sfmt("{}/{}.{}", m_path, m_itemName, im.fileExt());
if (sctx.project->exists(path)) {
oxLogError(ox::Error{1, "New file error: file already exists"});
return;

13
src/olympic/studio/applib/src/newmenu.hpp
View File

@ -8,6 +8,7 @@
#include <ox/event/signal.hpp>
#include <ox/std/string.hpp>
#include <studio/filetreemodel.hpp>
#include <studio/itemmaker.hpp>
#include <studio/popup.hpp>
@ -19,7 +20,7 @@ class NewMenu final: public Popup {
Closed,
Opening,
NewItemType,
NewItemName,
NewItemPath,
NewItemTemplate,
};
@ -28,16 +29,18 @@ class NewMenu final: public Popup {
private:
Stage m_stage = Stage::Closed;
keel::Context &m_kctx;
ox::String m_typeName;
ox::IString<255> m_itemName;
ox::String m_path;
ox::Vector<ox::UPtr<studio::ItemMaker>> m_types;
ox::Vector<ox::UPtr<ItemMaker>> m_types;
FileExplorer m_explorer{m_kctx};
size_t m_selectedType = 0;
size_t m_selectedTemplate = 0;
bool m_open = false;
public:
NewMenu() noexcept;
NewMenu(keel::Context &kctx) noexcept;
void openPath(ox::StringParam path) noexcept;
@ -72,9 +75,9 @@ class NewMenu final: public Popup {
private:
void drawNewItemType(StudioContext const&sctx) noexcept;
void drawNewItemName(StudioContext &sctx) noexcept;
void drawNewItemPath(StudioContext &sctx) noexcept;
void drawNewItemTemplate(StudioContext &sctx) noexcept;
void drawNewItemTemplate(StudioContext const &sctx) noexcept;
void drawButtons(Stage prev, Stage next) noexcept;

49
src/olympic/studio/applib/src/projectexplorer.cpp
View File

@ -10,50 +10,12 @@
namespace studio {
static ox::Result<ox::UniquePtr<FileTreeModel>> buildProjectTreeModel(
ProjectExplorer &explorer,
ox::StringParam name,
ox::StringView path,
FileTreeModel *parent) noexcept {
auto const fs = explorer.romFs();
OX_REQUIRE(stat, fs->stat(path));
auto out = ox::make_unique<FileTreeModel>(explorer, std::move(name), parent);
if (stat.fileType == ox::FileType::Directory) {
OX_REQUIRE_M(children, fs->ls(path));
std::sort(children.begin(), children.end());
ox::Vector<ox::UniquePtr<FileTreeModel>> outChildren;
for (auto const&childName : children) {
if (childName[0] != '.') {
auto const childPath = ox::sfmt("{}/{}", path, childName);
OX_REQUIRE_M(child, buildProjectTreeModel(explorer, childName, childPath, out.get()));
outChildren.emplace_back(std::move(child));
}
}
out->setChildren(std::move(outChildren));
}
return out;
}
ProjectExplorer::ProjectExplorer(turbine::Context &ctx) noexcept: m_ctx(ctx) {
}
void ProjectExplorer::draw(StudioContext &ctx) noexcept {
auto const viewport = ImGui::GetContentRegionAvail();
ImGui::BeginChild("ProjectExplorer", ImVec2(300, viewport.y), true);
ImGui::SetNextItemOpen(true);
if (m_treeModel) {
m_treeModel->draw(ctx.tctx);
}
ImGui::EndChild();
}
void ProjectExplorer::setModel(ox::UPtr<FileTreeModel> &&model) noexcept {
m_treeModel = std::move(model);
ProjectExplorer::ProjectExplorer(keel::Context &kctx) noexcept:
FileExplorer{kctx, true} {
}
ox::Error ProjectExplorer::refreshProjectTreeModel(ox::StringViewCR) noexcept {
OX_REQUIRE_M(model, buildProjectTreeModel(*this, "Project", "/", nullptr));
OX_REQUIRE_M(model, buildFileTreeModel(*this, "Project", "/", nullptr));
setModel(std::move(model));
return {};
}
@ -62,7 +24,7 @@ void ProjectExplorer::fileOpened(ox::StringViewCR path) const noexcept {
fileChosen.emit(path);
}
void ProjectExplorer::drawFileContextMenu(ox::StringViewCR path) const noexcept {
void ProjectExplorer::fileContextMenu(ox::StringViewCR path) const noexcept {
if (ImGui::BeginPopupContextItem("FileMenu", ImGuiPopupFlags_MouseButtonRight)) {
if (ImGui::MenuItem("Delete")) {
deleteItem.emit(path);
@ -71,7 +33,7 @@ void ProjectExplorer::drawFileContextMenu(ox::StringViewCR path) const noexcept
}
}
void ProjectExplorer::drawDirContextMenu(ox::StringViewCR path) const noexcept {
void ProjectExplorer::dirContextMenu(ox::StringViewCR path) const noexcept {
if (ImGui::BeginPopupContextItem("DirMenu", ImGuiPopupFlags_MouseButtonRight)) {
if (ImGui::MenuItem("Add Item")) {
addItem.emit(path);
@ -86,5 +48,4 @@ void ProjectExplorer::drawDirContextMenu(ox::StringViewCR path) const noexcept {
}
}
}

20
src/olympic/studio/applib/src/projectexplorer.hpp
View File

@ -12,10 +12,7 @@
namespace studio {
class ProjectExplorer final: public Widget, public FileExplorer {
private:
ox::UPtr<FileTreeModel> m_treeModel;
turbine::Context &m_ctx;
class ProjectExplorer final: public FileExplorer {
public:
// slots
@ -24,25 +21,16 @@ class ProjectExplorer final: public Widget, public FileExplorer {
ox::Signal<ox::Error(ox::StringViewCR)> addDir;
ox::Signal<ox::Error(ox::StringViewCR)> deleteItem;
explicit ProjectExplorer(turbine::Context &ctx) noexcept;
void draw(StudioContext &ctx) noexcept override;
void setModel(ox::UPtr<FileTreeModel> &&model) noexcept;
explicit ProjectExplorer(keel::Context &kctx) noexcept;
ox::Error refreshProjectTreeModel(ox::StringViewCR = {}) noexcept;
[[nodiscard]]
ox::FileSystem *romFs() noexcept {
return rom(m_ctx);
}
protected:
void fileOpened(ox::StringViewCR path) const noexcept override;
void drawFileContextMenu(ox::StringViewCR path) const noexcept override;
void fileContextMenu(ox::StringViewCR path) const noexcept override;
void drawDirContextMenu(ox::StringViewCR path) const noexcept override;
void dirContextMenu(ox::StringViewCR path) const noexcept override;
};

5
src/olympic/studio/applib/src/studioapp.cpp
View File

@ -50,7 +50,7 @@ StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexce
m_sctx(*this, ctx),
m_tctx(ctx),
m_projectDataDir(std::move(projectDataDir)),
m_projectExplorer(m_tctx),
m_projectExplorer(keelCtx(m_tctx)),
m_newProject(m_projectDataDir),
m_aboutPopup(m_tctx) {
turbine::setApplicationData(m_tctx, &m_sctx);
@ -120,7 +120,8 @@ void StudioUI::draw() noexcept {
ig::s_mainWinHasFocus = ImGui::IsWindowFocused(
ImGuiFocusedFlags_RootAndChildWindows | ImGuiFocusedFlags_NoPopupHierarchy);
if (m_showProjectExplorer) {
m_projectExplorer.draw(m_sctx);
auto const v = ImGui::GetContentRegionAvail();
m_projectExplorer.draw(m_sctx, {300, v.y});
ImGui::SameLine();
}
drawTabBar();

2
src/olympic/studio/applib/src/studioapp.hpp
View File

@ -39,7 +39,7 @@ class StudioUI: public ox::SignalHandler {
BaseEditor *m_activeEditorOnLastDraw = nullptr;
BaseEditor *m_activeEditor = nullptr;
BaseEditor *m_activeEditorUpdatePending = nullptr;
NewMenu m_newMenu;
NewMenu m_newMenu{keelCtx(m_tctx)};
DeleteConfirmation m_deleteConfirmation;
NewDir m_newDirDialog;
NewProject m_newProject;