[496466] Documentation for Copy/Paste format actions

Bug: 496466
Change-Id: I7fc454d693dca930992508cfa4ccf9bce7a14979
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

14 files changed, 89 insertions, 15 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 92ca25f9cc..26e183d369 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -91,6 +91,15 @@
 		<h2 id="sirius4.1.0">Changes in Sirius 4.1.0</h2>
 		<h3 id="UserVisibleChanges">User-Visible Changes</h3>
 		<ul>
+			<li><span class="label label-success">Added</span> Copy/Paste Layout has been completed with Copy/Paste Style and Copy/Paste Format. 
+				<em>Paste Format</em> is equivalent to paste 
+				<em>Layout</em> and 
+				<em>Style</em> action. See chapter 
+				<a href="./user/diagrams/Diagrams.html#copy_paste_format">
+					<em>Copy/paste of format</em>
+				</a> in 
+				<em>User Manual</em> for more details.
+			</li>
 			<li><span class="label label-success">Added</span> The 
 				<a href="./user/diagrams/Diagrams.html#snap_to_shapes">snap to shape</a> feature is now available on border nodes.
 			</li>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 43ae588045..1325b18c41 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -8,6 +8,7 @@ h2(#sirius4.1.0). Changes in Sirius 4.1.0
 
 h3. User-Visible Changes
 
+* <span class="label label-success">Added</span> Copy/Paste Layout has been completed with Copy/Paste Style and Copy/Paste Format. _Paste Format_ is equivalent to paste _Layout_ and _Style_ action. See chapter "_Copy/paste of format_":./user/diagrams/Diagrams.html#copy_paste_format in _User Manual_ for more details.
 * <span class="label label-success">Added</span> The "snap to shape":./user/diagrams/Diagrams.html#snap_to_shapes feature is now available on border nodes.
 * <span class="label label-info">Modified</span> When trying to open a session which holds a representation resource or a VSP which was saved using a more recent version of Sirius than the one you are using, the session will be automatically closed displaying an error message. You can overload this behavior by providing you own implementation of @UICallBack@ in which you can have an UI feedback letting you choose if you want to open the session anyway. Warning: if you choose to proceed, there is no guarantee that the resulting session will be usable. It may even lead to data loss or corruption; use at your own risk.
 If a viewpoint  has been defined with a more recent version of Sirius than the one you are using, the @ViewpointRegistry@ will not register it and a warning is logged in the error log view to inform the user.
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
index 2095e6463b..7918f7a24d 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
@@ -65,7 +65,7 @@
 								<a href="#PortshiftingPortDragandDrop">Port shifting - Port Drag and Drop</a>
 							</li>
 							<li>
-								<a href="#Copypasteoflayout">Copy/paste of layout</a>
+								<a href="#copy_paste_format">Copy/paste of format</a>
 							</li>
 							<li>
 								<a href="#diagram_element_pinning">Diagram element pinning</a>
@@ -631,23 +631,62 @@
 			<img border="0" src="images/diagram_editor_dnd03b.png"/>
 		</p>
 		<p>The port is dropped in the container above the mouse location and linked to its closest edge.</p>
-		<h3 id="Copypasteoflayout">Copy/paste of layout</h3>
-		<p>It is possible to duplicate layout of diagram elements, that is to say to replicate mutual organization of diagram elements from one diagram to another. This replication only applies to the same semantic elements between diagrams.</p>
-		<p>The next picture shows a partial view of a diagram. The tool to replicate the layout is called &#8220;Copy layout&#8221; and can be activated from the tab-bar or the contextual menu (see &#8220;edit&#8221; section). In this picture, layout of John Doe and Earvin Johnson persons will be replicated to another diagram.</p>
+		<h3 id="copy_paste_format">Copy/paste of format</h3>
+		<p>It is possible to duplicate format of diagram elements, that is to say to replicate mutual organization and style of diagram elements from one diagram to another. This replication only applies to the same semantic elements between diagrams.
+			<br/>By default, this copy/paste replicates the layout (x, y width and height) AND the style (colors, font, ...).
+		</p>
+		<p>But it is also possible to only 
+			<em>Paste Layout</em> or only 
+			<em>Paste Style</em>. The initial copy is always a 
+			<em>Copy Format</em> in all cases.
+		</p>
+		<p>The next picture shows a partial view of a diagram. The tool to replicate the format is called &#8220;Copy Format&#8221; and can be activated from the tab-bar when the diagram elements are selected, from the contextual menu (see 
+			<em>Edit</em> section) or through the 
+			<em>Ctrl+Alt+Shift+C</em> shortcut. In this picture, format of John Doe and Earvin Johnson persons will be replicated to another diagram.
+		</p>
 		<p>	
-			<img border="0" src="images/diagram_editor_copy_layout1.png"/>
+			<img border="0" src="images/diagram_editor_copy_format.png"/>
+		</p>
+		<h4 id="PasteLayout">Paste Layout</h4>
+		<p>The next picture shows the diagram where the layout will be replicated. The tool to paste layout is called &#8220;Paste Layout&#8221; and can be activated from the tab-bar or from the contextual menu (see 
+			<em>Edit</em> section).
 		</p>
-		<p>The next picture shows the diagram where the layout will be replicated. The tool to paste layout is called &#8220;Paste layout&#8221; and can be activated from the toolbar or the contextual menu (see &#8220;edit&#8221; section).</p>
 		<p>	
-			<img border="0" src="images/diagram_editor_copy_layout2.png"/>
+			<img border="0" src="images/diagram_editor_paste_layout1.png"/>
 		</p>
 		<p>The layout applies to John Doe and Earvin Johnson and is exactly the same as the original one (compare John Doe and Earvin Johnson each other positions with first screenshot).</p>
 		<p>	
-			<img border="0" src="images/diagram_editor_copy_layout3.png"/>
+			<img border="0" src="images/diagram_editor_paste_layout2.png"/>
 		</p>
 		<p>
 			<strong>Warning</strong> : This copy/paste operation copies exactly what you see on a diagram. When using low zoom level, some diagram elements can be twisted and the paste operation will duplicate theses twistings on the other diagram. Please, zoom in to reduce twistings.
 		</p>
+		<h4 id="PasteStyle">Paste Style</h4>
+		<p>The next picture shows the diagram where the layout will be replicated. The tool to paste style is called &#8220;Paste Style&#8221; and can be activated from the tab-bar or from the contextual menu (see 
+			<em>Edit</em> section).
+		</p>
+		<p>	
+			<img border="0" src="images/diagram_editor_paste_style1.png"/>
+		</p>
+		<p>The red font applies to John Doe.</p>
+		<p>	
+			<img border="0" src="images/diagram_editor_paste_style2.png"/>
+		</p>
+		<h4 id="PasteFormat">Paste Format</h4>
+		<p>The next picture shows the diagram where the layout will be replicated. The tool to paste format is called &#8220;Paste Format&#8221; and can be activated from the tab-bar when the diagram is selected, from the contextual menu (see 
+			<em>Edit</em> section) or through the 
+			<em>Ctrl+Alt+Shift+V</em> shortcut.
+		</p>
+		<p>	
+			<img border="0" src="images/diagram_editor_paste_format1.png"/>
+		</p>
+		<p>The result is the same as applying 
+			<em>Paste Format</em> and 
+			<em>Paste Style</em>.
+		</p>
+		<p>	
+			<img border="0" src="images/diagram_editor_paste_format2.png"/>
+		</p>
 		<h3 id="diagram_element_pinning">Diagram element pinning</h3>
 		<h4 id="Introduction">Introduction</h4>
 		<p>It is possible to mark specific elements in a diagram as having a fixed location so that they are not moved by the 
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
index c855ed5383..77e8e44086 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
@@ -414,24 +414,49 @@ If you want to drag and drop the port in a new container, just drag the port wit
 
 The port is dropped in the container above the mouse location and linked to its closest edge.
 
-h3. Copy/paste of layout
+h3(#copy_paste_format). Copy/paste of format
 
-It is possible to duplicate layout of diagram elements, that is to say to replicate mutual organization of diagram elements from one diagram to another. This replication only applies to the same semantic elements between diagrams.
+It is possible to duplicate format of diagram elements, that is to say to replicate mutual organization and style of diagram elements from one diagram to another. This replication only applies to the same semantic elements between diagrams.
+By default, this copy/paste replicates the layout (x, y width and height) AND the style (colors, font, ...).
 
-The next picture shows a partial view of a diagram. The tool to replicate the layout is called "Copy layout" and can be activated from the tab-bar or the contextual menu (see "edit" section). In this picture, layout of John Doe and Earvin Johnson persons will be replicated to another diagram.
+But it is also possible to only _Paste Layout_ or only _Paste Style_. The initial copy is always a _Copy Format_ in all cases.
 
-	!images/diagram_editor_copy_layout1.png!
+The next picture shows a partial view of a diagram. The tool to replicate the format is called "Copy Format" and can be activated from the tab-bar when the diagram elements are selected, from the contextual menu (see _Edit_ section) or through the _Ctrl+Alt+Shift+C_ shortcut. In this picture, format of John Doe and Earvin Johnson persons will be replicated to another diagram.
 
-The next picture shows the diagram where the layout will be replicated. The tool to paste layout is called "Paste layout" and can be activated from the toolbar or the contextual menu (see "edit" section).
+	!images/diagram_editor_copy_format.png!
+
+h4. Paste Layout
+
+The next picture shows the diagram where the layout will be replicated. The tool to paste layout is called "Paste Layout" and can be activated from the tab-bar or from the contextual menu (see _Edit_ section).
 	
-	!images/diagram_editor_copy_layout2.png!
+	!images/diagram_editor_paste_layout1.png!
 
 The layout applies to John Doe and Earvin Johnson and is exactly the same as the original one (compare John Doe and Earvin Johnson each other positions with first screenshot).
 
-	!images/diagram_editor_copy_layout3.png!
+	!images/diagram_editor_paste_layout2.png!
 
 *Warning* : This copy/paste operation copies exactly what you see on a diagram. When using low zoom level, some diagram elements can be twisted and the paste operation will duplicate theses twistings on the other diagram. Please, zoom in to reduce twistings.
 
+h4. Paste Style
+
+The next picture shows the diagram where the layout will be replicated. The tool to paste style is called "Paste Style" and can be activated from the tab-bar or from the contextual menu (see _Edit_ section).
+	
+	!images/diagram_editor_paste_style1.png!
+
+The red font applies to John Doe.
+
+	!images/diagram_editor_paste_style2.png!
+
+h4. Paste Format
+
+The next picture shows the diagram where the layout will be replicated. The tool to paste format is called "Paste Format" and can be activated from the tab-bar when the diagram is selected, from the contextual menu (see _Edit_ section) or through the _Ctrl+Alt+Shift+V_ shortcut.
+
+	!images/diagram_editor_paste_format1.png!
+	
+The result is the same as applying _Paste Format_ and _Paste Style_.
+
+	!images/diagram_editor_paste_format2.png!
+
 h3(#diagram_element_pinning). Diagram element pinning
 
 h4. Introduction
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_format.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_format.png
new file mode 100644
index 0000000000..29d6f0e043
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_format.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout1.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout1.png
deleted file mode 100644
index 81038272fe..0000000000
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout1.png
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout2.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout2.png
deleted file mode 100644
index 42889e62bc..0000000000
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout2.png
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout3.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout3.png
deleted file mode 100644
index 1476c68099..0000000000
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_copy_layout3.png
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format1.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format1.png
new file mode 100644
index 0000000000..95c9d8e901
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format1.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format2.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format2.png
new file mode 100644
index 0000000000..7a34746a0c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_format2.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout1.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout1.png
new file mode 100644
index 0000000000..48d8085d95
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout1.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout2.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout2.png
new file mode 100644
index 0000000000..6e0407b36e
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_layout2.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style1.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style1.png
new file mode 100644
index 0000000000..a743985090
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style1.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style2.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style2.png
new file mode 100644
index 0000000000..198370de77
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/diagram_editor_paste_style2.png