diff --git a/toonz/sources/toonz/convertfolderpopup.cpp b/toonz/sources/toonz/convertfolderpopup.cpp index 3083ea8..95a7108 100644 --- a/toonz/sources/toonz/convertfolderpopup.cpp +++ b/toonz/sources/toonz/convertfolderpopup.cpp @@ -62,9 +62,12 @@ void ConvertFolderPopup::Converter::run() { DVGui::ProgressDialog* progressDialog = m_parent->m_progressDialog; int levelCount = m_parent->m_srcFilePaths.size(); + QDir targetDir(m_parent->m_convertFolderFld->getPath()); + for (int i = 0; !m_parent->m_notifier->abortTask() && i < levelCount; i++) { TFilePath sourceLevelPath = sc->decodeFilePath(m_parent->m_srcFilePaths[i]); - QString levelName = QString::fromStdString(sourceLevelPath.getLevelName()); + QString levelName = + targetDir.relativeFilePath(sourceLevelPath.getQString()); TFilePath dstFolder = sourceLevelPath.getParentDir(); // check already existent levels diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index 527f116..708740e 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -664,6 +664,8 @@ Resources/tape.png Resources/type_in.png Resources/type_out.png + Resources/tzpicon.png + Resources/tzuicon.png Resources/work.png Resources/zoom.png Resources/browser_scene_open.svg