diff --git a/stuff/config/cleanupreslist.txt b/stuff/config/cleanupreslist.txt new file mode 100644 index 0000000..8326b0c --- /dev/null +++ b/stuff/config/cleanupreslist.txt @@ -0,0 +1,95 @@ +UHD 4K, 3840x2160, 16/9 + +HD 1080, 1920x1080, 16/9 + +HD 720, 1280x720, 16/9 + +HD 480, 853x480, 16/9 + +PAL analog, 768x576, 4/3 + +PAL digital, 720x576, 4/3 + +PAL 16/9, 1024x576, 16/9 + +NTSC digital, 720x486, 4/3 + +NTSC analog, 648x486, 4/3 + +NTSC 16/9, 864x486, 16/9 + +Academy Full Frame1 1K, 914x666, 1.37 + +Academy Full Frame2 1K, 1024x746, 1.37 + +Academy Full Frame1 2K, 1828x1332, 1.37 + +Academy Full Frame2 2K, 2048x1494, 1.37 + +Academy Full Frame1 4K, 3656x2664, 1.37 + +Academy Full Frame2 4K, 4096x2988, 1.37 + +Full Camera Aperture 1K, 1024x768, 4/3 + +1K, 1024x768, 4/3 + +Full Camera Aperture 2K, 2048x1536, 4/3 + +2K, 2048x1536, 4/3 + +3K, 3072x2304, 4/3 + +Full Camera Aperture 4k, 4096x3072, 4/3 + +4K, 4096x3072, 4/3 + +Cineon Half Unsqueezed, 3675x1556, 2.36183 + +Cineon Half, 1828x1556, 2.35 + +Cineon Half Squeezed, 1828x1556, 2.36183 + +Cineon Full, 3656x3112, 2.35 + +Cineon Full, 4704x3112, 2.36183 + +Academy Projection1 1K, 914x550, 1.66 + +Academy Projection2 1K, 1024x617, 1.66 + +Academy Projection1 2K, 1828x1102, 1.66 + +Academy Projection2 2K, 2048x1229, 1.66 + +Academy Projection1 4K, 3656x2202, 1.66 + +Academy Projection2 4K, 4096x2468, 1.66 + +Academy Projection1 1K, 914x494, 1.85 + +Academy Projection2 1K, 1024x554, 1.85 + +Academy Projection1 2K, 1828x988, 1.85 + +Academy Projection2 2K, 2048x1107, 1.85 + +Academy Projection1 4K, 3656x1976, 1.85 + +Academy Projection2 4K, 4096x2214, 1.85 + +Anamorphic Pre-squeezed 1K, 914x774, 1.18 + +Anamorphic Pre-squeezed 2K, 1828x1550, 1.18 + +Anamorphic Pre-squeezed 4K, 3656x3098, 1.18 + +Anamorphic Un-squeezed 1K, 914x388, 2.35 + +Anamorphic Un-squeezed 2K, 1828x778, 2.35 + +Anamorphic Un-squeezed 4K, 3656x1556, 2.35 + +DCI 2K, 2048x1080, 256/135 + +DCI 4K, 4096x2160, 256/135 diff --git a/stuff/config/reslist.txt b/stuff/config/reslist.txt new file mode 100644 index 0000000..8326b0c --- /dev/null +++ b/stuff/config/reslist.txt @@ -0,0 +1,95 @@ +UHD 4K, 3840x2160, 16/9 + +HD 1080, 1920x1080, 16/9 + +HD 720, 1280x720, 16/9 + +HD 480, 853x480, 16/9 + +PAL analog, 768x576, 4/3 + +PAL digital, 720x576, 4/3 + +PAL 16/9, 1024x576, 16/9 + +NTSC digital, 720x486, 4/3 + +NTSC analog, 648x486, 4/3 + +NTSC 16/9, 864x486, 16/9 + +Academy Full Frame1 1K, 914x666, 1.37 + +Academy Full Frame2 1K, 1024x746, 1.37 + +Academy Full Frame1 2K, 1828x1332, 1.37 + +Academy Full Frame2 2K, 2048x1494, 1.37 + +Academy Full Frame1 4K, 3656x2664, 1.37 + +Academy Full Frame2 4K, 4096x2988, 1.37 + +Full Camera Aperture 1K, 1024x768, 4/3 + +1K, 1024x768, 4/3 + +Full Camera Aperture 2K, 2048x1536, 4/3 + +2K, 2048x1536, 4/3 + +3K, 3072x2304, 4/3 + +Full Camera Aperture 4k, 4096x3072, 4/3 + +4K, 4096x3072, 4/3 + +Cineon Half Unsqueezed, 3675x1556, 2.36183 + +Cineon Half, 1828x1556, 2.35 + +Cineon Half Squeezed, 1828x1556, 2.36183 + +Cineon Full, 3656x3112, 2.35 + +Cineon Full, 4704x3112, 2.36183 + +Academy Projection1 1K, 914x550, 1.66 + +Academy Projection2 1K, 1024x617, 1.66 + +Academy Projection1 2K, 1828x1102, 1.66 + +Academy Projection2 2K, 2048x1229, 1.66 + +Academy Projection1 4K, 3656x2202, 1.66 + +Academy Projection2 4K, 4096x2468, 1.66 + +Academy Projection1 1K, 914x494, 1.85 + +Academy Projection2 1K, 1024x554, 1.85 + +Academy Projection1 2K, 1828x988, 1.85 + +Academy Projection2 2K, 2048x1107, 1.85 + +Academy Projection1 4K, 3656x1976, 1.85 + +Academy Projection2 4K, 4096x2214, 1.85 + +Anamorphic Pre-squeezed 1K, 914x774, 1.18 + +Anamorphic Pre-squeezed 2K, 1828x1550, 1.18 + +Anamorphic Pre-squeezed 4K, 3656x3098, 1.18 + +Anamorphic Un-squeezed 1K, 914x388, 2.35 + +Anamorphic Un-squeezed 2K, 1828x778, 2.35 + +Anamorphic Un-squeezed 4K, 3656x1556, 2.35 + +DCI 2K, 2048x1080, 256/135 + +DCI 4K, 4096x2160, 256/135 diff --git a/stuff/config/safearea.ini b/stuff/config/safearea.ini new file mode 100644 index 0000000..ec2118c --- /dev/null +++ b/stuff/config/safearea.ini @@ -0,0 +1,26 @@ +[SafeArea0] +area\0=80, 80 +area\1=90, 90 +name=PR_safe + +[SafeArea1] +area\0=95.5, 95.5, 0, 255, 0 +name=FR_PR + +[SafeArea2] +area\0=95.5, 95.5, 0, 255, 0 +area\1=85.95, 85.95 +area\2=76.4, 76.4 +name=FR_PR_safe + +[SafeArea3] +area\0=98.53, 93.85, 0, 0, 255 +area\1=94.12, 89.64, 0, 255, 0 +name=150MT_FR_PR + +[SafeArea4] +area\0=98.53, 93.85, 0, 0, 255 +area\1=94.12, 89.64, 0, 255, 0 +area\2=84.7, 80.68 +area\3=75.3, 71.71 +name=150MT_FR_PR_safe diff --git a/stuff/projects/.gitkeep b/stuff/projects/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/stuff/projects/.gitkeep diff --git a/stuff/projects/cleanupreslist.txt b/stuff/projects/cleanupreslist.txt deleted file mode 100644 index 8326b0c..0000000 --- a/stuff/projects/cleanupreslist.txt +++ /dev/null @@ -1,95 +0,0 @@ -UHD 4K, 3840x2160, 16/9 - -HD 1080, 1920x1080, 16/9 - -HD 720, 1280x720, 16/9 - -HD 480, 853x480, 16/9 - -PAL analog, 768x576, 4/3 - -PAL digital, 720x576, 4/3 - -PAL 16/9, 1024x576, 16/9 - -NTSC digital, 720x486, 4/3 - -NTSC analog, 648x486, 4/3 - -NTSC 16/9, 864x486, 16/9 - -Academy Full Frame1 1K, 914x666, 1.37 - -Academy Full Frame2 1K, 1024x746, 1.37 - -Academy Full Frame1 2K, 1828x1332, 1.37 - -Academy Full Frame2 2K, 2048x1494, 1.37 - -Academy Full Frame1 4K, 3656x2664, 1.37 - -Academy Full Frame2 4K, 4096x2988, 1.37 - -Full Camera Aperture 1K, 1024x768, 4/3 - -1K, 1024x768, 4/3 - -Full Camera Aperture 2K, 2048x1536, 4/3 - -2K, 2048x1536, 4/3 - -3K, 3072x2304, 4/3 - -Full Camera Aperture 4k, 4096x3072, 4/3 - -4K, 4096x3072, 4/3 - -Cineon Half Unsqueezed, 3675x1556, 2.36183 - -Cineon Half, 1828x1556, 2.35 - -Cineon Half Squeezed, 1828x1556, 2.36183 - -Cineon Full, 3656x3112, 2.35 - -Cineon Full, 4704x3112, 2.36183 - -Academy Projection1 1K, 914x550, 1.66 - -Academy Projection2 1K, 1024x617, 1.66 - -Academy Projection1 2K, 1828x1102, 1.66 - -Academy Projection2 2K, 2048x1229, 1.66 - -Academy Projection1 4K, 3656x2202, 1.66 - -Academy Projection2 4K, 4096x2468, 1.66 - -Academy Projection1 1K, 914x494, 1.85 - -Academy Projection2 1K, 1024x554, 1.85 - -Academy Projection1 2K, 1828x988, 1.85 - -Academy Projection2 2K, 2048x1107, 1.85 - -Academy Projection1 4K, 3656x1976, 1.85 - -Academy Projection2 4K, 4096x2214, 1.85 - -Anamorphic Pre-squeezed 1K, 914x774, 1.18 - -Anamorphic Pre-squeezed 2K, 1828x1550, 1.18 - -Anamorphic Pre-squeezed 4K, 3656x3098, 1.18 - -Anamorphic Un-squeezed 1K, 914x388, 2.35 - -Anamorphic Un-squeezed 2K, 1828x778, 2.35 - -Anamorphic Un-squeezed 4K, 3656x1556, 2.35 - -DCI 2K, 2048x1080, 256/135 - -DCI 4K, 4096x2160, 256/135 diff --git a/stuff/projects/reslist.txt b/stuff/projects/reslist.txt deleted file mode 100644 index 8326b0c..0000000 --- a/stuff/projects/reslist.txt +++ /dev/null @@ -1,95 +0,0 @@ -UHD 4K, 3840x2160, 16/9 - -HD 1080, 1920x1080, 16/9 - -HD 720, 1280x720, 16/9 - -HD 480, 853x480, 16/9 - -PAL analog, 768x576, 4/3 - -PAL digital, 720x576, 4/3 - -PAL 16/9, 1024x576, 16/9 - -NTSC digital, 720x486, 4/3 - -NTSC analog, 648x486, 4/3 - -NTSC 16/9, 864x486, 16/9 - -Academy Full Frame1 1K, 914x666, 1.37 - -Academy Full Frame2 1K, 1024x746, 1.37 - -Academy Full Frame1 2K, 1828x1332, 1.37 - -Academy Full Frame2 2K, 2048x1494, 1.37 - -Academy Full Frame1 4K, 3656x2664, 1.37 - -Academy Full Frame2 4K, 4096x2988, 1.37 - -Full Camera Aperture 1K, 1024x768, 4/3 - -1K, 1024x768, 4/3 - -Full Camera Aperture 2K, 2048x1536, 4/3 - -2K, 2048x1536, 4/3 - -3K, 3072x2304, 4/3 - -Full Camera Aperture 4k, 4096x3072, 4/3 - -4K, 4096x3072, 4/3 - -Cineon Half Unsqueezed, 3675x1556, 2.36183 - -Cineon Half, 1828x1556, 2.35 - -Cineon Half Squeezed, 1828x1556, 2.36183 - -Cineon Full, 3656x3112, 2.35 - -Cineon Full, 4704x3112, 2.36183 - -Academy Projection1 1K, 914x550, 1.66 - -Academy Projection2 1K, 1024x617, 1.66 - -Academy Projection1 2K, 1828x1102, 1.66 - -Academy Projection2 2K, 2048x1229, 1.66 - -Academy Projection1 4K, 3656x2202, 1.66 - -Academy Projection2 4K, 4096x2468, 1.66 - -Academy Projection1 1K, 914x494, 1.85 - -Academy Projection2 1K, 1024x554, 1.85 - -Academy Projection1 2K, 1828x988, 1.85 - -Academy Projection2 2K, 2048x1107, 1.85 - -Academy Projection1 4K, 3656x1976, 1.85 - -Academy Projection2 4K, 4096x2214, 1.85 - -Anamorphic Pre-squeezed 1K, 914x774, 1.18 - -Anamorphic Pre-squeezed 2K, 1828x1550, 1.18 - -Anamorphic Pre-squeezed 4K, 3656x3098, 1.18 - -Anamorphic Un-squeezed 1K, 914x388, 2.35 - -Anamorphic Un-squeezed 2K, 1828x778, 2.35 - -Anamorphic Un-squeezed 4K, 3656x1556, 2.35 - -DCI 2K, 2048x1080, 256/135 - -DCI 4K, 4096x2160, 256/135 diff --git a/stuff/projects/safearea.ini b/stuff/projects/safearea.ini deleted file mode 100644 index ec2118c..0000000 --- a/stuff/projects/safearea.ini +++ /dev/null @@ -1,26 +0,0 @@ -[SafeArea0] -area\0=80, 80 -area\1=90, 90 -name=PR_safe - -[SafeArea1] -area\0=95.5, 95.5, 0, 255, 0 -name=FR_PR - -[SafeArea2] -area\0=95.5, 95.5, 0, 255, 0 -area\1=85.95, 85.95 -area\2=76.4, 76.4 -name=FR_PR_safe - -[SafeArea3] -area\0=98.53, 93.85, 0, 0, 255 -area\1=94.12, 89.64, 0, 255, 0 -name=150MT_FR_PR - -[SafeArea4] -area\0=98.53, 93.85, 0, 0, 255 -area\1=94.12, 89.64, 0, 255, 0 -area\2=84.7, 80.68 -area\3=75.3, 71.71 -name=150MT_FR_PR_safe diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp index e94ee83..4e632f0 100644 --- a/toonz/sources/toonz/pane.cpp +++ b/toonz/sources/toonz/pane.cpp @@ -226,10 +226,10 @@ void TPanelTitleBarButton::mousePressEvent(QMouseEvent *e) { void TPanelTitleBarButtonForSafeArea::getSafeAreaNameList( QList &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()) diff --git a/toonz/sources/toonz/viewerdraw.cpp b/toonz/sources/toonz/viewerdraw.cpp index 49f56fc..4ef96bc 100644 --- a/toonz/sources/toonz/viewerdraw.cpp +++ b/toonz/sources/toonz/viewerdraw.cpp @@ -51,7 +51,7 @@ void getSafeAreaSizeList(QList> &_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> &_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()) diff --git a/toonz/sources/toonzlib/toonzfolders.cpp b/toonz/sources/toonzlib/toonzfolders.cpp index a8ccd6b..f699f87 100644 --- a/toonz/sources/toonzlib/toonzfolders.cpp +++ b/toonz/sources/toonzlib/toonzfolders.cpp @@ -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() {