REVIEW: 119222

Squashed commit of the following:

commit 3ffeb7c1808bd64eda08aee8138e35a2b85535bb
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Sat Nov 29 22:34:10 2014 +0000

    fix defect 11

commit ac808361a3605203139132e332bbb915626b4ed8
Merge: faf035e b709405
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Sat Nov 29 21:07:53 2014 +0000

    Merge branch 'master' into label-inline-edit

    Conflicts:
    	libs/koreport/wrtembed/reportscene.cpp

commit faf035e2ef0df2c8008dc77f7fac9e758da791f7
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Sat Nov 29 20:37:31 2014 +0000

    address review comments by refactoring

commit bed6665bfd47e8316729967cbe0d64104cb42524
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Sat Nov 29 18:02:04 2014 +0000

    Accept editing when focus lost (ie, switch view)

commit 3e9d10d03fd2a2057de87e29903589c1279dacdd
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Fri Nov 28 23:01:58 2014 +0000

    fix slots

commit e66c00a3a6b1f96a0ee2cf4fddc3a3d27694e16d
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Fri Nov 28 22:50:40 2014 +0000

    Address review issues

    Enter edit mode on new item
    Fix handling lost focos
    Code tidy

commit d6fd3fa32194a7e87039aa77ebffdeeed0b8d36a
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Wed Nov 19 21:57:21 2014 +0000

    Addressed review comments

    Fixed mouse interaction
    Fixed foreground colour
    Fixed font

commit 7c80e4c61e9ecdac16b1d343cd8389cb82eafe08
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Fri Nov 14 21:03:02 2014 +0000

    Updated inline edit of labels

    Double-click/f2 to enter edit
    Escape/click scene to exit edit
    Paint bg color properly

commit 20271ffe3c484d9f7956c2c673546c077bef86aa
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Wed Nov 12 22:43:11 2014 +0000

    resolve review issues

commit b88adfbc1640f083ec398254e468951a472935b5
Merge: a2eb32e db38193
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Wed Nov 12 22:42:27 2014 +0000

    Merge branch 'master' of git://anongit.kde.org/calligra into label-inline-edit

    Conflicts:
    	libs/koreport/items/label/KoReportDesignerItemLabel.h

commit a2eb32ecbc65b41660da4efbc7e209bcc3054169
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Mon Nov 3 19:48:05 2014 +0000

    Style the edit button with an xpm image

commit 8065d19b122591d36da8c737d99d28bf4e58abc7
Author: Adam Pigg <adam@piggz.co.uk>
Date:   Mon Nov 3 09:21:04 2014 +0000

    Make labels inline-editable

    Uses a button in the middle of the label to switch modes