diff --git a/src/GuiApp/FileTime.Avalonia/App.axaml b/src/GuiApp/FileTime.Avalonia/App.axaml index ee6a840..2c1b90d 100644 --- a/src/GuiApp/FileTime.Avalonia/App.axaml +++ b/src/GuiApp/FileTime.Avalonia/App.axaml @@ -22,7 +22,8 @@ #b58900 #93a1a1 - #268bd2 + #268bd2 + #fdf6e3 #7793a1a1 #93a1a1 #073642 @@ -38,6 +39,13 @@ + + + + + + + + x:Key="AccentBrush" + Color="{DynamicResource AccentColor}" /> + diff --git a/src/GuiApp/FileTime.Avalonia/Configuration/MainConfiguration.cs b/src/GuiApp/FileTime.Avalonia/Configuration/MainConfiguration.cs index 3f9bc76..85ef45e 100644 --- a/src/GuiApp/FileTime.Avalonia/Configuration/MainConfiguration.cs +++ b/src/GuiApp/FileTime.Avalonia/Configuration/MainConfiguration.cs @@ -103,7 +103,7 @@ namespace FileTime.Avalonia.Configuration { var editorPrograms = new List() { - new ProgramConfiguration(@"c:\Program Files\Notepad++\notepad++1.exe"), + new ProgramConfiguration(@"c:\Program Files\Notepad++\notepad++.exe"), new ProgramConfiguration("notepad.exe"), }; diff --git a/src/GuiApp/FileTime.Avalonia/Converters/NamePartShrinkerConverter.cs b/src/GuiApp/FileTime.Avalonia/Converters/NamePartShrinkerConverter.cs index 7b16f3b..2c17e73 100644 --- a/src/GuiApp/FileTime.Avalonia/Converters/NamePartShrinkerConverter.cs +++ b/src/GuiApp/FileTime.Avalonia/Converters/NamePartShrinkerConverter.cs @@ -6,7 +6,6 @@ using Avalonia.Data.Converters; using Avalonia.Media; using FileTime.Avalonia.Models; using FileTime.Avalonia.ViewModels; -using FileTime.Avalonia.Views; namespace FileTime.Avalonia.Converters { @@ -17,11 +16,11 @@ namespace FileTime.Avalonia.Converters { if (values.Count > 0 && values[0] is IList nameParts) { + var attributeWidth = values[2] is bool b && b ? 340 : 0; var newNameParts = nameParts; - //if (values.Count > 1 && values[1] is ItemView itemView && itemView.ShowAttributes && itemView.Bounds.Width > 0) if (values.Count > 1 && values[1] is double width && width > 0) { - newNameParts = GetNamePartsForWidth(nameParts, width - 340); + newNameParts = GetNamePartsForWidth(nameParts, width - attributeWidth); } return newNameParts.Select(p => new ItemNamePartViewModel(p.Text, p.IsSpecial ? TextDecorations.Underline : null)).ToList(); diff --git a/src/GuiApp/FileTime.Avalonia/Services/CommandHandlerService.cs b/src/GuiApp/FileTime.Avalonia/Services/CommandHandlerService.cs index 10b846f..12a3aac 100644 --- a/src/GuiApp/FileTime.Avalonia/Services/CommandHandlerService.cs +++ b/src/GuiApp/FileTime.Avalonia/Services/CommandHandlerService.cs @@ -783,6 +783,7 @@ namespace FileTime.Avalonia.Services var getNext = false; while (true) { + string? execPath = null; try { var editorProgram = _programsService.GetEditorProgram(getNext); @@ -792,6 +793,7 @@ namespace FileTime.Avalonia.Services } else if (editorProgram.Path is string executablePath) { + execPath = executablePath; if (string.IsNullOrWhiteSpace(editorProgram.Arguments)) { Process.Start(executablePath, "\"" + filePath + "\""); @@ -808,7 +810,7 @@ namespace FileTime.Avalonia.Services } catch (System.ComponentModel.Win32Exception e) { - _logger.LogError(e, "Error while running editor program, possible the executable path does not exists."); + _logger.LogError(e, "Error while running editor program, possible the executable path does not exists. {0}", execPath); } catch (Exception e) { diff --git a/src/GuiApp/FileTime.Avalonia/Views/ItemView.axaml b/src/GuiApp/FileTime.Avalonia/Views/ItemView.axaml index 22d3f40..b39c726 100644 --- a/src/GuiApp/FileTime.Avalonia/Views/ItemView.axaml +++ b/src/GuiApp/FileTime.Avalonia/Views/ItemView.axaml @@ -9,7 +9,7 @@ HorizontalContentAlignment="Stretch" HorizontalAlignment="Stretch" Background="{Binding ViewMode,Converter={StaticResource ItemViewModeToBackgroundConverter}}"> - +