Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 45df49f

Browse files
jcansdalejcansdale
committed
Use status messages from Resources.resx file
For some reason it isn't working in the `CommentTooltipView.xaml` file(currently commented out).
1 parent 23e46b2 commit 45df49f

File tree

5 files changed

+238
-18
lines changed

5 files changed

+238
-18
lines changed

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@
9191
<Compile Include="Peek\InlineCommentPeekResultPresentation.cs" />
9292
<Compile Include="Peek\InlineCommentPeekResultPresenter.cs" />
9393
<Compile Include="Properties\AssemblyInfo.cs" />
94+
<Compile Include="Resources.Designer.cs">
95+
<AutoGen>True</AutoGen>
96+
<DesignTime>True</DesignTime>
97+
<DependentUpon>Resources.resx</DependentUpon>
98+
</Compile>
9499
<Compile Include="SampleData\CommentTooltipViewModelDesigner.cs" />
95100
<Compile Include="SampleData\CommentThreadViewModelDesigner.cs" />
96101
<Compile Include="SampleData\DiffCommentThreadViewModelDesigner.cs" />
@@ -385,6 +390,10 @@
385390
</VSCTCompile>
386391
</ItemGroup>
387392
<ItemGroup>
393+
<EmbeddedResource Include="Resources.resx">
394+
<Generator>ResXFileCodeGenerator</Generator>
395+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
396+
</EmbeddedResource>
388397
<EmbeddedResource Include="VSPackage.resx">
389398
<MergeWithCTO>true</MergeWithCTO>
390399
<ManifestResourceName>VSPackage</ManifestResourceName>

‎src/GitHub.InlineReviews/Resources.Designer.cs‎

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

‎src/GitHub.InlineReviews/Resources.resx‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="CommentTooltipStatusMessage" xml:space="preserve">
121+
<value>Click to reply</value>
122+
</data>
123+
<data name="CommentTooltipStatusOverflowMessage" xml:space="preserve">
124+
<value>Click to reply or view more (showing most recent of {0} comments)</value>
125+
</data>
126+
</root>

‎src/GitHub.InlineReviews/Views/CommentTooltipView.xaml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:prop="clr-namespace:GitHub.InlineReviews"
7+
xmlns:vm="clr-namespace:GitHub.InlineReviews.ViewModels"
68
xmlns:local="clr-namespace:GitHub.InlineReviews.Views"
79
xmlns:sample="clr-namespace:GitHub.InlineReviews.SampleData"
810
mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
911
<d:DesignProperties.DataContext>
10-
<x:Array Type="{x:Type sample:CommentTooltipViewModelDesigner}">
11-
<sample:CommentTooltipViewModelDesigner>
12-
<sample:CommentTooltipViewModelDesigner.Comments>
13-
<sample:CommentViewModelDesigner EditState="None">
14-
<sample:CommentViewModelDesigner.Body>
15-
I assume this doesn't do anything if our message isn't showing?
16-
</sample:CommentViewModelDesigner.Body>
17-
</sample:CommentViewModelDesigner>
18-
<sample:CommentViewModelDesigner EditState="None">
19-
<sample:CommentViewModelDesigner.Body>
20-
Nope, does nothing! Also checked the logs.
21-
</sample:CommentViewModelDesigner.Body>
22-
</sample:CommentViewModelDesigner>
23-
</sample:CommentTooltipViewModelDesigner.Comments>
24-
</sample:CommentTooltipViewModelDesigner>
25-
</x:Array>
12+
<sample:CommentTooltipViewModelDesigner>
13+
<sample:CommentTooltipViewModelDesigner.Comments>
14+
<sample:CommentViewModelDesigner EditState="None">
15+
<sample:CommentViewModelDesigner.Body>
16+
I assume this doesn't do anything if our message isn't showing?
17+
</sample:CommentViewModelDesigner.Body>
18+
</sample:CommentViewModelDesigner>
19+
<sample:CommentViewModelDesigner EditState="None">
20+
<sample:CommentViewModelDesigner.Body>
21+
Nope, does nothing! Also checked the logs.
22+
</sample:CommentViewModelDesigner.Body>
23+
</sample:CommentViewModelDesigner>
24+
</sample:CommentTooltipViewModelDesigner.Comments>
25+
</sample:CommentTooltipViewModelDesigner>
2626
</d:DesignProperties.DataContext>
2727

2828
<DockPanel>
2929
<StackPanel DockPanel.Dock="Bottom">
3030
<Border BorderBrush="Silver" BorderThickness="0,1,0,0" Margin="0,8" />
31-
<TextBlock x:Name="StatusTextBlock" FontStyle="Italic">Click to reply</TextBlock>
31+
<!--<TextBlock x:Name="StatusTextBlock" FontStyle="Italic" Text="{x:Static prop:Resources.CommentTooltipStatusMessage}" />-->
32+
<TextBlock x:Name="StatusTextBlock" FontStyle="Italic" Text="Click to reply" />
3233
</StackPanel>
3334
<ScrollViewer x:Name="CommentScrollViewer" VerticalScrollBarVisibility="Auto">
3435
<ItemsControl ItemsSource="{Binding Comments}">

‎src/GitHub.InlineReviews/Views/CommentTooltipView.xaml.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ void WatchForScrollBarVisible(object sender, EventArgs e)
2121
if (CommentScrollViewer.ComputedVerticalScrollBarVisibility == System.Windows.Visibility.Visible)
2222
{
2323
CommentScrollViewer.ScrollToBottom();
24-
StatusTextBlock.Text = "Click to view more or reply";
24+
25+
var messageFormat = InlineReviews.Resources.CommentTooltipStatusOverflowMessage;
26+
var message = string.Format(messageFormat, ViewModel.Comments.Count);
27+
StatusTextBlock.Text = message;
2528
CommentScrollViewer.LayoutUpdated -= WatchForScrollBarVisible;
2629
}
2730
}

0 commit comments

Comments
 (0)