Merge pull request #94 from pver/issue_86

Added tool selection help
OpenCoverUI · Aug 13, 2015 · 4c23dd7 · 4c23dd7
2 parents cf7e8e7 + cfaadda
commit 4c23dd7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/OpenCover.UI/Views/SettingsControl.xaml b/OpenCover.UI/Views/SettingsControl.xaml
@@ -12,18 +12,29 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
             <ColumnDefinition Width="*"></ColumnDefinition>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
         </Grid.ColumnDefinitions>
+
         <Label Margin="0,0,5,5" Grid.Row="0" Grid.Column="0" Width="100" HorizontalContentAlignment="Right" >NUnit Path:</Label>
         <TextBox Margin="0,5,0,0" Grid.Row="0" Grid.Column="1" Text="{Binding Path=NUnitExePath, Mode=TwoWay}" HorizontalContentAlignment="Stretch" MinWidth="150"/>
         <Button Margin="5,5,0,0" Grid.Row="0" Grid.Column="2" Width="20" Command="{Binding ProcessSelectNUnitExe}">...</Button>
-        <Label Margin="0,1,5,4" Grid.Row="1" Grid.Column="0" Width="100" HorizontalContentAlignment="Right">OpenCover Path:</Label>
-        <TextBox Margin="0,5,0,0" Grid.Row="1" Grid.Column="1" Text="{Binding Path=OpenCoverExePath, Mode=TwoWay}" HorizontalContentAlignment="Stretch" MinWidth="150" />
-        <Button Margin="5,5,0,0" Grid.Row="1" Grid.Column="2" Width="20" Command="{Binding ProcessSelectOpenCoverExe}" >...</Button>
 
+        <Label Margin="0,0,5,5" Grid.Row="1" Grid.Column="1" FontStyle="Italic" FontSize="12">
+            <TextBlock Text="Select nunit-console.exe or nunit-console-x86.exe depending on your architecture" TextWrapping="Wrap" />
+        </Label>
+
+        <Label Margin="0,1,5,4" Grid.Row="2" Grid.Column="0" Width="100" HorizontalContentAlignment="Right">OpenCover Path:</Label>
+        <TextBox Margin="0,5,0,0" Grid.Row="2" Grid.Column="1" Text="{Binding Path=OpenCoverExePath, Mode=TwoWay}" HorizontalContentAlignment="Stretch" MinWidth="150" />
+        <Button Margin="5,5,0,0" Grid.Row="2" Grid.Column="2" Width="20" Command="{Binding ProcessSelectOpenCoverExe}" >...</Button>
+
+        <Label Margin="0,0,5,5" Grid.Row="3" Grid.Column="1" FontStyle="Italic" FontSize="12">
+            <TextBlock Text="Select opencover.console.exe of your OpenCover installation" TextWrapping="Wrap" />
+        </Label>
     </Grid>
 </UserControl>
diff --git a/OpenCover.UI/Views/SettingsControl.xaml.cs b/OpenCover.UI/Views/SettingsControl.xaml.cs
@@ -23,7 +23,7 @@ public SettingsControl()
 
         void SelectOpenCoverExeEvent(object sender, System.EventArgs e)
         {
-            var dialog = new OpenFileDialog { Filter = "Executables (*.exe)|*.exe" };
+            var dialog = new OpenFileDialog { Filter = "OpenCover Executable (opencover.console.exe)|opencover.console.exe" };
             if (dialog.ShowDialog() == true)
             {
                 _vm.OpenCoverExePath = dialog.FileName;
@@ -32,7 +32,7 @@ void SelectOpenCoverExeEvent(object sender, System.EventArgs e)
 
         void SelectNunitExeEvent(object sender, System.EventArgs e)
         {
-            var dialog = new OpenFileDialog {Filter = "Executables (*.exe)|*.exe"};
+            var dialog = new OpenFileDialog { Filter = "Nunit Executable (nunit-console*.exe)|nunit-console*.exe" };
             if (dialog.ShowDialog() == true)
             {
                 _vm.NUnitExePath = dialog.FileName;