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

Rename to Tahoma2D

Browse source
This commit is contained in:
Jeremy Bullock 2020-10-02 00:20:33 -06:00
parent b5582c8ede
commit d0f1813309
36 changed files with 305 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug_report.md vendored
View file

@ -8,7 +8,7 @@ assignees: ''
--- ---
<!-- Please search for existing issues to avoid creating duplicates. --> <!-- Please search for existing issues to avoid creating duplicates. -->
<!-- And please test using the latest nightly build to make sure your issue has not already been fixed: https://github.com/turtletooth/tahoma/releases/tag/nightly/ --> <!-- And please test using the latest nightly build to make sure your issue has not already been fixed: https://github.com/turtletooth/tahoma2d/releases/tag/nightly/ -->
**Describe the bug** **Describe the bug**
A clear and concise description of what the bug is. 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:** **Device Information:**
- OS: [e.g. Windows] - 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: [e.g. NVIDIA RTX 2080]
- GPU Driver Version: [e.g. 440.00] - GPU Driver Version: [e.g. 440.00]

2
.github/ISSUE_TEMPLATE/config.yml vendored
View file

@ -1,7 +1,7 @@
blank_issues_enabled: true blank_issues_enabled: true
contact_links: contact_links:
- name: Manual - name: Manual
url: https://tahoma.readthedocs.io/ url: https://tahoma2d.readthedocs.io/
about: The official, extensive manual for OpenToonz about: The official, extensive manual for OpenToonz
- name: User forum - name: User forum
url: https://groups.google.com/forum/#!forum/opentoonz_en/categories/ url: https://groups.google.com/forum/#!forum/opentoonz_en/categories/

4
.github/ISSUE_TEMPLATE/question.md vendored
View file

@ -8,8 +8,8 @@ assignees: ''
--- ---
<!-- Please search for existing questions to avoid creating duplicates or your question may be closed. --> <!-- Please search for existing questions to avoid creating duplicates or your question may be closed. -->
<!-- Before asking a question please first consult the Tahoma manual: https://tahoma.readthedocs.io/ --> <!-- Before asking a question please first consult the Tahoma2D manual: https://tahoma2d.readthedocs.io/ -->
<!-- Consider that your question may be better asked on the OpenToonz forum: https://groups.google.com/forum/#!forum/opentoonz_en/categories/ --> <!-- Consider that your question may be better asked on the OpenToonz forum: https://groups.google.com/forum/#!forum/opentoonz_en/categories/ -->
**Question** **Question**
Ask a question related to Tahoma. Ask a question related to Tahoma2D.

16
CONTRIBUTING.md
View file

@ -1,20 +1,20 @@
# How to contribute # 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 ## Pull-requests
I love any kind of contributions, such as fixing typos and code refactoring. 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. I will first review the request, then I'll accept it, add comments for rework, or decline it.
### Workflow ### Workflow
0. `fork` Tahoma to your GitHub account from `turtletooth/tahoma`. 0. `fork` Tahoma2D to your GitHub account from `turtletooth/tahoma2d`.
- (use the `fork` button at the https://github.com/turtletooth/tahoma) - (use the `fork` button at the https://github.com/turtletooth/tahoma2d)
0. `clone` the repository. 0. `clone` the repository.
- `git clone git@github.com:your-github-account/tahoma.git` - `git clone git@github.com:your-github-account/tahoma2d.git`
- `git remote add upstream https://github.com/turtletooth/tahoma.git`, additionally. - `git remote add upstream https://github.com/turtletooth/tahoma2d.git`, additionally.
0. modify the codes. 0. modify the codes.
- `git checkout -b your-branch-name` - `git checkout -b your-branch-name`
- `your-branch-name` is a name of your modifications, for example, - `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 ## 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 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 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. 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. 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). 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`. Please locate generated `.qm` files in `stuff/config/loc`.

2
LICENSE.txt
View file

@ -4,7 +4,7 @@ For files in the "stuff/library/mypaint brushes" directory: Please see the licen
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tahoma Tahoma2D
All contributions by Jeremy Bullock: All contributions by Jeremy Bullock:
Copyright (c) 2016 - 2020, Jeremy Bullock Copyright (c) 2016 - 2020, Jeremy Bullock

8
README.md
View file

@ -5,18 +5,18 @@
## What is Tahoma2D? ## 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 Ghibli Version**, originally developed in Italy by
[Digital Video, Inc.](http://www.toonz.com/), and customized by [Digital Video, Inc.](http://www.toonz.com/), and customized by
[Studio Ghibli](http://www.ghibli.jp/) over many years of production. [Studio Ghibli](http://www.ghibli.jp/) over many years of production.
## Program Requirements ## Program Requirements
Please refer to the Tahoma site at <https://tahoma2d.org/download>. Please refer to the Tahoma2D site at <https://tahoma2d.org/download>.
## Installation ## Installation
Please download the latest release at <https://github.com/turtletooth/tahoma/releases>. Please download the latest release at <https://github.com/turtletooth/tahoma2d/releases>.
## How to Build Locally ## How to Build Locally
@ -31,7 +31,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo
## Community ## Community
- To share tips or to troubleshoot, join the [Google OpenToonz Users forum](https://groups.google.com/forum/#!forum/opentoonz_en) - 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 ## Licensing

28
appveyor.yml
View file

@ -34,33 +34,33 @@ build:
verbosity: minimal verbosity: minimal
after_build: after_build:
- cmd: >- - 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: artifacts:
- path: toonz\$(PLATFORM)\$(CONFIGURATION) - path: toonz\$(PLATFORM)\$(CONFIGURATION)
name: Tahoma name: Tahoma2D

42
ci-scripts/linux/tahoma-buildpkg.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /opt/qt59/bin/qt59-env.sh source /opt/qt59/bin/qt59-env.sh
echo ">>> Temporary install of Tahoma" echo ">>> Temporary install of Tahoma2D"
export BUILDDIR=$(pwd)/toonz/build export BUILDDIR=$(pwd)/toonz/build
cd $BUILDDIR cd $BUILDDIR
sudo make install sudo make install
@ -12,30 +12,30 @@ echo ">>> Creating appDir"
rm -rf appdir rm -rf appdir
mkdir -p appdir/usr mkdir -p appdir/usr
echo ">>> Copy and configure Tahoma installation in appDir" echo ">>> Copy and configure Tahoma2D installation in appDir"
cp -r /opt/tahoma/* appdir/usr cp -r /opt/tahoma2d/* appdir/usr
cp appdir/usr/share/applications/*.desktop appdir cp appdir/usr/share/applications/*.desktop appdir
cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir
mv appdir/usr/lib/tahoma/* appdir/usr/lib mv appdir/usr/lib/tahoma2d/* appdir/usr/lib
rmdir appdir/usr/lib/tahoma rmdir appdir/usr/lib/tahoma2d
echo ">>> Creating Tahoma directory" echo ">>> Creating Tahoma2D directory"
rm -rf Tahoma rm -rf Tahoma2D
mkdir Tahoma mkdir Tahoma2D
echo ">>> Copying stuff to Tahoma/tahomastuff" echo ">>> Copying stuff to Tahoma2D/tahomastuff"
mv appdir/usr/share/tahoma/stuff Tahoma/tahomastuff mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff
chmod -R 777 Tahoma/tahomastuff chmod -R 777 Tahoma2D/tahomastuff
rmdir appdir/usr/share/tahoma rmdir appdir/usr/share/tahoma2d
if [ -d ../../thirdparty/ffmpeg/bin ] if [ -d ../../thirdparty/ffmpeg/bin ]
then then
echo ">>> Copying FFmpeg to Tahoma/ffmpeg" echo ">>> Copying FFmpeg to Tahoma2D/ffmpeg"
cp -R ../../thirdparty/ffmpeg/bin Tahoma/ffmpeg cp -R ../../thirdparty/ffmpeg/bin Tahoma2D/ffmpeg
fi fi
echo ">>> Creating Tahoma/Tahoma.AppImage" echo ">>> Creating Tahoma2D/Tahoma2D.AppImage"
if [ ! -f linuxdeployqt*.AppImage ] if [ ! -f linuxdeployqt*.AppImage ]
then then
@ -43,8 +43,8 @@ then
chmod a+x linuxdeployqt*.AppImage chmod a+x linuxdeployqt*.AppImage
fi fi
export LD_LIBRARY_PATH=appdir/usr/lib/tahoma export LD_LIBRARY_PATH=appdir/usr/lib/tahoma2d
./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -bundle-non-qt-libs -verbose=0 -always-overwrite \ ./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -bundle-non-qt-libs -verbose=0 -always-overwrite \
-executable=appdir/usr/bin/lzocompress \ -executable=appdir/usr/bin/lzocompress \
-executable=appdir/usr/bin/lzodecompress \ -executable=appdir/usr/bin/lzodecompress \
-executable=appdir/usr/bin/tcleanup \ -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/tconverter \
-executable=appdir/usr/bin/tfarmcontroller \ -executable=appdir/usr/bin/tfarmcontroller \
-executable=appdir/usr/bin/tfarmserver -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

36
ci-scripts/linux/travis-buildpkg.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /opt/qt59/bin/qt59-env.sh source /opt/qt59/bin/qt59-env.sh
echo ">>> Temporary install of Tahoma" echo ">>> Temporary install of Tahoma2D"
export BUILDDIR=$(pwd)/toonz/build export BUILDDIR=$(pwd)/toonz/build
cd $BUILDDIR cd $BUILDDIR
sudo make install sudo make install
@ -9,29 +9,29 @@ sudo make install
echo ">>> Creating appDir" echo ">>> Creating appDir"
mkdir -p appdir/usr mkdir -p appdir/usr
echo ">>> Copy and configure Tahoma installation in appDir" echo ">>> Copy and configure Tahoma2D installation in appDir"
cp -r /opt/tahoma/* appdir/usr cp -r /opt/tahoma2d/* appdir/usr
cp appdir/usr/share/applications/*.desktop appdir cp appdir/usr/share/applications/*.desktop appdir
cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir
mv appdir/usr/lib/tahoma/* appdir/usr/lib mv appdir/usr/lib/tahoma2d/* appdir/usr/lib
rmdir appdir/usr/lib/tahoma rmdir appdir/usr/lib/tahoma2d
echo ">>> Creating Tahoma directory" echo ">>> Creating Tahoma2D directory"
mkdir Tahoma mkdir Tahoma2D
echo ">>> Copying stuff to Tahoma/tahomastuff" echo ">>> Copying stuff to Tahoma2D/tahomastuff"
mv appdir/usr/share/tahoma/stuff Tahoma/tahomastuff mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff
chmod -R 777 Tahoma/tahomastuff chmod -R 777 Tahoma2D/tahomastuff
rmdir appdir/usr/share/tahoma 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" wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt*.AppImage chmod a+x linuxdeployqt*.AppImage
export LD_LIBRARY_PATH=appdir/usr/lib/tahoma export LD_LIBRARY_PATH=appdir/usr/lib/tahoma2d
./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -bundle-non-qt-libs -verbose=0 -always-overwrite \ ./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma2D -bundle-non-qt-libs -verbose=0 -always-overwrite \
-executable=appdir/usr/bin/lzocompress \ -executable=appdir/usr/bin/lzocompress \
-executable=appdir/usr/bin/lzodecompress \ -executable=appdir/usr/bin/lzodecompress \
-executable=appdir/usr/bin/tcleanup \ -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/tconverter \
-executable=appdir/usr/bin/tfarmcontroller \ -executable=appdir/usr/bin/tfarmcontroller \
-executable=appdir/usr/bin/tfarmserver -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

40
ci-scripts/osx/tahoma-buildpkg.sh
View file

@ -8,34 +8,34 @@ then
export TOONZDIR=$TOONZDIR/Release export TOONZDIR=$TOONZDIR/Release
fi fi
echo ">>> Copying stuff to $TOONZDIR/Tahoma.app/tahomastuff" echo ">>> Copying stuff to $TOONZDIR/Tahoma2D.app/tahomastuff"
cp -R stuff $TOONZDIR/Tahoma.app/tahomastuff cp -R stuff $TOONZDIR/Tahoma2D.app/tahomastuff
if [ -d thirdparty/ffmpeg/bin ] if [ -d thirdparty/ffmpeg/bin ]
then then
echo ">>> Copying FFmpeg to $TOONZDIR/Tahoma.app/ffmpeg" echo ">>> Copying FFmpeg to $TOONZDIR/Tahoma2D.app/ffmpeg"
cp -R thirdparty/ffmpeg/bin $TOONZDIR/Tahoma.app/ffmpeg cp -R thirdparty/ffmpeg/bin $TOONZDIR/Tahoma2D.app/ffmpeg
fi fi
if [ -d thirdparty/canon/Framework ] if [ -d thirdparty/canon/Framework ]
then then
echo ">>> Copying canon framework to $TOONZDIR/Tahoma.app/Contents/Frameworks/EDSDK.Framework" echo ">>> Copying canon framework to $TOONZDIR/Tahoma2D.app/Contents/Frameworks/EDSDK.Framework"
cp -R thirdparty/canon/Framework $TOONZDIR/Tahoma.app/Contents/Frameworks cp -R thirdparty/canon/Framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
fi fi
echo ">>> Configuring Tahoma.app for deployment" echo ">>> Configuring Tahoma2D.app for deployment"
$QTDIR/bin/macdeployqt $TOONZDIR/Tahoma.app -verbose=0 -always-overwrite \ $QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzocompress \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzocompress \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzodecompress \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzodecompress \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcleanup \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcleanup \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcomposer \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcomposer \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tconverter \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tconverter \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmcontroller \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmcontroller \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmserver -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver
echo ">>> Correcting library paths" 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 do
Z=`echo $X | cut -c 1-1` Z=`echo $X | cut -c 1-1`
if [ "$Z" != "/" ] if [ "$Z" != "/" ]
@ -44,7 +44,7 @@ do
else else
Y=`basename $X` Y=`basename $X`
W=`basename $LIBFILE` 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 then
echo "Fixing $X in $LIBFILE" echo "Fixing $X in $LIBFILE"
install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE
@ -52,8 +52,8 @@ do
fi fi
done 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

44
doc/how_to_build_macosx.md
View file

@ -57,13 +57,13 @@ $ ls -l /usr/local/lib/cmake/glew
$ rm /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# $ cd ~/Documents #or where you want to store the repository#
$ git clone https://github.com/turtletooth/tahoma $ git clone https://github.com/turtletooth/tahoma2d
$ cd tahoma $ cd tahoma2d
$ git lfs pull $ git lfs pull
$ cd thirdparty/boost $ cd thirdparty/boost
$ mv ~/Downloads/boost_1_72_0.tar.bz2 . #or whatever the boost filename you downloaded is# $ 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 ### 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 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` 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: 1. Create the build directory with the following:
``` ```
$ cd ~/Documents/tahoma/toonz $ cd ~/Documents/tahoma2d/toonz
$ mkdir build $ mkdir build
$ cd build $ cd build
$ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig" $ 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# $ 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 - Open Xcode app and open project /Users/yourlogin/Documents/tahoma2d/toonz/build/Tahoma2D.xcodeproj
- Change `ALL_BUILD` to `Tahoma` - Change `ALL_BUILD` to `Tahoma2D`
- Start build with: Product -> Build - 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: - 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/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/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 /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 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 ### 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 $ cd ~/Documents/tahoma2d
$ sudo mkdir /Applications/Tahoma $ sudo mkdir /Applications/Tahoma2D
$ sudo cp -r stuff /Applications/Tahoma/Tahoma_stuff $ sudo cp -r stuff /Applications/Tahoma2D/Tahoma2D_stuff
$ sudo chmod -R 777 /Applications/Tahoma $ sudo chmod -R 777 /Applications/Tahoma2D
``` ```
## Building with extended stop motion support for webcams and Canon DSLR cameras. ## Building with extended stop motion support for webcams and Canon DSLR cameras.
You will need one additional library: You will need one additional library:
- The Canon SDK. This requires applying for the Canon developer program and downloading the SDK. - 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 ### Running the build
- If built using command line, run the following: - 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: - 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 - Uncheck: Run -> Options -> Document Versions
- Run in Debug mode: Product -> Run - 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`

2
stuff/doc/LICENSE/LICENSE.txt
View file

@ -2,7 +2,7 @@ For licenses of third party libraries exploited in this software, please see the
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tahoma Tahoma2D
All contributions by Jeremy Bullock: All contributions by Jeremy Bullock:
Copyright (c) 2016 - 2020, Jeremy Bullock Copyright (c) 2016 - 2020, Jeremy Bullock

6
stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt
View file

@ -1,7 +1,7 @@
Tahoma ships with FFmpeg, and uses FFmpeg through command line commands. Tahoma2D ships with FFmpeg, and uses FFmpeg through command line commands.
Tahoma does not directly use FFmpeg libraries or code. 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: FFmpeg source code can be found at:
https://github.com/turtletooth/FFmpeg https://github.com/turtletooth/FFmpeg

6
stuff/doc/LICENSE/LICENSE_tahoma.txt
View file

@ -1,9 +1,9 @@
License Agreement For Tahoma License Agreement For Tahoma2D
[https://github.com/turtletooth/tahoma] [https://github.com/turtletooth/tahoma2d]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tahoma Tahoma2D
All contributions by Jeremy Bullock: All contributions by Jeremy Bullock:
Copyright (c) 2016 - 2020, Jeremy Bullock Copyright (c) 2016 - 2020, Jeremy Bullock

4
stuff/profiles/layouts/fxs/fxs.lst
View file

@ -162,7 +162,7 @@
STD_posterizeFx STD_posterizeFx
STD_solarizeFx STD_solarizeFx
</Stylize> </Stylize>
<Tahoma_Level> <Tahoma2D_Level>
STD_artContourFx STD_artContourFx
STD_calligraphicFx STD_calligraphicFx
STD_blendTzFx STD_blendTzFx
@ -171,7 +171,7 @@
STD_paletteFilterFx STD_paletteFilterFx
STD_cornerPinFx STD_cornerPinFx
STD_textureFx STD_textureFx
</Tahoma_Level> </Tahoma2D_Level>
<Shaders> <Shaders>
SHADER_caustics SHADER_caustics
SHADER_fireball SHADER_fireball

32
tahoma_build.sh
View file

@ -2,22 +2,22 @@
export QTDIR=/usr/local/Cellar/qt/5.15.0 export QTDIR=/usr/local/Cellar/qt/5.15.0
export TOONZDIR=toonz/build/toonz/Release export TOONZDIR=toonz/build/toonz/Release
echo ">>> Copying stuff to $TOONZDIR/Tahoma.app/tahomastuff" echo ">>> Copying stuff to $TOONZDIR/Tahoma2D.app/tahomastuff"
cp -R stuff $TOONZDIR/Tahoma.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 \ $QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzocompress \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzocompress \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/lzodecompress \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/lzodecompress \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcleanup \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcleanup \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tcomposer \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tcomposer \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tconverter \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tconverter \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmcontroller \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmcontroller \
-executable=$TOONZDIR/Tahoma.app/Contents/MacOS/tfarmserver -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver
echo ">>> Correcting library paths" 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 do
Z=`echo $X | cut -c 1-1` Z=`echo $X | cut -c 1-1`
if [ "$Z" != "/" ] if [ "$Z" != "/" ]
@ -26,7 +26,7 @@ do
else else
Y=`basename $X` Y=`basename $X`
W=`basename $LIBFILE` 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 then
echo "Fixing $X in $LIBFILE" echo "Fixing $X in $LIBFILE"
install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE
@ -34,8 +34,8 @@ do
fi fi
done 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

12
toonz/cmake/BundleInfo.plist.in
View file

@ -5,21 +5,21 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Tahoma</string> <string>Tahoma2D</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Tahoma</string> <string>Tahoma2D</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Tahoma.icns</string> <string>Tahoma.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>io.github.turtletooth.Tahoma</string> <string>io.github.turtletooth.Tahoma2D</string>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Tahoma needs access to the camera in order to use Camera Capture</string> <string>Tahoma2D needs access to the camera in order to use Camera Capture</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>Tahoma needs access to the microphone in order to record audio.</string> <string>Tahoma2D needs access to the microphone in order to record audio.</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Tahoma</string> <string>Tahoma2D</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

20
toonz/install/SystemVar.ini
View file

@ -1,11 +1,11 @@
[General] [General]
TOONZCACHEROOT="/Applications/Tahoma/Tahoma_stuff/cache" TOONZCACHEROOT="/Applications/Tahoma2D/Tahoma2D_stuff/cache"
TOONZCONFIG="/Applications/Tahoma/Tahoma_stuff/config" TOONZCONFIG="/Applications/Tahoma2D/Tahoma2D_stuff/config"
TOONZFXPRESETS="/Applications/Tahoma/Tahoma_stuff/fxs" TOONZFXPRESETS="/Applications/Tahoma2D/Tahoma2D_stuff/fxs"
TOONZLIBRARY="/Applications/Tahoma/Tahoma_stuff/library" TOONZLIBRARY="/Applications/Tahoma2D/Tahoma2D_stuff/library"
TOONZPROFILES="/Applications/Tahoma/Tahoma_stuff/profiles" TOONZPROFILES="/Applications/Tahoma2D/Tahoma2D_stuff/profiles"
TahomaPROFILES="/Applications/Tahoma/Tahoma_stuff/profiles" TAHOMAPROFILES="/Applications/Tahoma2D/Tahoma2D_stuff/profiles"
TOONZPROJECTS="/Applications/Tahoma/Tahoma_stuff/projects" TOONZPROJECTS="/Applications/Tahoma2D/Tahoma2D_stuff/projects"
TOONZROOT="/Applications/Tahoma/Tahoma_stuff" TOONZROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
TAHOMAROOT="/Applications/Tahoma/Tahoma_stuff" TAHOMAROOT="/Applications/Tahoma2D/Tahoma2D_stuff"
TOONZSTUDIOPALETTE="/Applications/Tahoma/Tahoma_stuff/studiopalette" TOONZSTUDIOPALETTE="/Applications/Tahoma2D/Tahoma2D_stuff/studiopalette"

2
toonz/install/package_sdk.sh
View file

@ -7,7 +7,7 @@ do
;; ;;
d) DIST=$OPTARG 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;
;; ;;
\?) exit 1 \?) exit 1

12
toonz/sources/CMakeLists.txt
View file

@ -2,7 +2,7 @@
set(CMAKE_BUILD_TYPE_INIT Release) set(CMAKE_BUILD_TYPE_INIT Release)
project(Tahoma) project(Tahoma2D)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -460,7 +460,7 @@ elseif(BUILD_ENV_UNIXLIKE)
# the libraries have .pc # the libraries have .pc
find_package(PkgConfig) 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 # present and libimage won't be aware causing linker to fail
pkg_check_modules(LZMA liblzma) pkg_check_modules(LZMA liblzma)
set(TIFF_LIB ${TIFF_LIBRARY} ${LZMA_LIBRARIES}) set(TIFF_LIB ${TIFF_LIBRARY} ${LZMA_LIBRARIES})
@ -580,12 +580,12 @@ elseif(BUILD_ENV_UNIXLIKE)
# Mirror relative bin/lib location for installation # Mirror relative bin/lib location for installation
# so the generated shell script works in both cases. # so the generated shell script works in both cases.
set(CMAKE_ARCHIVE_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/tahoma) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/tahoma2d)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 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()
endif() endif()
@ -654,7 +654,7 @@ if(BUILD_ENV_APPLE)
$<TARGET_FILE:executable> $<TARGET_FILE:executable>
) )
# add capability for retina displays # 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() endif()
if(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) if(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN)

2
toonz/sources/common/tapptools/tenv.cpp
View file

@ -177,7 +177,7 @@ public:
m_rootVarName = toUpper(m_version.getAppName()) + "ROOT"; m_rootVarName = toUpper(m_version.getAppName()) + "ROOT";
#ifdef _WIN32 #ifdef _WIN32
// from v1.3, registry root is moved to SOFTWARE\\Tahoma\\Tahoma // 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 #endif
m_systemVarPrefix = m_version.getAppName(); m_systemVarPrefix = m_version.getAppName();
updateEnvFile(); updateEnvFile();

2
toonz/sources/common/timage_io/timage_io.cpp
View file

@ -840,7 +840,7 @@ TString TImageException::getMessage() const {
TImageVersionException::TImageVersionException(const TFilePath &fp, int major, TImageVersionException::TImageVersionException(const TFilePath &fp, int major,
int minor) int minor)
: TException(L"The file " + fp.getWideString() + : 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.") L"be loaded.")
, m_fp(fp) , m_fp(fp)
, m_major(major) , m_major(major)

2
toonz/sources/include/tversion.h
View file

@ -17,7 +17,7 @@ public:
std::string getAppVersionInfo(std::string msg); std::string getAppVersionInfo(std::string msg);
private: private:
const char *applicationName = "Tahoma"; const char *applicationName = "Tahoma2D";
const float applicationVersion = 1.0; const float applicationVersion = 1.0;
const float applicationRevision = 1; const float applicationRevision = 1;
const char *applicationNote = ""; const char *applicationNote = "";

2
toonz/sources/tcomposer/tcomposer.cpp
View file

@ -664,7 +664,7 @@ int main(int argc, char *argv[]) {
TEnv::setRootVarName(rootVarName); TEnv::setRootVarName(rootVarName);
TEnv::setSystemVarPrefix(systemVarPrefix); TEnv::setSystemVarPrefix(systemVarPrefix);
QCoreApplication::setOrganizationName("Tahoma"); QCoreApplication::setOrganizationName("Tahoma2D");
QCoreApplication::setOrganizationDomain(""); QCoreApplication::setOrganizationDomain("");
QCoreApplication::setApplicationName( QCoreApplication::setApplicationName(
QString::fromStdString(TEnv::getApplicationName())); QString::fromStdString(TEnv::getApplicationName()));

112
toonz/sources/toonz/CMakeLists.txt
View file

@ -383,11 +383,11 @@ endif()
qt5_wrap_cpp(SOURCES ${MOC_HEADERS}) qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
if(BUILD_ENV_MSVC) 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() else()
set(MACOSX_BUNDLE_ICON_FILE "Tahoma.icns") set(MACOSX_BUNDLE_ICON_FILE "Tahoma.icns")
set_source_files_properties(Tahoma.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") 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( #add_definitions(
# -DTNZBASE_EXPORTS # -DTNZBASE_EXPORTS
# -DTPARAM_EXPORTS # -DTPARAM_EXPORTS
@ -440,7 +440,7 @@ if(BUILD_TARGET_WIN)
endif() endif()
if(BUILD_ENV_MSVC AND WITH_CANON) 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::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort
${GL_LIB} ${GLUT_LIB} ${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 tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm
) )
elseif(BUILD_ENV_MSVC) 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::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort
${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} strmiids ${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} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>") set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
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::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort
${GL_LIB} ${GLUT_LIB} ${CANON_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} ${GL_LIB} ${GLUT_LIB} ${CANON_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS}
@ -479,9 +479,9 @@ elseif(BUILD_ENV_APPLE)
# 変なところにライブラリ生成するカスども # 変なところにライブラリ生成するカスども
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>") set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
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::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort
${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} ${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS}
@ -501,7 +501,7 @@ elseif(BUILD_ENV_UNIXLIKE)
endif() endif()
target_link_libraries( 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 Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::SerialPort
${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} ${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS}
${EXTRA_LIBS} ${EXTRA_LIBS}
@ -511,7 +511,7 @@ endif()
if(BUILD_ENV_APPLE) if(BUILD_ENV_APPLE)
# CMAKE_RUNTIME_OUTPUT_DIRECTORY should be equivalent to usage on windows despite empty # CMAKE_RUNTIME_OUTPUT_DIRECTORY should be equivalent to usage on windows despite empty
# OSX だと CMAKE_RUNTIME_OUTPUT_DIRECTORY が空だが Windows 版と同じ使い方ができるようにしておく # 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) get_filename_component(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${bin} DIRECTORY)
# show CMAKE_RUNTIME_OUTPUT_DIRECTORY # show CMAKE_RUNTIME_OUTPUT_DIRECTORY
message("CMAKE_RUNTIME_OUTPUT_DIRECTORY:" ${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 # copy utilty executables onto the directory after build
if(LZODRIVER_FOUND) if(LZODRIVER_FOUND)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzocompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzocompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzodecompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzodecompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress)
endif() endif()
if(BUILD_ENV_APPLE) 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(" ==> App Bundle: " ${loc})
message(" ==> Mach-o: " ${bin}) message(" ==> Mach-o: " ${bin})
foreach(lib ${EXTRA_LIBS}) foreach(lib ${EXTRA_LIBS})
message(" copy:" ${lib} "==>" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) 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() endforeach()
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcomposer> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcomposer) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcomposer> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcomposer)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcleanup> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcleanup) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcleanup> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcleanup)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tconverter> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tconverter) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tconverter> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tconverter)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmcontroller> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmcontroller) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmcontroller> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmcontroller)
add_custom_command(TARGET Tahoma POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmserver> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmserver) add_custom_command(TARGET Tahoma2D POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmserver> ${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 Tahoma2D 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 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 POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin} || true ${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin} || true
) )
add_custom_command(TARGET Tahoma add_custom_command(TARGET Tahoma2D
POST_BUILD COMMAND POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin} || true ${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. # Setup files on Windows platform while cross compilation.
install( install(
TARGETS TARGETS
Tahoma Tahoma2D
DESTINATION bin DESTINATION bin
) )
@ -598,7 +598,7 @@ elseif(BUILD_ENV_UNIXLIKE AND BUILD_TARGET_WIN)
install( install(
DIRECTORY DIRECTORY
${CMAKE_SOURCE_DIR}/../../stuff ${CMAKE_SOURCE_DIR}/../../stuff
DESTINATION share/tahoma DESTINATION share/tahoma2d
) )
elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN)
# Setup files on Linux/Unix platform. # Setup files on Linux/Unix platform.
@ -606,62 +606,62 @@ elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN)
# but useful for package managers. # but useful for package managers.
# #
# Note that its assumed the destination can be either # Note that its assumed the destination can be either
# - /opt/tahoma # - /opt/tahoma2d
# - /usr # - /usr
install( install(
TARGETS TARGETS
Tahoma Tahoma2D
DESTINATION bin DESTINATION bin
) )
# Shell script that copies files to the home directory as needed # Shell script that copies files to the home directory as needed
# and sets the library preload path. # and sets the library preload path.
file(WRITE ${CMAKE_BINARY_DIR}/bin/tahoma file(WRITE ${CMAKE_BINARY_DIR}/bin/tahoma2d
"#!/bin/sh "#!/bin/sh
TAHOMA_BASE=\$(dirname \"\$0\")/.. TAHOMA2D_BASE=\$(dirname \"\$0\")/..
if [ ! -d \$HOME/.config/Tahoma ]; then if [ ! -d \$HOME/.config/Tahoma2D ]; then
mkdir -p \$HOME/.config/Tahoma mkdir -p \$HOME/.config/Tahoma2D
fi fi
if [ ! -d \$HOME/.config/Tahoma/stuff ]; then if [ ! -d \$HOME/.config/Tahoma2D/stuff ]; then
cp -r \$TAHOMA_BASE/share/tahoma/stuff \$HOME/.config/Tahoma cp -r \$TAHOMA2D_BASE/share/tahoma2d/stuff \$HOME/.config/Tahoma2D
fi fi
if [ ! -d \$HOME/.config/Tahoma/stuff/projects/library ]; then if [ ! -d \$HOME/.config/Tahoma2D/stuff/projects/library ]; then
mkdir -p \$HOME/.config/Tahoma/stuff/projects/library mkdir -p \$HOME/.config/Tahoma2D/stuff/projects/library
fi fi
if [ ! -d \$HOME/.config/Tahoma/stuff/projects/fxs ]; then if [ ! -d \$HOME/.config/Tahoma2D/stuff/projects/fxs ]; then
mkdir -p \$HOME/.config/Tahoma/stuff/projects/fxs mkdir -p \$HOME/.config/Tahoma2D/stuff/projects/fxs
fi fi
if [ ! -e \$HOME/.config/Tahoma/SystemVar.ini ]; then if [ ! -e \$HOME/.config/Tahoma2D/SystemVar.ini ]; then
cat << EOF > $HOME/.config/Tahoma/SystemVar.ini cat << EOF > $HOME/.config/Tahoma2D/SystemVar.ini
[General] [General]
TAHOMAROOT=\"\$HOME/.config/Tahoma/stuff\" TAHOMAROOT=\"\$HOME/.config/Tahoma2D/stuff\"
TahomaPROFILES=\"\$HOME/.config/Tahoma/stuff/profiles\" TahomaPROFILES=\"\$HOME/.config/Tahoma2D/stuff/profiles\"
TOONZCACHEROOT=\"\$HOME/.config/Tahoma/stuff/cache\" TOONZCACHEROOT=\"\$HOME/.config/Tahoma2D/stuff/cache\"
TOONZCONFIG=\"\$HOME/.config/Tahoma/stuff/config\" TOONZCONFIG=\"\$HOME/.config/Tahoma2D/stuff/config\"
TOONZFXPRESETS=\"\$HOME/.config/Tahoma/stuff/fxs\" TOONZFXPRESETS=\"\$HOME/.config/Tahoma2D/stuff/fxs\"
TOONZLIBRARY=\"\$HOME/.config/Tahoma/stuff/library\" TOONZLIBRARY=\"\$HOME/.config/Tahoma2D/stuff/library\"
TOONZPROFILES=\"\$HOME/.config/Tahoma/stuff/profiles\" TOONZPROFILES=\"\$HOME/.config/Tahoma2D/stuff/profiles\"
TOONZPROJECTS=\"$HOME/.config/Tahoma/stuff/projects\" TOONZPROJECTS=\"$HOME/.config/Tahoma2D/stuff/projects\"
TOONZROOT=\"\$HOME/.config/Tahoma/stuff\" TOONZROOT=\"\$HOME/.config/Tahoma2D/stuff\"
TOONZSTUDIOPALETTE=\"\$HOME/.config/Tahoma/stuff/studiopalette\" TOONZSTUDIOPALETTE=\"\$HOME/.config/Tahoma2D/stuff/studiopalette\"
EOF EOF
fi 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 # 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( install(
PROGRAMS PROGRAMS
${CMAKE_BINARY_DIR}/bin/tahoma ${CMAKE_BINARY_DIR}/bin/tahoma2d
"$<TARGET_FILE:tcleanup>" "$<TARGET_FILE:tcleanup>"
"$<TARGET_FILE:tcomposer>" "$<TARGET_FILE:tcomposer>"
"$<TARGET_FILE:tconverter>" "$<TARGET_FILE:tconverter>"
@ -692,13 +692,13 @@ exec \$TAHOMA_BASE/bin/Tahoma \"\$@\"
"$<TARGET_FILE:tnztools>" "$<TARGET_FILE:tnztools>"
"$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tnzstdfx>"
"$<TARGET_FILE:tfarm>" "$<TARGET_FILE:tfarm>"
DESTINATION lib/tahoma DESTINATION lib/tahoma2d
) )
install( install(
DIRECTORY DIRECTORY
${CMAKE_SOURCE_DIR}/../../stuff ${CMAKE_SOURCE_DIR}/../../stuff
DESTINATION share/tahoma DESTINATION share/tahoma2d
) )
endif() endif()

14
toonz/sources/toonz/aboutpopup.cpp
View file

@ -21,11 +21,11 @@ void AboutClickableLabel::mousePressEvent(QMouseEvent* event) {
} }
AboutPopup::AboutPopup(QWidget* parent) AboutPopup::AboutPopup(QWidget* parent)
: DVGui::Dialog(parent, true, "About Tahoma") { : DVGui::Dialog(parent, true, "About Tahoma2D") {
setFixedWidth(300); setFixedWidth(300);
setFixedHeight(350); setFixedHeight(350);
setWindowTitle(tr("About Tahoma")); setWindowTitle(tr("About Tahoma2D"));
setTopMargin(0); setTopMargin(0);
TFilePath baseLicensePath = TEnv::getStuffDir() + "doc/LICENSE"; TFilePath baseLicensePath = TEnv::getStuffDir() + "doc/LICENSE";
@ -49,7 +49,7 @@ AboutPopup::AboutPopup(QWidget* parent)
mainLayout->addWidget(blankLabel); mainLayout->addWidget(blankLabel);
AboutClickableLabel* licenseLink = new AboutClickableLabel(this); AboutClickableLabel* licenseLink = new AboutClickableLabel(this);
licenseLink->setText(tr("Tahoma License")); licenseLink->setText(tr("Tahoma2D License"));
connect(licenseLink, &AboutClickableLabel::clicked, [=]() { connect(licenseLink, &AboutClickableLabel::clicked, [=]() {
if (TSystem::isUNC(tahomaLicensePath)) if (TSystem::isUNC(tahomaLicensePath))
@ -77,20 +77,20 @@ AboutPopup::AboutPopup(QWidget* parent)
mainLayout->addWidget(thirdPartyLink); mainLayout->addWidget(thirdPartyLink);
QLabel* ffmpegLabel = new QLabel(this); QLabel* ffmpegLabel = new QLabel(this);
ffmpegLabel->setText( ffmpegLabel->setText(tr(
tr("Tahoma ships with FFmpeg. \nFFmpeg is licensed under the LGPLv2.1")); "Tahoma2D ships with FFmpeg. \nFFmpeg is licensed under the LGPLv2.1"));
mainLayout->addWidget(ffmpegLabel); mainLayout->addWidget(ffmpegLabel);
mainLayout->addSpacerItem(new QSpacerItem(this->width(), 10)); mainLayout->addSpacerItem(new QSpacerItem(this->width(), 10));
mainLayout->addWidget( 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:"))); "patrons.\nSpecial thanks to:")));
mainLayout->addWidget(new QLabel("Rodney Baker")); mainLayout->addWidget(new QLabel("Rodney Baker"));
mainLayout->addWidget(new QLabel(" ")); mainLayout->addWidget(new QLabel(" "));
AboutClickableLabel* supportLink = new AboutClickableLabel(this); 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, [=]() { connect(supportLink, &AboutClickableLabel::clicked, [=]() {
QDesktopServices::openUrl(QUrl("https://patreon.com/jeremybullock")); QDesktopServices::openUrl(QUrl("https://patreon.com/jeremybullock"));
; ;

8
toonz/sources/toonz/main.cpp
View file

@ -124,7 +124,7 @@ static void toonzRunOutOfContMemHandler(unsigned long size) {
#ifdef _WIN32 #ifdef _WIN32
static bool firstTime = true; static bool firstTime = true;
if (firstTime) { 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); (LPCWSTR)L"Warning", MB_OK | MB_SYSTEMMODAL);
firstTime = false; firstTime = false;
} }
@ -158,7 +158,7 @@ static void initToonzEnv(QHash<QString, QString> &argPathValues) {
++i; ++i;
} }
QCoreApplication::setOrganizationName("Tahoma"); QCoreApplication::setOrganizationName("Tahoma2D");
QCoreApplication::setOrganizationDomain(""); QCoreApplication::setOrganizationDomain("");
QCoreApplication::setApplicationName( QCoreApplication::setApplicationName(
QString::fromStdString(TEnv::getApplicationName())); QString::fromStdString(TEnv::getApplicationName()));
@ -614,7 +614,7 @@ int main(int argc, char *argv[]) {
loadShaderInterfaces(ToonzFolder::getLibraryFolder() + TFilePath("shaders")); loadShaderInterfaces(ToonzFolder::getLibraryFolder() + TFilePath("shaders"));
splash.showMessage(offsetStr + "Initializing Tahoma...", splash.showMessage(offsetStr + "Initializing Tahoma2D...",
Qt::AlignRight | Qt::AlignBottom, Qt::black); Qt::AlignRight | Qt::AlignBottom, Qt::black);
a.processEvents(); a.processEvents();
@ -698,7 +698,7 @@ int main(int argc, char *argv[]) {
w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName())); w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName()));
if (TEnv::getIsPortable()) { if (TEnv::getIsPortable()) {
splash.showMessage(offsetStr + "Starting Tahoma...", splash.showMessage(offsetStr + "Starting Tahoma2D...",
Qt::AlignRight | Qt::AlignBottom, Qt::black); Qt::AlignRight | Qt::AlignBottom, Qt::black);
} else { } else {
splash.showMessage(offsetStr + "Starting main window...", splash.showMessage(offsetStr + "Starting main window...",

22
toonz/sources/toonz/mainwindow.cpp
View file

@ -1047,14 +1047,14 @@ void MainWindow::onAbout() { m_aboutPopup->exec(); }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MainWindow::onOpenOnlineManual() { void MainWindow::onOpenOnlineManual() {
QDesktopServices::openUrl(QUrl(tr("http://tahoma.readthedocs.io"))); QDesktopServices::openUrl(QUrl(tr("http://tahoma2d.readthedocs.io")));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MainWindow::onOpenWhatsNew() { void MainWindow::onOpenWhatsNew() {
QDesktopServices::openUrl( 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() { void MainWindow::onOpenReportABug() {
QString str = QString( QString str = QString(
tr("To report a bug, click on the button below to open a web browser " 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.")); "the 'New issue' button and fill out the form."));
std::vector<QString> buttons = {QObject::tr("Report a Bug"), std::vector<QString> buttons = {QObject::tr("Report a Bug"),
@ -1077,7 +1077,7 @@ void MainWindow::onOpenReportABug() {
int ret = DVGui::MsgBox(DVGui::INFORMATION, str, buttons, 1); int ret = DVGui::MsgBox(DVGui::INFORMATION, str, buttons, 1);
if (ret == 1) if (ret == 1)
QDesktopServices::openUrl( 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::MsgBoxInPopup(
DVGui::INFORMATION, 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() { void MainWindow::maximizePanel() {
@ -1836,10 +1836,10 @@ void MainWindow::defineActions() {
// createAction(MI_SavePreview, "&Save Preview", ""); // createAction(MI_SavePreview, "&Save Preview", "");
createRightClickMenuAction(MI_SavePreset, tr("&Save As Preset"), ""); createRightClickMenuAction(MI_SavePreset, tr("&Save As Preset"), "");
menuAct = createMenuFileAction(MI_Preferences, tr("&Preferences..."), menuAct = createMenuFileAction(MI_Preferences, tr("&Preferences..."),
"Ctrl+U", tr("Change Tahoma's settings.")); "Ctrl+U", tr("Change Tahoma2D's settings."));
menuAct->setIcon(createQIcon("gear")); menuAct->setIcon(createQIcon("gear"));
createMenuFileAction(MI_ShortcutPopup, tr("&Configure Shortcuts..."), "", 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"), "", menuAct = createMenuFileAction(MI_PrintXsheet, tr("&Print Xsheet"), "",
tr("Print the scene's exposure sheet.")); tr("Print the scene's exposure sheet."));
@ -2399,8 +2399,8 @@ void MainWindow::defineActions() {
"Ctrl+`"); "Ctrl+`");
menuAct->setIcon(createQIcon("toggle_fullscreen")); menuAct->setIcon(createQIcon("toggle_fullscreen"));
menuAct = createMenuHelpAction(MI_About, tr("&About Tahoma..."), ""); menuAct = createMenuHelpAction(MI_About, tr("&About Tahoma2D..."), "");
menuAct->setIconText(tr("About Tahoma...")); menuAct->setIconText(tr("About Tahoma2D..."));
menuAct->setIcon(createQIcon("info")); menuAct->setIcon(createQIcon("info"));
menuAct = createMenuWindowsAction(MI_StartupPopup, tr("&Startup Popup..."), menuAct = createMenuWindowsAction(MI_StartupPopup, tr("&Startup Popup..."),
@ -3613,7 +3613,7 @@ void MainWindow::clearCacheFolder() {
message += message +=
tr("\nAre you sure?\n\nN.B. Make sure you are not running another " 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( QMessageBox::StandardButton ret = QMessageBox::question(
this, tr("Clear Cache Folder"), message, this, tr("Clear Cache Folder"), message,
@ -3672,7 +3672,7 @@ void MainWindow::makeTransparencyDialog() {
m_transparencyTogglerWindow->setFixedHeight(100); m_transparencyTogglerWindow->setFixedHeight(100);
m_transparencyTogglerWindow->setFixedWidth(250); m_transparencyTogglerWindow->setFixedWidth(250);
m_transparencyTogglerWindow->setWindowTitle(tr("Tahoma Transparency")); m_transparencyTogglerWindow->setWindowTitle(tr("Tahoma2D Transparency"));
QPushButton *toggleButton = new QPushButton(this); QPushButton *toggleButton = new QPushButton(this);
toggleButton->setText(tr("Close to turn off Transparency.")); toggleButton->setText(tr("Close to turn off Transparency."));
connect(toggleButton, &QPushButton::clicked, connect(toggleButton, &QPushButton::clicked,

76
toonz/sources/toonz/preferencespopup.cpp
View file

@ -348,34 +348,35 @@ void PreferencesPopup::onPathAliasPriorityChanged() {
void PreferencesPopup::onStyleSheetTypeChanged() { void PreferencesPopup::onStyleSheetTypeChanged() {
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QString currentStyle = m_pref->getCurrentStyleSheetPath(); QString currentStyle = m_pref->getCurrentStyleSheetPath();
QString iconThemeName = QIcon::themeName(); QString iconThemeName = QIcon::themeName();
std::string styleString = currentStyle.toStdString(); std::string styleString = currentStyle.toStdString();
std::string iconThemeString = iconThemeName.toStdString(); std::string iconThemeString = iconThemeName.toStdString();
qApp->setStyleSheet(currentStyle); qApp->setStyleSheet(currentStyle);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
if (currentStyle.contains("Light") || currentStyle.contains("Neutral")) { if (currentStyle.contains("Light") || currentStyle.contains("Neutral")) {
m_pref->setValue(iconTheme, true); m_pref->setValue(iconTheme, true);
if (iconThemeName != "dark") { if (iconThemeName != "dark") {
//QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION),
} tr("Please restart to reload the icons."));
} }
else { } else {
m_pref->setValue(iconTheme, false); m_pref->setValue(iconTheme, false);
if (iconThemeName != "light") { if (iconThemeName != "light") {
//QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION),
} tr("Please restart to reload the icons."));
}
} }
} }
////----------------------------------------------------------------------------- ////-----------------------------------------------------------------------------
// //
//void PreferencesPopup::onIconThemeChanged() { // void PreferencesPopup::onIconThemeChanged() {
// // Switch between dark or light icons // // Switch between dark or light icons
// QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
@ -934,8 +935,8 @@ void PreferencesPopup::insertDualUIs(
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void PreferencesPopup::insertFootNote(QGridLayout* layout) { void PreferencesPopup::insertFootNote(QGridLayout* layout) {
QLabel* note = QLabel* note = new QLabel(
new QLabel(tr("* Changes will take effect the next time you run Tahoma2D")); tr("* Changes will take effect the next time you run Tahoma2D"));
note->setStyleSheet("font-size: 10px; font: italic;"); note->setStyleSheet("font-size: 10px; font: italic;");
layout->addWidget(note, layout->rowCount(), 0, 1, 2, layout->addWidget(note, layout->rowCount(), 0, 1, 2,
Qt::AlignLeft | Qt::AlignVCenter); Qt::AlignLeft | Qt::AlignVCenter);
@ -952,7 +953,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
{autosavePeriod, tr("Interval (Minutes):")}, {autosavePeriod, tr("Interval (Minutes):")},
{autosaveSceneEnabled, tr("Automatically Save the Scene File")}, {autosaveSceneEnabled, tr("Automatically Save the Scene File")},
{autosaveOtherFilesEnabled, tr("Automatically Save Non-Scene Files")}, {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):")}, {undoMemorySize, tr("Undo Memory Size (MB):")},
{taskchunksize, tr("Render Task Chunk Size:")}, {taskchunksize, tr("Render Task Chunk Size:")},
{replaceAfterSaveLevelAs, {replaceAfterSaveLevelAs,
@ -1410,9 +1411,9 @@ QWidget* PreferencesPopup::createInterfacePage() {
insertUI(CurrentStyleSheetName, lay, styleSheetItemList); 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); // Qt::AlignRight | Qt::AlignVCenter);
//lay->addWidget(createUI(iconTheme), 2, 1); // lay->addWidget(createUI(iconTheme), 2, 1);
// insertUI(linearUnits, lay, getComboItemList(linearUnits)); // insertUI(linearUnits, lay, getComboItemList(linearUnits));
// insertUI(cameraUnits, lay, // insertUI(cameraUnits, lay,
@ -1501,7 +1502,7 @@ QWidget* PreferencesPopup::createLoadingPage() {
insertUI(autoExposeEnabled, lay); insertUI(autoExposeEnabled, lay);
insertUI(subsceneFolderEnabled, lay); insertUI(subsceneFolderEnabled, lay);
insertUI(removeSceneNumberFromLoadedLevelName, lay); insertUI(removeSceneNumberFromLoadedLevelName, lay);
//insertUI(IgnoreImageDpi, lay); // insertUI(IgnoreImageDpi, lay);
insertUI(initialLoadTlvCachingBehavior, lay, insertUI(initialLoadTlvCachingBehavior, lay,
getComboItemList(initialLoadTlvCachingBehavior)); getComboItemList(initialLoadTlvCachingBehavior));
insertUI(columnIconLoadingPolicy, lay, insertUI(columnIconLoadingPolicy, lay,
@ -1549,9 +1550,9 @@ QWidget* PreferencesPopup::createSavingPage() {
setupLayout(lay); setupLayout(lay);
QGridLayout* autoSaveLay = insertGroupBoxUI(autosaveEnabled, lay); QGridLayout* autoSaveLay = insertGroupBoxUI(autosaveEnabled, lay);
{ {
insertUI(autosavePeriod, autoSaveLay); insertUI(autosavePeriod, autoSaveLay);
insertUI(autosaveSceneEnabled, autoSaveLay); insertUI(autosaveSceneEnabled, autoSaveLay);
insertUI(autosaveOtherFilesEnabled, autoSaveLay); insertUI(autosaveOtherFilesEnabled, autoSaveLay);
} }
insertUI(replaceAfterSaveLevelAs, lay); insertUI(replaceAfterSaveLevelAs, lay);
QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay); QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay);
@ -1583,10 +1584,11 @@ QWidget* PreferencesPopup::createImportExportPage() {
QGridLayout* lay = new QGridLayout(); QGridLayout* lay = new QGridLayout();
setupLayout(lay); setupLayout(lay);
putLabel(tr("Tahoma2D can use FFmpeg for additional file formats.\n") + putLabel(
tr("FFmpeg is bundled with Tahoma2D,\n") + tr("Tahoma2D can use FFmpeg for additional file formats.\n") +
tr("but you can provide the path to a different ffmpeg location."), tr("FFmpeg is bundled with Tahoma2D,\n") +
lay); tr("but you can provide the path to a different ffmpeg location."),
lay);
insertUI(ffmpegPath, lay); insertUI(ffmpegPath, lay);
putLabel(tr("Number of seconds to wait for FFmpeg to complete processing the " putLabel(tr("Number of seconds to wait for FFmpeg to complete processing the "
@ -1615,7 +1617,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
QGridLayout* lay = new QGridLayout(); QGridLayout* lay = new QGridLayout();
setupLayout(lay); setupLayout(lay);
//insertUI(scanLevelType, lay, getComboItemList(scanLevelType)); // insertUI(scanLevelType, lay, getComboItemList(scanLevelType));
insertUI(DefLevelType, lay, getComboItemList(DefLevelType)); insertUI(DefLevelType, lay, getComboItemList(DefLevelType));
insertUI(newLevelSizeToCameraSizeEnabled, lay); insertUI(newLevelSizeToCameraSizeEnabled, lay);
insertDualUIs(DefLevelWidth, DefLevelHeight, lay); insertDualUIs(DefLevelWidth, DefLevelHeight, lay);
@ -1632,7 +1634,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
insertUI(saveUnpaintedInCleanup, lay); insertUI(saveUnpaintedInCleanup, lay);
insertUI(minimizeSaveboxAfterEditing, lay); insertUI(minimizeSaveboxAfterEditing, lay);
insertUI(useNumpadForSwitchingStyles, lay); insertUI(useNumpadForSwitchingStyles, lay);
//insertUI(downArrowInLevelStripCreatesNewFrame, lay); // insertUI(downArrowInLevelStripCreatesNewFrame, lay);
QGridLayout* replaceVectorsLay = insertGroupBox( QGridLayout* replaceVectorsLay = insertGroupBox(
tr("Replace Vectors with Simplified Vectors Command"), lay); tr("Replace Vectors with Simplified Vectors Command"), lay);
{ {
@ -1679,7 +1681,7 @@ QWidget* PreferencesPopup::createToolsPage() {
} }
insertUI(levelBasedToolsDisplay, lay, insertUI(levelBasedToolsDisplay, lay,
getComboItemList(levelBasedToolsDisplay)); getComboItemList(levelBasedToolsDisplay));
//insertUI(useCtrlAltToResizeBrush, lay); // insertUI(useCtrlAltToResizeBrush, lay);
lay->setRowStretch(lay->rowCount(), 1); lay->setRowStretch(lay->rowCount(), 1);
widget->setLayout(lay); widget->setLayout(lay);
@ -1714,8 +1716,8 @@ QWidget* PreferencesPopup::createXsheetPage() {
QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay); QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay);
{ insertUI(expandFunctionHeader, xshToolbarLay); } { insertUI(expandFunctionHeader, xshToolbarLay); }
insertUI(showColumnNumbers, lay); insertUI(showColumnNumbers, lay);
//insertUI(syncLevelRenumberWithXsheet, lay); // insertUI(syncLevelRenumberWithXsheet, lay);
//insertUI(currentTimelineEnabled, lay); // insertUI(currentTimelineEnabled, lay);
insertUI(currentColumnColor, lay); insertUI(currentColumnColor, lay);
lay->setRowStretch(lay->rowCount(), 1); lay->setRowStretch(lay->rowCount(), 1);

8
toonz/sources/toonz/shortcutpopup.cpp
View file

@ -576,7 +576,7 @@ void ShortcutPopup::showDialog(QString text) {
if (m_dialog == NULL) { if (m_dialog == NULL) {
m_dialogLabel = new QLabel("", this); m_dialogLabel = new QLabel("", this);
m_dialog = new DVGui::Dialog(this, false, false); 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->setModal(false);
m_dialog->setTopMargin(10); m_dialog->setTopMargin(10);
@ -699,7 +699,7 @@ void ShortcutPopup::onLoadPreset() {
if (!showConfirmDialog()) return; if (!showConfirmDialog()) return;
showDialog(tr("Setting Shortcuts")); showDialog(tr("Setting Shortcuts"));
if (preset == "Tahoma") { if (preset == "Tahoma2D") {
clearAllShortcuts(false); clearAllShortcuts(false);
TFilePath fp = defaultPresetDir + TFilePath("deftahoma.ini"); TFilePath fp = defaultPresetDir + TFilePath("deftahoma.ini");
setPresetShortcuts(fp); setPresetShortcuts(fp);
@ -739,7 +739,7 @@ void ShortcutPopup::onLoadPreset() {
QStringList ShortcutPopup::buildPresets() { QStringList ShortcutPopup::buildPresets() {
QStringList presets; QStringList presets;
presets << "" presets << ""
<< "Tahoma" << "Tahoma2D"
//<< "RETAS PaintMan" //<< "RETAS PaintMan"
<< "Toon Boom Harmony" << "Toon Boom Harmony"
<< "Adobe Animate" << "Adobe Animate"
@ -804,7 +804,7 @@ void ShortcutPopup::getCurrentPresetPref() {
if (name == "DELETED") if (name == "DELETED")
m_presetChoiceCB->setCurrentText(""); m_presetChoiceCB->setCurrentText("");
else if (name == "deftahoma") else if (name == "deftahoma")
m_presetChoiceCB->setCurrentText("Tahoma"); m_presetChoiceCB->setCurrentText("Tahoma2D");
else if (name == "otharmony") else if (name == "otharmony")
m_presetChoiceCB->setCurrentText("Toon Boom Harmony"); m_presetChoiceCB->setCurrentText("Toon Boom Harmony");
else if (name == "otadobe") else if (name == "otadobe")

2
toonz/sources/toonz/startuppopup.cpp
View file

@ -95,7 +95,7 @@ QString removeZeros(QString srcStr) {
StartupPopup::StartupPopup() StartupPopup::StartupPopup()
: Dialog(TApp::instance()->getMainWindow(), true, true, "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_projectBox = new QGroupBox(tr("Current Project"), this);
m_sceneBox = new QGroupBox(tr("Create a New Scene"), this); m_sceneBox = new QGroupBox(tr("Create a New Scene"), this);

6
toonz/sources/toonzqt/dvdialog.cpp
View file

@ -32,7 +32,7 @@
using namespace DVGui; using namespace DVGui;
QString DialogTitle = "Tahoma 1.0"; QString DialogTitle = "Tahoma2D 1.0";
//============================================================================= //=============================================================================
namespace { namespace {
@ -818,7 +818,7 @@ RadioButtonDialog::RadioButtonDialog(const QString &labelText,
const QList<QString> &radioButtonList, const QList<QString> &radioButtonList,
QWidget *parent, Qt::WindowFlags f) QWidget *parent, Qt::WindowFlags f)
: Dialog(parent, true, true), m_result(1) { : Dialog(parent, true, true), m_result(1) {
setWindowTitle(tr("Tahoma")); setWindowTitle(tr("Tahoma2D"));
setMinimumSize(20, 20); setMinimumSize(20, 20);
@ -888,7 +888,7 @@ ProgressDialog::ProgressDialog(const QString &labelText,
const QString &cancelButtonText, int minimum, const QString &cancelButtonText, int minimum,
int maximum, QWidget *parent, Qt::WindowFlags f) int maximum, QWidget *parent, Qt::WindowFlags f)
: Dialog(parent, true, true), m_isCanceled(false) { : Dialog(parent, true, true), m_isCanceled(false) {
setWindowTitle(tr("Tahoma")); setWindowTitle(tr("Tahoma2D"));
setMinimumSize(20, 20); setMinimumSize(20, 20);

4
toonz/sources/toonzqt/infoviewer.cpp
View file

@ -270,11 +270,11 @@ QString InfoViewerImp::getTypeString() {
else if (ext == "mov" || ext == "avi" || ext == "3gp") else if (ext == "mov" || ext == "avi" || ext == "3gp")
return "Movie File"; return "Movie File";
else if (ext == "tnz") else if (ext == "tnz")
return "Tahoma Scene"; return "Tahoma2D Scene";
else if (ext == "tab") else if (ext == "tab")
return "Tab Scene"; return "Tab Scene";
else if (ext == "plt") else if (ext == "plt")
return "Tahoma Palette"; return "Tahoma2D Palette";
else if (ext == "wav" || ext == "aiff" || ext == "mp3") else if (ext == "wav" || ext == "aiff" || ext == "mp3")
return "Audio File"; return "Audio File";
else if (ext == "mesh") else if (ext == "mesh")

6
toonz/sources/xdg-data/CMakeLists.txt
View file

@ -1,3 +1,3 @@
install(FILES io.github.Tahoma.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) install(FILES io.github.Tahoma2D.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
install(FILES io.github.Tahoma.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES io.github.Tahoma2D.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.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)

14
toonz/sources/xdg-data/io.github.Tahoma.appdata.xml
View file

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop"> <component type="desktop">
<id>io.github.Tahoma</id> <id>io.github.Tahoma2D</id>
<launchable type="desktop-id">io.github.Tahoma.desktop</launchable> <launchable type="desktop-id">io.github.Tahoma2D.desktop</launchable>
<name>Tahoma</name> <name>Tahoma2D</name>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>BSD-3-Clause</project_license> <project_license>BSD-3-Clause</project_license>
<developer_name>Tahoma</developer_name> <developer_name>Tahoma2D</developer_name>
<summary>2D animation</summary> <summary>2D animation</summary>
<description> <description>
<p> <p>
This is software for producing 2D and stop motion animation. This is software for producing 2D and stop motion animation.
</p> </p>
<p> <p>
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 developed by Digital Video S.p.A. in Italy and customized by
Studio Ghibli. Studio Ghibli.
</p> </p>
</description> </description>
<url type="homepage">https://tahoma2d.org</url> <url type="homepage">https://tahoma2d.org</url>
<url type="bugtracker">https://github.com/turtletooth/tahoma/issues</url> <url type="bugtracker">https://github.com/turtletooth/tahoma2d/issues</url>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image>https://raw.githubusercontent.com/flathub/io.github.Tahoma/master/screenshot1.png</image> <image>https://raw.githubusercontent.com/flathub/io.github.Tahoma2D/master/screenshot1.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />

6
toonz/sources/xdg-data/io.github.Tahoma.desktop
View file

@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Name=Tahoma Name=Tahoma2D
Comment=2D animation Comment=2D animation
Icon=io.github.Tahoma Icon=io.github.Tahoma2D
Exec=tahoma Exec=tahoma2d
Categories=Graphics; Categories=Graphics;
Terminal=false Terminal=false