[uml-devel-fr] [ISI-UMBRELLO] Merge to trunk

[Thibault Normand <thibault.normand@xxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ladies and gentlemen, we are proud to tell you that we've just merged
the isi-umbrello branch on the trunk.

Features that has been implemented :

* Implement the UML 2.0 standard [CCBUG: 115269]
  - Sequence Diagram
    * Combined Fragments
      * Operators : Alternative, Option, Break, Parallel, Reference,
                Negative, Critical
                Ignore, Consider, Assertion, Loop.
      * Found / Lost Messages.
  - Sequence Diagram
      * Pre/Post conditions.
      * ‘accept time event’ symbol.
      * Control Flow.
      * Object Flow.
      * Interruptible region.
      * Expansion region.
      * Control node : flow final.
      * Transformation.
      * Objects nodes :
        * Activity Invoke.
        * Activity Parameter Nodes.
        * Central buffer nodes.
        * Data stores nodes.
        * Input / Output / Constant Pins.

* Code generation and undo/redo take up too much memory [CCBUG:72644]
  - Use the KUndoStack derived from QT4 QUndoStack in order to manage
    commands.
  - Commands are stored in cmds folder.
  [Problem] Still having some problems with undo/redo on widget creation,
        suppression.

Details on Changelog.2 file.

A  +   umbrello/pinwidget.h
A  +   umbrello/toolbarstateonewidget.cpp
!      umbrello/pics
A  +   umbrello/pics/object_node.png
A  +   umbrello/pics/cursor-accept_time_event.png
A  +   umbrello/pics/cursor-send_signal.png
A  +   umbrello/pics/message-lost.png
A  +   umbrello/pics/cursor-precondition.png
A  +   umbrello/pics/send_signal.png
A  +   umbrello/pics/cursor-pin.png
A  +   umbrello/pics/cursor-accept_signal.png
A  +   umbrello/pics/pin.png
A  +   umbrello/pics/cursor-message-found.png
A  +   umbrello/pics/cursor-message-lost.png
A  +   umbrello/pics/cursor-PrePostCondition.png
A  +   umbrello/pics/region.png
A  +   umbrello/pics/cursor-region.png
A  +   umbrello/pics/accept_signal.png
A  +   umbrello/pics/PrePostCondition.png
A  +   umbrello/pics/final_activity.png
A  +   umbrello/pics/cursor-final_activity.png
A  +   umbrello/pics/message-found.png
A  +   umbrello/pics/exception.png
A  +   umbrello/pics/combined_fragment.png
M      umbrello/pics/CMakeLists.txt
A  +   umbrello/pics/precondition.png
A  +   umbrello/pics/cursor-end_of_life.png
A  +   umbrello/pics/cursor-exception.png
A  +   umbrello/pics/cursor-combined_fragment.png
A  +   umbrello/pics/accept_time_event.png
A  +   umbrello/pics/cursor-object_node.png
A  +   umbrello/pics/end_of_life.png
M      umbrello/associationwidget.cpp
M      umbrello/listpopupmenu.cpp
M      umbrello/umlwidget.cpp
M      umbrello/toolbarstateother.cpp
M      umbrello/floatingtextwidget.cpp
A  +   umbrello/combinedfragmentwidget.h
A  +   umbrello/objectnodewidget.h
M      umbrello/messagewidget.cpp
M      umbrello/umlobject.h
M      umbrello/messagewidgetcontroller.cpp
M      umbrello/toolbarstateassociation.cpp
M      umbrello/umllistviewitem.cpp
M      umbrello/linepath.cpp
A  +   umbrello/cmds
A  +   umbrello/cmds/cmd_create_classdiag.cpp
A  +   umbrello/cmds/cmd_moveWidget.h
A  +   umbrello/cmds/widget
A  +   umbrello/cmds/widget/cmd_changeFillColor.cpp
A  +   umbrello/cmds/widget/cmd_create_widget.h
A  +   umbrello/cmds/widget/cmd_set_name.cpp
A  +   umbrello/cmds/widget/cmd_changeLineColor.cpp
A  +   umbrello/cmds/widget/cmd_set_txt.h
A  +   umbrello/cmds/widget/cmd_changeFillColor.h
A  +   umbrello/cmds/widget/cmd_changeMulti.cpp
A  +   umbrello/cmds/widget/cmd_set_name.h
A  +   umbrello/cmds/widget/cmd_changeLineColor.h
A  +   umbrello/cmds/widget/cmd_changeFontSelection.cpp
A  +   umbrello/cmds/widget/cmd_changeMulti.h
A  +   umbrello/cmds/widget/cmd_create_widget.cpp
A  +   umbrello/cmds/widget/cmd_changeFontSelection.h
A  +   umbrello/cmds/widget/cmd_set_txt.cpp
A  +   umbrello/cmds/cmd_create_entityrelationdiag.cpp
A  +   umbrello/cmds/cmd_set_stereotype.h
A  +   umbrello/cmds/cmd_handle_rename.h
A  +   umbrello/cmds/cmd_create_statediag.h
A  +   umbrello/cmds/cmd_create_usecasediag.cpp
A  +   umbrello/cmds/cmd_set_visibility.cpp
A  +   umbrello/cmds/cmd_create_activitydiag.cpp
A  +   umbrello/cmds/cmd_create_collaborationdiag.h
A  +   umbrello/cmds/cmd_create_seqdiag.h
A  +   umbrello/cmds/cmd_create_deploydiag.h
A  +   umbrello/cmds/cmd_resizeWidget.h
A  +   umbrello/cmds/cmd_moveWidget.cpp
A  +   umbrello/cmds/cmd_create_umlobject.h
A  +   umbrello/cmds/cmd_set_stereotype.cpp
A  +   umbrello/cmds/cmd_create_componentdiag.h
A  +   umbrello/cmds/cmd_handle_rename.cpp
A  +   umbrello/cmds/cmd_create_classdiag.h
A  +   umbrello/cmds/classdiag
A  +   umbrello/cmds/classdiag/cmd_create_class.h
A  +   umbrello/cmds/classdiag/cmd_create_class.cpp
A  +   umbrello/cmds/cmd_create_entityrelationdiag.h
A  +   umbrello/cmds/cmd_create_statediag.cpp
A  +   umbrello/cmds/cmd_create_collaborationdiag.cpp
A  +   umbrello/cmds/cmd_create_seqdiag.cpp
A  +   umbrello/cmds/cmd_create_deploydiag.cpp
A  +   umbrello/cmds/cmd_resizeWidget.cpp
A  +   umbrello/cmds/cmd_create_usecasediag.h
A  +   umbrello/cmds/cmd_set_visibility.h
A  +   umbrello/cmds/cmd_create_umlobject.cpp
A  +   umbrello/cmds/generic
A  +   umbrello/cmds/generic/cmd_rename_umlobject.cpp
A  +   umbrello/cmds/generic/cmd_create_umlobject.h
A  +   umbrello/cmds/generic/cmd_rename_umlobject.h
A  +   umbrello/cmds/generic/cmd_create_umlobject.cpp
A  +   umbrello/cmds/cmd_create_activitydiag.h
A  +   umbrello/cmds/cmd_create_componentdiag.cpp
A  +   umbrello/toolbarstateonewidget.h
M      umbrello/umlnamespace.h
A  +   umbrello/floatingdashlinewidget.cpp
A  +   umbrello/cmds.h
M      umbrello/uml.cpp
M      umbrello/umlview.h
A  +   umbrello/preconditionwidget.cpp
M      umbrello/dialog_utils.h
A  +   umbrello/regionwidget.cpp
M      umbrello/umlwidget.h
M      umbrello/widget_factory.cpp
M      umbrello/worktoolbar.h
M      umbrello/umlobject.cpp
M      umbrello/umldoc.h
M      umbrello/seqlinewidget.h
M      umbrello/umldoc.cpp
M      umbrello/associationwidget.h
A  +   umbrello/preconditionwidget.h
M      umbrello/toolbarstate.h
M      umbrello/umlwidgetcontroller.h
A  +   umbrello/codegenerators/usewriter.cpp
A  +   umbrello/codegenerators/usewriter.h
M      umbrello/messagewidget.h
M      umbrello/dialogs/activitydialog.h
A  +   umbrello/dialogs/objectnodedialog.cpp
A  +   umbrello/dialogs/objectnodedialog.h
M      umbrello/dialogs/activitydialog.cpp
M      umbrello/toolbarstate.cpp
M      umbrello/seqlinewidget.cpp
M      umbrello/folder.cpp
M      umbrello/association.cpp
A  +   umbrello/signalwidget.cpp
M      umbrello/objectwidgetcontroller.h
M      umbrello/worktoolbar.cpp
M      umbrello/notewidget.cpp
A  +   umbrello/floatingdashlinewidget.h
A  +   umbrello/cmd_id.h
M      umbrello/umllistview.h
M      umbrello/activitywidget.cpp
A  +   umbrello/regionwidget.h
M      umbrello/toolbarstatefactory.h
M      umbrello/toolbarstatemessages.h
M      umbrello/umlwidgetcontroller.cpp
M      umbrello/objectwidget.cpp
A  +   umbrello/signalwidget.h
M      umbrello/toolbarstatefactory.cpp
M      umbrello/toolbarstatemessages.cpp
A  +   umbrello/combinedfragmentwidget.cpp
M      umbrello/notewidget.h
M      umbrello/objectwidget.h
M      umbrello/dialog_utils.cpp
A  +   umbrello/objectnodewidget.cpp
M      umbrello/umllistview.cpp
A  +   umbrello/pinwidget.cpp
M      umbrello/CMakeLists.txt
M      umbrello/umlview.cpp
M      umbrello/listpopupmenu.h
A  +   Doxyfile
M      ChangeLog.2
M      THANKS
A  +   uml.kdevelop

Let's update, and take a cup of Kfé (coffee) now ! pfiou !
Thanks to ervin for his management, and the whole KDE community !

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)

iD8DBQFGHPSzi+lV9TINsfgRAkq5AJ0f4o+aqp1+Da5ptSkV1E8NrZqyZgCeNhMF
QIefBfeBGWiswzi8nmqfGTk=
=5rkA
-----END PGP SIGNATURE-----