Add popup with choice of Accept or Won't Fix #5046
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <vsui:DialogWindow x:Class="SonarLint.VisualStudio.Integration.Transition.MuteWindowDialog" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:resx="clr-namespace:SonarLint.VisualStudio.Integration.Resources" | ||
| xmlns:local="clr-namespace:SonarLint.VisualStudio.Integration.Transition" | ||
| xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0" | ||
| mc:Ignorable="d" | ||
| SizeToContent="WidthAndHeight" | ||
| Title="{x:Static resx:Strings.MuteWindow_Title}"> | ||
| <Grid Height="350" Width="500"> | ||
| <Border BorderBrush="Black" Name="BorderWontFix" BorderThickness="1" HorizontalAlignment="Left" Height="75" Margin="25,25,0,0" VerticalAlignment="Top" Width="450" Visibility="{Binding WontFixVisibility}"> | ||
| <Grid> | ||
| <RadioButton Name="rbWontFix" GroupName="Transitions" Content="{x:Static resx:Strings.MuteWindow_WontFixTitle}" VerticalAlignment="Top" Margin="10,16,-10,0" FontWeight="Bold" Grid.ColumnSpan="2" Checked="RadioButton_Checked"/> | ||
| <Label Content="{x:Static resx:Strings.MuteWindow_WontFixContent}" HorizontalAlignment="Left" Margin="10,36,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> | ||
| </Grid> | ||
| </Border> | ||
|
|
||
| <Border BorderBrush="Black" Name="BorderAccept" BorderThickness="1" HorizontalAlignment="Left" Height="75" Margin="25,25,0,0" VerticalAlignment="Top" Width="450" Visibility="{Binding AcceptVisibility}"> | ||
| <Grid> | ||
| <RadioButton Name="rbAccept" GroupName="Transitions" Content="{x:Static resx:Strings.MuteWindow_AcceptTitle}" VerticalAlignment="Top" Margin="10,16,-10,0" FontWeight="Bold" Grid.ColumnSpan="2" Checked="RadioButton_Checked"/> | ||
|
There was a problem hiding this comment. Radio button stye (and possibly others) is duplicated. |
||
| <Label Content="{x:Static resx:Strings.MuteWindow_AcceptContent}" HorizontalAlignment="Left" Margin="10,36,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> | ||
| </Grid> | ||
| </Border> | ||
|
|
||
| <Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="75" Margin="25 | ||
| ,115,0,0" VerticalAlignment="Top" Width="450"> | ||
| <Grid> | ||
| <RadioButton x:Name="rbFalsePositive" GroupName="Transitions" Content="{x:Static resx:Strings.MuteWindow_FalsePositiveTitle}" VerticalAlignment="Top" Margin="10,16,-10,0" FontWeight="Bold" Grid.ColumnSpan="2" Checked="RadioButton_Checked"/> | ||
| <Label Content="{x:Static resx:Strings.MuteWindow_FalsePositiveContent}" HorizontalAlignment="Left" Margin="10,36,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> | ||
|
There was a problem hiding this comment. Style duplication |
||
| </Grid> | ||
| </Border> | ||
| <Label Content="{x:Static resx:Strings.MuteWindow_CommentLabel}" HorizontalAlignment="Left" Margin="25,200,0,0" VerticalAlignment="Top"/> | ||
| <TextBox Name="txtComment" HorizontalAlignment="Center" Height="60" Margin="0,225,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="450"/> | ||
|
There was a problem hiding this comment. Styles in the layout |
||
| <Button Name="Cancel" Content="{x:Static resx:Strings.MuteWindow_CancelButton}" Padding="5,1" HorizontalAlignment="Left" Margin="300,300,0,0" VerticalAlignment="Top" Click="Cancel_Click"/> | ||
| <Button Name="Submit" Content="{x:Static resx:Strings.MuteWindow_SubmitButton}" Padding="5,1" HorizontalAlignment="Left" Margin="360,300,0,0" VerticalAlignment="Top" Click="Submit_Click"> | ||
|
There was a problem hiding this comment. This style is not duplicated, however, it's hard to read There was a problem hiding this comment. Ah, actually it is duplicated from the Cancel button |
||
| <Button.Style> | ||
| <Style TargetType="Button"> | ||
|
|
||
| <Setter Property="IsEnabled" Value="False"/> | ||
|
|
||
| <Style.Triggers> | ||
|
|
||
| <DataTrigger Binding="{Binding Path=IsChecked, ElementName=rbWontFix}" Value="True"> | ||
| <Setter Property="IsEnabled" Value="True"/> | ||
| </DataTrigger> | ||
|
|
||
| <DataTrigger Binding="{Binding Path=IsChecked, ElementName=rbAccept}" Value="True"> | ||
| <Setter Property="IsEnabled" Value="True"/> | ||
| </DataTrigger> | ||
|
|
||
| <DataTrigger Binding="{Binding Path=IsChecked, ElementName=rbFalsePositive}" Value="True"> | ||
| <Setter Property="IsEnabled" Value="True"/> | ||
| </DataTrigger> | ||
|
|
||
| </Style.Triggers> | ||
| </Style> | ||
| </Button.Style> | ||
| </Button> | ||
| </Grid> | ||
| </vsui:DialogWindow> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * SonarLint for Visual Studio | ||
| * Copyright (C) 2016-2023 SonarSource SA | ||
| * mailto:info AT sonarsource DOT com | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| */ | ||
|
|
||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Windows; | ||
| using System.Windows.Markup; | ||
| using Microsoft.VisualStudio.PlatformUI; | ||
| using SonarQube.Client.Models; | ||
|
|
||
| namespace SonarLint.VisualStudio.Integration.Transition | ||
| { | ||
| /// <summary> | ||
| /// Interaction logic for UserControl1.xaml | ||
| /// </summary> | ||
| [ContentProperty(nameof(MuteWindowDialog))] | ||
| [ExcludeFromCodeCoverage] | ||
|
There was a problem hiding this comment. UI Code not testable |
||
| public partial class MuteWindowDialog : DialogWindow | ||
| { | ||
| public MuteWindowDialog(bool showAccept) | ||
| { | ||
| InitializeComponent(); | ||
|
|
||
| SetVisibility(showAccept); | ||
| } | ||
|
|
||
| private void SetVisibility(bool showAccept) | ||
| { | ||
| BorderWontFix.Visibility = showAccept ? Visibility.Hidden : Visibility.Visible; | ||
| BorderAccept.Visibility = showAccept ? Visibility.Visible : Visibility.Hidden; | ||
| } | ||
|
|
||
| private void Cancel_Click(object sender, RoutedEventArgs e) | ||
| { | ||
| this.DialogResult = false; | ||
| } | ||
|
|
||
| private void Submit_Click(object sender, RoutedEventArgs e) | ||
| { | ||
| this.DialogResult = true; | ||
| } | ||
|
|
||
| public SonarQubeIssueTransition SelectedIssueTransition { get; private set; } | ||
|
|
||
| public string Comment => txtComment.Text; | ||
|
|
||
| private void RadioButton_Checked(object sender, RoutedEventArgs e) | ||
| { | ||
| switch (sender) | ||
| { | ||
| case var value when value == rbWontFix: | ||
|
There was a problem hiding this comment. Non-blocker: Could be replaced with a dictionary that would look nicer |
||
| SelectedIssueTransition = SonarQubeIssueTransition.WontFix; | ||
| break; | ||
|
|
||
| case var value when value == rbAccept: | ||
| SelectedIssueTransition = SonarQubeIssueTransition.Accept; | ||
| break; | ||
|
|
||
| case var value when value == rbFalsePositive: | ||
| SelectedIssueTransition = SonarQubeIssueTransition.FalsePositive; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same content as Accept 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know I'll talk about it with Marco during the meet