Merge branch 'master' from opentoonz with conflicts resolved

Author: manongjohn

ci-scripts/osx/travis-install.sh

@@ -6,6 +6,8 @@ brew install clang-format
 # from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
 # so we start to use the latest version of Qt. (#1910)
 brew install qt
+# delete older qt versions and make sure to have only the latest
+brew cleanup qt
 # temp workaround to brew installed glew cmake info overriding glew lib detection
 # which causes compiling issues later
 if [ -L /usr/local/lib/cmake/glew ]

doc/how_to_build_win.md

@@ -1,78 +1,75 @@
+
 # Building on Windows
 
-This software can be built using Visual Studio 2015 and Qt 5.9
+This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Qt versions still not working correctly.)
 
 ## Required Software
 
-### Visual Studio Express 2015 for Windows Desktop
+### Visual Studio Express 2015 or higher for Windows Desktop
 - https://www.visualstudio.com/vs/older-downloads/
-- Make sure that the version is "2015" and that the target platform is "for Windows Desktop", not "for Windows".
-- Community and Professional versions of Visual Studio 2015 for Windows Desktop also work.
-- Visual Studio 2017 is currently unsupported.
+- Make sure the target platform is "for Windows Desktop", not "for Windows".
+- Community and Professional versions of Visual Studio for Windows Desktop also work.
 - During the installation, make sure to select all the Visual C++ packages.
 
 ### CMake
 - https://cmake.org/download/
 - This will be used to create the `MSVC 2015` project file.
 
-## Acquiring the Source Code
-- Clone the base repository.
-- Throughout the explanation `$opentoonz` will represent the root for the base repository.
-- Visual Studio cannot recognize UTF-8 without BOM source code properly.  Furthermore, since the endline character is represented with only the LF character, one line comments in Japanese will often cause the following line to be treated as a comment by `MSVS` as well.
-- In order to prevent this, please change the following setting in git so that it will preserve the proper endline characters:
-  - `git config core.safecrlf true`
-
-## Installation of Required Libraries
-Because of the size of these libraries, they are not maintained in the git repository.
-They will have to be installed seperately as follows.
-
-### `lib` and `dll`
-- `lib` and `dll` files are tracked by [Git Large File Storage](https://git-lfs.github.com/).
-- Execute `git lfs pull` after `git clone` by using the `lfs` client.
-
 ### Qt
 - https://www.qt.io/download-open-source/
 - Qt is a cross-platform GUI framework.
-- Install Qt 5.9 (64-bit version, tested up to 5.9.4) with the [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe).
+- Install Qt 5.9 (64-bit version, tested up to 5.9.9) with the [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe).
 
 ### boost
 - Boost 1.55.0 or later is required (tested up to 1.61.0).
 - http://www.boost.org/users/history/version_1_61_0.html
-- Download boost_1_61_0.zip from the above link.  Extract all contents to the '$opentoonz/thirdparty/boost' directory.
+- Download boost_1_73_0.zip from the above link. Extract all contents to the - '$opentoonz/thirdparty/boost' directory.
 - Install the following patch (Make the changes listed in the patch file), if you use Boost 1.55.0 with Visual Studio 2013.
-  - https://svn.boost.org/trac/boost/attachment/ticket/9369/vc12_fix_has_member_function_callable_with.patch
+- https://svn.boost.org/trac/boost/attachment/ticket/9369/vc12_fix_has_member_function_callable_with.patch
+
+## Acquiring the Source Code
+- Note: You can also perform these next commands with Github for Desktop client.
+- Clone the base repository.
+- Throughout the explanation `$opentoonz` will represent the root for the base repository.
 
+### lib and dll
 
-## Building
+- `lib` and `dll` files are tracked by [Git Large File Storage](https://git-lfs.github.com/).
+- Note: git-lfs is also installed with Github Desktop.
+- Visual Studio cannot recognize UTF-8 without BOM source code properly. Furthermore, since the endline character is represented with only the LF character, one line comments in Japanese will often cause the following line to be treated as a comment by `MSVS` as well.
+- In order to prevent this, please change the following setting in git so that it will preserve the proper endline characters:
+- `git config core.safecrlf true`
+- Execute `git lfs pull` after `git clone` by using the lfs client.
 
 ### Using CMake to Create a Visual Studio Project
-1. Launch CMake
-2. In `Where is the source code`, navigate to `$opentoonz/toonz/sources`
-3. In `Where to build the binaries`, navigate to `$opentoonz/toonz/build`
-  - Or to wherever you usually build to.
-  - If the build directory is in the git repository, be sure to add the directory to .gitignore
-  - If the build directory is different from the one above, be sure to change to the specified directory where appropriate below.
-4. Click on Configure and select Visual Studio 14 2015 Win64.
-5. If Qt was installed to a directory other than the default, and the error `Specify QT_PATH properly` appears, navigate to the `QT_DIR` install folder and specify the path to `msvc2015_64`. Rerun Configure.
-  - If red lines appear in the bottom box, you can safely ignore them.
-6. Click Generate
-  - Should the CMakeLists.txt file change, such as during automatic build cleanup, there is no need to rerun CMake.
+- Launch CMake
+- In `Where is the source code`, navigate to `$opentoonz/toonz/sources`
+- In `Where to build the binaries`, navigate to `$opentoonz/toonz/build`
+- Or to wherever you usually build to.
+- If the build directory is in the git repository, be sure to add the directory to .gitignore
+- If the build directory is different from the one above, be sure to change to the specified directory where appropriate below.
+-Click on Configure and select the version of Visual Studio you are using.
+-If Qt was installed to a directory other than the default, and the error Specify QT_PATH properly appears, navigate to the `QT_DIR` install folder and specify the path to `msvc2015_64`. Rerun Configure.
+-If red lines appear in the bottom box, you can safely ignore them.
+-Click Generate
+-Should the CMakeLists.txt file change, such as during automatic build cleanup, there is no need to rerun CMake.
 
 ## Setting Up Libraries
 Rename the following files:
-  - `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.vc` to `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.h`
-  - `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` to `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.h`
-  - `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` to `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
-  - `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` to `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
-    - Note that the destination is a different folder for the last file.
+- `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.vc` to `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.h`
+- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` to `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.h`
+- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h to $opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
+- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt to $opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
+- Note that the destination is a different folder for the last file.
 
 ## Building
-1. Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Debug` or `Release` in the top bar.
-2. The output will be in the corresponding folder in `$opentoonz/toonz/build/`
+- Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Debug` or `Release` in the top bar.
+- Compile the build.
+- The output will be in the corresponding folder in `$opentoonz/toonz/build/`
 
 ## Building with extended stop motion support for webcams and Canon DSLR cameras.
-You will need three additional libraries.
-  - [OpenCV](https://opencv.org/) (v4.1.0 and later)
+ You will need three additional libraries.
+- [OpenCV](https://opencv.org/) (v4.1.0 and later)
   - [libjpeg-turbo](https://www.libjpeg-turbo.org/)
   - The Canon SDK.  This requires applying for the Canon developer program and downloading the SDK.
 
@@ -88,10 +85,10 @@ To run the program with stop motion support, you will need to copy the .dll file
 
 ## Running the Program
 ### Setting Up the Program's Path
-1. Copy the entire contents of `$opentoonz/toonz/build/Release` to an appropriate folder.
+1. Copy the entire contents of $opentoonz/toonz/build/Release to an appropriate folder.
 
-2. Open a Command Prompt and navigate to `QT_DIR/msvc2015_64/bin`. Run the Qt program `windeployqt.exe` with the path for `OpenToonz.exe` as an argument.
-  - The necessary Qt library files should be in the same folder as `OpenToonz.exe`
+2. Open a Command Prompt and navigate to `QT_DIR/msvc2015_64/bin`. Run the Qt program `windeployqt.exe` with the path for `OpenToonz.exe` as an argument. (Another way to do this is navigate to the exe that was created in your Release folder and drag and drop the Opentoonz.exe on top of the windeployqt.exe This will automatically generate the QT files and folders you will need.)
+ - The necessary Qt library files should be in the same folder as `OpenToonz.exe`
   - These include:
     - `Qt5Core.dll`
     - `Qt5Gui.dll`

stuff/doc/LICENSE/LICENSE_tahoma.txt

@@ -0,0 +1,36 @@
+License Agreement For Tahoma
+[https://github.com/turtletooth/tahoma]
+
+- - - - - - - - - - - - - - - -
+
+Tahoma
+
+All contributions by Jeremy Bullock:
+Copyright (c) 2016 - 2020, Jeremy Bullock
+All rights reserved.
+
+All contributions by DWANGO:
+Copyright (c) 2016 - 2020, DWANGO Co., Ltd.
+All rights reserved.
+
+All other contributions:
+Copyright (c) 2016 - 2020, the respective contributors.
+All rights reserved.
+
+Each contributor holds copyright over their respective contributions.
+The project versioning (Git) records all such contribution source information.
+
+
+LICENSE
+
+BSD 3-Clause "New" or "Revised" License
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

stuff/profiles/layouts/fxs/STD_iwa_TextFx.xml

@@ -2,8 +2,12 @@
 	<page name="Text Iwa">
  	<vbox>
 		<control>targetType</control>
-		<control>columnIndex</control>
-		<control>text</control>
+		<vbox modeSensitive="targetType" mode="1">
+			<control>columnIndex</control>
+		</vbox>
+		<vbox modeSensitive="targetType" mode="2">
+			<control>text</control>
+		</vbox>
 		<control>hAlign</control>
 		<control>center</control>
 		<control>width</control>

stuff/profiles/layouts/fxs/STD_iwa_TimeCodeFx.xml

@@ -2,13 +2,17 @@
 	<page name="TimeCode Iwa">
  	<vbox>
 		<control>displayType</control>
-		<control>frameRate</control>
+		<vbox modeSensitive="displayType" mode="0,2">
+			<control>frameRate</control>
+		</vbox>
 		<control>startFrame</control>
 		<control>position</control>
 		<control>size</control>
 		<control>textColor</control>
 		<control>showBox</control>
-		<control>boxColor</control>
+		<vbox modeSensitive="showBox" mode="1">
+			<control>boxColor</control>
+		</vbox>
   	</vbox>
   	</page>
 </fxlayout>

stuff/profiles/layouts/rooms/Default/menubar_template.xml

@@ -55,6 +55,7 @@
         <command>MI_Paste</command>
         <command>MI_PasteAbove</command>
         <command>MI_PasteInto</command>
+        <command>MI_PasteDuplicate</command>
         <command>MI_Insert</command>
         <command>MI_InsertAbove</command>
         <command>MI_Clear</command>

toonz/sources/CMakeLists.txt

@@ -484,6 +484,8 @@ elseif(BUILD_ENV_UNIXLIKE)
     find_package(LZO REQUIRED)
     message("LZO:" ${LZO_INCLUDE_DIR})
 
+    find_library(PTHREAD_LIBRARY pthread)
+
     if(NOT BUILD_TARGET_WIN)
         pkg_check_modules(USB_LIB REQUIRED libusb-1.0)
         pkg_check_modules(FREETYPE REQUIRED freetype2)