* MonoDevelop.VersionControl/Makefile.am:

* MonoDevelop.VersionControl/version-control-16.png:
* MonoDevelop.VersionControl/VersionControl.addin.xml:
* MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj:
* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs: Added
  version control icon.

* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
  Fix type reference ambiguity.

svn path=/trunk/monodevelop/; revision=153245

7 files changed, 20 insertions, 3 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
index eda055f12c..83497077b5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* Makefile.am:
+	* version-control-16.png:
+	* VersionControl.addin.xml:
+	* MonoDevelop.VersionControl.csproj:
+	* MonoDevelop.VersionControl/Task.cs: Added version control
+	  icon.
+
+	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
+	  Fix type reference ambiguity.
+
 2010-03-03  Mike Krüger  <mkrueger@novell.com>
 
 	* MonoDevelop.VersionControl.Views/AnnotateView.cs: fix build.
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
index 33dbadec0f..34f6f5f983 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
@@ -93,7 +93,8 @@ RES =  \
 	overlay_unversioned.png \
 	Policies.xml \
 	repository.png \
-	VersionControl.addin.xml
+	VersionControl.addin.xml \
+	version-control-16.png
 
 DATA_FILES =  \
 	comment.png \
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
index 658ceae4f6..d2788dfef1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
@@ -161,6 +161,9 @@
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="version-control-16.png">
+      <LogicalName>version-control-16.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
index 462f410924..5087d6f2eb 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
@@ -28,7 +28,7 @@ namespace MonoDevelop.VersionControl
 		protected Task() {
 			threadnotify = new ThreadNotify(new ReadyEvent(Wakeup));
 			
-			tracker = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor("Version Control", null, true, true);
+			tracker = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("Version Control", "md-version-control", true, true);
 		}
 		
 		protected IProgressMonitor GetProgressMonitor ()
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
index d1d0db2ff2..33e21e183e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
@@ -362,7 +362,7 @@ namespace MonoDevelop.VersionControl
 						res = DiffView.Show (items, test);

 						break;

 					case Commands.Log:

-						res = LogView.Show (items, null, test);

+						res = MonoDevelop.VersionControl.Views.LogView.Show (items, null, test);

 						break;

 					case Commands.Status:

 						res = StatusView.Show (items, test);

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
index 29f70b49af..2e9b7896ba 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
@@ -62,6 +62,7 @@
 		<StockIcon stockid = "vc-commit" file = "menu_commit.png" />

 		<StockIcon stockid = "vc-remote-status" file = "menu_remote_status.png" />

 		<StockIcon stockid = "vc-comment" file = "comment.png" />

+		<StockIcon stockid = "md-version-control" resource = "version-control-16.png" />

 	</Extension>

     

 	<Extension path = "/MonoDevelop/Ide/Commands">
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/version-control-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/version-control-16.png
new file mode 100644
index 0000000000..621745e854
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/version-control-16.png