Browse Source

fix SD-1875 - "Copy" command in context menu on values in debugger tooltips does not work correctly

pull/21/merge
Siegfried Pammer 14 years ago
parent
commit
71fbb38182
  1. 15
      src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml
  2. 10
      src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs
  3. 27
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs
  4. 1
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj
  5. 4
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs
  6. 4
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml
  7. 35
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs
  8. 6
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj
  9. 1
      src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
  10. 32
      src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs

15
src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<UserControl
x:Class="Debugger.AddIn.Tooltips.DebuggerTooltipControl"
x:Class="Debugger.AddIn.Tooltips.DebuggerTooltipControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
@ -187,7 +187,18 @@ @@ -187,7 +187,18 @@
Style="{StaticResource TextStyle}"
IsEnabled="{Binding CanSetText}"
KeyUp="TextBox_KeyUp"
Text="{Binding Path=Text}" />
ContextMenuService.ShowOnDisabled="True"
Text="{Binding Path=Text}">
<TextBox.ContextMenu>
<ContextMenu>
<MenuItem Header="{core:Localize XML.MainMenu.EditMenu.Copy}" DataContext="{Binding}" Click="CopyMenuItemClick">
<MenuItem.Icon>
<Image Source="{core:GetBitmap Icons.16x16.CopyIcon}" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</TextBox.ContextMenu>
</TextBox>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>

10
src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs

@ -12,7 +12,7 @@ using System.Windows.Input; @@ -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 @@ -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

27
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Converters/NotBoolConverter.cs

@ -1,27 +0,0 @@ @@ -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();
}
}
}

1
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj

@ -103,7 +103,6 @@ @@ -103,7 +103,6 @@
<Compile Include="Converters\IUITypeToBackgroundConverter.cs" />
<Compile Include="Converters\IUITypeToBorderBrushConverter.cs" />
<Compile Include="Converters\MenuSeparatorToMenuSeparatorVisibilityConverter.cs" />
<Compile Include="Converters\NotBoolConverter.cs" />
<Compile Include="Converters\ObjectToVisibilityConverter.cs" />
<Compile Include="Converters\RelationToXYConverterBase.cs" />
<Compile Include="Converters\ExpanderHeightConverter.cs" />

4
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/PropertyGrid.xaml.cs

@ -14,13 +14,15 @@ using System.Windows.Controls; @@ -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

4
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ControlPanel/SQLServerControlPanel.xaml

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
<UserControl x:Class="ICSharpCode.Data.SQLServer.ControlPanel.SQLServerControlPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:ICSharpCode.Data.SQLServer.Converters"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
x:Name="This">
<UserControl.Resources>
<ResourceDictionary>
<converters:OppositeBoolConverter x:Key="OppositeBoolConverter" />
<core:NotBoolConverter x:Key="OppositeBoolConverter" />
</ResourceDictionary>
</UserControl.Resources>
<Grid>

35
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/Converters/OppositeBoolConverter.cs

@ -1,35 +0,0 @@ @@ -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
}
}

6
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj

@ -95,7 +95,6 @@ @@ -95,7 +95,6 @@
<Compile Include="ControlPanel\SQLServerControlPanel.xaml.cs">
<DependentUpon>SQLServerControlPanel.xaml</DependentUpon>
</Compile>
<Compile Include="Converters\OppositeBoolConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SQLServerDatabaseDriver.cs" />
<Compile Include="SQLServerDatasource.cs" />
@ -121,6 +120,11 @@ @@ -121,6 +120,11 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj">
<Project>{BAD94D6E-4159-4CB6-B991-486F412D9BB6}</Project>
<Name>ICSharpCode.Data.Core.UI</Name>

1
src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj

@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
<Compile Include="ExtendedPopup.cs" />
<Compile Include="GlobalStyles.cs" />
<Compile Include="Menu\MenuCheckBox.cs" />
<Compile Include="NotBoolConverter.cs" />
<Compile Include="RestrictDesiredSize.cs" />
<Compile Include="SortableGridViewColumn.cs" />
<Compile Include="ConditionalSeparator.cs" />

32
src/Main/ICSharpCode.Core.Presentation/NotBoolConverter.cs

@ -0,0 +1,32 @@ @@ -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;
}
}
}
Loading…
Cancel
Save