Skip to content

Commit 7b8a285

Browse files
retailcoderretailcoder
authored
Merge pull request #5263 from IvenBach/Issue2777_CleanedUpCommits
Issue2777 cleaned up commits
2 parents 652b8ff + f7add1a commit 7b8a285

11 files changed

+708
-463
lines changed

‎Rubberduck.Core/UI/Controls/ToolBar.xaml

Lines changed: 443 additions & 442 deletions
Large diffs are not rendered by default.

‎Rubberduck.Core/UI/Converters/ComponentTypeConverter.cs

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
using Rubberduck.VBEditor.SafeComWrappers;
5+
6+
namespace Rubberduck.UI.Converters
7+
{
8+
class ComponentTypeConverter : IValueConverter
9+
{
10+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
11+
{
12+
if (value is ComponentType componentType)
13+
{
14+
switch (componentType)
15+
{
16+
case ComponentType.ComComponent:
17+
return Resources.RubberduckUI.ComponentType_ComComponent;
18+
case ComponentType.Undefined:
19+
return Resources.RubberduckUI.ComponentType_Undefined;
20+
case ComponentType.StandardModule:
21+
return Resources.RubberduckUI.ComponentType_StandardModule;
22+
case ComponentType.ClassModule:
23+
return Resources.RubberduckUI.ComponentType_ClassModule;
24+
case ComponentType.UserForm:
25+
return Resources.RubberduckUI.ComponentType_UserForm;
26+
case ComponentType.ResFile:
27+
return Resources.RubberduckUI.ComponentType_ResFile;
28+
case ComponentType.VBForm:
29+
return Resources.RubberduckUI.ComponentType_VBForm;
30+
case ComponentType.MDIForm:
31+
return Resources.RubberduckUI.ComponentType_MDIForm;
32+
case ComponentType.PropPage:
33+
return Resources.RubberduckUI.ComponentType_PropPage;
34+
case ComponentType.UserControl:
35+
return Resources.RubberduckUI.ComponentType_UserControl;
36+
case ComponentType.DocObject:
37+
return Resources.RubberduckUI.ComponentType_DocObject;
38+
case ComponentType.RelatedDocument:
39+
return Resources.RubberduckUI.ComponentType_RelatedDocument;
40+
case ComponentType.ActiveXDesigner:
41+
return Resources.RubberduckUI.ComponentType_ActiveXDesigner;
42+
case ComponentType.Document:
43+
return Resources.RubberduckUI.ComponentType_Document;
44+
default:
45+
return Binding.DoNothing;
46+
}
47+
}
48+
49+
return Binding.DoNothing;
50+
}
51+
52+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
53+
{
54+
throw new NotImplementedException();
55+
}
56+
}
57+
}

‎Rubberduck.Core/UI/Converters/GroupingGridLocationConverter.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
using Rubberduck.VBEditor;
5+
using Rubberduck.VBEditor.SafeComWrappers;
6+
7+
namespace Rubberduck.UI.Converters
8+
{
9+
class GroupingGridLocationConverter : IValueConverter
10+
{
11+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
12+
{
13+
if (value is QualifiedModuleName qualifiedModuleName)
14+
{
15+
var componentTypeConverter = new ComponentTypeConverter();
16+
var localizedComponentType = (string)componentTypeConverter.Convert(qualifiedModuleName.ComponentType, typeof(ComponentType), parameter, culture);
17+
return $"{qualifiedModuleName} - {localizedComponentType}";
18+
}
19+
20+
return Binding.DoNothing;
21+
}
22+
23+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
24+
{
25+
throw new NotImplementedException();
26+
}
27+
}
28+
}

‎Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<codeInspections:InspectionSeverityImageSourceConverter x:Key="SeverityIconConverter" />
2222
<codeInspections:InspectionImageSourceConverter x:Key="InspectionIconConverter" />
23-
<codeInspections:QuickFixImageSourceConverter x:Key="QuickFixIconConverter" />
23+
<codeInspections:QuickFixImageSourceConverter x:Key="QuickFixIconConverter" />
2424

25-
<Style x:Key="IconMargin" TargetType="Image">
25+
<Style x:Key="IconMargin" TargetType="Image">
2626
<Setter Property="Margin" Value="4" />
2727
</Style>
2828

@@ -222,7 +222,7 @@
222222
</DataGridTemplateColumn.CellTemplate>
223223
</DataGridTemplateColumn>
224224
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Issue}" Binding="{Binding Description, Mode=OneTime}" />
225-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Location}" Binding="{Binding QualifiedSelection.QualifiedName, Mode=OneTime}" />
225+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Location}" Binding="{Binding QualifiedSelection.QualifiedName, Mode=OneTime, Converter={StaticResource GroupingGridLocationConverter}}" />
226226
</DataGrid.Columns>
227227
<DataGrid.ContextMenu>
228228
<ContextMenu ItemsSource="{Binding PlacementTarget.DataContext.QuickFixes, RelativeSource={RelativeSource Self}}">
@@ -236,8 +236,8 @@
236236
<Setter Property="Command" Value="{Binding Command}" />
237237
<Setter Property="CommandParameter" Value="{Binding Fix}" />
238238
<Setter Property="Header" Value="{Binding Description}" />
239-
<Setter Property="Background" Value="Transparent"></Setter>
240-
</Style>
239+
<Setter Property="Background" Value="Transparent" />
240+
</Style>
241241
</ContextMenu.Resources>
242242
</ContextMenu>
243243
</DataGrid.ContextMenu>

‎Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
using NLog;
1515
using Rubberduck.Common;
1616
using Rubberduck.Inspections.Abstract;
17-
using Rubberduck.Inspections.Results;
18-
using Rubberduck.Inspections.Abstract;
1917
using Rubberduck.Interaction.Navigation;
2018
using Rubberduck.Parsing.Inspections;
2119
using Rubberduck.Parsing.Inspections.Abstract;
@@ -28,7 +26,6 @@
2826
using Rubberduck.UI.Command.ComCommands;
2927
using Rubberduck.UI.Settings;
3028
using Rubberduck.VBEditor;
31-
using Rubberduck.Formatters;
3229

3330
namespace Rubberduck.UI.Inspections
3431
{
@@ -527,8 +524,7 @@ private void ExecuteQuickFixInProcedureCommand(object parameter)
527524
return;
528525
}
529526

530-
var selectedResult = SelectedItem as IInspectionResult;
531-
if (selectedResult == null)
527+
if (!(SelectedItem is IInspectionResult selectedResult))
532528
{
533529
return;
534530
}
@@ -555,8 +551,7 @@ private void ExecuteQuickFixInModuleCommand(object parameter)
555551
return;
556552
}
557553

558-
var selectedResult = SelectedItem as IInspectionResult;
559-
if (selectedResult == null)
554+
if (!(SelectedItem is IInspectionResult selectedResult))
560555
{
561556
return;
562557
}

‎Rubberduck.Resources/RubberduckUI.Designer.cs

Lines changed: 126 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rubberduck.Resources/RubberduckUI.cs.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ End Enum</value>
13521352
<value>Dle inspekce</value>
13531353
</data>
13541354
<data name="GroupingGrid_Filter" xml:space="preserve">
1355-
<value>Filtr</value>
1355+
<value />
13561356
</data>
13571357
<data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
13581358
<value>Metoda používající '{0}' má již jinou deklaraci '{1}' stejného jména v rozsahu.</value>

‎Rubberduck.Resources/RubberduckUI.de.resx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
14221422
<value>Der Typ des Ziels '{0}'ist '{1}' anstatt eines der erwarteten Typen '{2}'.</value>
14231423
</data>
14241424
<data name="GroupingGrid_Filter" xml:space="preserve">
1425-
<value>Filter</value>
1425+
<value />
14261426
</data>
14271427
<data name="GroupingStyle_ByName" xml:space="preserve">
14281428
<value>Nach Codeuntersuchung</value>
@@ -1439,7 +1439,7 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
14391439
<data name="References_BrowseButtonText" xml:space="preserve">
14401440
<value>Durchsuchen...</value>
14411441
</data>
1442-
<data name="SaveAndClose" xml:space="preserve">
1442+
<data name="SaveAndClose" xml:space="preserve">
14431443
<value>Speichern &amp; Schließen</value>
14441444
</data>
14451445
<data name="RegexAssistant_EncloseWhitespace_EnclosingFormat" xml:space="preserve">
@@ -1542,7 +1542,4 @@ Import abgebrochen.</value>
15421542

15431543
Import abgebrochen.</value>
15441544
</data>
1545-
<data name="SaveAndClose" xml:space="preserve">
1546-
<value>Speichern &amp; Schließen</value>
1547-
</data>
15481545
</root>

‎Rubberduck.Resources/RubberduckUI.es.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
14181418
<value>En el método que usa '{0}', el nombre de esta variable ya hace referencia a otra declaración.</value>
14191419
</data>
14201420
<data name="GroupingGrid_Filter" xml:space="preserve">
1421-
<value>Filtrar</value>
1421+
<value />
14221422
</data>
14231423
<data name="GroupingStyle_ByName" xml:space="preserve">
14241424
<value>Mediante inspección</value>

‎Rubberduck.Resources/RubberduckUI.fr.resx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
13851385
<value>La procédure qui utilise '{0}' contient déjà une déclaration utilisant cet identifiant.</value>
13861386
</data>
13871387
<data name="GroupingGrid_Filter" xml:space="preserve">
1388-
<value>Filtre</value>
1388+
<value />
13891389
</data>
13901390
<data name="GroupingStyle_ByName" xml:space="preserve">
13911391
<value>Par inspection</value>
@@ -1404,7 +1404,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
14041404
</data>
14051405
<data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
14061406
<value>'{0}' est accessible globalement, et est utilisé</value>
1407-
14081407
</data>
14091408
<data name="SaveAndClose" xml:space="preserve">
14101409
<value>Enregistrer &amp; Fermer</value>

0 commit comments

Comments
 (0)