Code cleanup for warnings.

7 files changed, 6 insertions, 7 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index 8366a3e83..fc762d77d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -155,7 +155,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                 catch (Exception ex)
                 {
                     Adapter.Invalidate();
-                    _notification.ShowError("Could not delete entity.");
+                    _notification.ShowError("Could not delete entity." + Environment.NewLine + ex.Message);
                 }
 
                 SelectedEntity = null;
@@ -251,7 +251,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + ex.InnerException.InnerException != null ? ex.InnerException.InnerException.Message : ex.InnerException.Message);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + "Please make sure all fields are properly populated.");
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
index 64f1913fb..4717196df 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
@@ -58,7 +58,7 @@ namespace Tango.MachineStudio.Logging.Parsing
                 }
                 catch (Exception ex)
                 {
-                    //TODO: What to do now ?
+                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
                 }
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
index d663d6088..ca68334bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
@@ -67,7 +67,7 @@ namespace Tango.MachineStudio.Logging.Parsing
                 }
                 catch (Exception ex)
                 {
-                    //TODO: What to do now ?
+                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
                 }
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
index b8ebe9f6a..26629003a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
@@ -26,7 +26,6 @@ namespace Tango.MachineStudio.Common.Controls
         public event EventHandler<Color> SelectedHiveColorChanged;
         public event EventHandler<HexagonControl> SelectedHexagonChanged;
         public event EventHandler<int> LAxisValueChanged;
-        public event EventHandler<int> ResolutionChanged;
 
         private bool _preventColorCanvasEvent;
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
index ceba52826..baa44bc28 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
@@ -23,7 +23,6 @@ namespace Tango.MachineStudio.Common.Controls
     /// </summary>
     public partial class HiveComboControl : UserControl
     {
-        public event EventHandler<Color> SelectedColorChanged;
         public event EventHandler<HexagonControl> SelectedHexagonChanged;
         public event EventHandler<int> LAxisValueChanged;
         public event EventHandler<int> ResolutionChanged;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 3531985d6..a9944a92d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -36,7 +36,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>design.ico</ApplicationIcon>
+    <ApplicationIcon>machine.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dragablz, Version=0.0.3.197, Culture=neutral, processorArchitecture=MSIL">
@@ -484,6 +484,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Html\HTML Templates\Thread Break.html" />
+    <Resource Include="machine.ico" />
     <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" />
     <Resource Include="Images\bug.png" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico
new file mode 100644
index 000000000..fb24158ed
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico