lp:~libowen96/workcraft/trunk-bug-1364057

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:workcraft at revision 546

Danil Sokolov: Approve on 2014-09-08

Diff: 2365 lines (+1277/-651)

28 files modified

SONPlugin/.classpath (+1/-1)
SONPlugin/models/groups.ucls (+7/-7)
SONPlugin/src/org/workcraft/plugins/son/ONGroup.java (+1/-2)
SONPlugin/src/org/workcraft/plugins/son/RenderedGroupText.java (+46/-0)
SONPlugin/src/org/workcraft/plugins/son/SON.java (+8/-3)
SONPlugin/src/org/workcraft/plugins/son/SONModule.java (+2/-2)
SONPlugin/src/org/workcraft/plugins/son/SONSettings.java (+35/-15)
SONPlugin/src/org/workcraft/plugins/son/VisualONGroup.java (+53/-41)
SONPlugin/src/org/workcraft/plugins/son/VisualSON.java (+10/-0)
SONPlugin/src/org/workcraft/plugins/son/VisualSuperGroup.java (+2/-15)
SONPlugin/src/org/workcraft/plugins/son/elements/Block.java (+3/-3)
SONPlugin/src/org/workcraft/plugins/son/elements/VisualBlock.java (+9/-2)
SONPlugin/src/org/workcraft/plugins/son/elements/VisualChannelPlace.java (+1/-1)
SONPlugin/src/org/workcraft/plugins/son/gui/StructureVerifyDialog.java (+0/-8)
SONPlugin/src/org/workcraft/plugins/son/tools/ColorRefreshTool.java (+0/-28)
SONPlugin/src/org/workcraft/plugins/son/tools/ColorResetTool.java (+28/-0)
SONPlugin/src/org/workcraft/plugins/son/tools/SelectionTool.java (+53/-48)
SONPlugin/src/org/workcraft/plugins/son/tools/StructurePropertyChecker.java (+0/-1)
SONPlugin/src/org/workcraft/plugins/son/verify/AbstractStructuralVerification.java (+2/-0)
SONPlugin/src/org/workcraft/plugins/son/verify/SONMainTask.java (+1/-0)
WorkcraftCore/src/images/icons/svg/channel-place.svg (+0/-76)
WorkcraftCore/src/images/icons/svg/son-block.svg (+507/-0)
WorkcraftCore/src/images/icons/svg/son-channel-place.svg (+76/-0)
WorkcraftCore/src/images/icons/svg/son-selection-group.svg (+0/-200)
WorkcraftCore/src/images/icons/svg/son-selection-page.svg (+0/-193)
WorkcraftCore/src/images/icons/svg/son-super-group.svg (+425/-0)
WorkcraftCore/src/org/workcraft/dom/visual/RenderedText.java (+4/-4)
WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1364057: Multiline labels are incompatible with SON Group

Low

Fix Committed

Link a bug report

Related blueprints

543. By Bowen Li on 2014-09-08

ONGroup label position is fixed on top-right, and cannot exceed the largest X coordinate (MaxX) of the group bounding box;
add margin for VisualPage;
split group/supergroup and page/block buttons.

542. By Bowen Li on 2014-09-05

fix bug-1364057; graphical improvements on SON group, block, page; split block/page and group/supergroup buttons

541. By Danil Sokolov on 2014-08-22

Merge proposal for bug #1360299 approved.

540. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1342059 approved.

539. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1343266 approved.

538. By Danil Sokolov on 2014-08-06

Merge proposal for bug #1349754 approved.

537. By Danil Sokolov on 2014-08-04

Merge proposal for bugs 1351503 and 1351504 approved.

536. By Danil Sokolov on 2014-08-01

Merge proposal for the blueprint ui-std-clear approved.

535. By Danil Sokolov on 2014-08-01

Merge proposal for the blueprint ui-file-recent approved.

534. By Danil Sokolov on 2014-08-01

Merge proposal for blueprint ui-text-newline approved.