implement save as, save version and file existence check on save
This commit is contained in:
@@ -460,6 +460,14 @@
|
|||||||
<icon icon="disk" width="20"/>
|
<icon icon="disk" width="20"/>
|
||||||
<text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
|
<text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
|
||||||
</button-custom>
|
</button-custom>
|
||||||
|
<button-custom id="file-save-as" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
|
||||||
|
<icon icon="disk" width="20"/>
|
||||||
|
<text text="Save as.." margin="0 0 0 5" font-face="arial" font-size="11"/>
|
||||||
|
</button-custom>
|
||||||
|
<button-custom id="file-save-ver" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
|
||||||
|
<icon icon="disk" width="20"/>
|
||||||
|
<text text="Save version" margin="0 0 0 5" font-face="arial" font-size="11"/>
|
||||||
|
</button-custom>
|
||||||
<button-custom id="file-export" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
|
<button-custom id="file-export" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
|
||||||
<icon icon="disk" width="20"/>
|
<icon icon="disk" width="20"/>
|
||||||
<text text="Export PNG" margin="0 0 0 5" font-face="arial" font-size="11"/>
|
<text text="Export PNG" margin="0 0 0 5" font-face="arial" font-size="11"/>
|
||||||
|
|||||||
@@ -21,21 +21,46 @@ void App::dialog_newdoc()
|
|||||||
|
|
||||||
dialog->btn_ok->on_click = [this, dialog](Node*)
|
dialog->btn_ok->on_click = [this, dialog](Node*)
|
||||||
{
|
{
|
||||||
doc_name = dialog->input->m_string;
|
std::string name = dialog->input->m_string;
|
||||||
if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
|
std::string path = data_path + "/" + name + ".pano";
|
||||||
docname->set_text(("Panodoc: " + doc_name).c_str());
|
|
||||||
|
auto action = [this, dialog, name] {
|
||||||
layers->clear();
|
doc_name = name;
|
||||||
canvas->m_canvas->m_layers.clear();
|
if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
|
||||||
canvas->m_canvas->m_order.clear();
|
docname->set_text(("Panodoc: " + doc_name).c_str());
|
||||||
canvas->reset_camera();
|
|
||||||
ActionManager::clear();
|
layers->clear();
|
||||||
|
canvas->m_canvas->m_layers.clear();
|
||||||
canvas->m_canvas->layer_add("Default");
|
canvas->m_canvas->m_order.clear();
|
||||||
layers->add_layer("Default");
|
canvas->reset_camera();
|
||||||
|
ActionManager::clear();
|
||||||
dialog->destroy();
|
|
||||||
App::I.hideKeyboard();
|
canvas->m_canvas->layer_add("Default");
|
||||||
|
layers->add_layer("Default");
|
||||||
|
|
||||||
|
dialog->destroy();
|
||||||
|
App::I.hideKeyboard();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (Asset::exist(path, false))
|
||||||
|
{
|
||||||
|
// ask confirm is file already exist
|
||||||
|
auto msgbox = new NodeMessageBox();
|
||||||
|
msgbox->m_manager = &layout;
|
||||||
|
msgbox->init();
|
||||||
|
msgbox->m_title->set_text("Warning");
|
||||||
|
msgbox->m_message->set_text("A document with this name already exists, continue?");
|
||||||
|
msgbox->btn_ok->on_click = [this, msgbox, action](Node*) {
|
||||||
|
action();
|
||||||
|
msgbox->destroy();
|
||||||
|
};
|
||||||
|
layout[main_id]->add_child(msgbox);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
action();
|
||||||
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
dialog->btn_cancel->on_click = [this, dialog](Node*)
|
dialog->btn_cancel->on_click = [this, dialog](Node*)
|
||||||
{
|
{
|
||||||
@@ -120,23 +145,58 @@ void App::dialog_save()
|
|||||||
|
|
||||||
App::I.showKeyboard();
|
App::I.showKeyboard();
|
||||||
|
|
||||||
layout[main_id]->add_child(dialog);
|
|
||||||
layout[main_id]->update();
|
|
||||||
|
|
||||||
dialog->btn_ok->on_click = [this, dialog](Node*)
|
dialog->btn_ok->on_click = [this, dialog](Node*)
|
||||||
{
|
{
|
||||||
doc_name = dialog->input->m_string;
|
std::string name = dialog->input->m_string;
|
||||||
if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
|
std::string path = data_path + "/" + name + ".pano";
|
||||||
docname->set_text(("Panodoc: " + doc_name).c_str());
|
|
||||||
canvas->m_canvas->project_save(data_path + "/" + doc_name + ".pano");
|
if (name.empty())
|
||||||
dialog->destroy();
|
{
|
||||||
App::I.hideKeyboard();
|
auto msgbox = new NodeMessageBox();
|
||||||
|
msgbox->m_manager = &layout;
|
||||||
|
msgbox->init();
|
||||||
|
msgbox->m_title->set_text("Warning");
|
||||||
|
msgbox->m_message->set_text("You need to specify a name to file.");
|
||||||
|
layout[main_id]->add_child(msgbox);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto action = [this, dialog, name, path] {
|
||||||
|
doc_name = name;
|
||||||
|
if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
|
||||||
|
docname->set_text(("Panodoc: " + doc_name).c_str());
|
||||||
|
canvas->m_canvas->project_save(path);
|
||||||
|
dialog->destroy();
|
||||||
|
App::I.hideKeyboard();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (Asset::exist(path, false))
|
||||||
|
{
|
||||||
|
// ask confirm is file already exist
|
||||||
|
auto msgbox = new NodeMessageBox();
|
||||||
|
msgbox->m_manager = &layout;
|
||||||
|
msgbox->init();
|
||||||
|
msgbox->m_title->set_text("Warning");
|
||||||
|
msgbox->m_message->set_text(("Are you sure you want to overwrite " + name + "?").c_str());
|
||||||
|
msgbox->btn_ok->on_click = [this, msgbox, action](Node*) {
|
||||||
|
action();
|
||||||
|
msgbox->destroy();
|
||||||
|
};
|
||||||
|
layout[main_id]->add_child(msgbox);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
action();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
dialog->btn_cancel->on_click = [this, dialog](Node*)
|
dialog->btn_cancel->on_click = [this, dialog](Node*)
|
||||||
{
|
{
|
||||||
dialog->destroy();
|
dialog->destroy();
|
||||||
App::I.hideKeyboard();
|
App::I.hideKeyboard();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
layout[main_id]->add_child(dialog);
|
||||||
|
layout[main_id]->update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -366,10 +366,59 @@ void App::init_menu_file()
|
|||||||
popup->destroy();
|
popup->destroy();
|
||||||
};
|
};
|
||||||
popup->find<NodeButtonCustom>("file-save")->on_click = [this](Node*) {
|
popup->find<NodeButtonCustom>("file-save")->on_click = [this](Node*) {
|
||||||
|
if (doc_name.empty())
|
||||||
|
{
|
||||||
|
dialog_save();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
canvas->m_canvas->project_save(data_path + "/" + doc_name + ".pano");
|
||||||
|
}
|
||||||
|
popup->mouse_release();
|
||||||
|
popup->destroy();
|
||||||
|
};
|
||||||
|
popup->find<NodeButtonCustom>("file-save-as")->on_click = [this](Node*) {
|
||||||
dialog_save();
|
dialog_save();
|
||||||
popup->mouse_release();
|
popup->mouse_release();
|
||||||
popup->destroy();
|
popup->destroy();
|
||||||
};
|
};
|
||||||
|
popup->find<NodeButtonCustom>("file-save-ver")->on_click = [this](Node*) {
|
||||||
|
if (doc_name.empty())
|
||||||
|
{
|
||||||
|
dialog_save();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int current = 0;
|
||||||
|
std::string next = doc_name + ".01";
|
||||||
|
std::string base = doc_name;
|
||||||
|
|
||||||
|
std::regex r(R"((.*)\.(\w{2})$)");
|
||||||
|
std::smatch m;
|
||||||
|
if (std::regex_search(doc_name, m, r))
|
||||||
|
{
|
||||||
|
std::string base = m[1].str();
|
||||||
|
current = atoi(m[2].str().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = current + 1; i < 99; i++)
|
||||||
|
{
|
||||||
|
static char tmp_name[256];
|
||||||
|
sprintf(tmp_name, "%s.%02d", base.c_str(), i);
|
||||||
|
next = tmp_name;
|
||||||
|
if (Asset::exist(data_path + "/" + next + ".pano", false))
|
||||||
|
continue;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
doc_name = next;
|
||||||
|
if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
|
||||||
|
docname->set_text(("Panodoc: " + doc_name).c_str());
|
||||||
|
canvas->m_canvas->project_save(data_path + "/" + next + ".pano");
|
||||||
|
}
|
||||||
|
popup->mouse_release();
|
||||||
|
popup->destroy();
|
||||||
|
};
|
||||||
popup->find<NodeButtonCustom>("file-export")->on_click = [this](Node*) {
|
popup->find<NodeButtonCustom>("file-export")->on_click = [this](Node*) {
|
||||||
dialog_export();
|
dialog_export();
|
||||||
popup->mouse_release();
|
popup->mouse_release();
|
||||||
|
|||||||
@@ -18,6 +18,24 @@ bool Asset::delete_file(const std::string& path)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Asset::exist(std::string path, bool is_asset)
|
||||||
|
{
|
||||||
|
if (is_asset)
|
||||||
|
{
|
||||||
|
Asset asset;
|
||||||
|
if (asset.open(path.c_str()))
|
||||||
|
{
|
||||||
|
asset.close();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::ifstream f(path);
|
||||||
|
return f.is_open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, const std::string& filter_regex)
|
std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, const std::string& filter_regex)
|
||||||
{
|
{
|
||||||
std::vector<std::string> names;
|
std::vector<std::string> names;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public:
|
|||||||
AAsset* m_asset = nullptr;
|
AAsset* m_asset = nullptr;
|
||||||
#endif
|
#endif
|
||||||
static std::vector<std::string> list_files(std::string folder, bool is_asset, const std::string& filter_regex);
|
static std::vector<std::string> list_files(std::string folder, bool is_asset, const std::string& filter_regex);
|
||||||
|
static bool exist(std::string path, bool is_asset);
|
||||||
static bool delete_file(const std::string& path);
|
static bool delete_file(const std::string& path);
|
||||||
|
|
||||||
std::string m_current_path;
|
std::string m_current_path;
|
||||||
|
|||||||
Reference in New Issue
Block a user