From aeee313f0b6e50d54a6d767c9140a17a29f39885 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Mon, 10 Jan 2011 22:12:13 +0100
Subject: [PATCH] added copy-button to diff-tooltip

---
 .../AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs    |  5 ++++-
 .../AvalonEdit.AddIn/Src/DiffControl.xaml         | 13 ++++++++++---
 .../AvalonEdit.AddIn/Src/DiffControl.xaml.cs      | 15 ++++++++++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
index 04c09a73af..71cb60d29c 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
@@ -153,6 +153,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				differ.editor.Document.Text = oldText;
 				differ.Background = Brushes.White;
 				
+				// TODO : deletions on line 0 cannot be displayed.
+				
 				LineChangeInfo prevLineInfo = changeWatcher.GetChange(startLine - 1);
 				LineChangeInfo lineInfo = changeWatcher.GetChange(startLine);
 				
@@ -163,6 +165,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				
 				if (oldText == string.Empty) {
 					differ.editor.Visibility = Visibility.Collapsed;
+					differ.copyButton.Visibility = Visibility.Collapsed;
 				} else {
 					var baseDocument = new TextDocument(changeWatcher.BaseDocument.Text);
 					var mainHighlighter = new DocumentHighlighter(baseDocument, differ.editor.SyntaxHighlighting.MainRuleSet);
@@ -174,7 +177,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 						popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(lineInfo.OldStartLineNumber);
 				}
 				
-				differ.undoButton.Click += delegate {
+				differ.revertButton.Click += delegate {
 					if (hasNewVersion) {
 						int delimiter = 0;
 						DocumentLine l = Document.GetLineByOffset(offset + length);
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
index 8c6a7b4239..b6da3f749d 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
@@ -1,11 +1,18 @@
 <UserControl x:Class="ICSharpCode.AvalonEdit.AddIn.DiffControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
              xmlns:ae="http://icsharpcode.net/sharpdevelop/avalonedit"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<StackPanel Orientation="Vertical">
-		<ToolBar>
-			<Button x:Name="undoButton" Content="Undo" />
+		<ToolBar ToolBarTray.IsLocked="True" ToolBar.OverflowMode="Never">
+			<Button x:Name="revertButton"
+				Content="{sd:Localize AddIns.Subversion.Revert}"
+				ToolTip="{sd:Localize AddIns.Subversion.Revert}" />
+			<Button x:Name="copyButton"
+				Click="CopyButtonClick"
+				Content="{sd:Localize ProjectComponent.ContextMenu.AddExistingFiles.Copy}"
+				ToolTip="{sd:Localize ProjectComponent.ContextMenu.AddExistingFiles.Copy}" />
 		</ToolBar>
-		<ae:TextEditor x:Name="editor" />
+		<ae:TextEditor x:Name="editor" IsReadOnly="True" />
 	</StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
index c1fbb004a9..35b60d4ce3 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
@@ -24,7 +24,20 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		{
 			InitializeComponent();
 			
-			undoButton.Content = PresentationResourceService.GetImage("Icons.16x16.UndoIcon");
+			revertButton.Content = PresentationResourceService.GetImage("Icons.16x16.UndoIcon");
+			copyButton.Content = PresentationResourceService.GetImage("Icons.16x16.CopyIcon");
+		}
+		
+		void CopyButtonClick(object sender, RoutedEventArgs e)
+		{
+			if (editor.SelectionLength == 0) {
+				int offset = editor.CaretOffset;
+				editor.SelectAll();
+				editor.Copy();
+				editor.Select(offset, 0);
+			} else {
+				editor.Copy();
+			}
 		}
 	}
 }
\ No newline at end of file