pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

AnalysisProjectOptionsPanel

pull/30/head
PeterForstmeier 14 years ago
parent
b0dd16be57
commit
e4a0c08d90
3 changed files with 66 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml
  2. 13
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
  3. 74
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsTreeNodes.cs

42
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml
Unescape View File

@ -52,31 +52,31 @@
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ComboBox Background="Transparent" Width="100" <ComboBox Background="Transparent" Width="100"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
ItemsSource="{Binding Path=RuleState}" ItemsSource="{Binding Path=RuleState}"
IsSynchronizedWithCurrentItem="True" IsSynchronizedWithCurrentItem="True"
IsReadOnly="False" IsReadOnly="False"
SelectedIndex="{Binding Index}"> SelectedIndex="{Binding Index}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image VerticalAlignment="Center" Height="15" Margin="3,0,5,0" <Image VerticalAlignment="Center" Height="15" Margin="3,0,5,0"
Source="{Binding Item1}"></Image> Source="{Binding Item1}"></Image>
<TextBlock VerticalAlignment="Center" Text="{Binding Item2}"></TextBlock>
<TextBlock VerticalAlignment="Center" Text="{Binding Item2}"></TextBlock> </StackPanel>
</StackPanel> </DataTemplate>
</ComboBox.ItemTemplate>
</DataTemplate> </ComboBox>
</ComboBox.ItemTemplate> </StackPanel>
</ComboBox>
</StackPanel>
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
</tv:SharpGridView.Columns> </tv:SharpGridView.Columns>
</tv:SharpGridView> </tv:SharpGridView>
</ListView.View> </ListView.View>

13
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
Unescape View File

@ -140,7 +140,8 @@ namespace ICSharpCode.CodeAnalysis
RuleTreeNode ruleNode; RuleTreeNode ruleNode;
if (rules.TryGetValue(rule, out ruleNode)) { if (rules.TryGetValue(rule, out ruleNode)) {
ruleNode.IsChecked = active; ruleNode.IsChecked = active;
ruleNode.isError = error; //ruleNode.isError = error;
ruleNode.Index = 1;
} }
} }
userCheck = true; userCheck = true;
@ -255,15 +256,7 @@ namespace ICSharpCode.CodeAnalysis
Console.WriteLine("OnPropertyChanged {0}",e.PropertyName); Console.WriteLine("OnPropertyChanged {0}",e.PropertyName);
if (e.PropertyName == "Index") { if (e.PropertyName == "Index") {
base.IsDirty = true; base.IsDirty = true;
// var rule = sender as RuleTreeNode;
// if (rule != null) {
// var cat = rule.Parent as CategoryTreeNode;
// if (cat != null) {
// cat.CheckMode();
// }
// }
} }
} }
} }
@ -311,7 +304,5 @@ namespace ICSharpCode.CodeAnalysis
} }
#endregion #endregion
} }
} }

74
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsTreeNodes.cs
Unescape View File

@ -28,10 +28,10 @@ namespace ICSharpCode.CodeAnalysis
private int index; private int index;
public BaseTree() public BaseTree()
{ {
RuleState = new ObservableCollection<Tuple<ImageSource,string>>(); RuleState = new ObservableCollection<Tuple<ImageSource,string>>();
Icon icon = SystemIcons.Warning; Icon icon = SystemIcons.Warning;
ImageSource imageSource = ToImageSource(icon); ImageSource imageSource = ToImageSource(icon);
@ -45,19 +45,19 @@ namespace ICSharpCode.CodeAnalysis
// bla.Add(Tuple.Create<Icon,string>(null,"None")); // bla.Add(Tuple.Create<Icon,string>(null,"None"));
} }
private static ImageSource ToImageSource( Icon icon) private static ImageSource ToImageSource( Icon icon)
{ {
Bitmap bitmap = icon.ToBitmap(); Bitmap bitmap = icon.ToBitmap();
IntPtr hBitmap = bitmap.GetHbitmap(); IntPtr hBitmap = bitmap.GetHbitmap();
ImageSource wpfBitmap = Imaging.CreateBitmapSourceFromHBitmap( ImageSource wpfBitmap = Imaging.CreateBitmapSourceFromHBitmap(
hBitmap, hBitmap,
IntPtr.Zero, IntPtr.Zero,
Int32Rect.Empty, Int32Rect.Empty,
BitmapSizeOptions.FromEmptyOptions()); BitmapSizeOptions.FromEmptyOptions());
return wpfBitmap; return wpfBitmap;
} }
@ -93,7 +93,6 @@ namespace ICSharpCode.CodeAnalysis
foreach (FxCopRule rule in category.Rules) { foreach (FxCopRule rule in category.Rules) {
this.Children.Add(new RuleTreeNode(rule)); this.Children.Add(new RuleTreeNode(rule));
} }
CheckMode(); CheckMode();
} }
@ -106,6 +105,7 @@ namespace ICSharpCode.CodeAnalysis
get { return category.DisplayName; } get { return category.DisplayName; }
} }
bool ignoreCheckMode;
public override int Index { public override int Index {
get { return base.Index; } get { return base.Index; }
set { set {
@ -113,10 +113,16 @@ namespace ICSharpCode.CodeAnalysis
base.Index = value; base.Index = value;
if (mixedModeTuple == null) { if (mixedModeTuple == null) {
Console.WriteLine("Set all to index"); Console.WriteLine("Set all to index");
ignoreCheckMode = true;
foreach (RuleTreeNode rule in this.Children) { foreach (RuleTreeNode rule in this.Children) {
rule.Index = Index; rule.Index = Index;
} }
base.RaisePropertyChanged("Index"); ignoreCheckMode = false;
// CheckMode();
// base.RaisePropertyChanged("Index");
// foreach (RuleTreeNode rule in this.Children) {
// Console.WriteLine(rule.Index.ToString());
// }
} }
} }
} }
@ -129,7 +135,7 @@ namespace ICSharpCode.CodeAnalysis
if (!RuleState.Contains(mixedModeTuple)) { if (!RuleState.Contains(mixedModeTuple)) {
var image = PresentationResourceService.GetBitmapSource("Icons.16x16.ClosedFolderBitmap"); var image = PresentationResourceService.GetBitmapSource("Icons.16x16.ClosedFolderBitmap");
mixedModeTuple = Tuple.Create<ImageSource,string>(image, mixedModeTuple = Tuple.Create<ImageSource,string>(image,
StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.WarningErrorMixed}")); StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.WarningErrorMixed}"));
RuleState.Add(mixedModeTuple); RuleState.Add(mixedModeTuple);
Index = RuleState.Count -1; Index = RuleState.Count -1;
base.RaisePropertyChanged("Index"); base.RaisePropertyChanged("Index");
@ -152,19 +158,23 @@ namespace ICSharpCode.CodeAnalysis
public void CheckMode () public void CheckMode ()
{ {
Console.WriteLine("CheckMode"); if (! ignoreCheckMode) {
if (!NewErrorState.HasValue) { Console.WriteLine("CheckMode");
Console.WriteLine ("\t{0} is Mixed Mode",Text); if (!NewErrorState.HasValue) {
AddMixedMode(); Console.WriteLine ("\t{0} is Mixed Mode",Text);
// categoryNode.AddMixedMode(); AddMixedMode();
} else{ }
RemoveMixedMode(); else{
if (NewErrorState == true) { RemoveMixedMode();
Console.WriteLine ("\t{0} is Error",Text); /*
// categoryNode.Index = 1; if (NewErrorState == true) {
} else { Console.WriteLine ("\t{0} is Error",Text);
Console.WriteLine ("\t{0} is Warning",Text); // Index = 1;
} else {
Console.WriteLine ("\t{0} is Warning",Text);
// categoryNode.Index = ; // categoryNode.Index = ;
}
*/
} }
} }
} }
@ -222,10 +232,11 @@ namespace ICSharpCode.CodeAnalysis
get { return error; } get { return error; }
set { set {
error = value; error = value;
// Index = 1;
} }
} }
public RuleTreeNode(FxCopRule rule):base() public RuleTreeNode(FxCopRule rule):base()
{ {
this.rule = rule; this.rule = rule;
@ -252,6 +263,7 @@ namespace ICSharpCode.CodeAnalysis
if (base.Index != value) { if (base.Index != value) {
isError = value == 1; isError = value == 1;
base.Index = value; base.Index = value;
RaisePropertyChanged("Index");
var p = Parent as CategoryTreeNode; var p = Parent as CategoryTreeNode;
p.CheckMode(); p.CheckMode();
Console.WriteLine ("RuleNode {0} - index {1} - error {2}",rule.DisplayName,Index, isError); Console.WriteLine ("RuleNode {0} - index {1} - error {2}",rule.DisplayName,Index, isError);

Write Preview
Loading…
Cancel
Save