Skip to content

Commit

Permalink
Fixed Language Names, Improve SyntaxHighlighting
Browse files Browse the repository at this point in the history
ghost1372 committed Apr 11, 2020
1 parent d9cb1f3 commit 6260101
Showing 12 changed files with 788 additions and 491 deletions.
19 changes: 16 additions & 3 deletions CodeHubDesktop/CodeHubDesktop.csproj
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@
<UseWPF>true</UseWPF>
<AssemblyName>CodeHubDesktop</AssemblyName>
<RootNamespace>CodeHubDesktop</RootNamespace>
<Version>1.1.0.0</Version>
<Version>1.2.0.0</Version>
<Configurations>Debug;Release</Configurations>
<Copyright>Copyright © Mahdi 2018-2020</Copyright>
<FileVersion>1.1.0.0</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.2.0.0</FileVersion>
<AssemblyVersion>1.2.0.0</AssemblyVersion>
<LangVersion>latest</LangVersion>
<SatelliteResourceLanguages>en;fa;en-US;fa-IR</SatelliteResourceLanguages>
<ApplicationIcon>Resources\gitbanner_6jm_icon.ico</ApplicationIcon>
@@ -26,6 +26,10 @@
<None Remove="Resources\Img\cloud.png" />
<None Remove="Resources\Img\Flag\en.png" />
<None Remove="Resources\Img\Flag\fa.png" />
<None Remove="Resources\LanguageList.txt" />
</ItemGroup>
<ItemGroup>
<Content Include="Resources\LanguageList.txt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.0.1" />
@@ -59,11 +63,20 @@
<AutoGen>True</AutoGen>
<DependentUpon>Lang.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="MultiLanguage\Language\Lang.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Lang.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
38 changes: 38 additions & 0 deletions CodeHubDesktop/Controls/HighlightingDefinitionConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
using CodeHubDesktop.Models;
using ICSharpCode.AvalonEdit.Highlighting;
using System;
using System.Globalization;
using System.Windows.Data;

namespace CodeHubDesktop.Controls
{
public class HighlightingDefinitionConverter : IValueConverter
{
private static readonly HighlightingDefinitionTypeConverter Converter = new HighlightingDefinitionTypeConverter();

public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value != null)
{
LanguageModel code = value as LanguageModel;
if (code != null)
{
return Converter.ConvertFrom(code.DisplayName);
}
else
{
return Converter.ConvertFrom("C#");
}
}
else
{
return Converter.ConvertFrom("C#");
}
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return Converter.ConvertToString(value);
}
}
}
8 changes: 8 additions & 0 deletions CodeHubDesktop/Models/LanguageModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace CodeHubDesktop.Models
{
public class LanguageModel
{
public string Name { get; set; }
public string DisplayName { get; set; }
}
}
95 changes: 95 additions & 0 deletions CodeHubDesktop/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions CodeHubDesktop/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="LanguageList" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\LanguageList.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
474 changes: 474 additions & 0 deletions CodeHubDesktop/Resources/LanguageList.txt

Large diffs are not rendered by default.

497 changes: 13 additions & 484 deletions CodeHubDesktop/ViewModels/CreateSnippetViewModel.cs

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions CodeHubDesktop/Views/CreateSnippet.xaml
Original file line number Diff line number Diff line change
@@ -8,13 +8,16 @@
xmlns:ext="clr-namespace:CodeHubDesktop.DynamicLanguage"
ext:Translation.ResourceManager="{x:Static lang:Lang.ResourceManager}"
prism:ViewModelLocator.AutoWireViewModel="True">
<UserControl.Resources>
<control:HighlightingDefinitionConverter x:Key="HighlightingDefinitionConverter"/>
</UserControl.Resources>
<hc:TransitioningContentControl>
<hc:ScrollViewer>
<StackPanel Margin="10">
<hc:TextBox Margin="10,0" Text="{Binding Subject, UpdateSourceTrigger=PropertyChanged}" hc:InfoElement.Placeholder="{ext:Loc Subject}" hc:TitleElement.Title="{ext:Loc SubjectTitle}"/>
<hc:TextBox Text="{Binding Detail, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" TextAlignment="Left" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" Margin="10" Height="100" hc:InfoElement.Placeholder="{ext:Loc Detail}" hc:TitleElement.Title="{ext:Loc DetailTitle}"/>
<hc:ComboBox SelectedItem="{Binding SelectedCode, UpdateSourceTrigger=PropertyChanged}" IsEditable="True" Name="cmb" ItemsSource="{Binding LanguageList}" hc:InfoElement.Placeholder="{ext:Loc SelectLanguage}" hc:TitleElement.Title="{ext:Loc SelectLanguageTitle}" Margin="10,0"/>
<control:BindableAvalonEditor Text="{Binding Snippet, UpdateSourceTrigger=PropertyChanged}" SyntaxHighlighting="{Binding ElementName=cmb, Path=SelectedItem}" WordWrap="True" ShowLineNumbers="True" Margin="10,15" Height="200"/>
<hc:ComboBox DisplayMemberPath="DisplayName" SelectedValuePath="Name" SelectedValue="true" SelectedItem="{Binding SelectedCode, UpdateSourceTrigger=PropertyChanged}" IsEditable="True" Name="cmb" ItemsSource="{Binding LanguageList}" hc:InfoElement.Placeholder="{ext:Loc SelectLanguage}" hc:TitleElement.Title="{ext:Loc SelectLanguageTitle}" Margin="10,0"/>
<control:BindableAvalonEditor Text="{Binding Snippet, UpdateSourceTrigger=PropertyChanged}" SyntaxHighlighting="{Binding ElementName=cmb, Path=SelectedItem, Converter={StaticResource HighlightingDefinitionConverter}}" WordWrap="True" ShowLineNumbers="True" Margin="10,15" Height="200"/>
<hc:TextBox Text="{Binding Error, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" TextAlignment="Left" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" Margin="10,0" Height="100" hc:InfoElement.Placeholder="{ext:Loc Error}" hc:TitleElement.Title="{ext:Loc ErrorTitle}"/>

<StackPanel HorizontalAlignment="Center" Margin="10,10" Orientation="Horizontal">
5 changes: 4 additions & 1 deletion CodeHubDesktop/Views/SnippetOnline.xaml
Original file line number Diff line number Diff line change
@@ -8,6 +8,9 @@
ext:Translation.ResourceManager="{x:Static lang:Lang.ResourceManager}"
xmlns:control="clr-namespace:CodeHubDesktop.Controls"
prism:ViewModelLocator.AutoWireViewModel="True">
<UserControl.Resources>
<control:HighlightingDefinitionConverter x:Key="HighlightingDefinitionConverter"/>
</UserControl.Resources>
<hc:TransitioningContentControl>
<Border hc:ScrollViewer.IsInertiaEnabled="True" Background="{DynamicResource RegionBrush}" Margin="16" CornerRadius="10" Effect="{StaticResource EffectShadow4}">
<hc:ScrollViewer>
@@ -30,7 +33,7 @@
<hc:TextBox Visibility="{Binding PanelVisibility}" IsReadOnly="True" Text="{Binding SnippetDetail, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" TextAlignment="Left" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" Margin="10" Height="150" hc:InfoElement.Placeholder="{ext:Loc Detail}" hc:TitleElement.Title="{ext:Loc DetailTitle}"/>
<hc:TextBox Visibility="{Binding PanelVisibility}" IsReadOnly="True" Text="{Binding Error, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" TextAlignment="Left" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" Margin="10" Height="100" hc:InfoElement.Placeholder="{ext:Loc Error}" hc:TitleElement.Title="{ext:Loc ErrorTitle}"/>

<control:BindableAvalonEditor Visibility="{Binding PanelVisibility}" Text="{Binding SnippetScript, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" SyntaxHighlighting="{Binding ElementName=lang, Path=Status}" WordWrap="True" ShowLineNumbers="True" Margin="10,5" Height="250"/>
<control:BindableAvalonEditor Visibility="{Binding PanelVisibility}" Text="{Binding SnippetScript, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" SyntaxHighlighting="{Binding ElementName=lang, Path=Status, Converter={StaticResource HighlightingDefinitionConverter}}" WordWrap="True" ShowLineNumbers="True" Margin="10,5" Height="250"/>

</StackPanel>
</hc:ScrollViewer>
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -4,10 +4,20 @@ CodeHub is a platform for archiving the errors, bugs, and scripts you intend to
This App work with CodeHub API services.

- Prism MVVM
- EntityFrameWorkCore
- EntityFrameWorkCore Sqlite
- .Net Core 3.1
- Multi Language (Dynamic)
- Dark/Light/Violet Theme

## Release
The latest Release can be found [here](https://github.com/CodeHub-Contributors/CodeHubDesktop/releases)

## How To Build From Source?
1. [Download](https://visualstudio.microsoft.com/) and Install Visual Studio 2019
2. [Download](https://dotnet.microsoft.com/download/dotnet-core/3.1) and Install .Net Core 3.1 SDK
3. Clone or Download Source Code `git clone https://github.com/CodeHub-Contributors/CodeHubDesktop.git`
4. Open CodeHubDesktop.sln with Visual Studio
5. Rebuild Project

![CodeHubDesktop](ScreenShot/1.png)
![CodeHubDesktop](ScreenShot/2.png)
Binary file modified ScreenShot/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ScreenShot/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6260101

Please sign in to comment.