Merged branch 'master' from opentoonz (v1.4)

Author: manongjohn

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.3.0.{build}
+version: 1.4.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 skip_tags: true

ci-scripts/linux/travis-install.sh

@@ -1,7 +1,7 @@
 sudo add-apt-repository --yes ppa:beineri/opt-qt597-trusty
 sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
 sudo apt-get update
-sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libsdl2-dev libglew-dev freeglut3-dev qt59script libsuperlu3-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev
+sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu3-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev
 
 # someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
 wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb

doc/how_to_build_linux.md

@@ -8,7 +8,6 @@ Building OpenToonz from source requires the following dependencies:
 - CMake (3.4.1 or newer).
 - Qt5 (5.9 or newer)
 - Boost (1.55 or newer)
-- SDL2
 - LibPNG
 - SuperLU
 - Lzo2
@@ -18,7 +17,7 @@ Building OpenToonz from source requires the following dependencies:
 ### Installing Dependencies on Debian / Ubuntu
 
 ```
-$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libsdl2-dev libfreetype6-dev libjson-c-dev qtwayland5
+$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libfreetype6-dev libjson-c-dev qtwayland5
 ```
 
 For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
@@ -34,7 +33,7 @@ Notes:
 (it may include some useless packages)
 
 ```
-$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut SDL2 SDL2-devel freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel libtool intltool make
+$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel libtool intltool make
 ```
 
 For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
@@ -47,7 +46,7 @@ $ sudo dnf install libmypaint-devel
 ### Installing Dependencies on ArchLinux
 
 ```
-$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 libusb lzo libjpeg-turbo glew freeglut sdl2 freetype2
+$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 libusb lzo libjpeg-turbo glew freeglut freetype2
 $ sudo pacman -S blas cblas
 ```
 From AUR, using eg. yaourt:
@@ -61,7 +60,7 @@ Notes:
 ### Installing Dependencies on openSUSE
 
 ```
-$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libSDL2-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel libusb-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel
+$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel libusb-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel
 ```
 
 For newest versions of OS you may install libmypaint from repository and don't need to build it from source:

doc/how_to_stylesheet.md

@@ -4,6 +4,8 @@ Stylesheets are written with [LESS](http://lesscss.org/), which is a dynamic pre
 ℹ️ [LESS Functions](http://lesscss.org/functions/)
 
 ## Recommended Setup
+
+### Windows
 Although any LESS compiler will work fine, here is a recommended setup.
 
 - Install [Visual Studio Code](https://code.visualstudio.com/) by Microsoft.
@@ -20,9 +22,27 @@ A `settings.json` file is already included to ensure developers work to the same
   "out":       false
 }
 ```
+
 ℹ️ [How to Change Settings in Visual Studio Code](https://code.visualstudio.com/docs/getstarted/settings).
 
+### Linux
+
+On Linux you will need a command-line compiler `lessc`.
+
+Ubuntu:
+
+    $ apt install node-less
+
+Fedora:
+
+    $ dnf install nodejs-less
+
+
+
 ## How To Compile
+
+### Windows
+
 Easy LESS uses a compile on save feature, so the theme files must be saved to generate an output.
 
 ```
@@ -32,6 +52,15 @@ themes/Dark.less
 themes/Light.less
 ```
 
+### Linux
+From opentoonz source directory root execute the following commands:
+```
+$ lessc -x stuff/config/qss/Default/less/Default.less stuff/config/qss/Default/Default.qss
+$ lessc -x stuff/config/qss/Default/less/themes/Blue.less stuff/config/qss/Blue/Blue.qss
+$ lessc -x stuff/config/qss/Default/less/themes/Dark.less stuff/config/qss/Dark/Dark.qss
+$ lessc -x stuff/config/qss/Default/less/themes/Light.less stuff/config/qss/Light/Light.qss
+```
+
 ## How They Work
 The stylesheets are designed into a component, wire-frame and palette structure similar to web design that exploits the cascade of the LESS language to generate multiple theme colors from a single layout. This method was used to prevent duplication.
 
@@ -131,4 +160,4 @@ It's possible to create custom themes.
 
 **Layouts:** The core wire-frame, every window, widget and control is designed here.
 
-**Themes:** Alternate theme colors that inherit the Default theme, it is only necessary to override variable values unique to the theme.
+**Themes:** Alternate theme colors that inherit the Default theme, it is only necessary to override variable values unique to the theme.