Skip to content
Open
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5aa6b0c
Merge branch 'Development' into 224-multi-language-translation
Hirogen Jul 7, 2025
7c9673d
resources.de
Hirogen Jul 7, 2025
7b57073
resources to program.cs added
Hirogen Jul 7, 2025
485c166
highlight dialog and proxy
Hirogen Jul 7, 2025
71b92c9
resources
Hirogen Jul 7, 2025
fa3eb1a
logWindow resources
Hirogen Jul 8, 2025
5f56cb4
Zerman Translation
Hirogen Jul 8, 2025
a5cbc4a
Update src/LogExpert.Resources/Resources.resx
Hirogen Jul 8, 2025
87148b8
Update src/LogExpert.Resources/Resources.resx
Hirogen Jul 8, 2025
a78c3c7
Update src/LogExpert.UI/Entities/PaintHelper.cs
Hirogen Jul 8, 2025
c5ac440
resources more resources
Hirogen Jul 9, 2025
9e7f8aa
Merge branch '224-multi-language-translation' of https://github.com/L…
Hirogen Jul 9, 2025
07a8efb
bug
Hirogen Jul 9, 2025
b8f76c4
missing n
Hirogen Jul 9, 2025
2c3b362
german
Hirogen Jul 9, 2025
f62fd99
Update src/LogExpert/Config/ConfigManager.cs
Hirogen Jul 9, 2025
3b59bfa
added comment
Hirogen Jul 9, 2025
8ad20fb
settings dialog finished
Hirogen Jul 9, 2025
acf05e4
prepare for language change
Hirogen Jul 9, 2025
9f79247
default language
Hirogen Jul 9, 2025
c68cdc0
move
Hirogen Jul 9, 2025
5f8baff
fix exception
Hirogen Jul 9, 2025
0972920
eminus resources and about box
Hirogen Jul 10, 2025
70bfd26
Merge branch 'Development' into 224-multi-language-translation
Hirogen Jul 10, 2025
98e96af
Update src/LogExpert.Resources/Resources.resx
Hirogen Jul 10, 2025
f6eb5d5
better resource management
Hirogen Jul 10, 2025
c477f53
resource loading through reflection
Hirogen Jul 10, 2025
9e337ff
small things
Hirogen Jul 10, 2025
7fe6502
DateTimeDragControl resources
Hirogen Jul 10, 2025
07c7e37
translation and bugfix
Hirogen Jul 11, 2025
eca91d2
Merge branch 'Development' into 224-multi-language-translation
Hirogen Jul 15, 2025
21e7103
more resources
Hirogen Jul 16, 2025
d1713de
resources
Hirogen Jul 16, 2025
f139564
logtab window resources
Hirogen Jul 17, 2025
a0ac4d5
more german translations
Hirogen Jul 17, 2025
5ccd2e9
Update src/LogExpert.UI/Dialogs/HighlightDialog.cs
Hirogen Jul 17, 2025
816fe5b
Update src/LogExpert.UI/Dialogs/HighlightDialog.cs
Hirogen Jul 17, 2025
b489828
update resources
Hirogen Jul 21, 2025
ee2c022
Merge branch '224-multi-language-translation' of https://github.com/L…
Hirogen Jul 21, 2025
97b0944
readded logger strings, because they dont need to be localised
Hirogen Sep 7, 2025
37473de
small optimizations
Hirogen Sep 7, 2025
3e1a0ae
applying resources as well
Hirogen Sep 7, 2025
3d997ca
ChooseIconDialog
Hirogen Sep 10, 2025
759339a
Merge branch 'Development' into 224-multi-language-translation
Hirogen Sep 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ partial class Build : NukeBuild
/// - JetBrains Rider https://nuke.build/rider
/// - Microsoft VisualStudio https://nuke.build/visualstudio
/// - Microsoft VSCode https://nuke.build/vscode
public static int Main() => Execute<Build>(x => x.Test);
public static int Main () => Execute<Build>(x => x.Test);

[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
Expand Down Expand Up @@ -78,7 +78,7 @@ Version Version
patch = AppVeyor.Instance.BuildNumber;
}

return new Version(1, 12, 0, patch);
return new Version(1, 20, 0, patch);
}
}

Expand Down Expand Up @@ -119,7 +119,7 @@ Version Version
ChocolateyDirectory / $"logexpert.{VersionString}.nupkg"
];

protected override void OnBuildInitialized()
protected override void OnBuildInitialized ()
{
SetVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");

Expand Down Expand Up @@ -479,7 +479,7 @@ protected override void OnBuildInitialized()
logExpertDocuments.DeleteDirectory();
});

private void ExecuteInnoSetup(AbsolutePath innoPath)
private void ExecuteInnoSetup (AbsolutePath innoPath)
{
Process proc = new();

Expand All @@ -501,12 +501,12 @@ private void ExecuteInnoSetup(AbsolutePath innoPath)
}
}

private string ReplaceVersionMatch(Match match, string replacement)
private string ReplaceVersionMatch (Match match, string replacement)
{
return $"{match.Groups[1]}{replacement}{match.Groups[3]}";
}

private void TransformTemplateFile(AbsolutePath path, bool deleteTemplate)
private void TransformTemplateFile (AbsolutePath path, bool deleteTemplate)
{
string text = path.ReadAllText();
text = text.Replace("##version##", VersionString);
Expand All @@ -520,17 +520,17 @@ private void TransformTemplateFile(AbsolutePath path, bool deleteTemplate)
}

[GeneratedRegex(@"(\[assembly: AssemblyInformationalVersion\("")([^""]*)(""\)\])")]
private static partial Regex AssemblyInformationalVersion();
private static partial Regex AssemblyInformationalVersion ();

[GeneratedRegex(@"(\[assembly: AssemblyVersion\("")([^""]*)(""\)\])")]
private static partial Regex AssemblyVersion();
private static partial Regex AssemblyVersion ();

[GeneratedRegex(@"(\[assembly: AssemblyConfiguration\()(""[^""]*"")(\)\])")]
private static partial Regex AssemblyConfiguration();
private static partial Regex AssemblyConfiguration ();

[GeneratedRegex(@"(\[assembly: AssemblyFileVersion\("")([^""]*)(""\)\])")]
private static partial Regex AssemblyFileVersion();
private static partial Regex AssemblyFileVersion ();

[GeneratedRegex(@"\w\w{2}[_]p?[tso]?[erzliasx]+[_rhe]{5}", RegexOptions.IgnoreCase, "en-GB")]
private static partial Regex SFTPPlugin();
private static partial Regex SFTPPlugin ();
}
11 changes: 8 additions & 3 deletions src/ColumnizerLib/ColumnizerLib.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@
<title>LogExpert ColumnizerLib</title>
<authors>Zarunbal, Hagen Raab, Hirogen, RandallFlagg and others</authors>
<owners>Zarunbal, Hirogen</owners>
<license>MIT</license>
<projectUrl>https://github.com/LogExperts/LogExpert</projectUrl>
<license type="MIT"></license>
<projectUrl url="https://github.com/LogExperts/LogExpert">https://github.com/LogExperts/LogExpert</projectUrl>
<repository type="git" url="https://github.com/LogExperts/LogExpert"></repository>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<bugTrackerUrl>https://github.com/LogExperts/LogExpert/issues</bugTrackerUrl>
<releaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v$version$</releaseNotes>
<releaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v.$version$</releaseNotes>
<description>Columnizer Lib for Logexpert plugins</description>
<readme>docs\README.md</readme>
<copyright>Copyright 2025</copyright>
<tags>LogExpert Columnizer</tags>
</metadata>
<files>
<file src="\..\..\README.md" target="docs\"></file>
</files>
</package>
15 changes: 6 additions & 9 deletions src/ColumnizerLib/IContextMenuEntry.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
using System.Collections.Generic;


namespace LogExpert;

/// <summary>
Expand All @@ -21,7 +18,7 @@ public interface IContextMenuEntry
/// Your implementation can control whether LogExpert will show a menu entry by returning
/// an appropriate value.<br></br>
/// </summary>
/// <param name="lines">A list containing all selected line numbers.</param>
/// <param name="loglines">A list containing all selected line numbers.</param>
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
/// if necessary.</param>
/// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
Expand All @@ -35,23 +32,23 @@ public interface IContextMenuEntry
/// <li>null: No menu entry is displayed.</li>
/// </ul>
/// </returns>
string GetMenuText(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
string GetMenuText (IList<int> loglines, ILogLineColumnizer columnizer, ILogExpertCallback callback);

string GetMenuText(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
string GetMenuText (int linesCount, ILogLineColumnizer columnizer, ILogLine logline);


/// <summary>
/// This function is called from LogExpert if the menu entry is choosen by the user. <br></br>
/// Note that this function is called from the GUI thread. So try to avoid time consuming operations.
/// </summary>
/// <param name="lines">A list containing all selected line numbers.</param>
/// <param name="loglines">A list containing all selected line numbers.</param>
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
/// if necessary.</param>
/// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
/// for retrieving log lines or pass it along to functions of the Columnizer if needed.</param>
void MenuSelected(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
void MenuSelected (IList<int> loglines, ILogLineColumnizer columnizer, ILogExpertCallback callback);

void MenuSelected(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
void MenuSelected (int linesCount, ILogLineColumnizer columnizer, ILogLine logline);

#endregion
}
9 changes: 9 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<!--<OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>--><!--TODO: Normalize this across solution-->
<SignAssembly>true</SignAssembly>
<PackageProjectUrl>https://github.com/LogExperts/LogExpert</PackageProjectUrl>
<RepositoryUrl>https://github.com/LogExperts/LogExpert</RepositoryUrl>
<PackageTags>LogExpert, Columnizer, Logging, Windows, Winforms</PackageTags>
<RepositoryType>git</RepositoryType>
<PackageReleaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v.1.20.0</PackageReleaseNotes>
<PackageVersion>1.20.0.0</PackageVersion>
<Optimize Condition="'$(Configuration)' == 'Release'">true</Optimize>
<Product>LogExpert</Product>
<Copyright>Copyright © LogExpert 2025</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IsTestProject>false</IsTestProject>
<UseWindowsForms>false</UseWindowsForms>
<ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
Expand Down Expand Up @@ -49,6 +57,7 @@
<ItemGroup Label="Links">
<Compile Include="..\Solution Items\AssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
<None Include="..\Solution Items\Key.snk" Link="Key.snk" />
<None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="\" />
</ItemGroup>

</Project>
Expand Down
6 changes: 3 additions & 3 deletions src/JsonCompactColumnizer/JsonCompactColumnizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
<ProjectReference Include="..\JsonColumnizer\JsonColumnizer.csproj" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
<ProjectReference Include="..\JsonColumnizer\JsonColumnizer.csproj" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions src/LogExpert.Core/Config/Preferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ public class Preferences

public string DefaultEncoding { get; set; }

public string DefaultLanguage { get; set; }

public bool FilterSync { get; set; } = true;

public bool FilterTail { get; set; } = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace LogExpert.Core.EventArguments;

public class GuiStateArgs : System.EventArgs
public class GuiStateEventArgs : EventArgs
{
#region Properties

Expand Down
9 changes: 9 additions & 0 deletions src/LogExpert.Resources/LogExpert.Resources.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
</ItemGroup>

<ItemGroup>
<Compile Update="Resources.de.Designer.cs">
<DependentUpon>Resources.de.resx</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand All @@ -31,6 +36,10 @@
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources.de.resx">
<LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Expand Down
Loading
Loading