Review Changes

toonz/cmake/BundleInfo.plist.in

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Tahoma2D</string>
 	<key>CFBundleIconFile</key>
-	<string>Tahoma.icns</string>
+	<string>Tahoma2D.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>io.github.turtletooth.Tahoma2D</string>
     <key>NSCameraUsageDescription</key>

toonz/install/SystemVar.ini

@@ -1,11 +1,10 @@
 [General]
-TOONZCACHEROOT="/Applications/Tahoma2D/Tahoma2D_stuff/cache"
-TOONZCONFIG="/Applications/Tahoma2D/Tahoma2D_stuff/config"
-TOONZFXPRESETS="/Applications/Tahoma2D/Tahoma2D_stuff/fxs"
-TOONZLIBRARY="/Applications/Tahoma2D/Tahoma2D_stuff/library"
-TOONZPROFILES="/Applications/Tahoma2D/Tahoma2D_stuff/profiles"
-TAHOMAPROFILES="/Applications/Tahoma2D/Tahoma2D_stuff/profiles"
-TOONZPROJECTS="/Applications/Tahoma2D/Tahoma2D_stuff/projects"
-TOONZROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
-TAHOMAROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
-TOONZSTUDIOPALETTE="/Applications/Tahoma2D/Tahoma2D_stuff/studiopalette"
+TAHOMA2DCACHEROOT="/Applications/Tahoma2D/Tahoma2D_stuff/cache"
+TAHOMA2DCONFIG="/Applications/Tahoma2D/Tahoma2D_stuff/config"
+TAHOMA2DFXPRESETS="/Applications/Tahoma2D/Tahoma2D_stuff/fxs"
+TAHOMA2DLIBRARY="/Applications/Tahoma2D/Tahoma2D_stuff/library"
+TAHOMA2DPROFILES="/Applications/Tahoma2D/Tahoma2D_stuff/profiles"
+TAHOMA2DPROJECTS="/Applications/Tahoma2D/Tahoma2D_stuff/projects"
+TAHOMA2DROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
+TAHOMA2DROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
+TAHOMA2DSTUDIOPALETTE="/Applications/Tahoma2D/Tahoma2D_stuff/studiopalette"

toonz/sources/toonz/CMakeLists.txt

@@ -385,9 +385,9 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
 if(BUILD_ENV_MSVC)
     add_executable(Tahoma2D WIN32 ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES} ${RC_FILE})
 else()
-    set(MACOSX_BUNDLE_ICON_FILE "Tahoma.icns")
-    set_source_files_properties(Tahoma.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-    add_executable(Tahoma2D MACOSX_BUNDLE Tahoma.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES})
+    set(MACOSX_BUNDLE_ICON_FILE "Tahoma2D.icns")
+    set_source_files_properties(Tahoma2D.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+    add_executable(Tahoma2D MACOSX_BUNDLE Tahoma2D.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES})
     #add_definitions(
     #    -DTNZBASE_EXPORTS
     #    -DTPARAM_EXPORTS
@@ -639,16 +639,15 @@ fi
 if [ ! -e \$HOME/.config/Tahoma2D/SystemVar.ini ]; then
     cat << EOF > $HOME/.config/Tahoma2D/SystemVar.ini
 [General]
-TAHOMAROOT=\"\$HOME/.config/Tahoma2D/stuff\"
-TahomaPROFILES=\"\$HOME/.config/Tahoma2D/stuff/profiles\"
-TOONZCACHEROOT=\"\$HOME/.config/Tahoma2D/stuff/cache\"
-TOONZCONFIG=\"\$HOME/.config/Tahoma2D/stuff/config\"
-TOONZFXPRESETS=\"\$HOME/.config/Tahoma2D/stuff/fxs\"
-TOONZLIBRARY=\"\$HOME/.config/Tahoma2D/stuff/library\"
-TOONZPROFILES=\"\$HOME/.config/Tahoma2D/stuff/profiles\"
-TOONZPROJECTS=\"$HOME/.config/Tahoma2D/stuff/projects\"
-TOONZROOT=\"\$HOME/.config/Tahoma2D/stuff\"
-TOONZSTUDIOPALETTE=\"\$HOME/.config/Tahoma2D/stuff/studiopalette\"
+TAHOMA2DROOT=\"\$HOME/.config/Tahoma2D/stuff\"
+TAHOMA2DPROFILES=\"\$HOME/.config/Tahoma2D/stuff/profiles\"
+TAHOMA2DCACHEROOT=\"\$HOME/.config/Tahoma2D/stuff/cache\"
+TAHOMA2DCONFIG=\"\$HOME/.config/Tahoma2D/stuff/config\"
+TAHOMA2DFXPRESETS=\"\$HOME/.config/Tahoma2D/stuff/fxs\"
+TAHOMA2DLIBRARY=\"\$HOME/.config/Tahoma2D/stuff/library\"
+TAHOMA2DPROJECTS=\"$HOME/.config/Tahoma2D/stuff/projects\"
+TAHOMA2DROOT=\"\$HOME/.config/Tahoma2D/stuff\"
+TAHOMA2DSTUDIOPALETTE=\"\$HOME/.config/Tahoma2D/stuff/studiopalette\"
 EOF
 fi
 

toonz/sources/toonz/main.cpp

@@ -91,8 +91,8 @@ using namespace DVGui;
 
 TEnv::IntVar EnvSoftwareCurrentFontSize("SoftwareCurrentFontSize", 12);
 
-const char *rootVarName     = "TOONZROOT";
-const char *systemVarPrefix = "TOONZ";
+const char *rootVarName     = "TAHOMA2DROOT";
+const char *systemVarPrefix = "TAHOMA2D";
 
 #ifdef MACOSX
 #include "tthread.h"

toonz/sources/toonz/shortcutpopup.cpp

@@ -701,7 +701,7 @@ void ShortcutPopup::onLoadPreset() {
   showDialog(tr("Setting Shortcuts"));
   if (preset == "Tahoma2D") {
     clearAllShortcuts(false);
-    TFilePath fp = defaultPresetDir + TFilePath("deftahoma.ini");
+    TFilePath fp = defaultPresetDir + TFilePath("deftahoma2d.ini");
     setPresetShortcuts(fp);
     return;
   } else if (preset == "Toon Boom Harmony") {
@@ -803,7 +803,7 @@ void ShortcutPopup::getCurrentPresetPref() {
   QString name = Preferences::instance()->getShortcutPreset();
   if (name == "DELETED")
     m_presetChoiceCB->setCurrentText("");
-  else if (name == "deftahoma")
+  else if (name == "deftahoma2d")
     m_presetChoiceCB->setCurrentText("Tahoma2D");
   else if (name == "otharmony")
     m_presetChoiceCB->setCurrentText("Toon Boom Harmony");