From 71fbb381826bd73973f19ef8d15666cb5ba96f79 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 8 Jan 2012 19:20:25 +0100 Subject: [PATCH] fix SD-1875 - "Copy" command in context menu on values in debugger tooltips does not work correctly --- .../Tooltips/DebuggerTooltipControl.xaml | 15 ++++++-- .../Tooltips/DebuggerTooltipControl.xaml.cs | 10 +++++- .../Converters/NotBoolConverter.cs | 27 -------------- ...CSharpCode.Data.EDMDesigner.Core.UI.csproj | 1 - .../UserControls/PropertyGrid.xaml.cs | 4 ++- .../ControlPanel/SQLServerControlPanel.xaml | 4 +-- .../Converters/OppositeBoolConverter.cs | 35 ------------------- .../ICSharpCode.Data.SQLServer.csproj | 6 +++- .../ICSharpCode.Core.Presentation.csproj | 1 + .../NotBoolConverter.cs | 32 +++++++++++++++++ 10 files changed, 65 insertions(+), 70 deletions(-) delete mode 100644 src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs delete mode 100644 src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs create mode 100644 src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml index 2d2a44abba..b28e746732 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml +++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml @@ -1,6 +1,6 @@  + ContextMenuService.ShowOnDisabled="True" + Text="{Binding Path=Text}"> + + + + + + + + + + diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs index 84c701c218..cd217e85b9 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Animation; using System.Windows.Shapes; - +using Debugger.AddIn.TreeModel; using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.SharpDevelop; @@ -365,6 +365,14 @@ namespace Debugger.AddIn.Tooltips } } + void CopyMenuItemClick(object sender, RoutedEventArgs e) + { + ExpressionNode node = ((MenuItem)sender).DataContext as ExpressionNode; + if (node != null) { + Clipboard.SetText(node.FullText); + } + } + #endregion #region Saved Adorner diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs deleted file mode 100644 index 14334b3df4..0000000000 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -#region Usings - -using System; -using System.Globalization; -using System.Windows.Data; - -#endregion - -namespace ICSharpCode.Data.EDMDesigner.Core.UI.Converters -{ - public class NotBoolConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return !((bool)value); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - - } -} diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj index e1e068e358..a38a0e3f9b 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj @@ -103,7 +103,6 @@ - diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs index e062a94145..c11064d224 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs @@ -14,13 +14,15 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media; using System.Windows.Shapes; + +using ICSharpCode.Core.Presentation; using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Common; using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.CSDL; using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.CSDL.Attributes; using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.CSDL.Type; +using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Designer.CSDL.Association; using ICSharpCode.Data.EDMDesigner.Core.UI.Converters; using ICSharpCode.Data.EDMDesigner.Core.UI.UserControls.Common; -using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Designer.CSDL.Association; #endregion diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml index 69df638dbe..5373446140 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml @@ -1,11 +1,11 @@  - + diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs deleted file mode 100644 index 53e592ea61..0000000000 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -#region Usings - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; - -#endregion - -namespace ICSharpCode.Data.SQLServer.Converters -{ - public class OppositeBoolConverter : IValueConverter - { - #region IValueConverter Members - - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - if (value is bool && (bool)value) - return false; - else - return true; - } - - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - return Binding.DoNothing; - } - - #endregion - } -} diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj index 0674b48c92..7792788853 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj @@ -95,7 +95,6 @@ SQLServerControlPanel.xaml - @@ -121,6 +120,11 @@ + + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} + ICSharpCode.Core.Presentation + False + {BAD94D6E-4159-4CB6-B991-486F412D9BB6} ICSharpCode.Data.Core.UI diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj index 5b90e44f28..fbd586b80b 100644 --- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj +++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj @@ -73,6 +73,7 @@ + diff --git a/src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs b/src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs new file mode 100644 index 0000000000..fe23ce1d09 --- /dev/null +++ b/src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs @@ -0,0 +1,32 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +#region Usings + +using System; +using System.Globalization; +using System.Windows.Data; + +#endregion + +namespace ICSharpCode.Core.Presentation +{ + public class NotBoolConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + if (value is bool && (bool)value) + return false; + else + return true; + } + + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + if (value is bool && (bool)value) + return false; + else + return true; + } + } +}