diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8802e4db..5531dafd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,7 +8,7 @@ assignees: '' --- - + **Describe the bug** A clear and concise description of what the bug is. @@ -27,6 +27,6 @@ If applicable, add screenshots to help explain your problem. **Device Information:** - OS: [e.g. Windows] - - Tahoma Version: [e.g. Nightly (2020-01-10)] + - Tahoma2D Version: [e.g. Nightly (2020-01-10)] - GPU: [e.g. NVIDIA RTX 2080] - GPU Driver Version: [e.g. 440.00] diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index d8a6738e..b0098225 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - name: Manual - url: https://tahoma.readthedocs.io/ + url: https://tahoma2d.readthedocs.io/ about: The official, extensive manual for OpenToonz - name: User forum url: https://groups.google.com/forum/#!forum/opentoonz_en/categories/ diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index c942736c..9ced762e 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -8,8 +8,8 @@ assignees: '' --- - + **Question** -Ask a question related to Tahoma. +Ask a question related to Tahoma2D. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff6161ef..4e59473a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,20 +1,20 @@ # How to contribute -This document describes some points about the contribution process for Tahoma. +This document describes some points about the contribution process for Tahoma2D. ## Pull-requests I love any kind of contributions, such as fixing typos and code refactoring. -If you fixed or added something useful to Tahoma, please send pull-requests to me. +If you fixed or added something useful to Tahoma2D, please send pull-requests to me. I will first review the request, then I'll accept it, add comments for rework, or decline it. ### Workflow -0. `fork` Tahoma to your GitHub account from `turtletooth/tahoma`. - - (use the `fork` button at the https://github.com/turtletooth/tahoma) +0. `fork` Tahoma2D to your GitHub account from `turtletooth/tahoma2d`. + - (use the `fork` button at the https://github.com/turtletooth/tahoma2d) 0. `clone` the repository. - - `git clone git@github.com:your-github-account/tahoma.git` - - `git remote add upstream https://github.com/turtletooth/tahoma.git`, additionally. + - `git clone git@github.com:your-github-account/tahoma2d.git` + - `git remote add upstream https://github.com/turtletooth/tahoma2d.git`, additionally. 0. modify the codes. - `git checkout -b your-branch-name` - `your-branch-name` is a name of your modifications, for example, @@ -32,7 +32,7 @@ I will first review the request, then I'll accept it, add comments for rework, o ## Bugs -If you find bugs, please report details about them using [issues](https://github.com/turtletooth/tahoma/issues). +If you find bugs, please report details about them using [issues](https://github.com/turtletooth/tahoma2d/issues). Please include information needed to reproduce the bug, including the operating system and information directly relating to the issue. Links to screen captures of what is observed on screen or video of specific steps to produce the problem are very helpful. @@ -56,6 +56,6 @@ please send us those modifications as pull-requests. Please send us Qt message (`.qm`) files with `.ts` files if you can make the following modifications. -Tahoma uses `.qm` files generated from `.ts` files. +Tahoma2D uses `.qm` files generated from `.ts` files. You can generate `.qm` files by using [Qt Linguist](http://doc.qt.io/qt-5.6/linguist-translators.html). Please locate generated `.qm` files in `stuff/config/loc`. diff --git a/LICENSE.txt b/LICENSE.txt index 3bc18ffb..802ac043 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -4,7 +4,7 @@ For files in the "stuff/library/mypaint brushes" directory: Please see the licen - - - - - - - - - - - - - - - - -Tahoma +Tahoma2D All contributions by Jeremy Bullock: Copyright (c) 2016 - 2020, Jeremy Bullock diff --git a/README.md b/README.md index 79b6bce4..2e56615e 100644 --- a/README.md +++ b/README.md @@ -5,18 +5,18 @@ ## What is Tahoma2D? -Tahoma is a 2D and stop motion animation software.It is based on **Toonz Studio +Tahoma2D is a 2D and stop motion animation software.It is based on **Toonz Studio Ghibli Version**, originally developed in Italy by [Digital Video, Inc.](http://www.toonz.com/), and customized by [Studio Ghibli](http://www.ghibli.jp/) over many years of production. ## Program Requirements -Please refer to the Tahoma site at . +Please refer to the Tahoma2D site at . ## Installation -Please download the latest release at . +Please download the latest release at . ## How to Build Locally @@ -31,7 +31,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo ## Community - To share tips or to troubleshoot, join the [Google OpenToonz Users forum](https://groups.google.com/forum/#!forum/opentoonz_en) -- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma/issues) and post there. +- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma2d/issues) and post there. ## Licensing diff --git a/appveyor.yml b/appveyor.yml index f47728e4..ccafa9db 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,33 +34,33 @@ build: verbosity: minimal after_build: - cmd: >- - mkdir %CONFIGURATION%\Tahoma + mkdir %CONFIGURATION%\Tahoma2D - move %CONFIGURATION%\*.* %CONFIGURATION%\Tahoma + move %CONFIGURATION%\*.* %CONFIGURATION%\Tahoma2D - C:\Qt\5.9\msvc2015_64\bin\windeployqt.exe %CONFIGURATION%\Tahoma\Tahoma.exe + C:\Qt\5.9\msvc2015_64\bin\windeployqt.exe %CONFIGURATION%\Tahoma2D\Tahoma2D.exe - copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\libmypaint\dist\64\libintl-8.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\libmypaint\dist\64\libintl-8.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\libmypaint\dist\64\libjson-c-2.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\libmypaint\dist\64\libjson-c-2.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll %CONFIGURATION%\Tahoma2D - copy /Y ..\..\thirdparty\libjpeg-turbo64\dist\turbojpeg.dll %CONFIGURATION%\Tahoma + copy /Y ..\..\thirdparty\libjpeg-turbo64\dist\turbojpeg.dll %CONFIGURATION%\Tahoma2D - copy /Y "C:\Tools\opencv\build\x64\vc14\bin\opencv_world412.dll" %CONFIGURATION%\Tahoma + copy /Y "C:\Tools\opencv\build\x64\vc14\bin\opencv_world412.dll" %CONFIGURATION%\Tahoma2D - mkdir "%CONFIGURATION%\Tahoma\tahomastuff" + mkdir "%CONFIGURATION%\Tahoma2D\tahomastuff" - xcopy /Y /E ..\..\stuff "%CONFIGURATION%\Tahoma\tahomastuff" + xcopy /Y /E ..\..\stuff "%CONFIGURATION%\Tahoma2D\tahomastuff" artifacts: - path: toonz\$(PLATFORM)\$(CONFIGURATION) - name: Tahoma + name: Tahoma2D diff --git a/ci-scripts/linux/tahoma-buildpkg.sh b/ci-scripts/linux/tahoma-buildpkg.sh index 0e251c42..65bb1650 100755 --- a/ci-scripts/linux/tahoma-buildpkg.sh +++ b/ci-scripts/linux/tahoma-buildpkg.sh @@ -1,7 +1,7 @@ #!/bin/bash source /opt/qt59/bin/qt59-env.sh -echo ">>> Temporary install of Tahoma" +echo ">>> Temporary install of Tahoma2D" export BUILDDIR=$(pwd)/toonz/build cd $BUILDDIR sudo make install @@ -12,30 +12,30 @@ echo ">>> Creating appDir" rm -rf appdir mkdir -p appdir/usr -echo ">>> Copy and configure Tahoma installation in appDir" -cp -r /opt/tahoma/* appdir/usr +echo ">>> Copy and configure Tahoma2D installation in appDir" +cp -r /opt/tahoma2d/* appdir/usr cp appdir/usr/share/applications/*.desktop appdir cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir -mv appdir/usr/lib/tahoma/* appdir/usr/lib -rmdir appdir/usr/lib/tahoma +mv appdir/usr/lib/tahoma2d/* appdir/usr/lib +rmdir appdir/usr/lib/tahoma2d -echo ">>> Creating Tahoma directory" -rm -rf Tahoma -mkdir Tahoma +echo ">>> Creating Tahoma2D directory" +rm -rf Tahoma2D +mkdir Tahoma2D -echo ">>> Copying stuff to Tahoma/tahomastuff" +echo ">>> Copying stuff to Tahoma2D/tahomastuff" -mv appdir/usr/share/tahoma/stuff Tahoma/tahomastuff -chmod -R 777 Tahoma/tahomastuff -rmdir appdir/usr/share/tahoma +mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff +chmod -R 777 Tahoma2D/tahomastuff +rmdir appdir/usr/share/tahoma2d if [ -d ../../thirdparty/ffmpeg/bin ] then - echo ">>> Copying FFmpeg to Tahoma/ffmpeg" - cp -R ../../thirdparty/ffmpeg/bin Tahoma/ffmpeg + echo ">>> Copying FFmpeg to Tahoma2D/ffmpeg" + cp -R ../../thirdparty/ffmpeg/bin Tahoma2D/ffmpeg fi -echo ">>> Creating Tahoma/Tahoma.AppImage" +echo ">>> Creating Tahoma2D/Tahoma2D.AppImage" if [ ! -f linuxdeployqt*.AppImage ] then @@ -43,8 +43,8 @@ then chmod a+x linuxdeployqt*.AppImage fi -export LD_LIBRARY_PATH=appdir/usr/lib/tahoma -./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -bundle-non-qt-libs -verbose=0 -always-overwrite \ +export LD_LIBRARY_PATH=appdir/usr/lib/tahoma2d +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -bundle-non-qt-libs -verbose=0 -always-overwrite \ -executable=appdir/usr/bin/lzocompress \ -executable=appdir/usr/bin/lzodecompress \ -executable=appdir/usr/bin/tcleanup \ @@ -52,10 +52,10 @@ export LD_LIBRARY_PATH=appdir/usr/lib/tahoma -executable=appdir/usr/bin/tconverter \ -executable=appdir/usr/bin/tfarmcontroller \ -executable=appdir/usr/bin/tfarmserver -./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -appimage +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -appimage -mv Tahoma*.AppImage Tahoma/Tahoma.AppImage +mv Tahoma2D*.AppImage Tahoma2D/Tahoma2D.AppImage -echo ">>> Creating Tahoma Linux package" +echo ">>> Creating Tahoma2D Linux package" -tar zcf Tahoma-linux.tar.gz Tahoma +tar zcf Tahoma2D-linux.tar.gz Tahoma2D diff --git a/ci-scripts/linux/travis-buildpkg.sh b/ci-scripts/linux/travis-buildpkg.sh index 8ce9eff7..cfcca06f 100755 --- a/ci-scripts/linux/travis-buildpkg.sh +++ b/ci-scripts/linux/travis-buildpkg.sh @@ -1,7 +1,7 @@ #!/bin/bash source /opt/qt59/bin/qt59-env.sh -echo ">>> Temporary install of Tahoma" +echo ">>> Temporary install of Tahoma2D" export BUILDDIR=$(pwd)/toonz/build cd $BUILDDIR sudo make install @@ -9,29 +9,29 @@ sudo make install echo ">>> Creating appDir" mkdir -p appdir/usr -echo ">>> Copy and configure Tahoma installation in appDir" -cp -r /opt/tahoma/* appdir/usr +echo ">>> Copy and configure Tahoma2D installation in appDir" +cp -r /opt/tahoma2d/* appdir/usr cp appdir/usr/share/applications/*.desktop appdir cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir -mv appdir/usr/lib/tahoma/* appdir/usr/lib -rmdir appdir/usr/lib/tahoma +mv appdir/usr/lib/tahoma2d/* appdir/usr/lib +rmdir appdir/usr/lib/tahoma2d -echo ">>> Creating Tahoma directory" -mkdir Tahoma +echo ">>> Creating Tahoma2D directory" +mkdir Tahoma2D -echo ">>> Copying stuff to Tahoma/tahomastuff" +echo ">>> Copying stuff to Tahoma2D/tahomastuff" -mv appdir/usr/share/tahoma/stuff Tahoma/tahomastuff -chmod -R 777 Tahoma/tahomastuff -rmdir appdir/usr/share/tahoma +mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff +chmod -R 777 Tahoma2D/tahomastuff +rmdir appdir/usr/share/tahoma2d -echo ">>> Creating Tahoma/Tahoma.AppImage" +echo ">>> Creating Tahoma2D/Tahoma2D.AppImage" wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" chmod a+x linuxdeployqt*.AppImage -export LD_LIBRARY_PATH=appdir/usr/lib/tahoma -./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -bundle-non-qt-libs -verbose=0 -always-overwrite \ +export LD_LIBRARY_PATH=appdir/usr/lib/tahoma2d +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -bundle-non-qt-libs -verbose=0 -always-overwrite \ -executable=appdir/usr/bin/lzocompress \ -executable=appdir/usr/bin/lzodecompress \ -executable=appdir/usr/bin/tcleanup \ @@ -39,10 +39,10 @@ export LD_LIBRARY_PATH=appdir/usr/lib/tahoma -executable=appdir/usr/bin/tconverter \ -executable=appdir/usr/bin/tfarmcontroller \ -executable=appdir/usr/bin/tfarmserver -./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -appimage +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -appimage -mv Tahoma*.AppImage Tahoma/Tahoma.AppImage +mv Tahoma2D*.AppImage Tahoma2D/Tahoma2D.AppImage -echo ">>> Creating Tahoma Linux package" +echo ">>> Creating Tahoma2D Linux package" -tar zcf Tahoma-linux.tar.gz Tahoma +tar zcf Tahoma2D-linux.tar.gz Tahoma2D diff --git a/ci-scripts/osx/tahoma-buildpkg.sh b/ci-scripts/osx/tahoma-buildpkg.sh index 9fd8b707..a00aa2f7 100755 --- a/ci-scripts/osx/tahoma-buildpkg.sh +++ b/ci-scripts/osx/tahoma-buildpkg.sh @@ -8,34 +8,34 @@ then export TOONZDIR=$TOONZDIR/Release fi -echo ">>> Copying stuff to $TOONZDIR/Tahoma.app/tahomastuff" -cp -R stuff $TOONZDIR/Tahoma.app/tahomastuff +echo ">>> Copying stuff to $TOONZDIR/Tahoma2D.app/tahomastuff" +cp -R stuff $TOONZDIR/Tahoma2D.app/tahomastuff if [ -d thirdparty/ffmpeg/bin ] then - echo ">>> Copying FFmpeg to $TOONZDIR/Tahoma.app/ffmpeg" - cp -R thirdparty/ffmpeg/bin $TOONZDIR/Tahoma.app/ffmpeg + echo ">>> Copying FFmpeg to $TOONZDIR/Tahoma2D.app/ffmpeg" + cp -R thirdparty/ffmpeg/bin $TOONZDIR/Tahoma2D.app/ffmpeg fi if [ -d thirdparty/canon/Framework ] then - echo ">>> Copying canon framework to $TOONZDIR/Tahoma.app/Contents/Frameworks/EDSDK.Framework" - cp -R thirdparty/canon/Framework $TOONZDIR/Tahoma.app/Contents/Frameworks + echo ">>> Copying canon framework to $TOONZDIR/Tahoma2D.app/Contents/Frameworks/EDSDK.Framework" + cp -R thirdparty/canon/Framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks fi -echo ">>> Configuring Tahoma.app for deployment" +echo ">>> Configuring Tahoma2D.app for deployment" -$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma.app -verbose=0 -always-overwrite \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzocompress \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzodecompress \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcleanup \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcomposer \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tconverter \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmcontroller \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmserver +$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzocompress \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzodecompress \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcleanup \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcomposer \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tconverter \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmcontroller \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver echo ">>> Correcting library paths" -for X in `find $TOONZDIR/Tahoma.app/Contents -type f -name *.dylib -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` +for X in `find $TOONZDIR/Tahoma2D.app/Contents -type f -name *.dylib -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` do Z=`echo $X | cut -c 1-1` if [ "$Z" != "/" ] @@ -44,7 +44,7 @@ do else Y=`basename $X` W=`basename $LIBFILE` - if [ -f $TOONZDIR/Tahoma.app/Contents/Frameworks/$Y -a "$Y" != "$W" ] + if [ -f $TOONZDIR/Tahoma2D.app/Contents/Frameworks/$Y -a "$Y" != "$W" ] then echo "Fixing $X in $LIBFILE" install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE @@ -52,8 +52,8 @@ do fi done -echo ">>> Creating Tahoma-osx.dmg" +echo ">>> Creating Tahoma2D-osx.dmg" -$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma.app -dmg -verbose=0 +$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -dmg -verbose=0 -mv $TOONZDIR/Tahoma.dmg $TOONZDIR/../Tahoma-osx.dmg +mv $TOONZDIR/Tahoma2D.dmg $TOONZDIR/../Tahoma2D-osx.dmg diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index 174641bb..fd5841b1 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -57,13 +57,13 @@ $ ls -l /usr/local/lib/cmake/glew $ rm /usr/local/lib/cmake/glew ``` -### Set up Tahoma repository +### Set up Tahoma2D repository -These steps will put the Tahoma repository under /Users/yourlogin/Documents. +These steps will put the Tahoma2D repository under /Users/yourlogin/Documents. ``` $ cd ~/Documents #or where you want to store the repository# -$ git clone https://github.com/turtletooth/tahoma -$ cd tahoma +$ git clone https://github.com/turtletooth/tahoma2d +$ cd tahoma2d $ git lfs pull $ cd thirdparty/boost $ mv ~/Downloads/boost_1_72_0.tar.bz2 . #or whatever the boost filename you downloaded is# @@ -76,16 +76,16 @@ $ ./configure --disable-lzma && make ### Configure build for QT version -Edit the `/Users/yourlogin/Documents/tahoma/toonz/sources/CMakeLists.txt` file at line 160 (64-bit OS) or 172 (32-bit OS) and modify the root path for the QT lib directory +Edit the `/Users/yourlogin/Documents/tahoma2d/toonz/sources/CMakeLists.txt` file at line 160 (64-bit OS) or 172 (32-bit OS) and modify the root path for the QT lib directory If you installed QT using `brew`, you can get the version and path to use with: `$ brew info qt`. The lib path will look something like this: `/usr/local/Cellar/qt/5.12.2/lib` If you downloaded the QT installer and installed to `/Users/yourlogin/Qt`, your lib path may look something like this: `~/Qt/5.12.2/clang_64/lib` or `~/Qt/5.12.2/clang_32/lib` -### Configure environment and Build Tahoma +### Configure environment and Build Tahoma2D 1. Create the build directory with the following: ``` -$ cd ~/Documents/tahoma/toonz +$ cd ~/Documents/tahoma2d/toonz $ mkdir build $ cd build $ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig" @@ -105,15 +105,15 @@ $ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer $ CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.2 cmake -G Xcode ../sources -B. #replace QT path with your installed QT version# ``` -- Open Xcode app and open project /Users/yourlogin/Documents/tahoma/toonz/build/Tahoma.xcodeproj -- Change `ALL_BUILD` to `Tahoma` +- Open Xcode app and open project /Users/yourlogin/Documents/tahoma2d/toonz/build/Tahoma2D.xcodeproj +- Change `ALL_BUILD` to `Tahoma2D` - Start build with: Product -> Build - NOTE about rebuilding in Xcode: The initial build should succeed without any errors. There after, the build will succeed but the following 3 errors can be ignored: ``` -/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/tahoma/toonz/build/toonz/Debug/Tahoma.app/Contents/MacOS/Tahoma (for architecture x86_64) option "-add_rpath @executable_path/." would duplicate path, file already has LC_RPATH for: @executable_path/. -/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/tahoma/toonz/build/toonz/Debug/Tahoma.app/Contents/MacOS/Tahoma (for architecture x86_64) option "-add_rpath /usr/local/Cellar/qt/5.12.2/lib/" would duplicate path, file already has LC_RPATH for: /usr/local/Cellar/qt/5.12.2/lib/ +/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/tahoma2d/toonz/build/toonz/Debug/Tahoma2D.app/Contents/MacOS/Tahoma2D (for architecture x86_64) option "-add_rpath @executable_path/." would duplicate path, file already has LC_RPATH for: @executable_path/. +/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/tahoma2d/toonz/build/toonz/Debug/Tahoma2D.app/Contents/MacOS/Tahoma2D (for architecture x86_64) option "-add_rpath /usr/local/Cellar/qt/5.12.2/lib/" would duplicate path, file already has LC_RPATH for: /usr/local/Cellar/qt/5.12.2/lib/ Command /bin/sh emitted errors but did not return a nonzero exit code to indicate failure ``` @@ -121,34 +121,34 @@ Side note: If you want the option to build by command line and Xcode, create a s ### Create the stuff Directory -If you have installed Tahoma on the machine already, you can skip this. Otherwise, you need to create the stuff folder with the following: +If you have installed Tahoma2D on the machine already, you can skip this. Otherwise, you need to create the stuff folder with the following: ``` -$ cd ~/Documents/tahoma -$ sudo mkdir /Applications/Tahoma -$ sudo cp -r stuff /Applications/Tahoma/Tahoma_stuff -$ sudo chmod -R 777 /Applications/Tahoma +$ cd ~/Documents/tahoma2d +$ sudo mkdir /Applications/Tahoma2D +$ sudo cp -r stuff /Applications/Tahoma2D/Tahoma2D_stuff +$ sudo chmod -R 777 /Applications/Tahoma2D ``` ## Building with extended stop motion support for webcams and Canon DSLR cameras. You will need one additional library: - The Canon SDK. This requires applying for the Canon developer program and downloading the SDK. -Copy the Header and Framework folders from the Canon SDK to `$tahoma/thirdparty/canon` +Copy the Header and Framework folders from the Canon SDK to `$tahoma2d/thirdparty/canon` -Edit the `/Users/yourlogin/Documents/tahoma/toonz/sources/CMakeLists.txt` file at the end of line 104, changing the `WITH_CANON` build option from `OFF` to `ON`. +Edit the `/Users/yourlogin/Documents/tahoma2d/toonz/sources/CMakeLists.txt` file at the end of line 104, changing the `WITH_CANON` build option from `OFF` to `ON`. -To run the program with stop motion support, you will need to copy the EDSDK.framework directory from the Canon SDK and place it in `Macintosh HD/Library/Frameworks`. It could also be placed in the same folder as `Tahoma.app`. If opening Tahoma.app fails because "EDSDK.framework can't be opened", go to `Preferences -> Security & Privacy -> General` and select "Open Anyway". Open Tahoma again and select "Open" when the "EDSDK.framework can't be opened" warning appears. +To run the program with stop motion support, you will need to copy the EDSDK.framework directory from the Canon SDK and place it in `Macintosh HD/Library/Frameworks`. It could also be placed in the same folder as `Tahoma2D.app`. If opening Tahoma2D.app fails because "EDSDK.framework can't be opened", go to `Preferences -> Security & Privacy -> General` and select "Open Anyway". Open Tahoma2D again and select "Open" when the "EDSDK.framework can't be opened" warning appears. ### Running the build - If built using command line, run the following: ``` -$ open ~/Documents/tahoma/build/toonz/Tahoma.app +$ open ~/Documents/tahoma2d/build/toonz/Tahoma2D.app ``` - If built using Xcode, do the following: - - Open Scheme editor for Tahoma: Product -> Scheme -> Edit Scheme + - Open Scheme editor for Tahoma2D: Product -> Scheme -> Edit Scheme - Uncheck: Run -> Options -> Document Versions - Run in Debug mode: Product -> Run - - To open with command line or from Finder window, the application is found in `/Users/yourlogin/Documents/tahoma/toonz/build/Debug/Tahoma.app` + - To open with command line or from Finder window, the application is found in `/Users/yourlogin/Documents/tahoma2d/toonz/build/Debug/Tahoma2D.app` diff --git a/stuff/doc/LICENSE/LICENSE.txt b/stuff/doc/LICENSE/LICENSE.txt index e25a08e8..d253f2e5 100644 --- a/stuff/doc/LICENSE/LICENSE.txt +++ b/stuff/doc/LICENSE/LICENSE.txt @@ -2,7 +2,7 @@ For licenses of third party libraries exploited in this software, please see the - - - - - - - - - - - - - - - - -Tahoma +Tahoma2D All contributions by Jeremy Bullock: Copyright (c) 2016 - 2020, Jeremy Bullock diff --git a/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt b/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt index ad11303a..944d0ae3 100644 --- a/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt +++ b/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt @@ -1,7 +1,7 @@ -Tahoma ships with FFmpeg, and uses FFmpeg through command line commands. -Tahoma does not directly use FFmpeg libraries or code. +Tahoma2D ships with FFmpeg, and uses FFmpeg through command line commands. +Tahoma2D does not directly use FFmpeg libraries or code. -As of July 2020, Tahoma is shipping with FFmpeg 4.3 LGPL version from https://ffmpeg.zeranoe.com/builds/ +As of July 2020, Tahoma2D is shipping with FFmpeg 4.3 LGPL version from https://ffmpeg.zeranoe.com/builds/ FFmpeg source code can be found at: https://github.com/turtletooth/FFmpeg diff --git a/stuff/doc/LICENSE/LICENSE_tahoma.txt b/stuff/doc/LICENSE/LICENSE_tahoma.txt index 1afdb03f..a3383bd6 100644 --- a/stuff/doc/LICENSE/LICENSE_tahoma.txt +++ b/stuff/doc/LICENSE/LICENSE_tahoma.txt @@ -1,9 +1,9 @@ -License Agreement For Tahoma -[https://github.com/turtletooth/tahoma] +License Agreement For Tahoma2D +[https://github.com/turtletooth/tahoma2d] - - - - - - - - - - - - - - - - -Tahoma +Tahoma2D All contributions by Jeremy Bullock: Copyright (c) 2016 - 2020, Jeremy Bullock diff --git a/stuff/profiles/layouts/fxs/fxs.lst b/stuff/profiles/layouts/fxs/fxs.lst index c9e686c0..73749c05 100644 --- a/stuff/profiles/layouts/fxs/fxs.lst +++ b/stuff/profiles/layouts/fxs/fxs.lst @@ -162,7 +162,7 @@ STD_posterizeFx STD_solarizeFx - + STD_artContourFx STD_calligraphicFx STD_blendTzFx @@ -171,7 +171,7 @@ STD_paletteFilterFx STD_cornerPinFx STD_textureFx - + SHADER_caustics SHADER_fireball diff --git a/tahoma_build.sh b/tahoma_build.sh index d2c80233..0ce21981 100644 --- a/tahoma_build.sh +++ b/tahoma_build.sh @@ -2,22 +2,22 @@ export QTDIR=/usr/local/Cellar/qt/5.15.0 export TOONZDIR=toonz/build/toonz/Release -echo ">>> Copying stuff to $TOONZDIR/Tahoma.app/tahomastuff" -cp -R stuff $TOONZDIR/Tahoma.app/tahomastuff +echo ">>> Copying stuff to $TOONZDIR/Tahoma2D.app/tahomastuff" +cp -R stuff $TOONZDIR/Tahoma2D.app/tahomastuff -echo ">>> Configuring Tahoma.app for deployment" +echo ">>> Configuring Tahoma2D.app for deployment" -$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma.app -verbose=0 -always-overwrite \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzocompress \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzodecompress \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcleanup \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcomposer \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tconverter \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmcontroller \ - -executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmserver +$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzocompress \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzodecompress \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcleanup \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcomposer \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tconverter \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmcontroller \ + -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver echo ">>> Correcting library paths" -for X in `find $TOONZDIR/Tahoma.app/Contents -type f -name *.dylib -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` +for X in `find $TOONZDIR/Tahoma2D.app/Contents -type f -name *.dylib -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` do Z=`echo $X | cut -c 1-1` if [ "$Z" != "/" ] @@ -26,7 +26,7 @@ do else Y=`basename $X` W=`basename $LIBFILE` - if [ -f $TOONZDIR/Tahoma.app/Contents/Frameworks/$Y -a "$Y" != "$W" ] + if [ -f $TOONZDIR/Tahoma2D.app/Contents/Frameworks/$Y -a "$Y" != "$W" ] then echo "Fixing $X in $LIBFILE" install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE @@ -34,8 +34,8 @@ do fi done -echo ">>> Creating Tahoma-osx.dmg" +echo ">>> Creating Tahoma2D-osx.dmg" -$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma.app -dmg -verbose=0 +$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -dmg -verbose=0 -mv $TOONZDIR/Tahoma.dmg $TOONZDIR/../../Tahoma-osx.dmg \ No newline at end of file +mv $TOONZDIR/Tahoma2D.dmg $TOONZDIR/../../Tahoma2D-osx.dmg \ No newline at end of file diff --git a/toonz/cmake/BundleInfo.plist.in b/toonz/cmake/BundleInfo.plist.in index 2b04df3d..886580d2 100644 --- a/toonz/cmake/BundleInfo.plist.in +++ b/toonz/cmake/BundleInfo.plist.in @@ -5,21 +5,21 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Tahoma + Tahoma2D CFBundleExecutable - Tahoma + Tahoma2D CFBundleIconFile Tahoma.icns CFBundleIdentifier - io.github.turtletooth.Tahoma + io.github.turtletooth.Tahoma2D NSCameraUsageDescription - Tahoma needs access to the camera in order to use Camera Capture + Tahoma2D needs access to the camera in order to use Camera Capture NSMicrophoneUsageDescription - Tahoma needs access to the microphone in order to record audio. + Tahoma2D needs access to the microphone in order to record audio. CFBundleInfoDictionaryVersion 6.0 CFBundleName - Tahoma + Tahoma2D CFBundlePackageType APPL CFBundleShortVersionString diff --git a/toonz/install/SystemVar.ini b/toonz/install/SystemVar.ini index 5ef6628e..9cc4978b 100644 --- a/toonz/install/SystemVar.ini +++ b/toonz/install/SystemVar.ini @@ -1,11 +1,11 @@ [General] -TOONZCACHEROOT="/Applications/Tahoma/Tahoma_stuff/cache" -TOONZCONFIG="/Applications/Tahoma/Tahoma_stuff/config" -TOONZFXPRESETS="/Applications/Tahoma/Tahoma_stuff/fxs" -TOONZLIBRARY="/Applications/Tahoma/Tahoma_stuff/library" -TOONZPROFILES="/Applications/Tahoma/Tahoma_stuff/profiles" -TahomaPROFILES="/Applications/Tahoma/Tahoma_stuff/profiles" -TOONZPROJECTS="/Applications/Tahoma/Tahoma_stuff/projects" -TOONZROOT="/Applications/Tahoma/Tahoma_stuff" -TAHOMAROOT="/Applications/Tahoma/Tahoma_stuff" -TOONZSTUDIOPALETTE="/Applications/Tahoma/Tahoma_stuff/studiopalette" +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" diff --git a/toonz/install/package_sdk.sh b/toonz/install/package_sdk.sh index d38655e9..fca63d46 100755 --- a/toonz/install/package_sdk.sh +++ b/toonz/install/package_sdk.sh @@ -7,7 +7,7 @@ do ;; d) DIST=$OPTARG ;; - h) echo "-t tahoma_repository_dir -d dist_dir" + h) echo "-t tahoma2d_repository_dir -d dist_dir" exit 1; ;; \?) exit 1 diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 22a449c4..aa582e36 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -2,7 +2,7 @@ set(CMAKE_BUILD_TYPE_INIT Release) -project(Tahoma) +project(Tahoma2D) #----------------------------------------------------------------------------- @@ -460,7 +460,7 @@ elseif(BUILD_ENV_UNIXLIKE) # the libraries have .pc find_package(PkgConfig) - # This is not required for Tahoma itself, but libtiff will pick it up if + # This is not required for Tahoma2D itself, but libtiff will pick it up if # present and libimage won't be aware causing linker to fail pkg_check_modules(LZMA liblzma) set(TIFF_LIB ${TIFF_LIBRARY} ${LZMA_LIBRARIES}) @@ -580,12 +580,12 @@ elseif(BUILD_ENV_UNIXLIKE) # Mirror relative bin/lib location for installation # so the generated shell script works in both cases. - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/tahoma) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/tahoma) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/tahoma2d) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/tahoma2d) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "/opt/tahoma" CACHE PATH "Tahoma install prefix" FORCE) + set(CMAKE_INSTALL_PREFIX "/opt/tahoma2d" CACHE PATH "Tahoma2D install prefix" FORCE) endif() endif() @@ -654,7 +654,7 @@ if(BUILD_ENV_APPLE) $ ) # add capability for retina displays - set_target_properties(Tahoma PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/../cmake/BundleInfo.plist.in) + set_target_properties(Tahoma2D PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/../cmake/BundleInfo.plist.in) endif() if(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) diff --git a/toonz/sources/common/tapptools/tenv.cpp b/toonz/sources/common/tapptools/tenv.cpp index 6b9a1be1..073625b9 100644 --- a/toonz/sources/common/tapptools/tenv.cpp +++ b/toonz/sources/common/tapptools/tenv.cpp @@ -177,7 +177,7 @@ public: m_rootVarName = toUpper(m_version.getAppName()) + "ROOT"; #ifdef _WIN32 // from v1.3, registry root is moved to SOFTWARE\\Tahoma\\Tahoma - m_registryRoot = TFilePath("SOFTWARE\\Tahoma\\") + m_version.getAppName(); + m_registryRoot = TFilePath("SOFTWARE\\Tahoma2D\\") + m_version.getAppName(); #endif m_systemVarPrefix = m_version.getAppName(); updateEnvFile(); diff --git a/toonz/sources/common/timage_io/timage_io.cpp b/toonz/sources/common/timage_io/timage_io.cpp index 6007b722..109a6ed8 100644 --- a/toonz/sources/common/timage_io/timage_io.cpp +++ b/toonz/sources/common/timage_io/timage_io.cpp @@ -840,7 +840,7 @@ TString TImageException::getMessage() const { TImageVersionException::TImageVersionException(const TFilePath &fp, int major, int minor) : TException(L"The file " + fp.getWideString() + - L" was generated by a newer version of Tahoma and cannot " + L" was generated by a newer version of Tahoma2D and cannot " L"be loaded.") , m_fp(fp) , m_major(major) diff --git a/toonz/sources/include/tversion.h b/toonz/sources/include/tversion.h index 50f00aad..2e2b6388 100644 --- a/toonz/sources/include/tversion.h +++ b/toonz/sources/include/tversion.h @@ -17,7 +17,7 @@ public: std::string getAppVersionInfo(std::string msg); private: - const char *applicationName = "Tahoma"; + const char *applicationName = "Tahoma2D"; const float applicationVersion = 1.0; const float applicationRevision = 1; const char *applicationNote = ""; diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index 41b44d20..cda07958 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -664,7 +664,7 @@ int main(int argc, char *argv[]) { TEnv::setRootVarName(rootVarName); TEnv::setSystemVarPrefix(systemVarPrefix); - QCoreApplication::setOrganizationName("Tahoma"); + QCoreApplication::setOrganizationName("Tahoma2D"); QCoreApplication::setOrganizationDomain(""); QCoreApplication::setApplicationName( QString::fromStdString(TEnv::getApplicationName())); diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 0427e17a..98dccf86 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -383,11 +383,11 @@ endif() qt5_wrap_cpp(SOURCES ${MOC_HEADERS}) if(BUILD_ENV_MSVC) - add_executable(Tahoma WIN32 ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES} ${RC_FILE}) + 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(Tahoma MACOSX_BUNDLE Tahoma.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES}) + add_executable(Tahoma2D MACOSX_BUNDLE Tahoma.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES}) #add_definitions( # -DTNZBASE_EXPORTS # -DTPARAM_EXPORTS @@ -440,7 +440,7 @@ if(BUILD_TARGET_WIN) endif() if(BUILD_ENV_MSVC AND WITH_CANON) - target_link_libraries(Tahoma + target_link_libraries(Tahoma2D Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort ${GL_LIB} ${GLUT_LIB} @@ -448,7 +448,7 @@ if(BUILD_ENV_MSVC AND WITH_CANON) tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm ) elseif(BUILD_ENV_MSVC) - target_link_libraries(Tahoma + target_link_libraries(Tahoma2D Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort ${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} strmiids @@ -462,9 +462,9 @@ elseif(BUILD_ENV_APPLE AND WITH_CANON) # 変なところにライブラリ生成するカスども set(EXTRA_LIBS ${EXTRA_LIBS} "$" "$") - add_dependencies(Tahoma tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm) + add_dependencies(Tahoma2D tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm) - target_link_libraries(Tahoma + target_link_libraries(Tahoma2D Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort ${GL_LIB} ${GLUT_LIB} ${CANON_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} @@ -479,9 +479,9 @@ elseif(BUILD_ENV_APPLE) # 変なところにライブラリ生成するカスども set(EXTRA_LIBS ${EXTRA_LIBS} "$" "$") - add_dependencies(Tahoma tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm) + add_dependencies(Tahoma2D tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm) - target_link_libraries(Tahoma + target_link_libraries(Tahoma2D Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort ${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} @@ -501,7 +501,7 @@ elseif(BUILD_ENV_UNIXLIKE) endif() target_link_libraries( - Tahoma Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml + Tahoma2D Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort ${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} ${EXTRA_LIBS} @@ -511,7 +511,7 @@ endif() if(BUILD_ENV_APPLE) # CMAKE_RUNTIME_OUTPUT_DIRECTORY should be equivalent to usage on windows despite empty # OSX だと CMAKE_RUNTIME_OUTPUT_DIRECTORY が空だが Windows 版と同じ使い方ができるようにしておく - get_target_property(bin Tahoma LOCATION) + get_target_property(bin Tahoma2D LOCATION) get_filename_component(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${bin} DIRECTORY) # show CMAKE_RUNTIME_OUTPUT_DIRECTORY message("CMAKE_RUNTIME_OUTPUT_DIRECTORY:" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) @@ -519,35 +519,35 @@ endif() # copy utilty executables onto the directory after build if(LZODRIVER_FOUND) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress) endif() if(BUILD_ENV_APPLE) - get_target_property(loc Tahoma MACOSX_BUNDLE_NAME) + get_target_property(loc Tahoma2D MACOSX_BUNDLE_NAME) message(" ==> App Bundle: " ${loc}) message(" ==> Mach-o: " ${bin}) foreach(lib ${EXTRA_LIBS}) message(" copy:" ${lib} "==>" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND cp ${lib} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND cp ${lib} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endforeach() - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcomposer) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcleanup) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tconverter) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmcontroller) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmserver) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcomposer) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcleanup) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tconverter) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmcontroller) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmserver) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../install/SystemVar.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../install/SystemVar.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources) - add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../../../qss) + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../../../qss) - add_custom_command(TARGET Tahoma + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin} || true ) - add_custom_command(TARGET Tahoma + add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin} || true ) @@ -556,7 +556,7 @@ elseif(BUILD_ENV_UNIXLIKE AND BUILD_TARGET_WIN) # Setup files on Windows platform while cross compilation. install( TARGETS - Tahoma + Tahoma2D DESTINATION bin ) @@ -598,7 +598,7 @@ elseif(BUILD_ENV_UNIXLIKE AND BUILD_TARGET_WIN) install( DIRECTORY ${CMAKE_SOURCE_DIR}/../../stuff - DESTINATION share/tahoma + DESTINATION share/tahoma2d ) elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) # Setup files on Linux/Unix platform. @@ -606,62 +606,62 @@ elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) # but useful for package managers. # # Note that its assumed the destination can be either - # - /opt/tahoma + # - /opt/tahoma2d # - /usr install( TARGETS - Tahoma + Tahoma2D DESTINATION bin ) # Shell script that copies files to the home directory as needed # and sets the library preload path. - file(WRITE ${CMAKE_BINARY_DIR}/bin/tahoma + file(WRITE ${CMAKE_BINARY_DIR}/bin/tahoma2d "#!/bin/sh -TAHOMA_BASE=\$(dirname \"\$0\")/.. +TAHOMA2D_BASE=\$(dirname \"\$0\")/.. -if [ ! -d \$HOME/.config/Tahoma ]; then - mkdir -p \$HOME/.config/Tahoma +if [ ! -d \$HOME/.config/Tahoma2D ]; then + mkdir -p \$HOME/.config/Tahoma2D fi -if [ ! -d \$HOME/.config/Tahoma/stuff ]; then - cp -r \$TAHOMA_BASE/share/tahoma/stuff \$HOME/.config/Tahoma +if [ ! -d \$HOME/.config/Tahoma2D/stuff ]; then + cp -r \$TAHOMA2D_BASE/share/tahoma2d/stuff \$HOME/.config/Tahoma2D fi -if [ ! -d \$HOME/.config/Tahoma/stuff/projects/library ]; then - mkdir -p \$HOME/.config/Tahoma/stuff/projects/library +if [ ! -d \$HOME/.config/Tahoma2D/stuff/projects/library ]; then + mkdir -p \$HOME/.config/Tahoma2D/stuff/projects/library fi -if [ ! -d \$HOME/.config/Tahoma/stuff/projects/fxs ]; then - mkdir -p \$HOME/.config/Tahoma/stuff/projects/fxs +if [ ! -d \$HOME/.config/Tahoma2D/stuff/projects/fxs ]; then + mkdir -p \$HOME/.config/Tahoma2D/stuff/projects/fxs fi -if [ ! -e \$HOME/.config/Tahoma/SystemVar.ini ]; then - cat << EOF > $HOME/.config/Tahoma/SystemVar.ini +if [ ! -e \$HOME/.config/Tahoma2D/SystemVar.ini ]; then + cat << EOF > $HOME/.config/Tahoma2D/SystemVar.ini [General] -TAHOMAROOT=\"\$HOME/.config/Tahoma/stuff\" -TahomaPROFILES=\"\$HOME/.config/Tahoma/stuff/profiles\" -TOONZCACHEROOT=\"\$HOME/.config/Tahoma/stuff/cache\" -TOONZCONFIG=\"\$HOME/.config/Tahoma/stuff/config\" -TOONZFXPRESETS=\"\$HOME/.config/Tahoma/stuff/fxs\" -TOONZLIBRARY=\"\$HOME/.config/Tahoma/stuff/library\" -TOONZPROFILES=\"\$HOME/.config/Tahoma/stuff/profiles\" -TOONZPROJECTS=\"$HOME/.config/Tahoma/stuff/projects\" -TOONZROOT=\"\$HOME/.config/Tahoma/stuff\" -TOONZSTUDIOPALETTE=\"\$HOME/.config/Tahoma/stuff/studiopalette\" +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\" EOF fi -export LD_LIBRARY_PATH=\${TAHOMA_BASE}/lib/tahoma:\${LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=\${TAHOMA2D_BASE}/lib/tahoma2d:\${LD_LIBRARY_PATH} -exec \$TAHOMA_BASE/bin/Tahoma \"\$@\" +exec \$TAHOMA2D_BASE/bin/Tahoma2D \"\$@\" ") # only needed for executing without installing - execute_process(COMMAND chmod +x ${CMAKE_BINARY_DIR}/bin/tahoma) + execute_process(COMMAND chmod +x ${CMAKE_BINARY_DIR}/bin/tahoma2d) install( PROGRAMS - ${CMAKE_BINARY_DIR}/bin/tahoma + ${CMAKE_BINARY_DIR}/bin/tahoma2d "$" "$" "$" @@ -692,13 +692,13 @@ exec \$TAHOMA_BASE/bin/Tahoma \"\$@\" "$" "$" "$" - DESTINATION lib/tahoma + DESTINATION lib/tahoma2d ) install( DIRECTORY ${CMAKE_SOURCE_DIR}/../../stuff - DESTINATION share/tahoma + DESTINATION share/tahoma2d ) endif() diff --git a/toonz/sources/toonz/aboutpopup.cpp b/toonz/sources/toonz/aboutpopup.cpp index a34a66f7..34a87ad9 100644 --- a/toonz/sources/toonz/aboutpopup.cpp +++ b/toonz/sources/toonz/aboutpopup.cpp @@ -21,11 +21,11 @@ void AboutClickableLabel::mousePressEvent(QMouseEvent* event) { } AboutPopup::AboutPopup(QWidget* parent) - : DVGui::Dialog(parent, true, "About Tahoma") { + : DVGui::Dialog(parent, true, "About Tahoma2D") { setFixedWidth(300); setFixedHeight(350); - setWindowTitle(tr("About Tahoma")); + setWindowTitle(tr("About Tahoma2D")); setTopMargin(0); TFilePath baseLicensePath = TEnv::getStuffDir() + "doc/LICENSE"; @@ -49,7 +49,7 @@ AboutPopup::AboutPopup(QWidget* parent) mainLayout->addWidget(blankLabel); AboutClickableLabel* licenseLink = new AboutClickableLabel(this); - licenseLink->setText(tr("Tahoma License")); + licenseLink->setText(tr("Tahoma2D License")); connect(licenseLink, &AboutClickableLabel::clicked, [=]() { if (TSystem::isUNC(tahomaLicensePath)) @@ -77,20 +77,20 @@ AboutPopup::AboutPopup(QWidget* parent) mainLayout->addWidget(thirdPartyLink); QLabel* ffmpegLabel = new QLabel(this); - ffmpegLabel->setText( - tr("Tahoma ships with FFmpeg. \nFFmpeg is licensed under the LGPLv2.1")); + ffmpegLabel->setText(tr( + "Tahoma2D ships with FFmpeg. \nFFmpeg is licensed under the LGPLv2.1")); mainLayout->addWidget(ffmpegLabel); mainLayout->addSpacerItem(new QSpacerItem(this->width(), 10)); mainLayout->addWidget( - new QLabel(tr("Tahoma is made possible with the help of " + new QLabel(tr("Tahoma2D is made possible with the help of " "patrons.\nSpecial thanks to:"))); mainLayout->addWidget(new QLabel("Rodney Baker")); mainLayout->addWidget(new QLabel(" ")); AboutClickableLabel* supportLink = new AboutClickableLabel(this); - supportLink->setText(tr("Please consider supporting Tahoma on Patreon.")); + supportLink->setText(tr("Please consider supporting Tahoma2D on Patreon.")); connect(supportLink, &AboutClickableLabel::clicked, [=]() { QDesktopServices::openUrl(QUrl("https://patreon.com/jeremybullock")); ; diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index bf374620..6c7d4b41 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -124,7 +124,7 @@ static void toonzRunOutOfContMemHandler(unsigned long size) { #ifdef _WIN32 static bool firstTime = true; if (firstTime) { - MessageBox(NULL, (LPCWSTR)L"Run out of contiguous physical memory: please save all and restart Tahoma!", + MessageBox(NULL, (LPCWSTR)L"Run out of contiguous physical memory: please save all and restart Tahoma2D!", (LPCWSTR)L"Warning", MB_OK | MB_SYSTEMMODAL); firstTime = false; } @@ -158,7 +158,7 @@ static void initToonzEnv(QHash &argPathValues) { ++i; } - QCoreApplication::setOrganizationName("Tahoma"); + QCoreApplication::setOrganizationName("Tahoma2D"); QCoreApplication::setOrganizationDomain(""); QCoreApplication::setApplicationName( QString::fromStdString(TEnv::getApplicationName())); @@ -614,7 +614,7 @@ int main(int argc, char *argv[]) { loadShaderInterfaces(ToonzFolder::getLibraryFolder() + TFilePath("shaders")); - splash.showMessage(offsetStr + "Initializing Tahoma...", + splash.showMessage(offsetStr + "Initializing Tahoma2D...", Qt::AlignRight | Qt::AlignBottom, Qt::black); a.processEvents(); @@ -698,7 +698,7 @@ int main(int argc, char *argv[]) { w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName())); if (TEnv::getIsPortable()) { - splash.showMessage(offsetStr + "Starting Tahoma...", + splash.showMessage(offsetStr + "Starting Tahoma2D...", Qt::AlignRight | Qt::AlignBottom, Qt::black); } else { splash.showMessage(offsetStr + "Starting main window...", diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index fd2aa58c..818ac4ed 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1047,14 +1047,14 @@ void MainWindow::onAbout() { m_aboutPopup->exec(); } //----------------------------------------------------------------------------- void MainWindow::onOpenOnlineManual() { - QDesktopServices::openUrl(QUrl(tr("http://tahoma.readthedocs.io"))); + QDesktopServices::openUrl(QUrl(tr("http://tahoma2d.readthedocs.io"))); } //----------------------------------------------------------------------------- void MainWindow::onOpenWhatsNew() { QDesktopServices::openUrl( - QUrl(tr("https://github.com/turtletooth/tahoma/releases/latest"))); + QUrl(tr("https://github.com/turtletooth/tahoma2d/releases/latest"))); } //----------------------------------------------------------------------------- @@ -1069,7 +1069,7 @@ void MainWindow::onOpenWhatsNew() { void MainWindow::onOpenReportABug() { QString str = QString( tr("To report a bug, click on the button below to open a web browser " - "window for Tahoma's Issues page on https://github.com. Click on " + "window for Tahoma2D's Issues page on https://github.com. Click on " "the 'New issue' button and fill out the form.")); std::vector buttons = {QObject::tr("Report a Bug"), @@ -1077,7 +1077,7 @@ void MainWindow::onOpenReportABug() { int ret = DVGui::MsgBox(DVGui::INFORMATION, str, buttons, 1); if (ret == 1) QDesktopServices::openUrl( - QUrl("https://github.com/turtletooth/tahoma/issues")); + QUrl("https://github.com/turtletooth/tahoma2d/issues")); } //----------------------------------------------------------------------------- @@ -1113,7 +1113,7 @@ void MainWindow::resetRoomsLayout() { DVGui::MsgBoxInPopup( DVGui::INFORMATION, - QObject::tr("The rooms will be reset the next time you run Tahoma.")); + QObject::tr("The rooms will be reset the next time you run Tahoma2D.")); } void MainWindow::maximizePanel() { @@ -1836,10 +1836,10 @@ void MainWindow::defineActions() { // createAction(MI_SavePreview, "&Save Preview", ""); createRightClickMenuAction(MI_SavePreset, tr("&Save As Preset"), ""); menuAct = createMenuFileAction(MI_Preferences, tr("&Preferences..."), - "Ctrl+U", tr("Change Tahoma's settings.")); + "Ctrl+U", tr("Change Tahoma2D's settings.")); menuAct->setIcon(createQIcon("gear")); createMenuFileAction(MI_ShortcutPopup, tr("&Configure Shortcuts..."), "", - tr("Change the shortcuts of Tahoma.")); + tr("Change the shortcuts of Tahoma2D.")); menuAct = createMenuFileAction(MI_PrintXsheet, tr("&Print Xsheet"), "", tr("Print the scene's exposure sheet.")); @@ -2399,8 +2399,8 @@ void MainWindow::defineActions() { "Ctrl+`"); menuAct->setIcon(createQIcon("toggle_fullscreen")); - menuAct = createMenuHelpAction(MI_About, tr("&About Tahoma..."), ""); - menuAct->setIconText(tr("About Tahoma...")); + menuAct = createMenuHelpAction(MI_About, tr("&About Tahoma2D..."), ""); + menuAct->setIconText(tr("About Tahoma2D...")); menuAct->setIcon(createQIcon("info")); menuAct = createMenuWindowsAction(MI_StartupPopup, tr("&Startup Popup..."), @@ -3613,7 +3613,7 @@ void MainWindow::clearCacheFolder() { message += tr("\nAre you sure?\n\nN.B. Make sure you are not running another " - "process of Tahoma,\nor you may delete necessary files for it."); + "process of Tahoma2D,\nor you may delete necessary files for it."); QMessageBox::StandardButton ret = QMessageBox::question( this, tr("Clear Cache Folder"), message, @@ -3672,7 +3672,7 @@ void MainWindow::makeTransparencyDialog() { m_transparencyTogglerWindow->setFixedHeight(100); m_transparencyTogglerWindow->setFixedWidth(250); - m_transparencyTogglerWindow->setWindowTitle(tr("Tahoma Transparency")); + m_transparencyTogglerWindow->setWindowTitle(tr("Tahoma2D Transparency")); QPushButton *toggleButton = new QPushButton(this); toggleButton->setText(tr("Close to turn off Transparency.")); connect(toggleButton, &QPushButton::clicked, diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index 9b869941..ab377392 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -348,34 +348,35 @@ void PreferencesPopup::onPathAliasPriorityChanged() { void PreferencesPopup::onStyleSheetTypeChanged() { QApplication::setOverrideCursor(Qt::WaitCursor); - QString currentStyle = m_pref->getCurrentStyleSheetPath(); - QString iconThemeName = QIcon::themeName(); - std::string styleString = currentStyle.toStdString(); + QString currentStyle = m_pref->getCurrentStyleSheetPath(); + QString iconThemeName = QIcon::themeName(); + std::string styleString = currentStyle.toStdString(); std::string iconThemeString = iconThemeName.toStdString(); qApp->setStyleSheet(currentStyle); QApplication::restoreOverrideCursor(); - + if (currentStyle.contains("Light") || currentStyle.contains("Neutral")) { - m_pref->setValue(iconTheme, true); - if (iconThemeName != "dark") { - //QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" - // : "light"); - DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); - } - } - else { - m_pref->setValue(iconTheme, false); - if (iconThemeName != "light") { - //QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" - // : "light"); - DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); - } + m_pref->setValue(iconTheme, true); + if (iconThemeName != "dark") { + // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" + // : "light"); + DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), + tr("Please restart to reload the icons.")); + } + } else { + m_pref->setValue(iconTheme, false); + if (iconThemeName != "light") { + // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" + // : "light"); + DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), + tr("Please restart to reload the icons.")); + } } } ////----------------------------------------------------------------------------- // -//void PreferencesPopup::onIconThemeChanged() { +// void PreferencesPopup::onIconThemeChanged() { // // Switch between dark or light icons // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // : "light"); @@ -934,8 +935,8 @@ void PreferencesPopup::insertDualUIs( //----------------------------------------------------------------------------- void PreferencesPopup::insertFootNote(QGridLayout* layout) { - QLabel* note = - new QLabel(tr("* Changes will take effect the next time you run Tahoma2D")); + QLabel* note = new QLabel( + tr("* Changes will take effect the next time you run Tahoma2D")); note->setStyleSheet("font-size: 10px; font: italic;"); layout->addWidget(note, layout->rowCount(), 0, 1, 2, Qt::AlignLeft | Qt::AlignVCenter); @@ -952,7 +953,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) { {autosavePeriod, tr("Interval (Minutes):")}, {autosaveSceneEnabled, tr("Automatically Save the Scene File")}, {autosaveOtherFilesEnabled, tr("Automatically Save Non-Scene Files")}, - {startupPopupEnabled, tr("Show Startup Window when Tahoma Starts")}, + {startupPopupEnabled, tr("Show Startup Window when Tahoma2D Starts")}, {undoMemorySize, tr("Undo Memory Size (MB):")}, {taskchunksize, tr("Render Task Chunk Size:")}, {replaceAfterSaveLevelAs, @@ -1410,9 +1411,9 @@ QWidget* PreferencesPopup::createInterfacePage() { insertUI(CurrentStyleSheetName, lay, styleSheetItemList); - //lay->addWidget(new QLabel(tr("Icon Theme*:"), this), 2, 0, + // lay->addWidget(new QLabel(tr("Icon Theme*:"), this), 2, 0, // Qt::AlignRight | Qt::AlignVCenter); - //lay->addWidget(createUI(iconTheme), 2, 1); + // lay->addWidget(createUI(iconTheme), 2, 1); // insertUI(linearUnits, lay, getComboItemList(linearUnits)); // insertUI(cameraUnits, lay, @@ -1501,7 +1502,7 @@ QWidget* PreferencesPopup::createLoadingPage() { insertUI(autoExposeEnabled, lay); insertUI(subsceneFolderEnabled, lay); insertUI(removeSceneNumberFromLoadedLevelName, lay); - //insertUI(IgnoreImageDpi, lay); + // insertUI(IgnoreImageDpi, lay); insertUI(initialLoadTlvCachingBehavior, lay, getComboItemList(initialLoadTlvCachingBehavior)); insertUI(columnIconLoadingPolicy, lay, @@ -1549,9 +1550,9 @@ QWidget* PreferencesPopup::createSavingPage() { setupLayout(lay); QGridLayout* autoSaveLay = insertGroupBoxUI(autosaveEnabled, lay); { - insertUI(autosavePeriod, autoSaveLay); - insertUI(autosaveSceneEnabled, autoSaveLay); - insertUI(autosaveOtherFilesEnabled, autoSaveLay); + insertUI(autosavePeriod, autoSaveLay); + insertUI(autosaveSceneEnabled, autoSaveLay); + insertUI(autosaveOtherFilesEnabled, autoSaveLay); } insertUI(replaceAfterSaveLevelAs, lay); QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay); @@ -1583,10 +1584,11 @@ QWidget* PreferencesPopup::createImportExportPage() { QGridLayout* lay = new QGridLayout(); setupLayout(lay); - putLabel(tr("Tahoma2D can use FFmpeg for additional file formats.\n") + - tr("FFmpeg is bundled with Tahoma2D,\n") + - tr("but you can provide the path to a different ffmpeg location."), - lay); + putLabel( + tr("Tahoma2D can use FFmpeg for additional file formats.\n") + + tr("FFmpeg is bundled with Tahoma2D,\n") + + tr("but you can provide the path to a different ffmpeg location."), + lay); insertUI(ffmpegPath, lay); putLabel(tr("Number of seconds to wait for FFmpeg to complete processing the " @@ -1615,7 +1617,7 @@ QWidget* PreferencesPopup::createDrawingPage() { QGridLayout* lay = new QGridLayout(); setupLayout(lay); - //insertUI(scanLevelType, lay, getComboItemList(scanLevelType)); + // insertUI(scanLevelType, lay, getComboItemList(scanLevelType)); insertUI(DefLevelType, lay, getComboItemList(DefLevelType)); insertUI(newLevelSizeToCameraSizeEnabled, lay); insertDualUIs(DefLevelWidth, DefLevelHeight, lay); @@ -1632,7 +1634,7 @@ QWidget* PreferencesPopup::createDrawingPage() { insertUI(saveUnpaintedInCleanup, lay); insertUI(minimizeSaveboxAfterEditing, lay); insertUI(useNumpadForSwitchingStyles, lay); - //insertUI(downArrowInLevelStripCreatesNewFrame, lay); + // insertUI(downArrowInLevelStripCreatesNewFrame, lay); QGridLayout* replaceVectorsLay = insertGroupBox( tr("Replace Vectors with Simplified Vectors Command"), lay); { @@ -1679,7 +1681,7 @@ QWidget* PreferencesPopup::createToolsPage() { } insertUI(levelBasedToolsDisplay, lay, getComboItemList(levelBasedToolsDisplay)); - //insertUI(useCtrlAltToResizeBrush, lay); + // insertUI(useCtrlAltToResizeBrush, lay); lay->setRowStretch(lay->rowCount(), 1); widget->setLayout(lay); @@ -1714,8 +1716,8 @@ QWidget* PreferencesPopup::createXsheetPage() { QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay); { insertUI(expandFunctionHeader, xshToolbarLay); } insertUI(showColumnNumbers, lay); - //insertUI(syncLevelRenumberWithXsheet, lay); - //insertUI(currentTimelineEnabled, lay); + // insertUI(syncLevelRenumberWithXsheet, lay); + // insertUI(currentTimelineEnabled, lay); insertUI(currentColumnColor, lay); lay->setRowStretch(lay->rowCount(), 1); diff --git a/toonz/sources/toonz/shortcutpopup.cpp b/toonz/sources/toonz/shortcutpopup.cpp index af7954e7..12b20635 100644 --- a/toonz/sources/toonz/shortcutpopup.cpp +++ b/toonz/sources/toonz/shortcutpopup.cpp @@ -576,7 +576,7 @@ void ShortcutPopup::showDialog(QString text) { if (m_dialog == NULL) { m_dialogLabel = new QLabel("", this); m_dialog = new DVGui::Dialog(this, false, false); - m_dialog->setWindowTitle(tr("Tahoma - Setting Shortcuts")); + m_dialog->setWindowTitle(tr("Tahoma2D - Setting Shortcuts")); m_dialog->setModal(false); m_dialog->setTopMargin(10); @@ -699,7 +699,7 @@ void ShortcutPopup::onLoadPreset() { if (!showConfirmDialog()) return; showDialog(tr("Setting Shortcuts")); - if (preset == "Tahoma") { + if (preset == "Tahoma2D") { clearAllShortcuts(false); TFilePath fp = defaultPresetDir + TFilePath("deftahoma.ini"); setPresetShortcuts(fp); @@ -739,7 +739,7 @@ void ShortcutPopup::onLoadPreset() { QStringList ShortcutPopup::buildPresets() { QStringList presets; presets << "" - << "Tahoma" + << "Tahoma2D" //<< "RETAS PaintMan" << "Toon Boom Harmony" << "Adobe Animate" @@ -804,7 +804,7 @@ void ShortcutPopup::getCurrentPresetPref() { if (name == "DELETED") m_presetChoiceCB->setCurrentText(""); else if (name == "deftahoma") - m_presetChoiceCB->setCurrentText("Tahoma"); + m_presetChoiceCB->setCurrentText("Tahoma2D"); else if (name == "otharmony") m_presetChoiceCB->setCurrentText("Toon Boom Harmony"); else if (name == "otadobe") diff --git a/toonz/sources/toonz/startuppopup.cpp b/toonz/sources/toonz/startuppopup.cpp index ab051726..c6c3b866 100644 --- a/toonz/sources/toonz/startuppopup.cpp +++ b/toonz/sources/toonz/startuppopup.cpp @@ -95,7 +95,7 @@ QString removeZeros(QString srcStr) { StartupPopup::StartupPopup() : Dialog(TApp::instance()->getMainWindow(), true, true, "StartupPopup") { - setWindowTitle(tr("Tahoma Startup")); + setWindowTitle(tr("Tahoma2D Startup")); m_projectBox = new QGroupBox(tr("Current Project"), this); m_sceneBox = new QGroupBox(tr("Create a New Scene"), this); diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index 5607b280..8488e26c 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -32,7 +32,7 @@ using namespace DVGui; -QString DialogTitle = "Tahoma 1.0"; +QString DialogTitle = "Tahoma2D 1.0"; //============================================================================= namespace { @@ -818,7 +818,7 @@ RadioButtonDialog::RadioButtonDialog(const QString &labelText, const QList &radioButtonList, QWidget *parent, Qt::WindowFlags f) : Dialog(parent, true, true), m_result(1) { - setWindowTitle(tr("Tahoma")); + setWindowTitle(tr("Tahoma2D")); setMinimumSize(20, 20); @@ -888,7 +888,7 @@ ProgressDialog::ProgressDialog(const QString &labelText, const QString &cancelButtonText, int minimum, int maximum, QWidget *parent, Qt::WindowFlags f) : Dialog(parent, true, true), m_isCanceled(false) { - setWindowTitle(tr("Tahoma")); + setWindowTitle(tr("Tahoma2D")); setMinimumSize(20, 20); diff --git a/toonz/sources/toonzqt/infoviewer.cpp b/toonz/sources/toonzqt/infoviewer.cpp index 170817a3..85300e23 100644 --- a/toonz/sources/toonzqt/infoviewer.cpp +++ b/toonz/sources/toonzqt/infoviewer.cpp @@ -270,11 +270,11 @@ QString InfoViewerImp::getTypeString() { else if (ext == "mov" || ext == "avi" || ext == "3gp") return "Movie File"; else if (ext == "tnz") - return "Tahoma Scene"; + return "Tahoma2D Scene"; else if (ext == "tab") return "Tab Scene"; else if (ext == "plt") - return "Tahoma Palette"; + return "Tahoma2D Palette"; else if (ext == "wav" || ext == "aiff" || ext == "mp3") return "Audio File"; else if (ext == "mesh") diff --git a/toonz/sources/xdg-data/CMakeLists.txt b/toonz/sources/xdg-data/CMakeLists.txt index ab0a6158..a948e3f2 100644 --- a/toonz/sources/xdg-data/CMakeLists.txt +++ b/toonz/sources/xdg-data/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES io.github.Tahoma.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) -install(FILES io.github.Tahoma.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) -install(FILES io.github.Tahoma.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps) +install(FILES io.github.Tahoma2D.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) +install(FILES io.github.Tahoma2D.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +install(FILES io.github.Tahoma2D.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps) diff --git a/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml b/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml index c029fd20..2c2ef688 100644 --- a/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml +++ b/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml @@ -1,27 +1,27 @@ - io.github.Tahoma - io.github.Tahoma.desktop - Tahoma + io.github.Tahoma2D + io.github.Tahoma2D.desktop + Tahoma2D CC0-1.0 BSD-3-Clause - Tahoma + Tahoma2D 2D animation

This is software for producing 2D and stop motion animation.

- Tahoma is based on OpenToonz which itself is based on "Toonz", + Tahoma2D is based on OpenToonz which itself is based on "Toonz", developed by Digital Video S.p.A. in Italy and customized by Studio Ghibli.

https://tahoma2d.org - https://github.com/turtletooth/tahoma/issues + https://github.com/turtletooth/tahoma2d/issues - https://raw.githubusercontent.com/flathub/io.github.Tahoma/master/screenshot1.png + https://raw.githubusercontent.com/flathub/io.github.Tahoma2D/master/screenshot1.png diff --git a/toonz/sources/xdg-data/io.github.Tahoma.desktop b/toonz/sources/xdg-data/io.github.Tahoma.desktop index c2ec6706..85a1f8ee 100644 --- a/toonz/sources/xdg-data/io.github.Tahoma.desktop +++ b/toonz/sources/xdg-data/io.github.Tahoma.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application -Name=Tahoma +Name=Tahoma2D Comment=2D animation -Icon=io.github.Tahoma -Exec=tahoma +Icon=io.github.Tahoma2D +Exec=tahoma2d Categories=Graphics; Terminal=false