Bug 506349 - Add "Copy from container" command to Docker Explorer

- add command to Docker explorer context menu
- add new icon for copy from container context menu action
- as well add icons for display log, remove log, copy to container,
  and remove tag
- specify icons for commit and exec shell context menu items

Change-Id: I2e9ba5d88d97773b0c042e4bf5319463a6c4014a
Reviewed-on: https://git.eclipse.org/r/84379
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>

6 files changed, 43 insertions, 0 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/icons/copy_from_container.gif b/containers/org.eclipse.linuxtools.docker.ui/icons/copy_from_container.gif
new file mode 100644
index 0000000000..7e7437bc53
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/icons/copy_from_container.gif
diff --git a/containers/org.eclipse.linuxtools.docker.ui/icons/copy_to_container.gif b/containers/org.eclipse.linuxtools.docker.ui/icons/copy_to_container.gif
new file mode 100644
index 0000000000..18576d47e9
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/icons/copy_to_container.gif
diff --git a/containers/org.eclipse.linuxtools.docker.ui/icons/display_log.gif b/containers/org.eclipse.linuxtools.docker.ui/icons/display_log.gif
new file mode 100644
index 0000000000..55e2d04ad6
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/icons/display_log.gif
diff --git a/containers/org.eclipse.linuxtools.docker.ui/icons/remove_log.gif b/containers/org.eclipse.linuxtools.docker.ui/icons/remove_log.gif
new file mode 100644
index 0000000000..a603027de1
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/icons/remove_log.gif
diff --git a/containers/org.eclipse.linuxtools.docker.ui/icons/remove_tag.gif b/containers/org.eclipse.linuxtools.docker.ui/icons/remove_tag.gif
new file mode 100644
index 0000000000..58873a1166
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.ui/icons/remove_tag.gif
diff --git a/containers/org.eclipse.linuxtools.docker.ui/plugin.xml b/containers/org.eclipse.linuxtools.docker.ui/plugin.xml
index 584bb34d62..9f2184384d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/plugin.xml
+++ b/containers/org.eclipse.linuxtools.docker.ui/plugin.xml
@@ -1285,6 +1285,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
 		          id="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
+		          icon="icons/commit.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -1309,6 +1310,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
+		          icon="icons/display_log.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -1333,6 +1335,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
+		          icon="icons/remove_log.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -1553,6 +1556,34 @@
 	            </visibleWhen>
 				</command>
 		</menuContribution>
+		
+		<!-- explorer view context menu: copy from containers -->
+		<menuContribution
+			locationURI="popup:org.eclipse.linuxtools.docker.ui.dockerExplorerView#PopupMenu?after=org.eclipse.linuxtools.docker.ui.commands.execContainer">
+	  		<command
+	           commandId="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer"
+	           id="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer"
+	           icon="icons/copy_from_container.gif"
+	           style="push">
+		      </command>
+		          <visibleWhen
+	               checkEnabled="false">
+	               <with
+	                   variable="selection">
+	               <count
+	                      value="1">
+	                </count>
+	                <iterate
+	                      ifEmpty="false"
+	                      operator="and">
+	                 <instanceof
+	                       value="org.eclipse.linuxtools.docker.core.IDockerContainer" />
+	                </iterate>
+	               </with>
+	            </visibleWhen>
+		</menuContribution>
+		
+		
 		<!-- explorer view context menu: tag image -->
 		<menuContribution
 			locationURI="popup:org.eclipse.linuxtools.docker.ui.dockerExplorerView#PopupMenu?after=org.eclipse.linuxtools.docker.ui.commands.pushImage">
@@ -1642,6 +1673,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
 		          id="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
+		          icon="icons/commit.gif"
 		          style="push">
 				</command>
 		</menuContribution>
@@ -1650,6 +1682,7 @@
 			locationURI="popup:org.eclipse.linuxtools.docker.ui.dockerContainersView">
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.restartContainers"
+		          icon="icons/restart.gif"
 		          id="org.eclipse.linuxtools.docker.ui.commands.restartContainers"
 		          style="push">
 				</command>
@@ -1660,6 +1693,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
+		          icon="icons/display_log.gif"
 		          style="push">
 				</command>
 		</menuContribution>
@@ -1669,6 +1703,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
+		          icon="icons/remove_log.gif"
 		          style="push">
 				</command>
 		</menuContribution>
@@ -1689,6 +1724,7 @@
 	  		<command
 	           commandId="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer"
 	           id="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer"
+	           icon="icons/copy_from_container.gif"
 	           style="push">
 		      </command>
 		</menuContribution>
@@ -1828,6 +1864,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.tagImage"
 		          id="org.eclipse.linuxtools.docker.ui.commands.tagImage2"
+		          icon="icons/tag.gif"
 		          style="push">
 				</command>
 		</menuContribution>
@@ -1837,6 +1874,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.removeTag"
 		          id="org.eclipse.linuxtools.docker.ui.commands.removeTag"
+		          icon="icons/remove_tag.gif"
 		          style="push">
 				</command>
 		</menuContribution>
@@ -1890,6 +1928,7 @@
 				<command
 					commandId="org.eclipse.linuxtools.docker.ui.commands.execContainer"
 					id="org.eclipse.linuxtools.docker.ui.commands.execContainer"
+					icon="icons/console_view.gif"
 					style="push">
 			</command>
 	    </menuContribution>
@@ -1999,6 +2038,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.removeTag"
 		          id="org.eclipse.linuxtools.docker.ui.commands.removeTag"
+		          icon="icons/remove_tag.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -2191,6 +2231,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
 		          id="org.eclipse.linuxtools.docker.ui.commands.commitContainer"
+		          icon="icons/commit.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -2214,6 +2255,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog"
+		          icon="icons/display_log.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">
@@ -2237,6 +2279,7 @@
 				<command
 		          commandId="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
 		          id="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog"
+		          icon="icons/remove_log.gif"
 		          style="push">
 		          <visibleWhen
 	               checkEnabled="false">