mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 12:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support to open image sequences when files are specified in the command line (fix #785)

Browse Source
This commit is contained in:
David Capello 2015-08-27 09:34:14 -03:00
parent 9201239eb3
commit eff31223ab
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/app/app.cpp
View File

@ -441,47 +441,47 @@ void App::initialize(const AppOptions& options)
else {
const std::string& filename = value.value();
// Load the sprite
Document* doc = load_document(ctx, filename.c_str());
if (!doc) {
if (!isGui())
console.printf("Error loading file \"%s\"\n", filename.c_str());
}
else {
// Add the given file in the argument as a "recent file" only
// if we are running in GUI mode. If the program is executed
// in batch mode this is not desirable.
if (isGui())
getRecentFiles()->addRecentFile(filename.c_str());
app::Document* oldDoc = ctx->activeDocument();
if (m_exporter != NULL) {
FrameTag* frameTag = nullptr;
if (!frameTagName.empty())
frameTag = doc->sprite()->frameTags().getByName(frameTagName);
Command* openCommand = CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
Params params;
params.set("filename", filename.c_str());
ctx->executeCommand(openCommand, params);
if (!importLayer.empty()) {
std::vector<Layer*> layers;
doc->sprite()->getLayersList(layers);
app::Document* doc = ctx->activeDocument();
Layer* foundLayer = NULL;
for (Layer* layer : layers) {
if (layer->name() == importLayer) {
foundLayer = layer;
break;
}
// If the active document is equal to the previous one, it
// means that we couldn't open this specific document.
if (doc == oldDoc)
doc = nullptr;
if (doc && m_exporter) {
FrameTag* frameTag = nullptr;
if (!frameTagName.empty())
frameTag = doc->sprite()->frameTags().getByName(frameTagName);
if (!importLayer.empty()) {
std::vector<Layer*> layers;
doc->sprite()->getLayersList(layers);
Layer* foundLayer = NULL;
for (Layer* layer : layers) {
if (layer->name() == importLayer) {
foundLayer = layer;
break;
}
if (foundLayer)
m_exporter->addDocument(doc, foundLayer, frameTag);
}
else if (splitLayers) {
std::vector<Layer*> layers;
doc->sprite()->getLayersList(layers);
for (auto layer : layers)
m_exporter->addDocument(doc, layer, frameTag);
}
else
m_exporter->addDocument(doc, nullptr, frameTag);
if (foundLayer)
m_exporter->addDocument(doc, foundLayer, frameTag);
}
else if (splitLayers) {
std::vector<Layer*> layers;
doc->sprite()->getLayersList(layers);
for (auto layer : layers)
m_exporter->addDocument(doc, layer, frameTag);
}
else
m_exporter->addDocument(doc, nullptr, frameTag);
}
if (!importLayer.empty())

7
src/app/commands/cmd_open_file.cpp
View File

@ -142,7 +142,9 @@ void OpenFileCommand::onExecute(Context* context)
Document* document = fop->document;
if (document) {
App::instance()->getRecentFiles()->addRecentFile(fop->filename.c_str());
if (context->isUIAvailable())
App::instance()->getRecentFiles()->addRecentFile(fop->filename.c_str());
document->setContext(context);
}
else if (!fop_is_stop(fop))
@ -152,7 +154,8 @@ void OpenFileCommand::onExecute(Context* context)
// The file was not found or was loaded loaded with errors,
// so we can remove it from the recent-file list
if (unrecent) {
App::instance()->getRecentFiles()->removeRecentFile(m_filename.c_str());
if (context->isUIAvailable())
App::instance()->getRecentFiles()->removeRecentFile(m_filename.c_str());
}
}
else {