Skip to content

Commit c349f7d

Browse files
Hosch250Hosch250
committed
Close #1256 
1 parent 5d49b4e commit c349f7d

File tree

5 files changed

+195
-4
lines changed

5 files changed

+195
-4
lines changed

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,7 @@
830830
</Compile>
831831
<Compile Include="UI\SourceControl\ChangesViewViewModel.cs" />
832832
<Compile Include="UI\SourceControl\CommitAction.cs" />
833+
<Compile Include="UI\SourceControl\Converters\ChangeTypesToTextConverter.cs" />
833834
<Compile Include="UI\SourceControl\Converters\CommitActionsToTextConverter.cs" />
834835
<Compile Include="UI\SourceControl\Converters\CommitActionTextToEnum.cs" />
835836
<Compile Include="UI\FileBrowserDialogFactory.cs" />

‎RetailCoder.VBE/UI/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.

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,4 +1665,46 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
16651665
<data name="SourceControl_UnknownErrorTitle" xml:space="preserve">
16661666
<value>An unknown error occurred.</value>
16671667
</data>
1668+
<data name="SourceControl_FileStatus_Added" xml:space="preserve">
1669+
<value>Added</value>
1670+
</data>
1671+
<data name="SourceControl_FileStatus_Ignored" xml:space="preserve">
1672+
<value>Ignored</value>
1673+
</data>
1674+
<data name="SourceControl_FileStatus_Missing" xml:space="preserve">
1675+
<value>Missing</value>
1676+
</data>
1677+
<data name="SourceControl_FileStatus_Modified" xml:space="preserve">
1678+
<value>Modified</value>
1679+
</data>
1680+
<data name="SourceControl_FileStatus_Nonexistent" xml:space="preserve">
1681+
<value>Nonexistent</value>
1682+
</data>
1683+
<data name="SourceControl_FileStatus_Removed" xml:space="preserve">
1684+
<value>Removed</value>
1685+
</data>
1686+
<data name="SourceControl_FileStatus_RenamedInIndex" xml:space="preserve">
1687+
<value>Renamed in index</value>
1688+
</data>
1689+
<data name="SourceControl_FileStatus_RenamedInWorkDir" xml:space="preserve">
1690+
<value>Renamed in working directory</value>
1691+
</data>
1692+
<data name="SourceControl_FileStatus_Staged" xml:space="preserve">
1693+
<value>Staged</value>
1694+
</data>
1695+
<data name="SourceControl_FileStatus_StagedTypeChange" xml:space="preserve">
1696+
<value>Staged type change</value>
1697+
</data>
1698+
<data name="SourceControl_FileStatus_TypeChanged" xml:space="preserve">
1699+
<value>Type changed</value>
1700+
</data>
1701+
<data name="SourceControl_FileStatus_Unaltered" xml:space="preserve">
1702+
<value>Unaltered</value>
1703+
</data>
1704+
<data name="SourceControl_FileStatus_Unreadable" xml:space="preserve">
1705+
<value>Unreadable</value>
1706+
</data>
1707+
<data name="SourceControl_FileStatus_Untracked" xml:space="preserve">
1708+
<value>Untracked</value>
1709+
</data>
16681710
</root>

‎RetailCoder.VBE/UI/SourceControl/ChangesView.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
d:DataContext="{d:DesignInstance {x:Type sourceControl:ChangesViewViewModel}, IsDesignTimeCreatable=False}">
1414
<TabItem.Resources>
1515
<BitmapImage x:Key="CheckImage" UriSource="../../Resources/tick.png" />
16-
<BitmapImage x:Key="DeleteImage" UriSource="../../Resources/cross-script.png" />
1716
<BitmapImage x:Key="UndoImage" UriSource="../../Resources/arrow-circle-left.png" />
1817

1918
<converters:CommitActionsToTextConverter x:Key="CommitActionToText" />
2019
<converters:CommitActionTextToEnum x:Key="CommitActionValueToEnum" />
20+
<converters:ChangeTypesToTextConverter x:Key="ChangeTypesToText" />
2121
<converters1:SelectedItemToBooleanConverter x:Key="HasSelectedItems" />
2222

2323
<ObjectDataProvider x:Key="CommitActions"
@@ -156,7 +156,7 @@
156156
</DataGrid.CellStyle>
157157
<DataGrid.Columns>
158158
<DataGridTextColumn Binding="{Binding FilePath}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FilePath}" Width="*" />
159-
<DataGridTextColumn Binding="{Binding FileStatus}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
159+
<DataGridTextColumn Binding="{Binding FileStatus, Converter={StaticResource ChangeTypesToText}}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
160160
</DataGrid.Columns>
161161
</DataGrid>
162162
</DockPanel>
@@ -201,7 +201,7 @@
201201
</DataGrid.CellStyle>
202202
<DataGrid.Columns>
203203
<DataGridTextColumn Binding="{Binding FilePath}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FilePath}" Width="*" />
204-
<DataGridTextColumn Binding="{Binding FileStatus}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
204+
<DataGridTextColumn Binding="{Binding FileStatus, Converter={StaticResource ChangeTypesToText}}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
205205
</DataGrid.Columns>
206206
</DataGrid>
207207
</DockPanel>
@@ -234,7 +234,7 @@
234234
</DataGrid.CellStyle>
235235
<DataGrid.Columns>
236236
<DataGridTextColumn Binding="{Binding FilePath}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FilePath}" Width="*" />
237-
<DataGridTextColumn Binding="{Binding FileStatus}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
237+
<DataGridTextColumn Binding="{Binding FileStatus, Converter={StaticResource ChangeTypesToText}}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_FileStatus}" Width="*" />
238238
</DataGrid.Columns>
239239
</DataGrid>
240240
</DockPanel>

‎RetailCoder.VBE/UI/SourceControl/Converters/ChangeTypesToTextConverter.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Linq;
4+
using System.Windows.Data;
5+
6+
namespace Rubberduck.UI.SourceControl.Converters
7+
{
8+
public class ChangeTypesToTextConverter : IValueConverter
9+
{
10+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
11+
{
12+
var values = value.ToString().Split(new[] {", "}, StringSplitOptions.RemoveEmptyEntries);
13+
var translatedValue = values.Select(s => RubberduckUI.ResourceManager.GetString("SourceControl_FileStatus_" + s));
14+
return string.Join(", ", translatedValue);
15+
}
16+
17+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
18+
{
19+
throw new InvalidOperationException();
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)