Merge branch textshape-stylesWidget-PierreSt into master
The stylesCombo should now display the styles sorted per usage with a category title. There are also several bug fixes for the usage sorted combo list. REVIEW: 108060 Squashed commit of the following: commit ee16d367 Merge: 966ad6d0 10b83ffd Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Tue Jan 1 14:28:33 2013 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 966ad6d0 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Tue Jan 1 14:17:24 2013 +0100 Fix paragraph style is applied twice regression. The paragraph style was applied twice because an old style signal was still used. commit f4cabe5f Merge: 5716300a cfb02531 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Tue Jan 1 09:29:03 2013 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 5716300a Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Dec 31 17:43:33 2012 +0100 Correct logic of previous patch commit 754306ae Merge: d968f8a2 0260a759 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Dec 31 17:05:27 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit d968f8a2 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Dec 31 17:01:26 2012 +0100 Remove default paragraph style from user visible lists. The default paragraph style was seen in user visible lists (as blank item). This style is not supposed to be user visible/selectable. commit 3dadacea Merge: 7ea974af bec31b80 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 30 11:37:21 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 7ea974af Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 30 10:28:29 2012 +0100 Fix sorting of style names. The style names were not sorted in natural order. Use KStringHandler::naturalCompare to fix the problem. The sorting of styles per category (ie. list styles,...) belongs to a wish item, and needs debating first. BUG: 288651 REVIEW: 108020 commit cf599664 Merge: 4c76a360 a23f73c4 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Fri Dec 28 21:32:57 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 4c76a360 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Fri Dec 28 21:28:16 2012 +0100 Keep the proper style selection after a style moves from unused to used The view gets notified when the model is changed on moving a style from unused to used. commit c4372390 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 23 19:46:42 2012 +0100 Fix apply characterStyle to caret without selection REVIEW: 107878 commit 82c8d538 Merge: 4b81bbb4 7deaf573 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 23 14:15:57 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 4b81bbb4 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 23 13:31:02 2012 +0100 Fix clicking in a selection does not update the caret. Initialize m_drag in the TextTool solves the problem somehow. REVIEW: 107849 commit 23e7859f Merge: ab191fb2 82b661cb Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 16 14:48:26 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit ab191fb2 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Dec 16 14:46:54 2012 +0100 tempo commit 7e8816f0 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Dec 10 21:35:27 2012 +0100 Initial steps at implementing category titles in the stylesCombo commit fb0ff739 Merge: e8e9407c 48ac9482 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Dec 10 17:57:55 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit e8e9407c Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Dec 1 14:07:50 2012 +0100 Clean up commit 4a31b7e1 Merge: 677be5ea fc4b0051 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Dec 1 13:54:43 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 677be5ea Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Dec 1 13:21:13 2012 +0100 Fix next style appears as modified after a list style commit 31cdb8e0 Merge: bd699d1b f3ae1099 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Wed Nov 28 18:28:01 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit bd699d1b Merge: 15e1a5c3 c98e7844 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Tue Nov 27 20:14:12 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 15e1a5c3 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Tue Nov 27 17:58:17 2012 +0100 Fix problems highlighted by C. Boemann commit fe4de0d6 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Nov 26 18:43:33 2012 +0100 Clean-up left-over commit 1e40dfdc Merge: ea8cdb0e 82cc0580 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Nov 25 10:19:14 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit ea8cdb0e Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 24 15:02:15 2012 +0100 Additional clean ups commit 6308ed4f Merge: d306e009 81b50cab Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 24 14:49:45 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit d306e009 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 24 14:48:09 2012 +0100 Clean ups in the code commit 231e717b Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Nov 11 13:03:26 2012 +0100 Fix another crash commit c37b513c Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Nov 11 12:42:08 2012 +0100 Fix random crash. commit 0a9c5e34 Merge: 8e675f4d e6c1c31e Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 10 17:07:22 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit 8e675f4d Merge: bcb9fbd7 6c7d9e1c Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 10 15:54:06 2012 +0100 Merge branch 'master' into textshape-stylesWidget-PierreSt commit bcb9fbd7 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sat Nov 10 15:52:53 2012 +0100 Initial population of style, a tad further. commit fbbcf132 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Mon Oct 22 21:36:20 2012 +0200 Add missing bits to previous commit commit 889e3986 Author: Pierre Stirnweiss <pstirnweiss@googlemail.com> Date: Sun Oct 21 23:39:14 2012 +0200 Create filter for stylesCombo in the docker
parent
ad41d290
Please register or sign in to comment