1. 27 Sep, 2018 1 commit
  2. 03 Jun, 2018 2 commits
  3. 22 Jul, 2017 1 commit
  4. 26 Nov, 2015 1 commit
  5. 18 Sep, 2015 1 commit
  6. 15 Sep, 2015 1 commit
    • Boudewijn Rempt's avatar
      Make kowidgets kdelibs4support-free · 6483ec80
      Boudewijn Rempt authored
      This breaks komain, which is now unported again...
      
      CCMAIL:calligra-devel@kde.org
      
      There is also a big todo left for the resourceserverprovider.
      QStandardPaths and KStandardDirs have one really big difference:
      KStandardDirs allows you to define a resource type and add different
      locations to look for those resources, QStandardPaths doesn't.
      
      The porting guide says to simply look in all those places when
      using QStandardPaths::locate, but that doesn't work, of course, for
      us, because our resource loading code is all generic.
      
      So this needs thought...
      6483ec80
  7. 10 Sep, 2015 2 commits
  8. 01 Sep, 2015 1 commit
  9. 26 Aug, 2015 1 commit
  10. 20 Mar, 2015 1 commit
    • Boudewijn Rempt's avatar
      Make kowidgets build · 7b58d2fb
      Boudewijn Rempt authored
      Note: KoDocumentInfoDlg is pretty broken because KPageDialog is now a
      broken QDialog instead of KDialog.
      7b58d2fb
  11. 30 Jan, 2015 1 commit
  12. 05 Dec, 2014 1 commit
    • Boudewijn Rempt's avatar
      Merge krita-mvc-rempt into master · 1cb2d177
      Boudewijn Rempt authored
      This refactors Krita to allow the user to have more than one
      image open in a window. Krita no longer uses or depends on the
      komain library.
      
      For now, Sketch and Gemini are disabled.
      
      review:119612
      
      Conflicts:
      	krita/ui/kis_view2.cpp
      	krita/ui/tool/kis_delegated_tool.h
      1cb2d177
  13. 23 Oct, 2014 1 commit
  14. 07 Oct, 2014 1 commit
  15. 04 Oct, 2014 3 commits
  16. 14 Sep, 2014 2 commits
  17. 02 Apr, 2014 1 commit
  18. 02 Mar, 2014 1 commit
  19. 22 Sep, 2013 1 commit
    • Boudewijn Rempt's avatar
      Squashed commit of the following: · afb80e69
      Boudewijn Rempt authored
      commit 8fd90a3dcbe35f7bb26f8f63dddf2fd2a74b49a4
      Merge: 92bc3a5 be195b7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Sep 22 22:22:47 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 92bc3a58c6f80433885f12a6305c69adf42122ef
      Author: Sven Langkamp <sven.langkamp@gmail.com>
      Date:   Sun Sep 22 15:16:26 2013 +0200
      
          Workaround for flickering in OpenGL 2 canvas on AMD graphic cards
          BUG:322808
          REVIEW:112883
      
      commit 8c5ec1b0d1723814a56ac028296fef93d0e620fa
      Merge: 94287d6 ec9b97a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Sep 20 08:52:16 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/tool/kis_tool_freehand.cc
      
      commit 94287d69187c6de85c1fb52c1dbd0105f8b732ea
      Merge: 83f300d 4c7b0a9
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Sep 19 15:55:36 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 83f300d5a7b57d4be2fec91349c4dfb886522bc9
      Merge: 073751d b3a7dfc
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Sep 15 11:45:39 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 073751defcce54cbda08fa67d8397240f01e07bd
      Merge: 1856287 3eb1053
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Sep 14 11:36:46 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 1856287e8fdf8e178ea4f8f4964e81e839f8d6ca
      Merge: 2e6fcaa 599eb6a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 10 11:20:05 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 2e6fcaa12b14b9f763b92b10c8c3a1aebf3c5989
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 10 11:15:41 2013 +0200
      
          Make sure tablet events return as mouse events
      
          Because Krita depends on that.
      
      commit c03fd12721237fc919a5cf90819b410537b76eb6
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Sep 9 13:31:17 2013 +0200
      
          Make it possible to log tablet events from krita
      
      commit bc6116b1da67c9417dab3b0ca3cd6df55d30aa74
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Sep 9 13:31:12 2013 +0200
      
          add logging of mouse events
      
      commit 182f43b9624c330698ab3aa54e8d9eb04f2ceefb
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 3 12:02:36 2013 +0200
      
          Start on a tablet event debugger
      
      commit 53bf3af2ced8b69d9f34f1c840847780c59116ef
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Sep 9 11:03:16 2013 +0200
      
          Only do the more expensive update when there are decorations
      
      commit 341bfa9b8d322ad3ca9c20b6fed52da7edc193ab
      Merge: a9670fe 965ea31
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Sep 9 10:42:14 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit a9670fe382682e7b0f167b28e6da96ca51204e8f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Sep 9 09:35:20 2013 +0200
      
          Use the basic circle preset on startup, it's nice.
      
      commit c7567ca6ca9fde80b28e53fcc0b3a64edfea3f7d
      Merge: e059335 730f5e2
      Author: Dan Leinir Turthra Jensen <admin@leinir.dk>
      Date:   Fri Sep 6 14:10:10 2013 +0100
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit e059335f2a37e5616dfad83f5b4976d819adb2ca
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Sep 5 15:56:26 2013 +0200
      
          Update the whole canvas in opengl mode
      
          This fixes an issue where the grids and assistants would disappear
          when updating only part of the canvas (for instance, when moving
          the cursor).
      
      commit 5d9f84b397c6a8cd9738090e17b0661671b7701a
      Merge: 1d26a8f 825ab65
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Sep 5 11:27:17 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
      commit 1d26a8f04e2ea13a0731587657b598cb0cfea3f9
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Sep 5 10:37:02 2013 +0200
      
          Make the cursor workaround hard-coded for Qt 4.6.3
      
          And disable it for later versions of Qt, since it meant we would
          fallback to the broken xor operator -- that doesn't work in opengl
      
      commit 962e7f9a9a8228137c35c052297437007767ddc1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 14:09:59 2013 +0200
      
          Revert "add studio branding"
      
          This reverts commit 6ffb63c6642572fa4afc29afad040c9c56284efe.
      
      commit 787625f87582389d7af5727549ecfe6737d0729d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 14:07:34 2013 +0200
      
          Put the canvas input config options in a scroll area
      
          So the dialog doesn't need to grow out of the desktop
      
      commit 7680330b5ca1f6e5c14e23610fe185682a3118d2
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 12:35:28 2013 +0200
      
          Check whether we can already create shaders, if not return
      
          This fixes an initialization problem with the lut docker on Windows
      
      commit 4c4ef1e57197fab18436838efbc53f276cda4b4a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 12:35:13 2013 +0200
      
          Don't compare a string to 0...
      
      commit 6ffb63c6642572fa4afc29afad040c9c56284efe
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 3 10:58:27 2013 +0200
      
          add studio branding
      
      commit eea75f62741c46cb7f80c0cdd4359a3028954af9
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 09:19:41 2013 +0200
      
          Add tablettester application
      
          This will help, hopefully, find problems with tablet drivers,
          mainly on Windows.
      
      commit a859535d14bf5836bb3bab123a91fdac8a30b5d5
      Merge: fd4f0e0 20ba1b1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Sep 4 09:08:15 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit fd4f0e02697e0eaffd1661c00a9461c3cc9c13d4
      Merge: 08a1570 47d5f65
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 3 14:43:52 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 08a157054a16278b2ed8775b5668fc11e8926563
      Merge: 98d680a 2b1296e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Sep 3 10:59:33 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 98d680acd878ecc8a7c5d644cc7013b993c5c104
      Merge: fa9ba89 c2434f0
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Aug 31 10:59:54 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit fa9ba8964151a5fa8a1de99322848cc63da8e490
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Aug 30 10:56:31 2013 +0200
      
          Move the paintop options model and widget to krita/ui
      
          This "fixes" the build on Windows. The templated stuff across dll boundaries
          was just too much for msvc2012. Fortunately, this move is not a really big
          problem.
      
      commit 2ca58b62557c41336e9ae74c97cbb2cf7e3356bd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Aug 30 09:40:53 2013 +0200
      
          Fix a few of the build errors on Windows
      
      commit b51adfb24c5bf890d9698fa7332025255283e2c7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Aug 28 11:59:31 2013 +0200
      
          Add exports
      
      commit 4e627fcdc0ccc7ec26d4cc6f05fc37605e8be670
      Merge: 8daeb8e 0518342
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Aug 28 09:45:19 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 8daeb8ec324319204f960a4a0c0002f9c223a1d1
      Merge: 6bcbeff 4b70c7d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Aug 26 09:50:43 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 6bcbeff8dec254c35eb4e424a4da191fdd4b42a1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Aug 15 15:28:46 2013 +0200
      
          Revert "do not disable opengl double buffering on windows"
      
          This reverts commit 816add58ac1c97929e266149873096032f045797.
      
      commit 43b7124b76a2a0115a0c3a965b9dc20e74b17e63
      Merge: 9133a10 667158f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Aug 15 09:14:22 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 9133a10efaa5da803be877d85c98385cdcf45405
      Merge: 816add5 4e8bb42
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Aug 10 11:33:02 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 816add58ac1c97929e266149873096032f045797
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Aug 8 13:55:41 2013 +0200
      
          do not disable opengl double buffering on windows
      
      commit d5e6bc236e696b0db16890e3b7a1434d8a89e80d
      Merge: bc050fa 18ec94b
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Aug 7 12:37:16 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit bc050faaf9d0a53a1fffc03a43cc258e2f0047a2
      Merge: 1deda65 7eaaef4
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Aug 5 10:57:33 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 1deda65ba2d2a544163131162cf2fa5287901345
      Merge: e4cdbf3 08c6b1e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Aug 5 09:53:32 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit e4cdbf39bc7954488c87e3fd1f1ec1f841fc9f1b
      Merge: ce495b4 634198d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Aug 5 09:30:28 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
          Conflicts:
          	CMakeLists.txt
      
      commit ce495b4550aad4eca155c142021f6444e656d13e
      Merge: be0ce90 7a719b9
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Aug 1 09:13:03 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit be0ce90c21a34008ce4802e636a436ca3c621218
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jul 31 14:55:30 2013 +0200
      
          Disable the image docker in win32 + x64 (hopefully)
      
      commit 47608b95a5f3cbe5a2e28b2d13e2fd2ad02f971b
      Merge: 6d80869 867a208
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 14:31:03 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 6d808694e22524fb74ceb10f0331dcf3aff376c1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 14:25:10 2013 +0200
      
          build fix on windows
      
      commit 8d1c23a5bc2debbae7bed5ff6e088366748773b6
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 13:13:47 2013 +0200
      
          fix image strip scene
      
      commit af499558a5b466ba724d7275198b904d6f56d6bd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 10:31:33 2013 +0200
      
          Make texture buffering optional
      
          It breaks on AMD/Radeon...
      
          BUG:322806
      
      commit 095db211cff7a818e25adfd7c8a19f17103eaaa9
      Merge: 7733459 548217e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 09:52:21 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/plugins/extensions/dockers/lut/ocio_display_filter.cpp
          	krita/ui/opengl/kis_opengl_canvas2.cpp
          	krita/ui/opengl/kis_opengl_image_textures.cpp
          	krita/ui/opengl/kis_texture_tile_update_info.h
      
      commit 7733459b5e4b2e1db3fb8e500549213af4d98225
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 30 09:33:34 2013 +0200
      
          On Win64, reader.supportsOption(QImageIOHandler::Size) crashes
      
          Somewhere in the jpg library...
      
      commit de1caec2a39f0668b10ffa83bfaefcdedf20d05d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jul 26 10:17:39 2013 +0200
      
          Properly activate and bind the textures
      
      commit b344a93bab5348d388ab48b0e72906687602ceea
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jul 26 10:03:45 2013 +0200
      
          use other composite op again
      
      commit 1298414ddc56b1c5ce3ac4cd92142ca4faa22b38
      Merge: cf4a441 1f37394
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jul 26 09:07:50 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/plugins/extensions/dockers/lut/ocio_display_filter.cpp
          	krita/plugins/extensions/dockers/lut/ocio_display_filter.h
          	krita/ui/canvas/kis_display_filter.h
          	krita/ui/opengl/kis_opengl_canvas2.cpp
          	krita/ui/opengl/kis_opengl_image_textures.cpp
      
      commit cf4a441e5f921fd56757ba63ba563b55757d9286
      Merge: 1637922 b934077
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jul 25 10:06:07 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 1637922cd3781a4d2c9f00f18ca98fcb04506838
      Merge: 6902a27 3fc2e50
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 23 14:50:11 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/plugins/tools/defaulttools/kis_tool_gradient.cc
          	krita/ui/opengl/kis_opengl_canvas2.cpp
      
      commit 3fc2e501e3cf1284cc4d65fff9d4e3eec9b79182
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:12:55 2013 +0200
      
          Wrap KoShapeBackground in QPointer
      
          This patch wraps KoShapeBackground in a QPointer instead of doing manual
          refcounting. Bug 321714 shows, imo, that the manual refcounting is
          fragile and sometimes breaks. I don't remember why we weren't supposed
          to use QPointer (other than that it gets a little ugly with subclassing),
          but it seems a good fit here.
      
          There are other classes that do manual refcounting, and I think those
          should be converted, too -- but in another patch.
      
          BUG: 321714
      
      commit f4235c8c0b37761e33cef93cf30045bebd6e2f08
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:22:34 2013 +0200
      
          Krita uses palettes, too.
      
          BUG:322243
      
      commit c468b1c16ae5d54bd3469c1f920add6a411104fd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:12:47 2013 +0200
      
          remove spurious file
      
      commit 6902a27a83a3d12711ae4d135099d341c4bc9bc3
      Merge: f59e9f0 36cce28
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jul 21 11:05:48 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit f59e9f0030ac09ee18f44345213f78801b796101
      Merge: 0a8138c 5296d47
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jul 21 11:04:53 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 36cce28a0650337e6be411c923b4b0422ee286a4
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:12:55 2013 +0200
      
          Wrap KoShapeBackground in QPointer
      
          This patch wraps KoShapeBackground in a QPointer instead of doing manual
          refcounting. Bug 321714 shows, imo, that the manual refcounting is
          fragile and sometimes breaks. I don't remember why we weren't supposed
          to use QPointer (other than that it gets a little ugly with subclassing),
          but it seems a good fit here.
      
          There are other classes that do manual refcounting, and I think those
          should be converted, too -- but in another patch.
      
          BUG: 321714
      
      commit 3f10d5363b5ca5c2fd7d98bb895a05dbf222901a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:22:34 2013 +0200
      
          Krita uses palettes, too.
      
          BUG:322243
      
      commit b2fb1a169f280d12e04b4bf660ae1d5f2a3a0851
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 14:12:47 2013 +0200
      
          remove spurious file
      
      commit 0a8138cef2bf87c40425853a5f53f6e07fdea1ce
      Merge: 9b0ed4a 9e42c70
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 20 12:12:31 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
          Conflicts:
          	CMakeLists.txt
      
      commit 9b0ed4a8a9583d565970e6922cc34e84caf60d74
      Merge: 9ff2e88 3d405de
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jul 10 09:17:37 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 9ff2e884d3326016a8c8beacb012bb724e5bae23
      Merge: 00c31fa dc307e0
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jul 8 14:53:21 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/kis_view2.cpp
      
      commit 00c31fad837fb9375f0661c0199423f19bbb77fa
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jul 5 09:49:53 2013 +0200
      
          properly fix build on windows
      
      commit dfcdfad49e309b02c852563f9202be212c7cdb00
      Merge: 313ba0b 15bca6d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jul 5 09:36:47 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 313ba0b8a366457bb4f939b56d2681e74c169652
      Merge: 85fd350 946fa7c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jul 4 11:09:07 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 85fd350915c95051af8a4abda2a5180b37e6d248
      Merge: 968082f c3b6af4
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jul 3 11:06:17 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 968082f79a4d41a0c743d1c83522bc2da0a9740c
      Merge: 1ee397e c0f9671
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 2 20:23:26 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 1ee397e03c7f79eec246a66cf05f0b4ae5e1063f
      Merge: 91877e6 a67eff3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jul 2 16:22:56 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 91877e654fe13f8319a297e315c08304487ca74e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jul 1 16:13:27 2013 +0200
      
          Bring in line with sketch
      
      commit cc95f608ba0f1366266beb6155d1c0ae372c31df
      Merge: cb10e6b 87fd1fb
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jul 1 11:25:45 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/plugins/extensions/dockers/defaultdockers/defaultdockers.cpp
      
      commit cb10e6be5a9aed7dfc2172393cd7519a621df89f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 26 15:59:07 2013 +0200
      
          BUG: 320606 (fix display of title text when floating)
      
          Floating dockers on Windows used to have an illegible caption.
          Fixed the rectangle calculation for the titlebar painter.
      
      commit 6dee1b154c5e55f32229c59ebbbd70993f1b276e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 26 12:32:31 2013 +0200
      
          Remove the temporary test interpolation settings
      
      commit 48fdda0957b4ea23b8456a58fb34149b72c706c7
      Merge: 80ce00c e91bc99
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 25 21:37:50 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 80ce00c0133d68bc0ce86c3e9e5657f52bb983dd
      Merge: f4ff7da 207f527
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jun 23 15:57:47 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
      commit f4ff7da3e76039389a4ebb2629acdac6175639f8
      Merge: 5302557 5d2c5b6
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jun 23 14:27:28 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit 530255727cda7ba409cfcaf642607d5db8e126cd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jun 23 12:25:13 2013 +0200
      
          Do not use KDirSelectDialog on Windows
      
          It uses kio, and kio uses dbus, and we don't use dbus on windows,
          so use QFileDialog instead.
      
          BUG:315524
      
      commit 3acdde4aae95d4e7a9daeb14789b958225befcf7
      Merge: 5bb82ae f96a2bf
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jun 23 10:52:09 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
      commit 5bb82ae212fbb888d1ae99bee6689c0b86e37424
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 22 14:57:27 2013 +0200
      
          Do not save the original image when saving a backup
      
          BUG:314214
      
          Apparently, the original design was to save the current state both as
          a backup and under the original filename. That makes sort of sense,
          but it is confusing because F4 doesn't tell the user it is "Saving the
          plus a backup", but that it is "saving a backup".
      
      commit 6b5231e60a3a2cd2c5014b1d2ac9dee5e3730a31
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 22 10:43:02 2013 +0200
      
          Constify a bit.
      
      commit 436c4da34a94705d15b1aa43f45a8c92004c2f01
      Merge: fdfdf54 04a624e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jun 21 05:34:22 2013 -0700
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/CMakeLists.txt
      
      commit fdfdf544984c5d40ef65232bc32e0045c7426741
      Merge: 6580bcf 5a4fdc6
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jun 20 15:50:21 2013 +0200
      
          Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/opengl/kis_opengl_image_textures.cpp
          	krita/ui/opengl/kis_texture_tile.cpp
      
      commit 6580bcfaff3a6521cf23964687c9b41a41701b10
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 19 13:44:53 2013 +0200
      
          split paintGL into two calls, one for GL, one for qpainter
      
      commit c7bbe63db02a1a5ad1282d86806b480cd0fbfcd9
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 19 13:44:32 2013 +0200
      
          give the shared context widget a name
      
      commit 35568778e70402c3bc3162116119de9b5b166fe5
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 19 18:13:28 2013 +0200
      
          Fix bug 320679: correctly convert input pixels to textures
      
          We hardcoded GL_BGRA, but we actually have GL_RGBA as a possibility now,
          for the floating point colorspaces.
      
          BUG: 320679
      
      commit cd69157963d821996e17e4945a89f9e41657d066
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 19 18:13:21 2013 +0200
      
          fix whitespace
      
      commit 96ee133f615c31b577ee3d7113cb78d0bf207972
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 19 17:01:57 2013 +0200
      
          Revert "Experiment with changing minification filters according to zoom level"
      
          This reverts commit e4a6eb74e65e973c30568d2b2210cdf9b9cf8c2c.
      
      commit baa98fcbff51b6a427d53eaaea802ed18d8cf944
      Merge: e4a6eb7 bb962b5
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 18 14:23:07 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
      commit e4a6eb74e65e973c30568d2b2210cdf9b9cf8c2c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 18 14:19:45 2013 +0200
      
          Experiment with changing minification filters according to zoom level
      
      commit 66123e8e55b7647ea3fd367c6e5cbeb865d75b15
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Jun 13 19:27:17 2013 +0200
      
          Remove some old cruft
      
           it failed to compile if you didn't have VC installed in the right place
      
      commit b9ce0f23fd3927896383636c494bd1b95c19bd84
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jun 13 16:47:53 2013 +0200
      
          Also use the buffer for updating part of a tile
      
      commit e773d5113d915b6326a1cd1cbaa609e85348e62a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jun 13 16:31:03 2013 +0200
      
          Remove test file
      
      commit 0e41df473b48e3a6623b8fb8d9d98bc50a58ef7c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jun 13 16:30:51 2013 +0200
      
          Experiment with double buffering
      
      commit d81da54ce7004cee3cd8922a257050fc84479494
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu Jun 13 15:24:55 2013 +0200
      
          remove option to enable double-buffering
      
      commit 4190c61e61c0f7e11b6abc433610d169ad3a3f4d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 12 12:42:35 2013 +0200
      
          Fix build on Linux
      
      commit 33a7303bbc0d71ddb5dad545feae89f9ecc12858
      Author: Dan Leinir Turthra Jensen <admin@leinir.dk>
      Date:   Tue Oct 2 15:46:12 2012 +0100
      
          Expose a bunch of useful things from the selection tools to QML
      
      commit f83aac3eac168586048df1f1d1efa49c7354178c
      Author: Dmitry Kazakov <dimula73@gmail.com>
      Date:   Thu Jun 13 14:28:47 2013 +0400
      
          Fix an uninitialized variable in the filter stroke
      
      commit ead30790d36bcfe29f56aedb8926ea2cb67875b8
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 12 11:16:30 2013 +0200
      
          Re-instate LUT-docker for opengl canvas
      
      commit 763b586f58ee1b797e9bbb25bfdbd1476612677a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 19:17:06 2013 +0200
      
          Comment-out workaround to sanitize zoom levels
      
          There must be a better way.
      
      commit 6f3ce8ba42225b1c0c28b2dded6d29cbf64c8dc7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 19:16:00 2013 +0200
      
          Start porting lut docker to new opengl canvas
      
          Instead of locally building and linking the shader, just create the
          text and let the existing canvas do that. Now that needs to be integrated
          with our canvas.
      
      commit 0a98d71a6814aec108c8cebe8aeb5e4de0024d59
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 12 09:54:21 2013 +0200
      
          fix build on windows
      
      commit 860dfe84ea1e51244bf4c4543c4b66a15ed882e8
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 12 09:54:09 2013 +0200
      
          make compile on windows in debug mode
      
      commit c27ecca90464e933f544227396b594d8e0efc92b
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed Jun 12 09:53:58 2013 +0200
      
          remove unused KoUnit variable
      
      commit 76e71fe52d2e994a4f90f2626a3838a22aaada6e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 16:23:22 2013 +0200
      
          Add apitrace files to git ignore
      
      commit b605d7bd1cba9093838373b52c47fa91d2b1cc70
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 16:22:58 2013 +0200
      
          oops
      
      commit b1771e0ee667096d90f6c7b9a5fc801feda1dbeb
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 16:22:44 2013 +0200
      
          share code
      
      commit 1a7e2512ea05fe92230e71c61bf97ae0e7911dff
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 16:16:31 2013 +0200
      
          some level of detail tweaks
      
      commit f9f037a3a1013243934b5c81d4ef78138e0b2f01
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 14:46:58 2013 +0200
      
          Temporarily add three more mipmap filter options
      
      commit c3bebbf16a801515fce25808abda87ef6b869d47
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 14:20:49 2013 +0200
      
          Sanitize zoom levels.
      
      commit a3d27307e1650e334f46d151c580ec1dd7e87788
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 12:30:19 2013 +0200
      
          debug--
      
      commit 5ed7355639d41c771fdc511885964df25a2afcaf
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 12:29:20 2013 +0200
      
          Reset the canvas when changing the filter option
      
      commit 648c3016c7833c1123fd976d8ef5b2f17bd2d00d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 11:46:31 2013 +0200
      
          Fix updating/replacing of texture tiles
      
          Also set the parameters when updating or replacing a texture, instead of
          only initially
      
      commit ca0e8d8d922b9c4414092cf99869fcb56cbfced2
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 10:57:24 2013 +0200
      
          Make bilinear the default again.
      
      commit 67f7251fa401a973f9eaa3e435139bca8c2b67df
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 10:52:54 2013 +0200
      
          Make it possible to choose between nearest, bi and trilinear
      
          And only explicitly generate mipmaps on Windows
      
      commit 5dc75f259ca1ab170963ce5ba0d21c7bb73b7bc4
      Merge: c9e42d3 78333fa
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue Jun 11 09:45:17 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit c9e42d313bad38704db7f3824ccfa5ec7450d6c3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 16:48:18 2013 +0200
      
          Add option to enable double buffering
      
          For those windows users where this prevents tearing.
      
      commit a3dac60071c872fc789fdc77eb56b6c7d713c757
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 16:40:02 2013 +0200
      
          enable opengl by default
      
      commit 2de0a06292b73e63d69d1b716943f6710a3a41da
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 16:31:59 2013 +0200
      
          Add config setting to enable/disable double buffering
      
      commit 0f2b2281d544f287405495e8fe173cf05e2dab0c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 16:31:33 2013 +0200
      
          Fix spello
      
      commit 96fca8e7124aa6288bf0f944967fd2876e768cc3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:59:22 2013 +0200
      
          fix build on windows
      
      commit 97960a85f560c0b86054f93dd1031e7dc268c5bb
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:50:19 2013 +0200
      
          Revert "Revert "Major fixes for the Krita filtering system""
      
          This reverts commit 19c8dbaf210a18170fb0446f4bde33731a258fbd.
      
      commit 6116f04975af74da2ed0fbd986f576eb6950cfd4
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:50:10 2013 +0200
      
          Revert "Revert "Fixed the Filter Dialog""
      
          This reverts commit 1581e4c3abb2360be43c5c0ec5cd903947ff735f.
      
      commit 5c260773385c90c0708d9655bc0bc01661a2ed74
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:49:59 2013 +0200
      
          Revert "Revert "Removed ThreadWeaver dependency from Krita""
      
          This reverts commit 54c4184ade67c56a63382b764cfcd6828de1da83.
      
      commit b28b19f5df5c15846d6c505398d812d96cba3e8f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:49:45 2013 +0200
      
          Revert "Revert "Ported filter application to the strokes system""
      
          This reverts commit 0253f98cace097860bb480bdf8167371766ea902.
      
      commit 78d95a133e67c86d0a97fb4132e0b5553458f227
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:49:19 2013 +0200
      
          Revert "Revert "Fix compilation of Shiva filters""
      
          This reverts commit 47f2474eeb372c41d97dc31433689925add798de.
      
      commit 646781b8d6aff0684dcc7922e2fdbf719b1d484a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:18:57 2013 +0200
      
          Fix drawing the cursor in XOR mode with opengl
      
          However... ES 2.0 doesn't have
      
                  glEnable(GL_COLOR_LOGIC_OP);
                  glLogicOp(GL_XOR);
      
          Which is, of course, why QPainter in OpenGL mode doesn't have it either.
      
      commit 9dc87c90fbd5071914ce7c2a60b770fbda1aef7c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 11:06:07 2013 +0200
      
          Show the cursor as the right size, at the right place, in front of the image
      
          The outline is still wrong, though.
      
      commit 47f2474eeb372c41d97dc31433689925add798de
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 10:15:31 2013 +0200
      
          Revert "Fix compilation of Shiva filters"
      
          This reverts commit 2ddf9c45324a7c1ffca619acd100e764adf3bf1d.
      
      commit 5492d21e10a79d86a3f5c5827c19b2d438a79d7c
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 10:04:47 2013 +0200
      
          Start re-implementing the opengl cursor
      
      commit b25060f8b2ba8046277708f7216d41653f71ec93
      Merge: d2e2975 99a19df
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jun 10 10:06:46 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
      commit d2e2975d40f65713b7d0ef2f7b32bbbeffdcc887
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri Jun 7 10:59:19 2013 +0200
      
          Don't mess with the startup geometry on Windows
      
      commit 0253f98cace097860bb480bdf8167371766ea902
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 1 14:05:47 2013 +0200
      
          Revert "Ported filter application to the strokes system"
      
          This reverts commit 8b3de7d65c9f7bffe988d93d1822a82a9949285f.
      
      commit 54c4184ade67c56a63382b764cfcd6828de1da83
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 1 14:04:33 2013 +0200
      
          Revert "Removed ThreadWeaver dependency from Krita"
      
          This reverts commit 74ba0554bb903e28382e0159e33b5fab83c51f0b.
      
      commit 1581e4c3abb2360be43c5c0ec5cd903947ff735f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 1 14:00:15 2013 +0200
      
          Revert "Fixed the Filter Dialog"
      
          This reverts commit a13e5a2d26b09eb81294add5839b2fc114922cca.
      
      commit 19c8dbaf210a18170fb0446f4bde33731a258fbd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 1 13:53:52 2013 +0200
      
          Revert "Major fixes for the Krita filtering system"
      
          This reverts commit 8ace3ad4756d1f0a9a1b13997dae54215629af0f.
      
      commit 9a5096f472a53554cc51816791efd22b4838c426
      Merge: ba8b503 cedf488
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jun 1 11:46:31 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
      commit ba8b503efb2b537b70f77a36e2945228146b878d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 15:33:56 2013 +0200
      
          Disable the palette docker on Windows for now
      
          CCBUG:295475
      
      commit 77569360804851ede31f760a113f941479f36d14
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 15:18:28 2013 +0200
      
          Revert "Add an option to combine plugins in a big meta plugin"
      
          This reverts commit ad1194f3fedf2f1672e73f8828e89fb9c8b0aff3.
      
      commit 97b8175165a4fd137dda4a398a07f9abc36a0c56
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 15:08:21 2013 +0200
      
          Better fix for hopping windows
      
      commit f2d2572cd566986742c7dfb08aa53be61c31e2cb
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 15:08:11 2013 +0200
      
          Remove unneeded show() call
      
      commit 95e6e8965b52c98d4dd039e36dbd2005d89a2744
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 15:00:31 2013 +0200
      
          On Windows, don't restore the size of the view component
      
          This prevents the hopping windows on view creation syndrome
      
      commit 60161baa364fe7bd3dc9380f11acee4c18215656
      Merge: b324763 ff09dc1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 31 10:40:08 2013 +0200
      
          Merge remote-tracking branch 'origin' into krita-opengl2-rempt
      
      commit b324763aa17676e7f5a3d7b9ca52bd7c3c349af3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 30 10:03:12 2013 +0200
      
          smaller texture size mipmaps faster
      
      commit c78ee67e0ed1722ed98a8345ceb950a56c370f9f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 27 13:54:14 2013 +0200
      
          (Re)generate the mipmaps on updating the projection
      
          This makes the opengl canvas usable on Windows
      
      commit b9104ae5edb36cc1862fe15ec3cfbec8cf6fcd1e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 27 13:53:43 2013 +0200
      
          Don't show  the kfilewidget existing files pane
      
          It conflicts with my stripped kdelibs and causes a wait on startup
      
      commit ad1194f3fedf2f1672e73f8828e89fb9c8b0aff3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 27 12:11:49 2013 +0200
      
          Add an option to combine plugins in a big meta plugin
      
          And use that for krita's filters. This should give an improvement
          in loading time on Windows, while it's still possible to compile
          filter plugins separately.
      
      commit dfa5d86d1573fbfed6bfff89528e7118ec957c04
      Merge: 33c3ef7 2ab4a35
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 26 15:58:34 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/opengl/kis_opengl_canvas2.cpp
      
      commit 33c3ef7d85613b08772568aecdb9495ad1d5d6b7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 26 15:51:54 2013 +0200
      
          Move creating the checkers textures to the constructor of the canvas
      
      commit 9b38b368b8c7de642aef114eac4469cce5b0b199
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 26 15:20:10 2013 +0200
      
          Make opengl work (again) on Windows
      
          The trick here was to _not_ set the format in initializeGL,
          that caused all the crashes...
      
          There is one big problem: the trilinear filtering causes weirdness
          when zoom < 100%. First new lines get gray, then they disappear.
      
          More investigation is needed.
      
      commit 130d9c4e8134256f85e7d1927fff64122c434db1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 26 11:51:21 2013 +0200
      
          Export interfaces
      
      commit 9e66751bdd12c5301cbdb0f75e0def364971f706
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 26 11:49:54 2013 +0200
      
          Make build against stripped windows kdelibs
      
      commit 887f1d1276de37de5d7f6082627ae3d505f4675d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 19 16:57:14 2013 +0200
      
          Make calligra compile on Windows
      
          Against a plain install of the dependencies, outside the
          KDE emerge environment.
      
      commit 602e1c6f05117e005051e1d15a5bc4e2bc7fe312
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Tue May 21 08:49:32 2013 +0000
      
          Make sure that we don't try to reparent a QGLWidget
      
          That is broken on Windows
      
      commit 0141c9a87feec1fd7d4d8d864dd6c6806509cba7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 20 17:07:54 2013 +0200
      
          use our own
      
      commit 712049d5589e7231cd1130b67e78442e5b0c7119
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 20 17:04:54 2013 +0200
      
          Add FindGLEW and friends for now
      
      commit b87ec5731788d70b030f4a3cf44c9643e5288bbe
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 20 16:33:53 2013 +0200
      
          Use glew again
      
          With the cmake findglew.cmake, instead of our own copy
      
      commit de8c97278ab1bfebb2b734c4bd8f1c89b8f67cb5
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 20 15:58:12 2013 +0200
      
          Paint in paintGL not paintEvent
      
      commit db0c89bd8dda81f80987277fbc6d7af3f4ceb6b3
      Merge: 6a2ec1b 5f5da3d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 19 14:44:58 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/plugins/extensions/dockers/CMakeLists.txt
          	krita/ui/opengl/kis_opengl_canvas2.cpp
          	krita/ui/opengl/kis_opengl_canvas2.h
          	krita/ui/opengl/kis_texture_tile.cpp
          	krita/ui/opengl/kis_texture_tile.h
      
      commit 6a2ec1b0c5c101d292bb409de4be00bdb48c0f46
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun May 19 14:43:30 2013 +0200
      
          Activate texture position
      
      commit 9198a6d2220fdbb8c0e258edbd6004ba3e9d9935
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 17 09:41:55 2013 +0200
      
          Set the format version and profile
      
          And print out some information about supported versions. If there is
          no properly supported version, fall back to the qpainter canvas.
      
      commit 33fbffea6c44747336e6aeb09fed68612854f61e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 16 15:59:15 2013 +0200
      
          Also show the image properly.
      
          CCMAIL:kimageshop@kde.org
      
          Please, everyone who has a different gpu from me, build this branch
          and test painting, zooming, panning, everything. Checkout the
          krita-opengl2-rempt branch
      
          We can now also start testing on windows and osx...
      
          TODO:
      
          * reintegrate OCIO (which was fragment-only)
          * move the texture updating to a separate thread
          * move the canvas rendering to a separate thread
          * integrate with krita sketch, somehow
          * reimplement the opengl cursor outline
          * reimplement the gradient shaders (perhaps? Not sure how useful they were.)
          * reimplement the 3d cursors (low prio -- they were fun, but I guess no
          pro artist used them)
          * figure out a way to move the layerstack composition to the GPU?
      
      commit 16ddc176b5419d8a3f43788f9e2b017310f1b053
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 16 15:22:06 2013 +0200
      
          Fix include
      
      commit 433d159078da17afc43913c1795d0280eafcff45
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 16 15:20:48 2013 +0200
      
          install the shaders
      
      commit ed3725365afcb22694ce6b513189d0cdfbc5491f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 16 15:17:43 2013 +0200
      
          Painting the checkers works now
      
          This uses the original models that keep track of rotation, panning,
          zoom and the configurability of the checkers following zoom/pan
      
      commit d6f4aae17a911d184839f8507d233db920e89880
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 15 14:31:21 2013 +0200
      
          Use Xor instead of SourceXor for now
      
      commit 95b8195125dcf33becdda2c154c697136306ee4d
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 15 14:22:43 2013 +0200
      
          Use only qpainter from tools for now
      
      commit 1b24dc6ca1b3d883580f5535624a1cced3e0fa00
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon May 13 11:03:19 2013 +0200
      
          Add notes on opengl 2 port
      
      commit 653cc2e0f2a0bb2fa3946270eba4b68f2150ee1b
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat May 11 10:54:51 2013 +0200
      
          Don't use the coordinate converter matrices for now, they don't work
      
          (yet)
      
      commit c17c71478bce36fd803e3f02e45460ce1213d05f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 16:39:22 2013 +0200
      
          remove glew config include
      
      commit c704f383ee4629f407ad410c2ea3248687a30bd3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 16:17:23 2013 +0200
      
          debug--
      
      commit 526518f048e9a9d50b878e4a4df550c453bef17e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 16:14:29 2013 +0200
      
          Paint checkers at the right size
      
          Now they need to be painted only underneath the image.
      
      commit 8dcc20035d7d31b0cd1168fb51fb950b3ff5d502
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 13:14:46 2013 +0200
      
          Start building the modern rendering code
      
      commit bda7603f3d61ac268f693bb8784e76bdffba32a7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 10:57:56 2013 +0200
      
          use initializer list
      
      commit 3f2f94000b55d52f0971c428f2820d54e2dbcff3
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 10:56:33 2013 +0200
      
          Remove Fixme
      
          No, it is not possible to do an in place conversion of the pixels
      
      commit 7b3309f82ce078bd5c5a60f2c8242406fcf1694e
      Merge: 7d455eb 6973021
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 10:49:46 2013 +0200
      
          Merge branch 'master' into krita-opengl2-rempt
      
          Conflicts:
          	krita/ui/tool/kis_tool_freehand.cc
      
      commit 7d455eb3cf10b296999fe190304d1437d6f19bb5
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Fri May 10 10:10:28 2013 +0200
      
          prepare for multithreading of opengl on X11
      
      commit 5df0cefc0057acd94e7c6303eeb1b6f547da83c1
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 9 14:41:07 2013 +0200
      
          remove separate method for clearing to border color
      
      commit 817d5ab5d31d543c1e2a8b02459e20e706f5d5b7
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 9 14:33:20 2013 +0200
      
          Modernize the creation of the checkers texture.
      
      commit ece9514fb8185d49dedad02331aa3962412419fd
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Thu May 9 14:19:06 2013 +0200
      
          disable ocio shader for now
      
      commit 95355c86114e0a557f2dcff2a5518ee6bbc63b9a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 20:35:33 2013 +0200
      
          re-enable opengl on windows
      
      commit 412d9350ab3fb2e3331c14ff4fe95045e2beec2f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 20:28:32 2013 +0200
      
          Determine float/half extensions without glew
      
          Not sure what to do with the OES extensions here.
      
      commit d8d3149ef1c5d33695f61e1247571d0e1400873a
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 19:20:27 2013 +0200
      
          follow coding style
      
      commit 147225c68f525a1c661403978badc480d7327f58
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 19:16:51 2013 +0200
      
          Avoid assert in QGLFunctions when making a 0 texture active.
      
      commit d8098487ace34bdc53c7dd27baa84a253a29745e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 19:13:27 2013 +0200
      
          Initialize QGLFunctions with the shared context.
      
      commit 4b5266fd1adc84bbebc2048dc85a8d8bdaceead8
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 16:32:17 2013 +0200
      
          Port ocio display filter to QtGLFunctions
      
      commit f1b6c2bfaa8adf4edf05e97a385f08803f545152
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 15:43:53 2013 +0200
      
          Remove the 3D cursor
      
          It uses display lists, which only works with old-fashioned opengl, plus
          actual users never use it. It seems to be little more than a gimmick :-(.
      
      commit e1bbfb01ff808bdf90373137355e87c925a6fa9b
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Wed May 8 15:35:12 2013 +0200
      
          Modernize the opengl canvas a bit
      
          * Replace the use of GLEW with QtGLFunctions
          * Replace the use of the Krita shader classes with QtGLShaderProgram
          * Remove checks whether the current opengl implementation supports
            shaders.
      afb80e69
  20. 07 Aug, 2013 1 commit
    • Boudewijn Rempt's avatar
      Don't crash in calligraconverter · 29116583
      Boudewijn Rempt authored
      First crash: when converting to pdf, KoZoomAction::createWidget
      hasn't been called yet, which means that the aspect buttons hasn't been
      set yet.
      29116583
  21. 21 May, 2013 1 commit
  22. 19 Jan, 2013 1 commit
    • C. Boemann's avatar
      Introduce a "Fit Text Width" zoom mode · 6a2625e2
      C. Boemann authored
          This also changes how the other "fit" modes work: We now zoom in to the fit the
          max pagesize of the currently shown pages. Previously we zoomed in to the max
          pagesize of the entire document.
      
          The page counter in the lower left of Words' window now show the scroll position
          and not the cursorposition. Previously it was a weird mix
      
          The page counter also now shows ranges so that if pages 3,4,5 are shown, the counter
          says "3-5 of 47"
      
          REVIEW: 108420
      6a2625e2
  23. 13 Nov, 2012 1 commit
    • Dmitry Kazakov's avatar
      Made the zooming steps consistent in Krita · 02aa597d
      Dmitry Kazakov authored
      1) Now the wheel and hotkey zooming in Krita is done using KoZoomAction
         instead of hardcoded code
      2) The zoom levels are changed to be in consistency with other
         applications (checked in Adobe Reader and Adobe Photoshop).
         Such change was demanded in bug 302775
      
      BUG:302775
      02aa597d
  24. 06 Aug, 2012 1 commit
    • Friedrich W. H. Kossebau's avatar
      introduce koIcon · 58f724c9
      Friedrich W. H. Kossebau authored
      * fixes for the wrong usage of K/QIcon vs. pixmap (from incomplete Qt3->Qt4 porting):
        Q/KIcon does not have a real size, it's more kind of a factory for whatever
        pixmap size it is asked for, so just loading a certain icon pixmap and setting that
        to a KIcon/QIcon is useless, as the widget which takes the icon might request a
        different size. So e.g. passing a SmallIcon("icon-foo") to a button which takes a
        QIcon can result in badly scaled icons instead of loading the most perfect size
        match from the icon-set.
      * removes lots of unneeded includes, usually kiconloader.h
      * makes the API consistent for some classes, with
       "iconName" for a QString-based icon name and
       "icon" for a KIcon/QIcon type property
      * use consistently "IconSize" everywhere instead of "KIconLoader::global()->currentSize"
      * removes unused "KPrFactory::iconLoader()"
      * adds a simple script tools/iconcheck/iconcheck.py to find iconnames without existing icons
      
      REVIEW: 105289
      58f724c9
  25. 06 Jun, 2012 1 commit
  26. 01 Nov, 2011 1 commit
  27. 23 Feb, 2011 1 commit
  28. 05 Apr, 2010 1 commit
  29. 27 Dec, 2009 1 commit
    • Thomas Zander's avatar
      Fix include of moc · 32b7a32a
      Thomas Zander authored
      the moc file is always generated in the build dir, the sourcefile
      lives in the sourcedir.
      Using the proper include means the compiler avoids looking in
      the current dir it doesn't exist in.
      
      svn path=/trunk/koffice/; revision=1066728
      32b7a32a
  30. 04 Sep, 2009 1 commit
  31. 12 Aug, 2009 1 commit
  32. 20 Jul, 2009 1 commit
  33. 16 Jun, 2009 1 commit
    • Boudewijn Rempt's avatar
      Extract the widgets from KoGuiUtils · 6f99f96e
      Boudewijn Rempt authored
      Note: zoom png's are still to follow! (git-svn limitations...)
      
      Ultimately, once the dependencies of the widgets have been minimized,
      they should be grouped in one or two logical libraries again.
      
      svn path=/trunk/koffice/; revision=982809
      6f99f96e
  34. 10 Apr, 2009 1 commit
  35. 12 Nov, 2008 1 commit