Merge branch 'dev'

geaz · Sep 25, 2015 · 78febcc · 78febcc
2 parents 6d6ceab + c468a2a
commit 78febcc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 9 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Version 1.0rc2
+
+- GUI bugfixes
+- Method call parser bugfix
+
 Version 1.0rc
 
 - Created two seperate executes (gui and console)

diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ The tool creates a model of a given c# solution and passes it to the registered
 The plugins transform the model to a defined output. **sharpDox** comes with a chm & html export plugin which
 demonstrate the possibilities of the tool.
 
-[This](http://doc.sharpdox.de/en) is an example for a html documentation.
+[This](http://sharpdox.de/en/doc/) is an example for a html documentation.
 
 If you want to try the latests development version go to my site at [AppVeyor](https://ci.appveyor.com/project/Geaz/sharpdox/history).
 
-[![Build status](https://ci.appveyor.com/api/projects/status/vwrl041pp9tm5xp6)](https://ci.appveyor.com/project/Geaz/sharpdox)
+[![Build status](https://ci.appveyor.com/api/projects/status/vwrl041pp9tm5xp6)](https://ci.appveyor.com/project/Geaz/sharpdox)
diff --git a/src/Core/SharpDox.Core/Config/LanguageList.cs b/src/Core/SharpDox.Core/Config/LanguageList.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using SharpDox.Sdk.Config.Lists;
+using System;
 
 namespace SharpDox.Core.Config
 {
@@ -11,6 +12,11 @@ public LanguageList()
             {
                 Add(language.TwoLetterISOLanguageName, language.DisplayName);
             }
+
+            Sort(delegate (Tuple<object, string> one, Tuple<object, string> two)
+            {
+                return one.Item2.CompareTo(two.Item2);
+            });
         }
     }
 }
diff --git a/src/Libraries/SharpDox.Build.NRefactory/Loader/CSharpSolution.cs b/src/Libraries/SharpDox.Build.NRefactory/Loader/CSharpSolution.cs
@@ -53,7 +53,7 @@ public IEnumerable<CSharpFile> AllFiles
 
         public CSharpFile GetFile(string fileName)
         {
-            return AllFiles.First(f => f.FileName == fileName);
+            return AllFiles.FirstOrDefault(f => f.FileName == fileName);
         }
 
         private static bool FileIsSolution(string pathToSolutionFile)

diff --git a/src/Libraries/SharpDox.Build.NRefactory/Parser/MethodCallParser.cs b/src/Libraries/SharpDox.Build.NRefactory/Parser/MethodCallParser.cs
@@ -24,11 +24,14 @@ internal void ParseMethodCalls()
                     {
                         HandleOnItemParseStart(sdMethod.Name);
                         var file = _solution.GetFile(sdType.Region.Filename);
-                        var methodAstNode = file.SyntaxTree.GetNodeContaining(
+                        if(file != null) // TODO Check why file can be null sometimes!
+                        {
+                            var methodAstNode = file.SyntaxTree.GetNodeContaining(
                                                 new TextLocation(sdMethod.Region.BeginLine, sdMethod.Region.BeginColumn),
                                                 new TextLocation(sdMethod.Region.EndLine, sdMethod.Region.EndColumn));
 
-                        methodAstNode.AcceptVisitor(new MethodVisitor(_repository, sdMethod, sdType, file));
+                            methodAstNode.AcceptVisitor(new MethodVisitor(_repository, sdMethod, sdType, file));
+                        }                        
                     }
                 }
             }       

diff --git a/src/Shells/SharpDox.GUI/Controls/ColorSelector.xaml.cs b/src/Shells/SharpDox.GUI/Controls/ColorSelector.xaml.cs
@@ -26,7 +26,8 @@ public partial class ColorSelector : UserControl
             DependencyProperty.Register("CustomHeaderText", typeof(string), typeof(ColorSelector), new PropertyMetadata("Custom Color"));
 
         private bool _userSelectsColor = false;
-
+        private string _previousColor = string.Empty;
+
         public ColorSelector()
         {
             InitializeComponent();
@@ -104,12 +105,17 @@ private string GetHexValue(Color color)
         }
 
         private void SelectedColor_Changed(object sender, EventArgs eventArgs)
-        {
+        {            
             if (SelectedColor != null && CheckValidFormatHtmlColor(SelectedColor))
             {
+                _previousColor = SelectedColor;
                 var colorPreview = (Rectangle)colorSelector.Template.FindName("colorPreview", colorSelector);
                 if (colorPreview != null) colorPreview.Fill = new SolidColorBrush((Color)ColorConverter.ConvertFromString(SelectedColor));
             }
+            else
+            {
+                SelectedColor = _previousColor;
+            }
         }
 
         private void ColorSelector_KeyUp(object sender, KeyEventArgs e)

diff --git a/src/Shells/SharpDox.GUI/Controls/ConfigGrid/Elements/ConfigComboboxControl.xaml b/src/Shells/SharpDox.GUI/Controls/ConfigGrid/Elements/ConfigComboboxControl.xaml
@@ -31,7 +31,7 @@
             <Border Background="{StaticResource BackColor_MainWindow}" Grid.ColumnSpan="3"/>
             <Border Background="White" Grid.Column="0"/>
             <TextBlock FontFamily="{StaticResource Font_Italic}" FontSize="13" Margin="7,5,5,5" Text="{Binding WaterMarkText}" Foreground="{Binding WaterMarkColor}" Grid.Column="0"
-                                Visibility="{Binding ElementName=cbItem, Path=SelectedValue.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                Visibility="{Binding ElementName=cbItem, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" />
             <ComboBox Style="{StaticResource ComboBox}" ItemsSource="{Binding SourceList}" SelectedValuePath="Item1" DisplayMemberPath="Item2" Background="Black" Grid.Column="0" Grid.ColumnSpan="3"
                       Name="cbItem" IsTextSearchEnabled="True" SelectedValue="{Binding SelectedValue, UpdateSourceTrigger=PropertyChanged}" IsEditable="True"/>
         </Grid>

diff --git a/src/Shells/SharpDox.GUI/Resources/Styles/Combobox.xaml b/src/Shells/SharpDox.GUI/Resources/Styles/Combobox.xaml
@@ -87,7 +87,7 @@
                               Name="Border"
                               Background="White"
                               SnapsToDevicePixels="True"
-                              Padding="5" Margin="0,0,0,0">
+                              Padding="0" Margin="5">
                                 <CheckBox IsChecked="{Binding Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="{Binding Name}" Style="{StaticResource CheckBox}"
                                   Tag="{RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}" Command="{Binding Path=SelectionChanged, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
                             </Border>