1. 16 Jun, 2017 1 commit
    • Dmitry Kazakov's avatar
      Implement KoShape::updateAbsolute() for complex transformation updates · 6f51599f
      Dmitry Kazakov authored
      Historically, transformation code uses extremely weird method of shape
      updates that rely on the event loop. This patch implements a framework
      for moving away from this strategy.
      
      The problem:
      
      When one transforms a shape he needs to update both areas: bounding
      rect of the shape *before* the transform and a bounding rect of the shape
      *after* the transform. Before the patch, the transformation code used the
      system like that:
      
      shape->update();
      shape->setTransformation(newTransform);
      shape->update();
      
      That works only with assumption that the first update() call will *not*
      be executed before setTransform() call. That should be true atm, but it
      is not guaranteed to be so in the future. Therefore, now the update happens
      like that:
      
      const QRectF oldDirtyRect = shape->boundingRect();
      shape->setTransformation(newTransform);
      shape->updateAbsolute(oldDirtyRect | shape->boundingRect());
      6f51599f
  2. 05 Jan, 2017 1 commit
  3. 09 Jan, 2016 1 commit
  4. 26 Nov, 2015 1 commit
  5. 07 Dec, 2014 2 commits
    • Jarosław Staniek's avatar
      proper indent · 8417fe2c
      Jarosław Staniek authored
      GIT_SILENT
      8417fe2c
    • Pierre Ducroquet's avatar
      Fix the simpleRootAreaProvider following 4fa0b6e29 · 758833be
      Pierre Ducroquet authored
      The commit 4fa0b6e29d31d7755441b231ea3bf2ef068435b4 introduced
      a refactoring of KoTextDocumentLayout that required doing the
      caching of rootAreas at the provider level.
      
      A failure to do so led to weird behaviours like missing inputs,
      missing rendering and so on in stage and other applications.
      
      Thanks to leinir for reporting the issue.
      758833be
  6. 27 Nov, 2014 1 commit
    • Pierre Ducroquet's avatar
      Pass more data between layout and RootAreaProvider · 8ab38f4f
      Pierre Ducroquet authored
      This patch refactors a bit the KoTextLayoutRootAreaProvider.
      It extends the provideNext call by adding a constraints structure.
      This structure contains so far the masterPageName and the page
      number of the requested new rootArea.
      This way, the provider don't have to sneak in layout specific data.
      It also adds a way for KoTextLayoutRootAreaProvider to help the
      layout and fix inserting a new page (by adding lines to a paragraph
      for instance) before a page break changing the page style.
      
      Some more explanations regarding this bug :
      - Page 1, style AAA
      * page break, requesting style BBB
      - Page 2, style BBB
      
      If you add more data to the page 1, then dynamically the layout should
      do :
      - Page 1, style AAA
      - Page 2, style AAA
      * page break, requesting style BBB
      - Page 3, style BBB
      
      But the layout did recycle the page 2, leading to :
      - Page 1, style AAA
      - Page 2, style BBB
      * page break, requesting style BBB
      - Page 3, style BBB
      
      Reloading the document leads to a correct layout.
      
      This refactoring also simplifies the page style management since the
      RootAreaProvider no longer has to mess with the document to guess the
      proper page style, and removes some duplicated code in KoTextDocumentLayout.
      
      Thanks to Camilla Boemann for all the reviews.
      
      REVIEW: 120733
      8ab38f4f
  7. 12 Jul, 2014 1 commit
  8. 30 Nov, 2013 1 commit
    • C. Boemann's avatar
      Correctly merge the text-annotation branch. · 0f02989a
      C. Boemann authored
          REVIEW: 111914
          FEATURE: Add support for annotations to Words and Author
      
      Squashed commit of the following:
      
      commit c26f5aa21ba649614f7a25e5b9d2b2f145a328fa
      Merge: 955818d bbecfa5
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Nov 30 16:43:30 2013 +0100
      
          Merge branch 'text-annotation' of git://anongit.kde.org/calligra into text-annotation
      
      commit 955818d359cd09ae612fc9a88f195da32760a68d
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Nov 30 16:43:10 2013 +0100
      
          less qDebug
      
      commit e442fabb7fa0872e68a6117fdb41825402a70068
      Merge: 0b4be46 d5f3f5d
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Nov 30 14:07:55 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit bbecfa5516a94e176ac14a7a9bbe195ef3270100
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Nov 30 00:23:25 2013 +0100
      
          Don't show annotation shapes before they are laid out.
      
      commit 0b4be4613cb6133c4a0b29090cb00604c82ec05d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Nov 29 23:29:12 2013 +0100
      
          some small additions
      
      commit 61ebd0059738bb92607c367e18677f7bc5332037
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Nov 29 21:06:08 2013 +0100
      
          Tested undo/redo.  Couldn't make it break or malfunction.
      
      commit 4460fc3e0da7a2f7814f90c48078b35795465aa5
      Merge: 311c665 a7cf9f9
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Nov 29 19:16:30 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 311c6651dc7ed24ee82153a7a2e030acf9a7aa82
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Nov 17 13:36:23 2013 +0100
      
          Better interactivity
      
      commit e539fb0318f715f9a4c59c1e8c311c2a1a238e21
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Nov 17 13:36:08 2013 +0100
      
          more issues we need to fix
      
      commit 72b4545f7a0bbb6ef8b825ae86ec1eba2ed207c6
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Nov 16 22:18:51 2013 +0100
      
          Preent inserting tables and annotatios into annotations
      
      commit 7764db70ffcd3e71210d7a07f0609ab8af0e07fb
      Merge: 06c65b2 c024391
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Nov 14 17:58:04 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 06c65b23279588a8d31198e96f2a806183d13c91
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Wed Nov 13 22:31:20 2013 +0100
      
          update todo list
      
      commit 8f04d441db001e37d8880f4460bf57efa5608465
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Wed Nov 13 00:36:55 2013 +0100
      
          Make the annotation commands work
      
      commit 36b4d39e0807e9ad4a4a2dcee897b06e9e9d619b
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Tue Nov 12 22:59:59 2013 +0100
      
          Fix option widget layout
          and
          Fix a warning
      
      commit 3528cca02c78833e17d2616466140bcc5dd86b2a
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Tue Nov 12 22:49:34 2013 +0100
      
          bum words.rc version since we have added a new item
      
      commit ad1f9ff40f8e13da6fdf035641e51468dcb47ec5
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Tue Nov 12 22:33:49 2013 +0100
      
          Adding annotation is now undoable
           well except that the sidepanel doesn't disappear when the last annotation disappears
      
      commit 327899b983342f5b480b5ced4e41820b4503b46a
      Merge: df15690 35fea76
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Nov 12 22:08:46 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit df156909e96767ab7dce6b3570b7f76ac8fe8298
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Tue Nov 12 21:28:21 2013 +0100
      
          First steps on making deleting annotations undoable
      
      commit 6771a21178866dbadeb33e0afdf9c8a569bb85bd
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Nov 10 22:09:43 2013 +0100
      
          Also call the buttons "Comment" rather than "Note" and change the implementation to use actions
      
      commit 584accffe908c20afcab5da0a3db6883909e240c
      Merge: 1e7c4fc b60307a
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Nov 10 18:01:51 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 1e7c4fcf592df45297e925e1a2acbaafa954d0c2
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Nov 6 19:43:15 2013 +0100
      
          Fix a couple of issues from the RR.
      
      commit aa69ffc425f58099b40360f6bb01ec98248979a0
      Merge: e52aa4f 499f472
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Nov 6 18:23:41 2013 +0100
      
          Merge branch 'master' into text-annotation
      
          Reason: new review request
      
      commit e52aa4f130dc04823ff6fe639b96a83d9927b2b8
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Nov 6 00:38:41 2013 +0330
      
          Put insert Annotation action in TextTool and set a shortcut for it.
      
      commit 65f0e5b894b4cbf417011b3a5dc2c8e6cd34e7e3
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Nov 5 22:27:13 2013 +0330
      
          Update Annotation_TODO
      
      commit 533d8569fe57bc6219dbb7a2583e24af1d92f53c
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Nov 5 22:22:55 2013 +0330
      
          Update Annotatio_TODO
      
      commit 160c5efb8ed336a6018ef8981d7e881c56d9e1da
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Nov 5 22:01:58 2013 +0330
      
          Fix the saving of annotations date format.
      
      commit 51c8c680f562240bda558366cd794b39aa13c84d
      Merge: 91ed060 1ae029d
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Nov 5 21:42:45 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 1ae029d76181c398360d9e1c002eecf71a780d11
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Nov 5 18:31:38 2013 +0100
      
          Guard against layout of annotations before the canvas is created.
      
      commit 91ed060a2f05cb2bf1db94a1035659956ab4432f
      Merge: 5fb42a6 6817ebe
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Nov 5 18:21:19 2013 +0330
      
          Merge remote-tracking branch 'origin/master' into text-annotation
      
      commit 5fb42a6cde77f8f01b90a1112b6d366d9ae2ba16
      Merge: 3f47155 9fcbee1
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Nov 5 13:46:13 2013 +0100
      
          Merge branch 'master' into text-annotation
      
          Conflicts:
          	words/part/KWDocument.cpp
          	words/part/KWDocument.h
      
      commit 3f47155b38ab277189af4b584ed54c38e0424a00
      Merge: 726d9d3 3dcbac5
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Sep 8 10:16:14 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit 726d9d308b435051bc297dee52a4dcc0d684672d
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Aug 30 15:13:47 2013 +0430
      
          Use ++it instead it++.
      
      commit 9664cf487aedd11b81c10380fc50f919834ba64e
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Aug 30 00:09:01 2013 +0430
      
          Fix problem calligra freezed at saving.
      
      commit e10f038f0dca283d104638292964ce28ed74db55
      Merge: b9a4b45 0c79406
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Aug 29 23:34:49 2013 +0430
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit b9a4b450319ea844ecfa3662f26d3eb1765a7bab
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Aug 29 23:33:52 2013 +0430
      
          Fixed issues in review.
      
      commit 0c794069de36ac155692ff98fbd270c64b1288c7
      Merge: ed8a4b0 e5a6ce1
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Aug 29 21:01:12 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit ed8a4b0ed957eba3cf241d1fa9fc2c043a5ec268
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Aug 29 20:45:47 2013 +0200
      
          Fix APIDox
      
      commit e126b1363afdb2a7c09b24e80fa22e9a45c7562a
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Aug 17 11:16:27 2013 +0200
      
          Make the text tool report it being able to work with annotation shapes too
      
      commit 5cc41fb428e7cccac4ac3ada22b767e63a93efcb
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 27 21:49:32 2013 +0430
      
          Update annotations layout and connection lines when an anntation deleted.
      
      commit 31fb81f27c14258fde4d9507ed0a454713c0299b
      Merge: 9b6eb15 52daa7f
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 27 21:33:06 2013 +0430
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 9b6eb154a9e5c7cbedc5696cdeebbfb401f1450a
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 27 21:24:21 2013 +0430
      
          Fix updating line connections, update whole of canvas.
      
      commit 52daa7f89b099479801c7ef697943c7b789c59d0
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Aug 23 10:32:11 2013 +0200
      
          Add to TODO
      
      commit 3b3f261ebe5152793ae387f70374bbf65117f95c
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Aug 23 12:57:45 2013 +0430
      
          Update the line conncetions between annotation shape and ref text between the outlinerect of page and textarea when y ref position changed.
      
      commit 16e6ec345899c4f9b4575571f3dbfe1f97fe78fd
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Aug 22 07:24:28 2013 +0200
      
          Make the UI show "Notes" everywhere, not "Annotations"
      
      commit b18893656e8a438901f8447f5b265085a8db4f54
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Aug 21 20:47:45 2013 +0200
      
          Get rid of annoying debug messages.
      
      commit 869432abc5481633bd9de53fe83473d660d72c00
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Aug 21 20:42:11 2013 +0200
      
          Make the annotation area continuous even at page breaks.
      
      commit 114c0f1e29c315d3505fe886593c49d9a883f64c
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Aug 19 01:11:53 2013 +0200
      
          Better handling of constants todo with annotations.
      
           - annotation area width moved from KWView to KWCanvasBase
           - constants in the annotation shape are now constants, not magic numbers.
      
           - Also updated TODO-ANNOTATIONS
      
      commit fd3ad2cd01252705e8ad2178cf8b14ce107d1cd7
      Merge: 34dedb7 9c36e72
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Aug 17 10:52:52 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit 34dedb7199303895e2f3b7736ec7260fe2520ec1
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Aug 17 10:29:01 2013 +0200
      
          Revert "Make sure the cursor is painted at the right position when textshape has padding"
      
          This reverts commit 4703e59eb66f82390d303c268371216f736d3368.
      
      commit c856608e22be1095be330eb2a3196391d3da5854
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Aug 17 10:17:07 2013 +0200
      
          Make the line to the annotation point to the correct textposition
           it used to just point to topLeft of the paragraph
      
      commit 8b9fc66329cfa5ea4eceb53a85c5596ed079fc39
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Aug 16 20:22:10 2013 +0200
      
           * Two small changes for annotations
              - Support meta:date-string
              - some simplification of loading.
      
      commit f88fb2cd17044f260e3d21266768638945aba591
      Merge: ff59495 bc03d30
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Aug 16 17:47:43 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit ff594951c3a5f7c3e00339f3e608ea7d3813c970
      Merge: 2498fd6 d4e4b5c
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Aug 15 19:24:35 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit 2498fd6c1851d3f6e181e486517b2a1426f4e749
      Merge: cc891a9 474104e
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Aug 15 19:24:26 2013 +0200
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
          Conflicts:
          	libs/flake/KoShapeManager.cpp
          	libs/kotext/KoTextEditor.h
          	libs/kotext/opendocument/KoTextLoader.cpp
          	plugins/textshape/dialogs/SimpleAnnotationWidget.cpp
      
      commit cc891a94f589698f6afd79dac03a57dd9f716991
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Aug 15 19:19:07 2013 +0200
      
          Fix some minor things pointed out in initial review.
      
      commit 474104e12edafb34266415e13bdbcba30c23cc22
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Aug 15 13:39:54 2013 +0430
      
          Some cleanup.
      
      commit 0f42698e8355c4bf36fcc364af3333efcbf5fd1f
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Aug 15 01:55:36 2013 +0430
      
          Fix save annotation method.
      
      commit 24449c13144835471a97baf3c56278d65c816bba
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Aug 14 18:56:07 2013 +0430
      
          writes <office:annotation-end> before <office:annotation> problem Fixed.
      
      commit 6c953a8678935dde7454171d9f38ed93ac0074cc
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Aug 14 16:24:36 2013 +0430
      
          Disconnect in right place.
      
      commit f38f4c2c8f3f6fff18e8590e97dbc16e253e23d2
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Aug 14 15:55:32 2013 +0430
      
          expanded shape doesn't move down other shapes Fixed.
      
      commit ef4ec092a024cf05f73e91adc1fdafb487764b1d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Aug 13 17:57:53 2013 +0200
      
          Update the buglist
      
      commit e9396a8244084f592fbccc2b51fe2dc2bc3fd10e
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Aug 13 14:13:39 2013 +0200
      
          Save office:annotation, not text:annotation.
      
      commit 347fbc6d55fec5a8cd0c1e3944dd3b6b0e50cc94
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 16:26:43 2013 +0430
      
          Fix saving date problem.
      
      commit b9c2c8fb5037dbe7f6922f577db0407d223f19fc
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 14:43:21 2013 +0430
      
          Save the date value.
      
      commit 6ff15b113e36be9b55b0eb9cbeb753b3d9676977
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 14:32:31 2013 +0430
      
          Update TODO list.
      
      commit 991474a204ba1cca404d3d7233be051b3eff0e11
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 14:18:40 2013 +0430
      
          Use local date for annotation date format.
      
      commit 14021b9f08facdd84c786f323245a0cbffa9cb71
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 14:07:32 2013 +0430
      
          Clear KoAnnotation class.
      
      commit 8119b38b050d6b79864b3552118adb6c22fdbc41
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 03:48:32 2013 +0430
      
          Set new size and new position for annotation shapes.
      
      commit efa172e4bd07c42fa392ae0bcb6530a20b55e858
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Aug 6 03:01:19 2013 +0430
      
          paint connection lines with new path and new style.
      
      commit 83f53b29d5326a308f893b703d70dcfe7b863604
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Mon Aug 5 17:44:31 2013 +0430
      
          Set Creator and Date for annotation shape  that user insert.
      
      commit e57f9f6704dee43291037e5b8388fab1e163f623
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sun Aug 4 14:23:01 2013 +0430
      
          Paint connections between text and annotation shape.
      
      commit de296ec541b05aa4e396e44464f9386abf425838
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Aug 3 15:34:03 2013 +0430
      
          Fix annotation background according to new chnages in master.
      
      commit f24fd7c353ce8eadf161e967f82eada3822263e6
      Merge: b00d243 221b8b6
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Aug 3 14:37:00 2013 +0430
      
          Merge remote-tracking branch 'origin/master' into text-annotation
      
          Conflicts:
          	libs/flake/KoShape.h
      
      commit b00d243b4ce7513dd9a7b7d1bb32deadc2cf17f5
      Author: Timothée Giet <animtim@gmail.com>
      Date:   Tue Jul 30 16:41:35 2013 +0200
      
          Revert "Properly fix the maskWidth/maskHeight problem"
      
          This reverts commit 2c30521ebd58ac15f1990b263e26501295417e18.
          which introduced bad precision regression.
      
      commit 5648f5f7e1bd07fa3a7c4ad01e5f1828bd5655d3
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Mon Jul 29 11:45:49 2013 +0200
      
          Fix crash
      
          BUG: 319155
      
      commit 01c887113428f2272cea58327a95846341716df6
      Author: Dmitry Kazakov <dimula73@gmail.com>
      Date:   Tue Jul 30 15:25:45 2013 +0400
      
          Added an option for disabling Anisotropic Spacing
      
      commit 9300bc7a5d89dce100eb9c03ff97fdedf8f495e1
      Author: Dmitry Kazakov <dimula73@gmail.com>
      Date:   Tue Jul 30 14:41:34 2013 +0400
      
          Removed now unused methods x/ySpacing() of KisBrush
      
      commit 8ba9ca546aceb76914b465f11af13da6d053b3fa
      Author: Dmitry Kazakov <dimula73@gmail.com>
      Date:   Tue Jul 30 13:52:12 2013 +0400
      
          PaintOps overriding paintLine() need not return spacing
      
      commit 949f0ea284e58cda590bc240f97a4ca25427ee88
      Author: Dmitry Kazakov <dimula73@gmail.com>
      Date:   Tue Jul 30 13:50:48 2013 +0400
      
          Implemented anisotropic spacing for the Krita brushes
      
          Now if you change the 'ratio' option the brush, the horizontal
          and vertical spacing will be relative to the width and height of the
          brush correspondingly.
      
          This effect is achieved by used equation of a ellipse. When the
          cumulative 'distance' value grows out of the ellipse defined by the
          spacing values, a new dab is painted.
      
          BUG:276465
      
      commit 72d1ab186b8c31b624bb6b67fdb4ee1c573d81f8
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jul 29 13:54:19 2013 +0200
      
          Wrap KoShapeBackground in QSharedPointer
      
          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.
      
      commit 41febefa8db07b014b186471b0efb7f060ad6eda
      Author: Matus Uzak <matus.uzak@gmail.com>
      Date:   Mon Jul 29 16:32:38 2013 +0200
      
          docx: Added support for bidi el. (Right to Left Section Layout).
      
          Changed interpretation of values of the jc element: In order to
          support different writing modes, left and right should be
          interpreted as start and end respectively.
      
          Reverted 36531721d558d5466d1dfd6a8a40068ccd7f3d1f
      
          CCBUG:286971
      
      commit f0706f097bf3bffb0df5fc8af9323a47cf143d7f
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Mon Jul 29 12:59:29 2013 +0200
      
          BUG: 322940
      
          Don't create and try to update empty tiles.
      
      commit 950ca2057774ece4a5b57e4d7ca4bedd7661e94f
      Author: Jos van den Oever <jos@vandenoever.info>
      Date:   Mon Jul 29 12:06:52 2013 +0200
      
          Speed up conversion from ppt to odp by not compressing png and jpg files.
      
      commit 8f954101cc836b11b080dbbf4f3dd637a4cd682e
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sun Jul 28 12:04:39 2013 +0200
      
          Activate the right texture units
      
      commit 232b0aa5c3d0d77f8164f0684746bef27ffb3fde
      Author: Boudewijn Rempt <boud@valdyas.org>
      Date:   Sat Jul 27 12:15:12 2013 +0200
      
          Revert "Wrap KoShapeBackground in QPointer"
      
          This reverts commit dcecbd47724d2ef34e7465c126b685ae9f8aadbb.
      
      commit b6b528b7f4a3f9b4124143ee972ca476acfd4c68
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Aug 2 22:22:19 2013 +0430
      
          Add an action that let user show or hide annotation area, annotation area will automatically shown after inserting an annotation shape.
      
      commit b7d1f9a3cf4d5c85fd210f6a268bb3f379a85ce7
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Aug 2 14:51:13 2013 +0430
      
          Fix problem, freezing after insert select annotation.
      
      commit 5bbf9f52315f73888b37fd496f0c203d2ec68c1d
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Mon Jul 29 11:13:33 2013 +0200
      
          Place annotations releative to their placement in the text
      
          there is a bug however, adding more than one annotation will freeze words
      
      commit 6f2c0200b72740183387704dbf33efb3989b8c38
      Merge: 292c1f2 4703e59
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Jul 28 12:09:33 2013 +0200
      
          Merge remote-tracking branch 'origin' into text-annotation
      
      commit 292c1f250085bce97ec914a2afe541b06c573dd5
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Jul 28 11:57:22 2013 +0200
      
          qDebugg--
          and make sure we actually clip so we don't draw too much
      
      commit 993f7b5a3ebc57c33f37d52460801d5341c5e014
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Jul 28 10:36:34 2013 +0200
      
          Fix annotation shape not updating when typing in it
      
          also removed the annotationshape:paintcomponent mpl as the Textshape ditto is good enough
      
      commit 2ffc0222cb7df6f4d96203fb32f2d740f233e3ff
      Merge: e71ff65 37dbe67
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Jul 27 20:32:04 2013 +0200
      
          Merge branch 'text-annotation' of git://anongit.kde.org/calligra into text-annotation
      
          Conflicts:
          	words/part/KWView.cpp
      
      commit e71ff6540cc97a89cde93ca5329d9e9871dbecc6
      Merge: 64ef332 19953b1
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sat Jul 27 20:21:53 2013 +0200
      
          Merge remote-tracking branch 'origin' into text-annotation
      
          Conflicts:
          	words/part/KWView.cpp
      
      commit 37dbe678233132a80ff4a51a10b98ec66648e787
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jul 1 11:15:45 2013 +0700
      
          Add another issue
      
      commit 69a6f5ceb38d70585bf4e51106fae86b921af119
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Jun 28 11:39:32 2013 +0700
      
          Found some more bugs
      
      commit 08dec667485701d188d28d18da803b50a12192ab
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Jun 28 10:23:30 2013 +0700
      
          Add a TODO and an informational file to the branch.
      
          These are only usable during the development and should be removed
          before merging to master.
      
      commit ee481f996e0f997bb42968115f3c31b53a1a4c96
      Merge: d4a75b5 a896114
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jun 24 10:52:47 2013 +0700
      
          Merge branch 'master' into text-annotation
      
      commit d4a75b506bb228deaba39e1839cc36fca2d211e3
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Jun 22 15:44:25 2013 +0430
      
          Anchor the text that annotation shape is referenced to it when user select on an annotation shape.
      
      commit bf66b6a31fe1fbda568e1d63bdfe090a5eaaa370
      Merge: 62738e6 5a4fdc6
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Jun 20 15:48:56 2013 +0430
      
          Merge remote-tracking branch 'origin/master' into text-annotation
      
      commit 62738e6b49fc8f8cc80e46998620ac5c5bf61fc0
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri May 31 21:15:07 2013 +0430
      
          Disable delete and option button at annotatio shape.
      
      commit e3ef1abb3706f3d84a4b08129989f5e73e9e315a
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu May 30 23:55:59 2013 +0430
      
          Text shape can shrink just for annotation shapes.
      
      commit 771044c1251695ddc58123d4087b7a356fd55af8
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat May 25 00:28:22 2013 +0430
      
          Fix conflicts.
      
      commit d8418d6164b7a2e31ae939043605056cba5c4ddd
      Merge: 56b90b3 683ebc2
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat May 25 00:07:06 2013 +0430
      
          Merge remote-tracking branch 'origin/master' into text-annotation
      
          Conflicts:
          	words/part/KWView.cpp
      
      commit 56b90b38f42ac26978519eba37bdbd0a09a44d2d
      Merge: f67dffc 5e06af9
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu May 2 22:02:17 2013 +0430
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit f67dffc4745529c43f19db29fa969f2903fbc082
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu May 2 21:49:35 2013 +0430
      
          Sort the list of annotations in map to thrier reference position.
      
      commit 5e06af99d8563c0d592b6acfadbcc0bf340d588b
      Merge: 72d5de7 c684496
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Apr 29 18:44:49 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit 72d5de7261540689184caa23ae5425c50bfa5cec
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Apr 27 20:57:49 2013 +0430
      
          Fix problem about showing loaded annotation.
      
      commit 64ef332610b4505db36d32080051a082ccb9fa4a
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Mon Apr 22 22:52:00 2013 +0200
      
          make the layout of annotations actually be called
      
      commit 9268c12c1a2b4d5de3fb79db1d9734bde0979d97
      Merge: f4d2c6a 11f9fba
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Mon Apr 22 16:45:18 2013 +0200
      
          Merge branch 'text-annotation' of git://anongit.kde.org/calligra into text-annotation
      
      commit f4d2c6a928a7518c07d14463235078eab956bda4
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Apr 18 00:41:38 2013 +0200
      
          some changes to the way layout of annotation shapes takes place
      
      commit 11f9fba704dfc19297e808eb9c942b389855d68d
      Merge: c1ec636 e3a1b70
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Apr 19 19:42:45 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit c1ec6366b5b2caf3bb5f8c0ba064417693b18f79
      Merge: e1c30d4 9ef0d14
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Apr 16 22:58:15 2013 +0430
      
          Merge remote-tracking branch 'origin/master' into text-annotation
      
          Conflicts:
          	plugins/textshape/CMakeLists.txt
      
      commit e1c30d47d1655378afd450d5aa00b4dbef0ad45d
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Apr 10 13:00:36 2013 +0430
      
          Add Remove annotation button to remove selected annotation shape.
      
      commit 133ed324cb5c4bc0129e0ca78b97cac42682ff76
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Tue Apr 9 13:19:09 2013 +0430
      
          Insert annotation in Review Tool plugin.
      
      commit ba271ef19e902c4231c28c1fb9e07ba14eba4b8f
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sun Apr 7 20:22:11 2013 +0430
      
          Change shape and color of annotation shape.
      
      commit 47bd08cd197b09d90d0a4dedfec4e8c10ba1efdd
      Merge: 287f3b1 d0643a2
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Apr 6 18:00:03 2013 +0200
      
          Merge branch 'master' into text-annotation
      
      commit 287f3b16e9b1a47c407316c3b2dfc3fe5503a250
      Merge: 99a646f ff05026
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Mar 18 20:16:56 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 99a646f19297e65ccaad18b0d6bc0bb35acf44cf
      Merge: d8a509c 31e350c
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Mar 13 22:11:23 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit d8a509cf9bf2d3eb4a32c3f9f80113a7b9e43996
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Mar 8 13:37:32 2013 +0330
      
          Remove annotation shape.
          Handle mouse press event for annotation shapes in TextTool::mousePressEvent.
          Handle mouse move event.
          Add an signal in KoShapeManager, when an annotation shape removed from shape manager.
      
      commit 40b4463fb708cbd31ff469f457faf59bcce38a90
      Merge: 4fc90b8 6910b44
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Mar 7 17:20:42 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 4fc90b8c27a43c79dd8288e7eee55c5813be4545
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Mar 7 17:15:11 2013 +0330
      
          Paint a rect in corner at right top of annotation shape as delete annotation button.
      
      commit 6910b444c12389f3528946424b4c00e003910d84
      Merge: 19ec206 442a34d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Mar 6 21:01:19 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 19ec2063b676d60ce1fecb4b738745139b1f1b53
      Merge: 52f138d 286af63
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Mar 6 19:48:26 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 52f138dd25cc719b490559e53e9000ebc6b7395f
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Wed Mar 6 19:44:21 2013 +0330
      
          Set annotation information (Author and Date) at top of the shape.
      
      commit 286af63f84264ff4c61f8d35cdb685e32fec81de
      Merge: 80db4df 3ae9d43
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Mar 4 19:26:27 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 80db4df1be47fab268b58560c300a54380c8c313
      Merge: 54654e0 db3cae7
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Mar 3 21:12:57 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 54654e0ff255ff906809878be6d82ec9507d069a
      Merge: b2156ca 737465a
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Mar 3 18:46:29 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit b2156caacfee1bddaafc8cfe2335e8f730503071
      Merge: b87e05e bb66907
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Mar 3 18:07:31 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit bb669078608c6a3f531c40a0fb88c6ddb3e4b0cd
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Sun Mar 3 18:03:13 2013 +0100
      
          Make switching too in modebox faster (no need to recalc the icon size everytime)
      
      commit b87e05e4e5ca18d4cdbbcde54d33d6222883302f
      Merge: 7054a91 851fe7c
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Mar 2 22:44:11 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 7054a916c54a4d7a84bc25e4b48dcb318f13fbc5
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Mar 2 22:39:25 2013 +0330
      
          Set annotation shapes in different pages and in right page.
      
      commit 851fe7c7f077a3d404ee07f3bdd0934540f81c91
      Merge: 6a4a51c 2218723
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Mar 1 22:15:06 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 6a4a51c767f9801593a21b79346b56a067ef327c
      Merge: 14a2dc3 2f3be17
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Mar 1 20:37:03 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit 14a2dc3b5f6c18d84999622acd8f5d71946fc834
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Fri Mar 1 14:34:53 2013 +0330
      
          Handle changing annotations shapes size automatically when you add an annotation shape.
      
      commit 2f3be17a33ef377fcd25a604910de1efd3c6be66
      Merge: 94cc9bd 09967cc
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Feb 26 20:44:22 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 94cc9bda514b1bdf4ec89178b4e751e17a4997ca
      Merge: bab0634 f30f536
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Mon Feb 25 20:09:45 2013 +0330
      
          Merge remote-tracking branch 'origin/text-annotation' into text-annotation
      
      commit bab06344d1ccf3950fb28385718920f6b24f2c53
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Mon Feb 25 20:02:25 2013 +0330
      
          Move layout annotation shapes, stuff from KwCanvas to KWView with this when we insert an annotation
          shape i register an annotation and add it to annotation manager and also add the shape to
          annotation layout manager, and no problem in saving them because now we have them in annotation manager.
          Also define new signal specific for annotation shapes in KWDocument.
      
      commit f30f5364f5a5ee2ffd96668371162356f4da2c92
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 23 16:13:57 2013 +0100
      
          Make the background of the annotation shape solid white.
      
      commit 08cae5acf8a564d71bf646b6ce38e65cec509617
      Merge: 8c9326c ca63ca7
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 23 15:17:37 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit 8c9326c2578ab0417e50b55491e75ed733ccced3
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 23 13:38:44 2013 +0100
      
          Paint all backgrounds before we paint anything else.
      
          Before the annotations were overpainted by the color of the annotation
          area because it was painted after the contents was painted.
      
      commit c505ae4ab7b1f13da9aebcb0e904d43c106b287d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 23 12:50:44 2013 +0100
      
          Fix problems with painting the annotation area.
      
          There is still a problem because all shapes are painted before the
          area so the annotation shapes will be painted over.  The painting of
          the area has to be moved to before the painting of the shapes.
      
      commit 9e09e7835da7402f56c389a8d962ad16c337b424
      Merge: dd2ddd6 6774114
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Feb 21 09:56:08 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit dd2ddd6835becdd5b573d4d97f2e30ef586fa61e
      Merge: e3f05b4 99cb7ab
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Feb 20 20:37:30 2013 +0100
      
          Merge branch 'master' into text-annotation
      
      commit e3f05b4c58055b934ea728c67eb26a50e5c2118b
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sun Feb 17 21:18:30 2013 +0330
      
          Layout annotation shapes, with  class KoAnnotationLayoutManager, for now its position is hardcoded in x == 400.
      
      commit e9ef3e04202d137fdfc3b0f8494aa410ecb15708
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 16 17:42:50 2013 +0100
      
          Reenable the signal now that there is a new API for shapes in flake.
      
      commit 60814211de89ee9d7a9fca8b2d95c4bb28d009ba
      Merge: 2eeedc8 b25faa3
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Feb 16 10:24:45 2013 +0100
      
          Merge branch 'master' into text-annotation
      
          Conflicts:
          	libs/widgets/KoBalloon.h
          	libs/widgets/KoOpacityConfigWidget.h
          	plugins/textshape/AnnotationTextShapeFactory.h
          	plugins/textshape/TextDocumentInspectionPlugin.cpp
          	plugins/textshape/TextDocumentInspectionPlugin.h
          	words/part/KWCanvas.cpp
      
      commit 2eeedc8451cdd71733388bab948cdae320454ca2
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Feb 15 19:24:23 2013 +0100
      
          Fix broken build in a hacky way.
      
          This breakage was introduced by my previous patch.  Boemann says that
          she has a better way of doing this anyway so we will just comment the
          offending line away for now.
      
      commit c965e855efb13716fc39c276a2a61b46cbce991c
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Feb 15 18:48:02 2013 +0100
      
          Remove a line on advice (more like an order :)) from boemann.
      
      commit 13eeae1f47c0a0e4fcb958c2514d9d8177b39f88
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Feb 15 18:29:55 2013 +0100
      
          Some small cleanups, FIXME's and notes for later work.
      
      commit c8becb5d98f2799ccaa68426a8d1a913be06c729
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jan 28 21:35:46 2013 +0100
      
          Make the annotation area work with zoom settings Fit to Page Width
      
      commit 9114e642206208eb95db10d1f74832ef2e1c9ce0
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jan 28 19:58:50 2013 +0100
      
          Make clear that there is a temporary hack in the code that has to be fixed.
      
      commit fa867b2bafa2f30615b6d841e918b54faf233d80
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Thu Jan 24 20:58:57 2013 +0330
      
          Reintroduce the red "annotation area" per boemann's plan.
      
      commit c8b39525e57b4ff26814bd180ec4e0372472effe
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sun Jan 27 22:57:22 2013 +0330
      
          Implement Annotation::saveOdf, call it from KoAnnotation  and tweak words to doesen't KoShape::saveOdf.
      
      commit 80e04c49b81ae0b24ac4e5bb5a5ceb67d667f60d
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sun Jan 27 12:57:24 2013 +0330
      
          Load annotation at a shape and show it in document.
      
      commit e346a0277d2815a9fce637eae51417b0f774d636
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Jan 26 19:22:45 2013 +0330
      
          Add an annotation shape with AnnotationTextShape. you can edit text set bold, italic and also have a list.
      
      commit d8753f798c4cf507750b90e0a161313ad48e9cc4
      Author: Mojtaba Shahi Senobari <mojtaba.shahi3000@gmail.com>
      Date:   Sat Jan 26 15:43:42 2013 +0330
      
          Remove all old ui for annotation.
      0f02989a
  9. 06 Nov, 2013 1 commit
    • Thorsten Zachmann's avatar
      Fix assert in in stage · 1f6f4039
      Thorsten Zachmann authored
      ASSERT failure in setReferenceRect: "Bounding-rect is not normalized", file
      /home/tz/develop/kde/git/calligra/libs/textlayout/KoTextLayoutArea.cpp, line 1769
      
      The assert happend on a vertical line with a text shape (even with no text) that
      had a padding defiend. Therfore the with was 0 and after padding it was negative
      resulting in the above assert.
      1f6f4039
  10. 02 Aug, 2013 1 commit
    • Inge Wallin's avatar
      Merge the branch flake-shapeborders-ingwa · aabdbedd
      Inge Wallin authored
      This branch contains:
       - Borders for shapes
       - Painting of borders in KoBorder instead of other places
       - Handling of padding inside borders
      
      Code by me (ingwa) and Camilla Boemann
      
      REVIEW: 111044
      
      FEATURE: Shape borders
      FEATURE: Padding inside borders
      
      Squashed commit of the following:
      
      commit ffab6ec0f8c3d41b881eaaffc6abba7245a703bf
      Merge: 33e3bc8 5ff12bb
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Aug 1 19:26:12 2013 +0200
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
          Conflicts:
          	libs/flake/KoShape.h
      
      commit 33e3bc8f902175c728b06ddbc804a0558aadac29
      Merge: 5429aa2 6648461
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Jul 30 17:27:47 2013 +0200
      
          Merge remote-tracking branch 'origin/flake-shapeborders-ingwa' into flake-shapeborders-ingwa
      
          Conflicts:
          	libs/flake/KoShape.h
      
      commit 6648461572ca845fe0372780ddc8545363dc5521
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Tue Jul 30 16:16:27 2013 +0200
      
          Only paint when there really is a border - or we would end up painting a cosmetic line
      
          also loading a file with all individually specified borders would still report it hadn't any borders
      
      commit 300a98b9b45c77df1ae1fd55ba367e484b074f3d
      Merge: a32fd98 3b4d668
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Mon Jul 29 11:19:00 2013 +0200
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
      commit 5429aa2f4f40e750459dd08c1bac3d9d8919cb6d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Jul 28 09:32:11 2013 +0200
      
          Add a missing method to KoBorder.
      
      commit 78dc4d134e3581bc6abecc8061898e9e1ee99a46
      Merge: a32fd98 3350bba
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jul 27 15:28:19 2013 +0200
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
          Conflicts:
          	libs/flake/KoShape.h
      
      commit a32fd9886c719a9d019c7d13925a862801ad675d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jul 18 23:38:54 2013 +0200
      
          Fix the build.
      
          Seems that boemann is not building the tests.  Booo!
      
          The test now builds but I don't know if the suggested rects make sense.
      
      commit 7335fcf876a19c4e636a2b44a333099b532ecef1
      Merge: 92c5bce 35ca4ac
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jul 18 23:04:02 2013 +0200
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
      commit 92c5bcef0961405765d8faae787cf68580be60d4
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Jun 20 22:17:00 2013 +0200
      
          Take padding and border into account when doing anchor placement
      
          Also We need to give the page for page-anchored shapes, otherwise sub objects will not be placed
      
          Also don't scale the border twice
      
      commit 8b674a8e2b5e500040695fff93d76ea43ae4e520
      Merge: cb26e25 05b3301
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 22 13:17:40 2013 +0700
      
          Merge branch 'flake-shapeborders-ingwa' of ssh://git.kde.org/calligra into flake-shapeborders-ingwa
      
          Conflicts:
          	libs/flake/KoShape.cpp
      
      commit cb26e2567be0a84649d1457d9d3fc45c84fa7b8a
      Merge: 21e69bf 04a624e
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 22 13:09:55 2013 +0700
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
      commit 21e69bf563a7d58535f6c339270b5ce3cdbfd180
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 22 12:43:32 2013 +0700
      
          Fix border width bug for page borders.
      
          KoShape::paintBorder() now assumes that all view tranformations are
          already applied to the painter.
      
      commit a5a566c3ce168d71c46afa48aae73f14229500f2
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 22 12:04:27 2013 +0700
      
          Fix faulty indentation.
      
      commit 05b330131120e419fd24e9529e15d4b74f8f619d
      Author: C. Boemann <cbo@boemann.dk>
      Date:   Thu Jun 20 22:10:55 2013 +0200
      
          fix scaling being applied twice for the text
      
      commit 83bcd122d2610a48cf27b0bf4f257dd67c43b71d
      Merge: e921d88 5a4fdc6
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 20 23:58:21 2013 +0700
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
      commit e921d887275347cbb94f76b876e413be5c1611e0
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 20 11:45:16 2013 +0700
      
          A better way to set the dash style of the QPainter.
      
      commit ec0bf5760a1cb4939874d8473e84a1ff93347668
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 20 04:26:39 2013 +0700
      
          Treat border="none" the same as no mention of border at all.
      
      commit 7fd9926672f32431f63b5b016a2995e43f086db7
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jun 17 21:15:13 2013 +0200
      
          Remove unuzed parameters.
      
      commit 4a24367c17b35e26556706de59cc86a688fbbec7
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jun 17 21:07:10 2013 +0200
      
          Improve the old loading code for borders.
      
          The old code didn't check for individual edges (-top, -bottom, -left,
          -right) when there was a common border definition.
      
      commit f5c0652d8f877905bd5252f3b2f92a87d6259950
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Mon Jun 17 20:30:15 2013 +0200
      
          Use painter scaling instead of explicit zoom parameters.
      
      commit 637d674acb3c9ae6940a0f70e3fd9dab70ecbb7c
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 20:06:10 2013 +0200
      
          Fix a bug visible only with thick inner borders.
      
          Also remove some remaining kdebugs.
      
      commit e0d9c69478262151199f6e6f516a02d0134f3383
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 18:03:16 2013 +0200
      
          Fix another small pasto bug
      
      commit 2d09674fcbf613ecfaeae430fe9132caae090c1d
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 17:25:50 2013 +0200
      
          Fix a small bug
      
      commit b105ffcfdcffcbe7a906dbb7104bd1782d1cc470
      Merge: cf97de5 4021e36
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 17:07:24 2013 +0200
      
          Merge branch 'master' into flake-shapeborders-ingwa
      
      commit cf97de5aeca89e6da10e296d164eb2c60fe7854e
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 17:04:38 2013 +0200
      
          Simplify the painting of borders significantly.
      
      commit 71be183148c87ebc46b825bf1256aa130ef44816
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sat Jun 15 10:28:37 2013 +0200
      
          Make double borders work in the corners.
      
          Unfortunately I had to refactor the drawing a bit to make this work.
          But I know how to simplify it back so I'll do that next.
      
      commit b306709efe4a2aefe8a6d0ccb519f6f448e17948
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Fri Jun 14 10:04:42 2013 +0200
      
          Make KoBorder able to paint on the designated rect or inside it.
      
      commit c2de625bc4696ca5b1372070349c454180164b4f
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 13 20:56:31 2013 +0200
      
          Remove an unneded parameter.
      
      commit 1293e44e60e97ebba01f2d7d6fcc7f97e4b4880f
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 13 07:30:32 2013 +0200
      
          Remove old border painting code in KWCanvasBase.
      
      commit 8c56fd221cc706028e00667599b7ac6ac8430eee
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Thu Jun 13 06:37:17 2013 +0200
      
          Fix all scaling problems.
      
          The borders are now drawn in all the correct places.
          Still some things to do to get the corners right.
      
      commit 2fcb972323852aa993779675f7fea6b4991b2904
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Jun 12 14:12:38 2013 +0200
      
          Put the border inside the available area instead of having the center line at the boundary of the area.
      
      commit a0213a361b28dbe1a74e4a9abb5f081c64bd1fc0
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Wed Jun 12 05:23:08 2013 +0200
      
          Implement painting of borders in KoShape and call this from the pictureshape and the textshape.
      
          Still some kdebugs that we need to remove later.
      
      commit d455047e34a9351a558656c7e6fd3b5501d9ad9b
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Tue Jun 11 18:17:17 2013 +0200
      
          Implement painting in KoBorder and call it from KWCanvasBase.
      
      commit c6e73db52ead4aab98469b9bc969a9b0c2e0caae
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Jun 9 23:23:08 2013 +0200
      
          Initialize the border field of the private class.
      
      commit 04d431b0bc08c81bb857a938a61ee7b68876fb40
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Jun 9 18:58:47 2013 +0200
      
          Implement saving of borders in KoShape
      
          This was easier than I expected...
      
      commit cd0268f499aca9ede9f38be82dc04917cfeeab02
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Jun 9 18:44:40 2013 +0200
      
          Implement loading of borders in KoShape
      
      commit 9ff1e5e91f439a738894abf573bcdc7e8d9bf91e
      Author: Inge Wallin <inge@lysator.liu.se>
      Date:   Sun Jun 9 17:51:18 2013 +0200
      
          Add ODF loading from KoStyleStack too.
      aabdbedd
  11. 02 May, 2013 1 commit
  12. 31 Dec, 2012 1 commit
    • C. Boemann's avatar
      Change the way we draw markings of speeling errors. Instead of using the qt... · a02ac0bb
      C. Boemann authored
      Change the way we draw markings of speeling errors. Instead of using the qt way we draw it ourselves.
      This has the following benefits:
        - we don't have to relayout after finding spelling errors
        - we can have more than one type of marking (spelling, grammar, etc)
      
      This commit also changes the way we ask for spellchecking to be performed. The old way had some
      shortcommings that could lead to text not being checked at all
      a02ac0bb
  13. 15 Jun, 2012 1 commit
  14. 06 Jun, 2012 1 commit
  15. 09 Sep, 2011 1 commit
  16. 02 Aug, 2011 1 commit
  17. 18 Jul, 2011 1 commit
    • Thorsten Zachmann's avatar
      Fix position loading of text shapes with autogrow · 2a23952a
      Thorsten Zachmann authored
      OO grows shapes to top and bottom if the text does not fit. It can happen that
      a text shape is too small on loading therefore the text shape should grow the
      same as in OO the first time. This patch checks if a workaround should be used
      and sets a flag that the initial layouting does set move the shape to the correct
      position.
      2a23952a
  18. 15 Jul, 2011 1 commit
  19. 30 Apr, 2011 1 commit
  20. 26 Apr, 2011 2 commits
  21. 21 Apr, 2011 1 commit
  22. 20 Apr, 2011 1 commit
  23. 17 Apr, 2011 1 commit
  24. 16 Apr, 2011 1 commit
  25. 12 Apr, 2011 1 commit
  26. 08 Apr, 2011 1 commit
  27. 05 Apr, 2011 2 commits
  28. 04 Apr, 2011 1 commit
  29. 29 Mar, 2011 1 commit
  30. 25 Mar, 2011 1 commit
  31. 22 Mar, 2011 1 commit
  32. 15 Mar, 2011 1 commit
  33. 09 Feb, 2011 1 commit
  34. 07 Oct, 2010 1 commit
    • Boudewijn Rempt's avatar
      De-QObject-ify the factories and registries · e5cada60
      Boudewijn Rempt authored
      There is no reason for the registries and the factories the registries
      contain to be QObjects. The only thing it was used for was the
      parent-child relation so the factories would be deleted on shutdown.
      
      The objects would thus both be in the hashmap and in the list of
      children of the registry, effectively clouding the ownership relation.
      
      To make all registries in KOffice consistent in usage, the destructors
      of the registries now delete their contents, there is no parent-child
      relationship anymore.
      
      It also saves memory and makes it clear where all these objects are
      destroyed
      
      svn path=/branches/work/koffice-essen/; revision=1183433
      e5cada60
  35. 04 Mar, 2010 1 commit
  36. 29 Jan, 2010 2 commits