SLVS-1631 Implement rebranding feedback (#5841)

[SLVS-1631](https://sonarsource.atlassian.net/browse/SLVS-1631)
SonarSource · Nov 18, 2024 · 522f460 · 522f460
1 parent 806dd1e
commit 522f460
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 104 deletions.
diff --git a/src/ConnectedMode/ConnectedMode.csproj b/src/ConnectedMode/ConnectedMode.csproj
@@ -44,11 +44,11 @@
     <None Remove="UI\Resources\CheckImage.xaml" />
     <None Remove="UI\Resources\LogoImages.xaml" />
     <None Remove="UI\Resources\Pencil.xaml" />
-    <None Remove="UI\Resources\sonarlint_32px.ico" />
+    <None Remove="UI\Resources\sonarqube_for_ide_logo_16px.png" />
     <None Remove="UI\Resources\Styles.xaml" />
     <None Remove="UI\Resources\TrashCanImage.xaml" />
     <None Remove="UI\ServerSelection\ServerSelectionDialog.xaml" />
-    <Resource Include="UI\Resources\sonarqube_for_ide_16px.ico">
+    <Resource Include="UI\Resources\sonarqube_for_ide_logo_16px.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
     <EmbeddedResource Include="Install\SonarLintTargets.xml" />

diff --git a/src/ConnectedMode/UI/Resources/LogoImages.xaml b/src/ConnectedMode/UI/Resources/LogoImages.xaml
diff --git a/src/ConnectedMode/UI/Resources/Styles.xaml b/src/ConnectedMode/UI/Resources/Styles.xaml
@@ -12,7 +12,7 @@
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static vsShell:VsFonts.EnvironmentFontFamilyKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell:VsBrushes.BrandedUITextKey}}" />
         <Setter Property="SnapsToDevicePixels" Value="False" />
-        <Setter Property="Icon" Value="pack://application:,,,/SonarLint.VisualStudio.ConnectedMode;component/UI/Resources/sonarqube_for_ide_16px.ico" />
+        <Setter Property="Icon" Value="pack://application:,,,/SonarLint.VisualStudio.ConnectedMode;component/UI/Resources/sonarqube_for_ide_logo_16px.png" />
     </Style>
 
     <Style x:Key="ConnectedModeWindow" TargetType="Window" BasedOn="{StaticResource {x:Type Window}}">

diff --git a/src/ConnectedMode/UI/Resources/sonarqube_for_ide_16px.ico b/src/ConnectedMode/UI/Resources/sonarqube_for_ide_16px.ico
diff --git a/src/ConnectedMode/UI/Resources/sonarqube_for_ide_logo_16px.png b/src/ConnectedMode/UI/Resources/sonarqube_for_ide_logo_16px.png
diff --git a/src/ConnectedMode/UI/ServerSelection/ServerSelectionDialog.xaml b/src/ConnectedMode/UI/ServerSelection/ServerSelectionDialog.xaml
@@ -44,12 +44,12 @@
 
                     <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
                         <RadioButton GroupName="ServerSelection" VerticalContentAlignment="Center" IsChecked="{Binding Path=IsSonarCloudSelected}">
-                            <Image Source="{StaticResource SonarCloudDrawingImage}" Width="250"/>
+                            <Image Source="{StaticResource SonarCloudDrawingImage}" Margin="0,10" />
                         </RadioButton>
                     </StackPanel>
                     <TextBlock Grid.Row="1" Text="{x:Static res:UiResources.SonarCloudDescription}" Margin="10, 0"/>
                     <TextBlock Grid.Row="2" Margin="10,10,10,0">
-                        <Hyperlink NavigateUri="https://www.sonarsource.com/products/sonarcloud/" RequestNavigate="ViewWebsite">SonarCloud</Hyperlink>
+                        <Hyperlink NavigateUri="https://www.sonarsource.com/products/sonarcloud/" RequestNavigate="ViewWebsite">SonarQube Cloud</Hyperlink>
                         <Run Text="{x:Static res:UiResources.FreeSonarCloudOfferDescription}"></Run>
                     </TextBlock>
                 </Grid>
@@ -64,13 +64,13 @@
 
                     <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
                         <RadioButton GroupName="ServerSelection" VerticalContentAlignment="Center" IsChecked="{Binding Path=IsSonarQubeSelected}">
-                            <Image Source="{StaticResource SonarQubeDrawingImage}" Width="250" Margin="0"/>
+                            <Image Source="{StaticResource SonarQubeDrawingImage}" Margin="0,10" />
                         </RadioButton>
                     </StackPanel>
                     <TextBlock Grid.Row="1" Text="{x:Static res:UiResources.SonarQubeDescription}" Margin="10, 0"/>
                     <TextBlock Grid.Row="2" Margin="10,10,10,0">
                         <Run Text="{x:Static res:UiResources.FreeSonarQubeOfferDescription}"></Run>
-                        <Hyperlink NavigateUri="https://www.sonarsource.com/plans-and-pricing/sonarqube/" RequestNavigate="ViewWebsite">Community Edition</Hyperlink>
+                        <Hyperlink NavigateUri="https://www.sonarsource.com/plans-and-pricing/sonarqube/" RequestNavigate="ViewWebsite">Community Build</Hyperlink>
                     </TextBlock>
 
                     <Grid x:Name="QubeUrlGrid" Grid.Row="3" Margin="10" IsEnabled="{Binding Path=IsSonarQubeSelected}">

diff --git a/src/Education/Resources.Designer.cs b/src/Education/Resources.Designer.cs
diff --git a/src/Education/Resources.resx b/src/Education/Resources.resx
@@ -139,7 +139,7 @@
     <value>[Education] Error handling Uri: {0}</value>
   </data>
   <data name="RuleHelpToolWindowCaption" xml:space="preserve">
-    <value>Sonar Rule Help</value>
+    <value>SonarQube Rule Help</value>
   </data>
   <data name="RuleHelpUserControl_RelativeURI" xml:space="preserve">
     <value>[Education] Failed to open Uri: {0}</value>

diff --git a/src/Integration.Vsix/Resources/sonarqube_for_ide_logo_16px.png b/src/Integration.Vsix/Resources/sonarqube_for_ide_logo_16px.png
diff --git a/src/IssueViz.Security/Resources.Designer.cs b/src/IssueViz.Security/Resources.Designer.cs
diff --git a/src/IssueViz.Security/Resources.resx b/src/IssueViz.Security/Resources.resx
@@ -124,15 +124,15 @@
     <value>Finished initializing security package.</value>
   </data>
   <data name="HotspotsToolWindowCaption" xml:space="preserve">
-    <value>Sonar Local Security Hotspots</value>
+    <value>SonarQube Local Security Hotspots</value>
   </data>
   <data name="OpenInIDEHotspotsToolWindowCaption" xml:space="preserve">
-    <value>Sonar Server Security Hotspots</value>
+    <value>SonarQube Server Security Hotspots</value>
   </data>
   <data name="StartedPackageInitialization" xml:space="preserve">
     <value>Initializing security package...</value>
   </data>
   <data name="TaintToolWindowCaption" xml:space="preserve">
-    <value>Sonar Taint Vulnerabilities</value>
+    <value>SonarQube Taint Vulnerabilities</value>
   </data>
 </root>
diff --git a/src/IssueViz.Security/Taint/TaintList/TaintIssuesControl.xaml b/src/IssueViz.Security/Taint/TaintList/TaintIssuesControl.xaml
@@ -101,7 +101,7 @@
                     <LineBreak />
                 </TextBlock>
                 <TextBlock Style="{StaticResource OverlayTextBlockStyle}">
-                    <Run>Please ensure that your solution is bound to a Sonar project that contains taint vulnerabilities.</Run>
+                    <Run>Please ensure that your solution is bound to a SonarQube project that contains taint vulnerabilities.</Run>
                 </TextBlock>
                 <TextBlock Style="{StaticResource OverlayTextBlockStyle}">
                     <Hyperlink Command="{Binding ShowDocumentationCommand}">

diff --git a/src/IssueViz.Security/Taint/TaintList/sonarqube_for_ide_logo_16px.png b/src/IssueViz.Security/Taint/TaintList/sonarqube_for_ide_logo_16px.png
diff --git a/src/IssueViz/Commands/Resources/sonarqube_for_ide_logo_16px.png b/src/IssueViz/Commands/Resources/sonarqube_for_ide_logo_16px.png