Merge branch 'master' into feature/resx

Author: ennerperez

.editorconfig

@@ -26,6 +26,8 @@ Opensouce Git GUI client.
  * Revision Diffs
 * GitFlow support
 
+> **Linux** only tested on **Ubuntu 22.04** on **X11**.
+
 ## How to use
 
 **To use this tool, you need to install Git first.**
@@ -43,7 +45,7 @@ For **macOS** users:
 For **Linux** users:
 
 * `xdg-open` must be installed to support open native file manager.
-* Only tested on `Ubuntu 22.04`.
+* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI. 
 
 ## Screen Shots
 
@@ -55,12 +57,10 @@ For **Linux** users:
 
 ![Theme Light](./screenshots/theme_light.png)
 
-## Thanks
+## Contributing
+
+Thanks to all the people who contribute.
 
-* [gigi81](https://github.com/gigi81) Github actions integration
-* [kekekeks](https://github.com/kekekeks) Way to stage/unstage/discard selected changes in a file.
-* [XiaoLinger](https://gitee.com/LingerNN) Hotkey: `CTRL + Enter` to commit
-* [carterl](https://gitee.com/carterl) Supports Windows Terminal; Rewrite way to find git executable
-* [PUMA](https://gitee.com/whgfu) Configure for default user
-* [Rwing](https://gitee.com/rwing) GitFlow: add an option to keep branch after finish
-* [XiaoLinger](https://gitee.com/LingerNN) Fix localizations in popup panel
+<a href="https://github.com/sourcegit-scm/sourcegit/graphs/contributors">
+ <img src="https://contrib.rocks/image?repo=sourcegit-scm/sourcegit" />
+</a>

README.md

@@ -1,3 +1,12 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -6,22 +15,21 @@
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
 using Avalonia.Styling;
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
 
-namespace SourceGit {
- public partial class App : Application {
+namespace SourceGit
+{
+ public partial class App : Application
+ {
 
  [STAThread]
- public static void Main(string[] args) {
- try {
+ public static void Main(string[] args)
+ {
+ try
+ {
  BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
- } catch (Exception ex) {
+ }
+ catch (Exception ex)
+ {
  var builder = new StringBuilder();
  builder.Append("Crash: ");
  builder.Append(ex.Message);
@@ -39,40 +47,48 @@ public static void Main(string[] args) {
  "SourceGit",
  $"crash_{time}.log");
  File.WriteAllText(file, builder.ToString());
- } 
+ }
  }
 
- public static AppBuilder BuildAvaloniaApp() {
+ public static AppBuilder BuildAvaloniaApp()
+ {
  var builder = AppBuilder.Configure<App>();
  builder.UsePlatformDetect();
  builder.LogToTrace();
- builder.ConfigureFonts(manager => {
+ builder.ConfigureFonts(manager =>
+ {
  var monospace = new EmbeddedFontCollection(
  new Uri("fonts:SourceGit", UriKind.Absolute),
  new Uri("avares://SourceGit/Resources/Fonts", UriKind.Absolute));
  manager.AddFontCollection(monospace);
  });
 
- Native.OS.SetupFonts(builder);
+ Native.OS.SetupApp(builder);
  return builder;
  }
 
- public static void RaiseException(string context, string message) {
- if (Current is App app && app._notificationReceiver != null) {
+ public static void RaiseException(string context, string message)
+ {
+ if (Current is App app && app._notificationReceiver != null)
+ {
  var notice = new Models.Notification() { IsError = true, Message = message };
  app._notificationReceiver.OnReceiveNotification(context, notice);
  }
  }
 
- public static void SendNotification(string context, string message) {
- if (Current is App app && app._notificationReceiver != null) {
+ public static void SendNotification(string context, string message)
+ {
+ if (Current is App app && app._notificationReceiver != null)
+ {
  var notice = new Models.Notification() { IsError = false, Message = message };
  app._notificationReceiver.OnReceiveNotification(context, notice);
  }
  }
 
- public static void SetLocale(string localeKey) {
+ public static void SetLocale(string localeKey)
+ {
  var app = Current as App;
+
  localeKey = localeKey.Replace("_", "-");
 
  Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(localeKey);
@@ -92,39 +108,51 @@ public static void SetLocale(string localeKey) {
  return;
  }
 
- if (app._activeLocale != null) {
+ if (app._activeLocale != null)
+ {
  app.Resources.MergedDictionaries.Remove(app._activeLocale);
  }
 
  app.Resources.MergedDictionaries.Add(targetLocale);
  app._activeLocale = targetLocale;
  }
 
- public static void SetTheme(string theme) {
- if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase)) {
+ public static void SetTheme(string theme)
+ {
+ if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
+ {
  Current.RequestedThemeVariant = ThemeVariant.Light;
- } else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) {
+ }
+ else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
+ {
  Current.RequestedThemeVariant = ThemeVariant.Dark;
- } else {
+ }
+ else
+ {
  Current.RequestedThemeVariant = ThemeVariant.Default;
  }
  }
 
- public static async void CopyText(string data) {
- if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
- if (desktop.MainWindow.Clipboard is { } clipbord) {
+ public static async void CopyText(string data)
+ {
+ if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
+ if (desktop.MainWindow.Clipboard is { } clipbord)
+ {
  await clipbord.SetTextAsync(data);
  }
  }
  }
 
- public static string Text(string key, params object[] args) {
+ public static string Text(string key, params object[] args)
+ {
  var fmt = Current.FindResource($"Text.{key}") as string;
  if (string.IsNullOrWhiteSpace(fmt)) return $"Text.{key}";
  return string.Format(fmt, args);
  }
 
- public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) {
+ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
+ {
  var icon = new Avalonia.Controls.Shapes.Path();
  icon.Width = 12;
  icon.Height = 12;
@@ -133,29 +161,36 @@ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) {
  return icon;
  }
 
- public static TopLevel GetTopLevel() {
- if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
+ public static TopLevel GetTopLevel()
+ {
+ if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
  return desktop.MainWindow;
  }
  return null;
  }
 
- public static void Quit() {
- if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
+ public static void Quit()
+ {
+ if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
  desktop.MainWindow.Close();
  desktop.Shutdown();
  }
  }
 
- public override void Initialize() {
+ public override void Initialize()
+ {
  AvaloniaXamlLoader.Load(this);
 
  SetLocale(ViewModels.Preference.Instance.Locale);
  SetTheme(ViewModels.Preference.Instance.Theme);
  }
 
- public override void OnFrameworkInitializationCompleted() {
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
+ public override void OnFrameworkInitializationCompleted()
+ {
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
  BindingPlugins.DataValidators.RemoveAt(0);
 
  var launcher = new Views.Launcher();

src/App.axaml.cs

@@ -1,18 +1,25 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SourceGit.Commands {
- public class Add : Command {
- public Add(string repo, List<Models.Change> changes = null) {
+namespace SourceGit.Commands
+{
+ public class Add : Command
+ {
+ public Add(string repo, List<Models.Change> changes = null)
+ {
  WorkingDirectory = repo;
  Context = repo;
 
- if (changes == null || changes.Count == 0) {
+ if (changes == null || changes.Count == 0)
+ {
  Args = "add .";
- } else {
+ }
+ else
+ {
  var builder = new StringBuilder();
  builder.Append("add --");
- foreach (var c in changes) {
+ foreach (var c in changes)
+ {
  builder.Append(" \"");
  builder.Append(c.Path);
  builder.Append("\"");
@@ -21,4 +28,4 @@ public Add(string repo, List<Models.Change> changes = null) {
  }
  }
  }
-}
+}

src/Commands/Add.cs

@@ -1,6 +1,9 @@
-namespace SourceGit.Commands {
- public class Apply : Command {
- public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, string extra) {
+namespace SourceGit.Commands
+{
+ public class Apply : Command
+ {
+ public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, string extra)
+ {
  WorkingDirectory = repo;
  Context = repo;
  Args = "apply ";
@@ -10,4 +13,4 @@ public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceM
  Args += $"\"{file}\"";
  }
  }
-}
+}

src/Commands/Apply.cs

@@ -1,19 +1,23 @@
 using System;
 
-namespace SourceGit.Commands {
- public class Archive : Command {
- public Archive(string repo, string revision, string saveTo, Action<string> outputHandler) {
+namespace SourceGit.Commands
+{
+ public class Archive : Command
+ {
+ public Archive(string repo, string revision, string saveTo, Action<string> outputHandler)
+ {
  WorkingDirectory = repo;
  Context = repo;
  Args = $"archive --format=zip --verbose --output=\"{saveTo}\" {revision}";
  TraitErrorAsOutput = true;
  _outputHandler = outputHandler;
  }
 
- protected override void OnReadline(string line) {
+ protected override void OnReadline(string line)
+ {
  _outputHandler?.Invoke(line);
  }
 
- private Action<string> _outputHandler;
+ private readonly Action<string> _outputHandler;
  }
-}
+}