Merge master branch into release branch (v0.6.2 RC1)

.gitignore

@@ -25,6 +25,7 @@ ui_*.h
 Makefile*
 *-build-*
 .moc
+moc_predefs.h
 
 Makefile
 Makefile.Debug

.travis.yml

@@ -58,14 +58,15 @@ before_install:
             brew upgrade python;
         fi
         brew install p7zip;
-        brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/13d52537d1e0e5f913de46390123436d220035f6/Formula/qt.rb;
+        brew install qt;
         brew link qt --force;
     fi
 
 install:
   - pip3 freeze > requirements.txt
   - pip3 install -r requirements.txt
-  - sudo pip3 install google-api-python-client
+  - sudo pip3 install --upgrade oauth2client
+  - sudo pip3 install --upgrade google-api-python-client
   - python3 -V
   - pip3 -V
 
@@ -89,7 +90,7 @@ script:
   - 'if [ "$TRAVIS_BRANCH" == "release" ]; then
     qmake ../ PREFIX=/usr CONFIG+=release DEFINES+=QT_NO_DEBUG_OUTPUT DEFINES+=PENCIL2D_RELEASE;
   else
-    qmake ../ PREFIX=/usr CONFIG+=GIT CONFIG+=NIGHTLY;
+    qmake ../ PREFIX=/usr CONFIG+=release CONFIG+=GIT CONFIG+=NIGHTLY;
   fi'
   - make;
   - "$TRAVIS_BUILD_DIR/build/tests/tests"
@@ -119,9 +120,9 @@ after_success:
 
       echo "Copying ffmpeg plugin";
       mkdir Pencil2D.app/Contents/MacOS/plugins;
-      wget -P Pencil2D.app/Contents/MacOS/plugins https://evermeet.cx/ffmpeg/ffmpeg-3.2.4.7z;
-      7z x Pencil2D.app/Contents/MacOS/plugins/ffmpeg-3.2.4.7z -o"Pencil2D.app/Contents/MacOS/plugins";
-      rm Pencil2D.app/Contents/MacOs/plugins/ffmpeg-3.2.4.7z;
+      wget -P Pencil2D.app/Contents/MacOS/plugins https://evermeet.cx/pub/ffmpeg/ffmpeg-3.4.2.7z;
+      7z x Pencil2D.app/Contents/MacOS/plugins/ffmpeg-3.4.2.7z -o"Pencil2D.app/Contents/MacOS/plugins";
+      rm Pencil2D.app/Contents/MacOs/plugins/ffmpeg-3.4.2.7z;
 
       echo "Copying necessary Qt frameworks";
       macdeployqt Pencil2D.app;

README.md

@@ -8,30 +8,18 @@
 
 ## Download ###
 
-### Pencil2D 0.6.1  (15 April 2018)
+### Pencil2D 0.6.1  (16 April 2018)
 
-[What's new?](https://www.pencil2d.org/2017/12/introducing-pencil2d-0.6.html)
+[What's new?](https://www.pencil2d.org/2018/04/maintenance-release-0.6.1.html)
 
 | Windows 64 bit   | Windows 32 bit    | Mac             | Linux             |
 | :--------------: | :---------------: | :-------------: | :---------------: |
 | [Download][0]    | [Download][1]     | [Download][2]   | [Download][3]     |
 
-[0]: https://github.com/pencil2d/pencil/releases/download/v0.6.1/pencil2d-win64-0.6.1.zip
-[1]: https://github.com/pencil2d/pencil/releases/download/v0.6.1/pencil2d-win32-0.6.1.zip
-[2]: https://github.com/pencil2d/pencil/releases/download/v0.6.1/pencil2d-mac-0.6.1.zip
-[3]: https://github.com/pencil2d/pencil/releases/download/v0.6.1/pencil2d-linux-amd64-0.6.1.AppImage
-
-### Debian & Ubuntu
-
-```bash    
-sudo apt-get install pencil2d
-```
-
-### Homebrew Cask (macOS)
-
-```bash
-brew cask install pencil2d
-```
+[0]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-win64-0.6.1.1.zip
+[1]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-win32-0.6.1.1.zip
+[2]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-mac-0.6.1.1.zip
+[3]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-linux-amd64-0.6.1.1.AppImage
 
 ### Nightly build
 

app/app.pro

@@ -58,7 +58,8 @@ HEADERS += \
     src/exportimagedialog.h \
     src/importimageseqdialog.h \
     src/spinslider.h \
-    src/doubleprogressdialog.h
+    src/doubleprogressdialog.h \
+    src/colorslider.h
 
 SOURCES += \
     src/main.cpp \
@@ -85,7 +86,8 @@ SOURCES += \
     src/exportimagedialog.cpp \
     src/importimageseqdialog.cpp \
     src/spinslider.cpp \
-    src/doubleprogressdialog.cpp
+    src/doubleprogressdialog.cpp \
+    src/colorslider.cpp
 
 FORMS += \
     ui/mainwindow2.ui \
@@ -137,6 +139,12 @@ win32 {
 linux {
     target.path = $${PREFIX}/bin
 
+    bashcompletion.files = data/pencil2d
+    bashcompletion.path = $${PREFIX}/share/bash-completion/completions
+
+    zshcompletion.files = data/_pencil2d
+    zshcompletion.path = $${PREFIX}/share/zsh/site-functions
+
     mimepackage.files = data/pencil2d.xml
     mimepackage.path = $${PREFIX}/share/mime/packages
 
@@ -146,7 +154,7 @@ linux {
     icon.files = data/pencil2d.png
     icon.path = $${PREFIX}/share/icons/hicolor/256x256/apps
 
-    INSTALLS += target mimepackage desktopentry icon
+    INSTALLS += bashcompletion zshcompletion target mimepackage desktopentry icon
 }
 
 

app/data/Info.plist

@@ -58,11 +58,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.0</string>
+	<string>0.6.2</string>
 	<key>CFBundleSignature</key>
 	<string>PC2D</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.0.0</string>
+	<string>0.6.2.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.graphics-design</string>
 	<key>NSHighResolutionCapable</key>

app/data/_pencil2d

@@ -0,0 +1,13 @@
+#compdef pencil2d
+
+_arguments \
+  {-h,--help}'[Display help]' \
+  {-v,--version}'[Display version information]' \
+  {-o+,--export=}'[Render the file to the given path]:output file:_files' \
+  '--camera=[Name of the camera layer to use]:name of the camera layer to use:' \
+  '--width=[Width of the output frames]:width of the output frames:' \
+  '--height=[Height of the output frames]:height of the output frames:' \
+  '--start=[The first frame to export]:number of first frame to include:' \
+  '--end=[The last frame to include]:number of last frame to include:((last\:"Last frame containing animation" last-sound\:"Last frame containing animation or sound"))' \
+  '--transparency[Render transparency when possible]' \
+  '::input file:_files -g "*.pcl|*.pclx"'

app/data/app.qrc

@@ -50,6 +50,12 @@
         <file>icons/new/svg/selection.svg</file>
         <file>icons/new/svg/smudge_detailed.svg</file>
         <file>icons/new/svg/trash_detailed.svg</file>
+        <file>icons/new/checkerboard_smaller</file>
+        <file>icons/new/arrow-diagonalleft.png</file>
+        <file>icons/new/arrow-diagonalright.png</file>
+        <file>icons/new/arrow-horizontal.png</file>
+        <file>icons/new/arrow-selectmove.png</file>
+        <file>icons/new/arrow-vertical.png</file>
     </qresource>
     <qresource prefix="/app">
         <file>icons/onion-blue.png</file>
@@ -62,5 +68,7 @@
         <file>icons/mirrorV.png</file>
         <file>icons/dialog-error.svg</file>
         <file>pencil2d_quick_guide.pdf</file>
+        <file>icons/new/svg/color-dialog.svg</file>
+        <file>icons/new/svg/more_options.svg</file>
     </qresource>
 </RCC>

app/data/pencil2d

@@ -0,0 +1,27 @@
+_pencil2d()
+{
+  local cur prev words cword opts
+  _init_completion || return
+  opts="-h --help -v --version -o --export --camera --width --height --start --end --transparency"
+
+  case "${prev}" in
+    --camera|--width|--height|--start)
+      return 0
+      ;;
+    --end)
+      COMPREPLY=( $(compgen -W "last last-sound" -- ${cur}) )
+      return 0
+      ;;
+    -o|--export)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  if [[ ${cur} == -* ]]; then
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+  else
+    _filedir "pcl?(x)"
+  fi
+} &&
+complete -F _pencil2d pencil2d

app/data/pencil2d.desktop

@@ -6,21 +6,23 @@ GenericName=Animation Software
 Comment=Create traditional hand-drawn animation using both bitmap and vector graphics
 Icon=pencil2d
 Exec=pencil2d %f
-MimeType=application/x-pencil-pcl;application/x-pencil-pclx;
+MimeType=application/x-pencil2d-pcl;application/x-pencil2d-pclx;application/x-pencil2d-palette;
 Categories=Graphics;2DGraphics;VectorGraphics;RasterGraphics;Qt;AudioVideo;Video;
 Keywords=picture;drawing;vector;bitmap;cartoon;
-Keywords[de]=Bild;Zeichnen;Vektor;Raster;Zeichentrick;
+
+
+# Translations
 
 
 # Translations
 Name[he]=Pencil2D
 GenericName[he]=תוכנת הנפשה
 Comment[he]=צרו הנפשה מסורתית מצויירת ביד באמצעות כלי מפת ביטים וכלים וקטוריים
 Icon[he]=pencil2d
-Name[sl]=Svinčnik2D
-GenericName[sl]=Program za animacijo
-Comment[sl]=Ustvarite tradicionalno ročno risano animacijo s pomočjo bitne in vektorske grafike
-Icon[sl]=svinčnik2d
+Name[ar]=بنسل2D
+GenericName[ar]=برنامج تحريك الرسومات
+Comment[ar]=أنشئ رسومات متحركة بالطريقة الكلاسكية بإستخدام bitmap و vector graphics
+Icon[ar]=pencil2d
 Name[pt]=Pencil2D
 GenericName[pt]=Programa de Animação
 Comment[pt]=Cria animações tradicionais feitas a mão utilizando bitmaps e vectores gráficos 
@@ -43,17 +45,26 @@ Name[de]=Pencil2D
 GenericName[de]=Animationssoftware
 Comment[de]=Traditionelle handgezeichnete Animation sowohl mit Raster- als auch mit Vektorgrafik schaffen
 Icon[de]=pencil2d
+Name[sl]=Svinčnik2D
+GenericName[sl]=Program za animacijo
+Comment[sl]=Ustvarite tradicionalno ročno risano animacijo s pomočjo bitne in vektorske grafike
+Icon[sl]=pencil2d
 Name[es]=Pencil2D
 GenericName[es]=Programa de Animación
 Comment[es]=Crea animaciones tradicionales hechas a mano usando mapas de bits o vectores gráficos
 Icon[es]=pencil2d
 Name[et]=Pencil2D
 GenericName[et]=Animeerimistarkvara
+Comment[et]=Loo traditsioonilisi käsitsijoonistatud animatsioone kasutades nii raster- kui vektorgraafikat.
 Icon[et]=pencil2d
 Name[vi]=Pencil 2D
 GenericName[vi]=Phần mềm làm phim hoạt hình
 Comment[vi]=Tạo nên các chuyển Động hoạt hình vẽ tay truyền thống bằng các hình ảnh Bitmap và Vector
-Icon[vi]=Pencil 2D
+Icon[vi]=pencil2d
+Name[zh_CN]=Pencil2D
+GenericName[zh_CN]=动画软件
+Comment[zh_CN]=用位图和矢量两种图像技术创作传统手绘动画
+Icon[zh_CN]=pencil2d
 Name[fr]=Pencil2D
 GenericName[fr]=Logiciel d'Animation
 Comment[fr]=Créez une animation traditionnelle dessinée à la main à l'aide de graphiques bitmap et vectoriels

app/src/aboutdialog.cpp

@@ -21,6 +21,8 @@ GNU General Public License for more details.
 #include <QSysInfo>
 #include <QClipboard>
 
+#include "pencildef.h"
+
 AboutDialog::AboutDialog(QWidget* parent) :
     QDialog(parent),
     ui(new Ui::AboutDialog)
@@ -37,13 +39,8 @@ AboutDialog::~AboutDialog()
 
 void AboutDialog::init()
 {
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-#define S__GIT_TIMESTAMP TOSTRING(GIT_TIMESTAMP)
-#define S__GIT_COMMIT_HASH TOSTRING(GIT_CURRENT_SHA1)
-
 	QStringList devText;
-	devText << tr("Version: %1", "Version Number in About Dialog").arg(APP_VERSION);
+	devText << tr("Version: %1", "Version Number in About Dialog").arg(APP_VERSION " RC1");
 #if defined(GIT_EXISTS) && defined(NIGHTLY_BUILD)
     devText << "commit: " S__GIT_COMMIT_HASH ;
 	devText << "date: " S__GIT_TIMESTAMP ;