Skip to content

Commit 6260101

Browse files
ghost1372ghost1372
committed
Fixed Language Names, Improve SyntaxHighlighting
1 parent d9cb1f3 commit 6260101

File tree

12 files changed

+788
-491
lines changed

12 files changed

+788
-491
lines changed

‎CodeHubDesktop/CodeHubDesktop.csproj‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<UseWPF>true</UseWPF>
66
<AssemblyName>CodeHubDesktop</AssemblyName>
77
<RootNamespace>CodeHubDesktop</RootNamespace>
8-
<Version>1.1.0.0</Version>
8+
<Version>1.2.0.0</Version>
99
<Configurations>Debug;Release</Configurations>
1010
<Copyright>Copyright © Mahdi 2018-2020</Copyright>
11-
<FileVersion>1.1.0.0</FileVersion>
12-
<AssemblyVersion>1.1.0.0</AssemblyVersion>
11+
<FileVersion>1.2.0.0</FileVersion>
12+
<AssemblyVersion>1.2.0.0</AssemblyVersion>
1313
<LangVersion>latest</LangVersion>
1414
<SatelliteResourceLanguages>en;fa;en-US;fa-IR</SatelliteResourceLanguages>
1515
<ApplicationIcon>Resources\gitbanner_6jm_icon.ico</ApplicationIcon>
@@ -26,6 +26,10 @@
2626
<None Remove="Resources\Img\cloud.png" />
2727
<None Remove="Resources\Img\Flag\en.png" />
2828
<None Remove="Resources\Img\Flag\fa.png" />
29+
<None Remove="Resources\LanguageList.txt" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<Content Include="Resources\LanguageList.txt" />
2933
</ItemGroup>
3034
<ItemGroup>
3135
<PackageReference Include="AvalonEdit" Version="6.0.1" />
@@ -59,11 +63,20 @@
5963
<AutoGen>True</AutoGen>
6064
<DependentUpon>Lang.resx</DependentUpon>
6165
</Compile>
66+
<Compile Update="Properties\Resources.Designer.cs">
67+
<DesignTime>True</DesignTime>
68+
<AutoGen>True</AutoGen>
69+
<DependentUpon>Resources.resx</DependentUpon>
70+
</Compile>
6271
</ItemGroup>
6372
<ItemGroup>
6473
<EmbeddedResource Update="MultiLanguage\Language\Lang.resx">
6574
<Generator>PublicResXFileCodeGenerator</Generator>
6675
<LastGenOutput>Lang.Designer.cs</LastGenOutput>
6776
</EmbeddedResource>
77+
<EmbeddedResource Update="Properties\Resources.resx">
78+
<Generator>ResXFileCodeGenerator</Generator>
79+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
80+
</EmbeddedResource>
6881
</ItemGroup>
6982
</Project>

‎CodeHubDesktop/Controls/HighlightingDefinitionConverter.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using CodeHubDesktop.Models;
2+
using ICSharpCode.AvalonEdit.Highlighting;
3+
using System;
4+
using System.Globalization;
5+
using System.Windows.Data;
6+
7+
namespace CodeHubDesktop.Controls
8+
{
9+
public class HighlightingDefinitionConverter : IValueConverter
10+
{
11+
private static readonly HighlightingDefinitionTypeConverter Converter = new HighlightingDefinitionTypeConverter();
12+
13+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
14+
{
15+
if (value != null)
16+
{
17+
LanguageModel code = value as LanguageModel;
18+
if (code != null)
19+
{
20+
return Converter.ConvertFrom(code.DisplayName);
21+
}
22+
else
23+
{
24+
return Converter.ConvertFrom("C#");
25+
}
26+
}
27+
else
28+
{
29+
return Converter.ConvertFrom("C#");
30+
}
31+
}
32+
33+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
34+
{
35+
return Converter.ConvertToString(value);
36+
}
37+
}
38+
}

‎CodeHubDesktop/Models/LanguageModel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace CodeHubDesktop.Models
2+
{
3+
public class LanguageModel
4+
{
5+
public string Name { get; set; }
6+
public string DisplayName { get; set; }
7+
}
8+
}

‎CodeHubDesktop/Properties/Resources.Designer.cs‎

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

‎CodeHubDesktop/Properties/Resources.resx‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
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+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="LanguageList" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\LanguageList.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123+
</data>
124+
</root>

0 commit comments

Comments
 (0)