OpenToonz - An open-source full-featured 2D animation creation software
C
Fix wrong wrong folder name when export all levels one by one
Abel You4baf09819831
diff --git a/toonz/sources/toonz/exportalllevelspopup.cpp b/toonz/sources/toonz/exportalllevelspopup.cppindex 942a0bf16..6d1595ab6 100644--- a/toonz/sources/toonz/exportalllevelspopup.cpp+++ b/toonz/sources/toonz/exportalllevelspopup.cpp@@ -312,8 +312,9 @@ bool ExportAllLevelsPopup::execute() {MultiExportOverwriteCB overwriteCB;while (!outputLevels.empty()) {sl = outputLevels.back()->getSimpleLevel();- ret = IoCmd::exportLevel(TFilePath(fp.getWideString()+to_wstring("\\") + sl->getName() + to_wstring("."+ext)), sl,- opts, &overwriteCB, &progressCB,m_exportOptions->m_createlevelfolder->isChecked()) &&+ ret = IoCmd::exportLevel(TFilePath(fp.getWideString()+ L"\\" + sl->getName() + L"."+ to_wstring(ext)), sl,+ opts, &overwriteCB, &progressCB,+ (folderName.empty() ? sl->getName() : folderName)) &&ret;if (ret) {++level_exported; // count exported levels@@ -341,7 +342,7 @@ bool ExportAllLevelsPopup::execute() {TXshSimpleLevel *sl = outputLevels.back()->getSimpleLevel();ret = IoCmd::exportLevel(fp.withType(ext).withName(m_nameField->text().toStdWString()), sl,- opts, 0, 0, m_exportOptions->m_createlevelfolder->isChecked()) &&+ opts, 0, 0, folderName) &&ret;// count levels exporteddiff --git a/toonz/sources/toonz/exportlevelcommand.cpp b/toonz/sources/toonz/exportlevelcommand.cppindex b1172226e..f13b50f63 100644--- a/toonz/sources/toonz/exportlevelcommand.cpp+++ b/toonz/sources/toonz/exportlevelcommand.cpp@@ -44,7 +44,7 @@// Qt includes#include <QApplication>-+#include <QString>#include "exportlevelcommand.h"using namespace DVGui;@@ -415,7 +415,7 @@ bool IoCmd::exportLevel(const TFilePath &path, TXshSimpleLevel *sl,ExportLevelOptions opts,OverwriteCallbacks *overwriteCB,ProgressCallbacks *progressCB,- bool CreateLevelFolder) {+ std::wstring foldername) {struct Locals {const TFilePath &m_path;TXshSimpleLevel *m_sl;@@ -552,16 +552,18 @@ bool IoCmd::exportLevel(const TFilePath &path, TXshSimpleLevel *sl,// if Need to Create FolderTFilePath fp;- if (CreateLevelFolder) {+ if (!foldername.empty()) {fp = TFilePath(path.getParentDir().getWideString() +to_wstring("\\") +- sl->getName() + to_wstring("\\") ++ foldername + to_wstring("\\") +path.withoutParentDir().getWideString());TFilePath fp2 = fp.getParentDir();bool exist = TFileStatus(fp2).isDirectory();if (!TFileStatus(fp.getParentDir()).isDirectory()) {TSystem::mkDir(fp.getParentDir());}+ } else {+ fp = path;}// Initialize variablesdiff --git a/toonz/sources/toonz/exportlevelcommand.h b/toonz/sources/toonz/exportlevelcommand.hindex 51c5b3fdd..9d7e0eef7 100644--- a/toonz/sources/toonz/exportlevelcommand.h+++ b/toonz/sources/toonz/exportlevelcommand.h@@ -145,7 +145,8 @@ bool exportLevel(0, //!< External callbacks to overwrite requests.ProgressCallbacks *progressCB =0, //!< External callbacks to progress notifications.- bool CreateLevelFolder = false);// Create a Level Folder if not exist and export to the folder+ std::wstring foldername =+ std::wstring()); // Create a Level Folder if not exist and export to the folder} // namespace IoCmddiff --git a/toonz/sources/toonz/exportlevelpopup.cpp b/toonz/sources/toonz/exportlevelpopup.cppindex 3add522d3..123e75287 100644--- a/toonz/sources/toonz/exportlevelpopup.cpp+++ b/toonz/sources/toonz/exportlevelpopup.cpp@@ -179,6 +179,7 @@ ExportLevelPopup::ExportLevelPopup() : FileBrowserPopup(tr("Export Level"), OptiQTabBar *tabBar = new QTabBar;QStackedWidget *stackedWidget = new QStackedWidget;QFrame *exportOptionsPage = new QFrame;+ folderName = L"Cell";// Options / Swatch splitterQSplitter *splitter = new QSplitter(Qt::Vertical);@@ -427,6 +428,9 @@ void ExportLevelPopup::showEvent(QShowEvent *se) {ret = connect(app->getCurrentLevel(), SIGNAL(xshLevelChanged()), this,SLOT(updatePreview())) &&ret;+ ret = connect(m_exportOptions->m_createlevelfolder,SIGNAL(clicked(bool),SLOT),this,+ SLOT(setFolderName(bool))) &&+ ret;}assert(ret);@@ -638,7 +642,7 @@ bool ExportLevelPopup::execute() {ret = ret && IoCmd::exportLevel(fp.withName(sl->getName()), sl, opts,&overwriteCB, &progressCB,- m_exportOptions->m_createlevelfolder->isChecked());+ folderName);}}@@ -655,7 +659,7 @@ bool ExportLevelPopup::execute() {return false;return IoCmd::exportLevel(fp.withType(ext).withFrame(tmplFId), 0, opts,- 0,0,m_exportOptions->m_createlevelfolder->isChecked());+ 0,0,folderName);}}@@ -711,7 +715,7 @@ ExportLevelPopup::ExportOptions::ExportOptions(QWidget *parent)m_noAntialias = new QCheckBox(tr("No Antialias"));layout->addWidget(m_noAntialias, row++, 2, Qt::AlignLeft);- m_createlevelfolder = new QCheckBox(tr("Create Level Folder"));+ m_createlevelfolder = new QCheckBox(tr("Create Folder(equal file name)"));layout->addWidget(m_createlevelfolder, row++, 2, Qt::AlignLeft);//-------------- Vector Options ---------------------@@ -1031,6 +1035,14 @@ void ExportLevelPopup::ExportOptions::onThicknessTransformModeChanged() {m_toThicknessDisplacement->setVisible(!scaleMode);}+void ExportLevelPopup::setFolderName(bool tocreate) {+ if (tocreate) {+ folderName = m_nameField->text().toStdWString();+ } else {+ folderName = std::wstring();+ }+}+//********************************************************************************// Export Level Command instantiationdiff --git a/toonz/sources/toonz/exportlevelpopup.h b/toonz/sources/toonz/exportlevelpopup.hindex fe9bd4c37..e493b3abe 100644--- a/toonz/sources/toonz/exportlevelpopup.h+++ b/toonz/sources/toonz/exportlevelpopup.h@@ -92,6 +92,7 @@ private:ExportOptions *m_exportOptions;Swatch *m_swatch;+ std::wstring folderName;// Othersstd::vector<TXshSimpleLevel *> outputLevels;@@ -107,6 +108,7 @@ private slots:void onOptionsClicked();void onRetas(int);void initFolder() override;+ void setFolderName(bool tocreate);void onformatChanged(const QString &);void checkAlpha();void updatePreview();