razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Clear project folder of non-project files (#701)

Browse source 
* clear project folder of non-project files, moving them from projects to config
This commit is contained in:
Jeremy Bullock 2016-12-01 21:09:13 -07:00 committed by shun-iwasawa
parent 4f59008bae
commit 1d47b826ed
7 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
stuff/projects/cleanupreslist.txt → stuff/config/cleanupreslist.txt
View file

0
stuff/projects/reslist.txt → stuff/config/reslist.txt
View file

0
stuff/projects/safearea.ini → stuff/config/safearea.ini
View file

0
stuff/projects/.gitkeep Normal file
View file

4
toonz/sources/toonz/pane.cpp
View file

@ -226,10 +226,10 @@ void TPanelTitleBarButton::mousePressEvent(QMouseEvent *e) {
void TPanelTitleBarButtonForSafeArea::getSafeAreaNameList(
QList<QString> &nameList) {
TFilePath fp = ToonzFolder::getFirstProjectsFolder();
TFilePath fp = TEnv::getConfigDir();
QString currentSafeAreaName = QString::fromStdString(EnvSafeAreaName);
std::string safeAreaFileName = "safeArea.ini";
std::string safeAreaFileName = "safearea.ini";
while (!TFileStatus(fp + safeAreaFileName).doesExist() && !fp.isRoot() &&
fp.getParentDir() != TFilePath())

4
toonz/sources/toonz/viewerdraw.cpp
View file

@ -51,7 +51,7 @@ void getSafeAreaSizeList(QList<QList<double>> &_sizeList) {
static TFilePath projectPath;
static QString safeAreaName;
TFilePath fp = ToonzFolder::getFirstProjectsFolder();
TFilePath fp = TEnv::getConfigDir();
QString currentSafeAreaName = QString::fromStdString(EnvSafeAreaName);
if (fp != projectPath || currentSafeAreaName != safeAreaName) {
@ -60,7 +60,7 @@ void getSafeAreaSizeList(QList<QList<double>> &_sizeList) {
projectPath = fp;
safeAreaName = currentSafeAreaName;
std::string safeAreaFileName = "safeArea.ini";
std::string safeAreaFileName = "safearea.ini";
while (!TFileStatus(fp + safeAreaFileName).doesExist() && !fp.isRoot() &&
fp.getParentDir() != TFilePath())

3
toonz/sources/toonzlib/toonzfolders.cpp
View file

@ -114,8 +114,7 @@ TFilePath ToonzFolder::getProfileFolder() {
}
TFilePath ToonzFolder::getReslistPath(bool forCleanup) {
return getFirstProjectsFolder() +
(forCleanup ? "cleanupreslist.txt" : "reslist.txt");
return getConfigDir() + (forCleanup ? "cleanupreslist.txt" : "reslist.txt");
}
TFilePath ToonzFolder::getTemplateModuleDir() {