Diffusion Krita 6d3bcba61b94

Merge remote-tracking branch 'origin/master' into kazakov/svg-loading

Authored by dkazakov on Apr 6 2017, 11:11 AM.

Description

Merge remote-tracking branch 'origin/master' into kazakov/svg-loading

  1. Conflicts:
  2. krita/krita.xmlgui
  3. libs/pigment/KoColorSpaceEngine.h
  4. libs/pigment/KoColorSpaceRegistry.cpp
  5. libs/pigment/colorspaces/KoSimpleColorSpaceEngine.h
  6. libs/ui/canvas/kis_canvas2.h
  7. libs/ui/widgets/KoStrokeConfigWidget.h
  8. libs/widgets/KoStrokeConfigWidget.cpp
  9. plugins/color/lcms2engine/IccColorSpaceEngine.cpp
  10. plugins/color/lcms2engine/IccColorSpaceEngine.h
  11. plugins/tools/basictools/kis_tool_pencil.cc
  12. plugins/tools/defaulttool/connectionTool/ConnectionTool.cpp
  13. plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
  14. plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.cpp
  15. plugins/tools/defaulttool/defaulttool/DefaultToolWidget.cpp

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
f3c1e9b8d773rempt
Build sip on Windows with mingw 
Apr 5 2017
f77f0e2d2584rempt
Download the right python on Windows and install it 
Apr 5 2017
4f56f2f99fc1rempt
Configure sip for windows 
Apr 5 2017
31f5de8afd13rempt
First attempt at downloading python for windows 
Apr 5 2017
34b6776b9721pino
fixuifiles 
Apr 5 2017
940d91e841c2rempt
Reword this message slightly 
Apr 4 2017
2a1bf73c5bebrempt
Add Python bindings to libkis 
Apr 4 2017
636305c5311frempt
Fix typo 
Apr 4 2017
a3f0be760389rempt
Add a menu entry for scripts 
Apr 4 2017
8fab8972d83frempt
Update the outdated mainpage.dox 
Apr 4 2017
7ffd0b4ec156rempt
Add python stuff to gitignore 
Apr 4 2017
71631f90dc3brempt
Add cmake modules for finding python, sip and pyqt 
Apr 4 2017
505fa128f235rempt
Add libkis: the Krita scripting wrapper library 
Apr 4 2017
7a974cdc1c23rempt
Expose parts of kritaui to the scripting engine 
Apr 4 2017
ea83775f4841rempt
Fix spello 
Apr 4 2017
eaa48b7c192drempt
Use doc, not d -- d for document is confusing us with d-pointers 
Apr 4 2017
f601ee2e7ebbrempt
Add a constructor that doesn't need a KoCanvasResourceManager 
Apr 4 2017
4c6163cb3b1brempt
Fix eigen includes 
Apr 4 2017
1d3b8f4c658crempt
Fix the width of the splash screen 
Apr 4 2017
c2ee169d01c3rempt
Make two functions public so libkis can access them 
Apr 4 2017
f20296cc7004rempt
Check whether there's a mainwindow 
Apr 4 2017
396bbcbdd97drempt
Expose some more API in KisApplication 
Apr 4 2017
ec4ffb60bd6brempt
Remove unused function and fix whitespace 
Apr 4 2017
1cb86b518249rempt
Add method to rotate the canvas from the KisCanvasController 
Apr 4 2017
aa97d774b1e7rempt
Add const 
Apr 4 2017
2f703362e5c3rempt
Fix eigen includes 
Apr 4 2017
ba4da9c13187rempt
Check pointer for safety's sake 
Apr 4 2017
54764838ba0erempt
Add 3rdparty projects for python, sip and pyqt 
Apr 4 2017
82ea5b1d9969rempt
emove unused method 
Apr 4 2017
cf1634a4dbe3rempt
Test copying a KisProperties object 
Apr 4 2017
81d1479a5946rempt
Tell the world the profile has changed when it has changed 
Apr 4 2017
c3b5ed3f6ff2rempt
Add friend class for the scripting api 
Apr 4 2017
a93a3ff6d2c3rempt
Export KisChangeProfileVisitor so it can be used directly 
Apr 4 2017
09b99e0285b7rempt
Fix spello in comment 
Apr 4 2017
69b2e08935ecrempt
Use debug areas to debug kxmlguifactory 
Apr 4 2017
5bfc4ed3f080rempt
Add Alpha colorspaces for 16i, 16f and 32f channel depths 
Apr 4 2017
3391cc8900f4rempt
Fix apidox 
Apr 4 2017
3ee06820cb85rempt
Remove unused load/saveOasis methods from KoDocumentInfo 
Apr 4 2017
f48d4621479arempt
Set the default png compression to 3 
Apr 4 2017
17175edc899brempt
Remove stray reference to calligra 
Apr 2 2017
9e2b8c5b07dedkazakov/rempt
Add compression to the guides 
Mar 31 2017
1d2343c0cacfrempt
BUG:378313 Fix warnings about qlayout 
Mar 31 2017
e02948b118e4rempt
Show the warning dialog much earlier 
Mar 30 2017
50d549cda444jospin
Correct the behavior of center offset in Offset Image/Layer dialog. 
Mar 30 2017
a643bc7bf51btimotheegiet
fix spacing step 
Mar 30 2017
61e58d5dea9fD5124jospin
Uses unit aware spinboxes in some strategical places, especially imagesize and… 
Mar 29 2017
b17501c182a6rempt
update the appimage scripts 
Mar 29 2017
8b3e3905ea22timotheegiet
make spacing sliders exponential 
Mar 28 2017
2307e466bb22rempt
BUG:376098 Warn the user when saving a read-only file 
Mar 28 2017
4060363ce6b8rempt
BUG:376311 Don't crash if there is no proofing colorspace 
Mar 27 2017