diff --git a/src/PicView.Avalonia/Converters/IndexBiggerThanBooleanConverter.cs b/src/PicView.Avalonia/Converters/IndexBiggerThanBooleanConverter.cs new file mode 100644 index 000000000..682f2a78c --- /dev/null +++ b/src/PicView.Avalonia/Converters/IndexBiggerThanBooleanConverter.cs @@ -0,0 +1,23 @@ +using System.Globalization; +using Avalonia.Data; +using Avalonia.Data.Converters; + +namespace PicView.Avalonia.Converters; + +public class IndexBiggerThanBooleanConverter: IValueConverter +{ + public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) + { + if (!int.TryParse(value?.ToString(), out var index) || !int.TryParse(parameter?.ToString(), out var parameterIndex)) + { + return BindingOperations.DoNothing; + } + return index >= parameterIndex; + } + + public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) + { + + return BindingOperations.DoNothing; + } +} diff --git a/src/PicView.Avalonia/PicViewTheme/Controls/ProgressBar.axaml b/src/PicView.Avalonia/PicViewTheme/Controls/ProgressBar.axaml new file mode 100644 index 000000000..ff29f557a --- /dev/null +++ b/src/PicView.Avalonia/PicViewTheme/Controls/ProgressBar.axaml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/PicView.Avalonia/PicViewTheme/Icons.axaml b/src/PicView.Avalonia/PicViewTheme/Icons.axaml index 7888c1f86..1847e93ba 100644 --- a/src/PicView.Avalonia/PicViewTheme/Icons.axaml +++ b/src/PicView.Avalonia/PicViewTheme/Icons.axaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> M448 384H256c-35.3 0-64-28.7-64-64V64c0-35.3 28.7-64 64-64H396.1c12.7 0 24.9 5.1 33.9 14.1l67.9 67.9c9 9 14.1 21.2 14.1 33.9V320c0 35.3-28.7 64-64 64zM64 128h96v48H64c-8.8 0-16 7.2-16 16V448c0 8.8 7.2 16 16 16H256c8.8 0 16-7.2 16-16V416h48v32c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V192c0-35.3 28.7-64 64-64z M384 336H192c-8.8 0-16-7.2-16-16V64c0-8.8 7.2-16 16-16l140.1 0L400 115.9V320c0 8.8-7.2 16-16 16zM192 384H384c35.3 0 64-28.7 64-64V115.9c0-12.7-5.1-24.9-14.1-33.9L366.1 14.1c-9-9-21.2-14.1-33.9-14.1H192c-35.3 0-64 28.7-64 64V320c0 35.3 28.7 64 64 64zM64 128c-35.3 0-64 28.7-64 64V448c0 35.3 28.7 64 64 64H256c35.3 0 64-28.7 64-64V416H272v32c0 8.8-7.2 16-16 16H64c-8.8 0-16-7.2-16-16V192c0-8.8 7.2-16 16-16H96V128H64z - M384 480h48c11.4 0 21.9-6 27.6-15.9l112-192c5.8-9.9 5.8-22.1 .1-32.1S555.5 224 544 224H144c-11.4 0-21.9 6-27.6 15.9L48 357.1V96c0-8.8 7.2-16 16-16H181.5c4.2 0 8.3 1.7 11.3 4.7l26.5 26.5c21 21 49.5 32.8 79.2 32.8H416c8.8 0 16 7.2 16 16v32h48V160c0-35.3-28.7-64-64-64H298.5c-17 0-33.3-6.7-45.3-18.7L226.7 50.7c-12-12-28.3-18.7-45.3-18.7H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H87.7 384z + M30.718,23.404l0.007-19.877c-0.003-0.611-0.499-1.107-1.109-1.107H15.597 c-0.433-0.01-0.771-0.807-0.771-1.111V1.182c0-0.648-0.528-1.182-1.18-1.182h-7.46C5.535,0,5.008,0.533,5.008,1.182v0.127 c0,0.309-0.341,1.117-0.784,1.117h0.013c-0.604,0.008-1.094,0.5-1.094,1.105l0.005,5.754H0.763c0,0-1.056-0.057-0.683,1.199 l2.516,12.92c0,0.65,0.453,1.176,1.104,1.176h26.474C30.824,24.58,30.718,23.404,30.718,23.404z M29.359,10.949l-0.014,12.975 l-2.502-13.908c-0.212-0.764-1.075-0.711-1.075-0.711H4.51V4.891h24.85V10.949z M393.87 190a32.1 32.1 0 01-45.25 0l-26.57-26.57a32.09 32.09 0 010-45.26L382.19 58a1 1 0 00-.3-1.64c-38.82-16.64-89.15-8.16-121.11 23.57-30.58 30.35-32.32 76-21.12 115.84a31.93 31.93 0 01-9.06 32.08L64 380a48.17 48.17 0 1068 68l153.86-167a31.93 31.93 0 0131.6-9.13c39.54 10.59 84.54 8.6 114.72-21.19 32.49-32 39.5-88.56 23.75-120.93a1 1 0 00-1.6-.26 @@ -1010,4 +1010,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/PicView.Avalonia/PicViewTheme/Index.axaml b/src/PicView.Avalonia/PicViewTheme/Index.axaml index 60f5ec1de..b112688c1 100644 --- a/src/PicView.Avalonia/PicViewTheme/Index.axaml +++ b/src/PicView.Avalonia/PicViewTheme/Index.axaml @@ -18,6 +18,7 @@ + diff --git a/src/PicView.Avalonia/StartUp/StartUpHelper.cs b/src/PicView.Avalonia/StartUp/StartUpHelper.cs index bb93858c7..67f94fbef 100644 --- a/src/PicView.Avalonia/StartUp/StartUpHelper.cs +++ b/src/PicView.Avalonia/StartUp/StartUpHelper.cs @@ -93,17 +93,11 @@ public static void Start(MainViewModel vm, bool settingsExists, IClassicDesktopS HandleNormalWindow(vm, window); } } - UIHelper.SetControls(desktop); - + UIHelper.SetControls(desktop); HandleWindowControlSettings(vm, desktop); - ValidateGallerySettings(vm, settingsExists); - - - SetWindowEventHandlers(window); - UIHelper.AddMenus(); Application.Current.Name = "PicView"; diff --git a/src/PicView.Avalonia/ViewModels/MainViewModel.cs b/src/PicView.Avalonia/ViewModels/MainViewModel.cs index bb43a55de..c12b76e96 100644 --- a/src/PicView.Avalonia/ViewModels/MainViewModel.cs +++ b/src/PicView.Avalonia/ViewModels/MainViewModel.cs @@ -31,170 +31,131 @@ public class MainViewModel : ViewModelBase public readonly IPlatformSpecificService? PlatformService; #region Image - - private object? _imageSource; - + public object? ImageSource { - get => _imageSource; - set => this.RaiseAndSetIfChanged(ref _imageSource, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private object? _secondaryImageSource; - + public object? SecondaryImageSource { - get => _secondaryImageSource; - set => this.RaiseAndSetIfChanged(ref _secondaryImageSource, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private ImageType _imageType; - + public ImageType ImageType { - get => _imageType; - set => this.RaiseAndSetIfChanged(ref _imageType, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private double _imageWidth; public double ImageWidth { - get => _imageWidth; - set => this.RaiseAndSetIfChanged(ref _imageWidth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _imageHeight; - public double ImageHeight { - get => _imageHeight; - set => this.RaiseAndSetIfChanged(ref _imageHeight, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private double _imageSecondaryWidth; - + public double SecondaryImageWidth { - get => _imageSecondaryWidth; - set => this.RaiseAndSetIfChanged(ref _imageSecondaryWidth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private Brush? _imageBackground; - public Brush? ImageBackground { - get => _imageBackground; - set => this.RaiseAndSetIfChanged(ref _imageBackground, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isShowingSideBySide = SettingsHelper.Settings.ImageScaling.ShowImageSideBySide; - public bool IsShowingSideBySide { - get => _isShowingSideBySide; - set => this.RaiseAndSetIfChanged(ref _isShowingSideBySide, value); - } + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.ImageScaling.ShowImageSideBySide; - private double _scrollViewerWidth = double.NaN; - public double ScrollViewerWidth { - get => _scrollViewerWidth; - set => this.RaiseAndSetIfChanged(ref _scrollViewerWidth, value); - } - - private double _scrollViewerHeight = double.NaN; - + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = double.NaN; + public double ScrollViewerHeight { - get => _scrollViewerHeight; - set => this.RaiseAndSetIfChanged(ref _scrollViewerHeight, value); - } - - + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = double.NaN; + #endregion #region Gallery - - private Thickness _galleryMargin; public Thickness GalleryMargin { - get => _galleryMargin; - set => this.RaiseAndSetIfChanged(ref _galleryMargin, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isGalleryShown = SettingsHelper.Settings.UIProperties.ShowInterface && SettingsHelper.Settings.Gallery.IsBottomGalleryShown; public bool IsGalleryShown { - get => _isGalleryShown; - set => this.RaiseAndSetIfChanged(ref _isGalleryShown, value); - } - - private bool _isBottomGalleryShownInHiddenUi = SettingsHelper.Settings.Gallery.ShowBottomGalleryInHiddenUI; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.ShowInterface && SettingsHelper.Settings.Gallery.IsBottomGalleryShown; public bool IsBottomGalleryShownInHiddenUI { - get => _isBottomGalleryShownInHiddenUi; - set => this.RaiseAndSetIfChanged(ref _isBottomGalleryShownInHiddenUi, value); - } - - private GalleryMode _galleryMode = GalleryMode.Closed; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.Gallery.ShowBottomGalleryInHiddenUI; public GalleryMode GalleryMode { - get => _galleryMode; - set => this.RaiseAndSetIfChanged(ref _galleryMode, value); - } - - private Stretch _galleryStretch; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = GalleryMode.Closed; public Stretch GalleryStretch { - get => _galleryStretch; - set => this.RaiseAndSetIfChanged(ref _galleryStretch, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private int _selectedGalleryItemIndex; public int SelectedGalleryItemIndex { - get => _selectedGalleryItemIndex; - set => this.RaiseAndSetIfChanged(ref _selectedGalleryItemIndex, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private VerticalAlignment _galleryVerticalAlignment = VerticalAlignment.Bottom; - public VerticalAlignment GalleryVerticalAlignment { - get => _galleryVerticalAlignment; - set => this.RaiseAndSetIfChanged(ref _galleryVerticalAlignment, value); - } - - private Orientation _galleryOrientation; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = VerticalAlignment.Bottom; public Orientation GalleryOrientation { - set => this.RaiseAndSetIfChanged(ref _galleryOrientation, value); - get => _galleryOrientation; + set => this.RaiseAndSetIfChanged(ref field, value); + get; } - private bool _isGalleryCloseIconVisible; - public bool IsGalleryCloseIconVisible { - get => _isGalleryCloseIconVisible; - set => this.RaiseAndSetIfChanged(ref _isGalleryCloseIconVisible, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private double _galleryWidth; + public double GalleryWidth { - get => _galleryWidth; - set => this.RaiseAndSetIfChanged(ref _galleryWidth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } + public double GalleryHeight { get @@ -216,37 +177,30 @@ public double GalleryHeight } } - private double _getGalleryItemWidth = double.NaN; - public double GetGalleryItemWidth { - get => _getGalleryItemWidth; - set => this.RaiseAndSetIfChanged(ref _getGalleryItemWidth, value); - } - - private double _getGalleryItemHeight; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = double.NaN; + public double GetGalleryItemHeight { - get => _getGalleryItemHeight; - set => this.RaiseAndSetIfChanged(ref _getGalleryItemHeight, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _getFullGalleryItemHeight = SettingsHelper.Settings.Gallery.ExpandedGalleryItemSize; - public double GetFullGalleryItemHeight { - get => _getFullGalleryItemHeight; - set => this.RaiseAndSetIfChanged(ref _getFullGalleryItemHeight, value); - } - - private double _getBottomGalleryItemHeight = SettingsHelper.Settings.Gallery.BottomGalleryItemSize; - + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.Gallery.ExpandedGalleryItemSize; + public double GetBottomGalleryItemHeight { - get => _getBottomGalleryItemHeight; - set => this.RaiseAndSetIfChanged(ref _getBottomGalleryItemHeight, value); - } - + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.Gallery.BottomGalleryItemSize; + public double MaxFullGalleryItemHeight { get => GalleryDefaults.MaxFullGalleryItemHeight; @@ -265,142 +219,123 @@ public double MinBottomGalleryItemHeight { get => GalleryDefaults.MinBottomGalleryItemHeight; } - - private Thickness _galleryItemMargin; - + public Thickness GalleryItemMargin { - get => _galleryItemMargin; - set => this.RaiseAndSetIfChanged(ref _galleryItemMargin, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #region Gallery Stretch IsChecked - - private bool _isUniformBottomChecked; + public bool IsUniformBottomChecked { - get => _isUniformBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isUniformFullChecked; + public bool IsUniformFullChecked { - get => _isUniformFullChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isUniformMenuChecked; public bool IsUniformMenuChecked { - get => _isUniformMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isUniformToFillBottomChecked; + public bool IsUniformToFillBottomChecked { - get => _isUniformToFillBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformToFillBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isUniformToFillFullChecked; + public bool IsUniformToFillFullChecked { - get => _isUniformToFillFullChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformToFillFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isUniformToFillMenuMenuChecked; public bool IsUniformToFillMenuChecked { - get => _isUniformToFillMenuMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isUniformToFillMenuMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isFillBottomChecked; + public bool IsFillBottomChecked { - get => _isFillBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isFillBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isFillFullChecked; + public bool IsFillFullChecked { - get => _isFillFullChecked; - set => this.RaiseAndSetIfChanged(ref _isFillFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isFillMenuMenuChecked; public bool IsFillMenuChecked { - get => _isFillMenuMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isFillMenuMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isNoneBottomChecked; + public bool IsNoneBottomChecked { - get => _isNoneBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isNoneBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isNoneFullChecked; + public bool IsNoneFullChecked { - get => _isNoneFullChecked; - set => this.RaiseAndSetIfChanged(ref _isNoneFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isNoneMenuChecked; public bool IsNoneMenuChecked { - get => _isNoneMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isNoneMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isSquareBottomChecked; + public bool IsSquareBottomChecked { - get => _isSquareBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isSquareBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isSquareFullChecked; + public bool IsSquareFullChecked { - get => _isSquareFullChecked; - set => this.RaiseAndSetIfChanged(ref _isSquareFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isSquareMenuChecked; public bool IsSquareMenuChecked { - get => _isSquareMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isSquareMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isFillSquareBottomChecked; + public bool IsFillSquareBottomChecked { - get => _isFillSquareBottomChecked; - set => this.RaiseAndSetIfChanged(ref _isFillSquareBottomChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isFillSquareFullChecked; + public bool IsFillSquareFullChecked { - get => _isFillSquareFullChecked; - set => this.RaiseAndSetIfChanged(ref _isFillSquareFullChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isFillSquareMenuChecked; public bool IsFillSquareMenuChecked { - get => _isFillSquareMenuChecked; - set => this.RaiseAndSetIfChanged(ref _isFillSquareMenuChecked, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } + #endregion #endregion Gallery @@ -532,180 +467,142 @@ public bool IsFillSquareMenuChecked #region Fields #region Booleans - - private bool _isAvoidingZoomingOut = SettingsHelper.Settings.Zoom.AvoidZoomingOut; - + public bool IsAvoidingZoomingOut { - get => _isAvoidingZoomingOut; + get; set { SettingsHelper.Settings.Zoom.AvoidZoomingOut = value; - this.RaiseAndSetIfChanged(ref _isAvoidingZoomingOut, value); - } - } - - private IImage? _changeCtrlZoomImage; + this.RaiseAndSetIfChanged(ref field, value); + } + } = SettingsHelper.Settings.Zoom.AvoidZoomingOut; public IImage? ChangeCtrlZoomImage { - get => _changeCtrlZoomImage; - set => this.RaiseAndSetIfChanged(ref _changeCtrlZoomImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isLoading; - public bool IsLoading { - get => _isLoading; - set => this.RaiseAndSetIfChanged(ref _isLoading, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isUIShown = SettingsHelper.Settings.UIProperties.ShowInterface; - public bool IsUIShown { - get => _isUIShown; - set => this.RaiseAndSetIfChanged(ref _isUIShown, value); - } - - private bool _isTopToolbarShown = SettingsHelper.Settings.UIProperties.ShowInterface; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.ShowInterface; public bool IsTopToolbarShown { - get => _isTopToolbarShown; - set => this.RaiseAndSetIfChanged(ref _isTopToolbarShown, value); - } - - private bool _isBottomToolbarShown = SettingsHelper.Settings.UIProperties.ShowBottomNavBar && - SettingsHelper.Settings.UIProperties.ShowInterface; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.ShowInterface; public bool IsBottomToolbarShown { - get => _isBottomToolbarShown; - set => this.RaiseAndSetIfChanged(ref _isBottomToolbarShown, value); - } - - private bool _isBottomToolbarShownSetting = SettingsHelper.Settings.UIProperties.ShowBottomNavBar; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.ShowBottomNavBar && + SettingsHelper.Settings.UIProperties.ShowInterface; public bool IsBottomToolbarShownSetting { - get => _isBottomToolbarShownSetting; - set => this.RaiseAndSetIfChanged(ref _isBottomToolbarShownSetting, value); - } - - private bool _isShowingTaskbarProgress = SettingsHelper.Settings.UIProperties.IsTaskbarProgressEnabled; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.ShowBottomNavBar; public bool IsShowingTaskbarProgress { - get => _isShowingTaskbarProgress; - set => this.RaiseAndSetIfChanged(ref _isShowingTaskbarProgress, value); - } - - private bool _isFullscreen = SettingsHelper.Settings.WindowProperties.Fullscreen; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.IsTaskbarProgressEnabled; public bool IsFullscreen { - get => _isFullscreen; - set => this.RaiseAndSetIfChanged(ref _isFullscreen, value); - } - - private bool _isTopMost = SettingsHelper.Settings.WindowProperties.TopMost; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.WindowProperties.Fullscreen; public bool IsTopMost { - get => _isTopMost; - set => this.RaiseAndSetIfChanged(ref _isTopMost, value); - } - - private bool _isIncludingSubdirectories = SettingsHelper.Settings.Sorting.IncludeSubDirectories; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.WindowProperties.TopMost; public bool IsIncludingSubdirectories { - get => _isIncludingSubdirectories; - set => this.RaiseAndSetIfChanged(ref _isIncludingSubdirectories, value); - } - - private bool _isScrollingEnabled; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.Sorting.IncludeSubDirectories; public bool IsScrollingEnabled { - get => _isScrollingEnabled; - set => this.RaiseAndSetIfChanged(ref _isScrollingEnabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isStretched = SettingsHelper.Settings.ImageScaling.StretchImage; - public bool IsStretched { - get => _isStretched; + get; set { - this.RaiseAndSetIfChanged(ref _isStretched, value); + this.RaiseAndSetIfChanged(ref field, value); SettingsHelper.Settings.ImageScaling.StretchImage = value; WindowResizing.SetSize(this); } - } - - private bool _isLooping = SettingsHelper.Settings.UIProperties.Looping; + } = SettingsHelper.Settings.ImageScaling.StretchImage; public bool IsLooping { - get => _isLooping; - set => this.RaiseAndSetIfChanged(ref _isLooping, value); - } - - private bool _isAutoFit = SettingsHelper.Settings.WindowProperties.AutoFit; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.UIProperties.Looping; public bool IsAutoFit { - get => _isAutoFit; - set => this.RaiseAndSetIfChanged(ref _isAutoFit, value); - } - - private bool _isStayingCentered = SettingsHelper.Settings.WindowProperties.KeepCentered; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.WindowProperties.AutoFit; public bool IsStayingCentered { - get => _isStayingCentered; + get; set { - this.RaiseAndSetIfChanged(ref _isStayingCentered, value); + this.RaiseAndSetIfChanged(ref field, value); SettingsHelper.Settings.WindowProperties.KeepCentered = value; } - } - - private bool _isOpeningInSameWindow = SettingsHelper.Settings.UIProperties.OpenInSameWindow; + } = SettingsHelper.Settings.WindowProperties.KeepCentered; public bool IsOpeningInSameWindow { - get => _isOpeningInSameWindow; + get; set { - this.RaiseAndSetIfChanged(ref _isOpeningInSameWindow, value); + this.RaiseAndSetIfChanged(ref field, value); SettingsHelper.Settings.UIProperties.OpenInSameWindow = value; - } - } + } + } = SettingsHelper.Settings.UIProperties.OpenInSameWindow; - private bool _isEditableTitlebarOpen; - public bool IsEditableTitlebarOpen { - get => _isEditableTitlebarOpen; - set => this.RaiseAndSetIfChanged(ref _isEditableTitlebarOpen, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private bool _isUsingTouchpad = SettingsHelper.Settings.Zoom.IsUsingTouchPad; public bool IsUsingTouchpad { - get => _isUsingTouchpad; + get; set { - this.RaiseAndSetIfChanged(ref _isUsingTouchpad, value); + this.RaiseAndSetIfChanged(ref field, value); SettingsHelper.Settings.Zoom.IsUsingTouchPad = value; } - } + } = SettingsHelper.Settings.Zoom.IsUsingTouchPad; #endregion Booleans @@ -716,663 +613,514 @@ public double WindowMinSize return SizeDefaults.WindowMinSize; } } - - private double _titlebarHeight = SettingsHelper.Settings.WindowProperties.Fullscreen - || !SettingsHelper.Settings.UIProperties.ShowInterface ? 0 : SizeDefaults.TitlebarHeight; + public double TitlebarHeight { - set => this.RaiseAndSetIfChanged(ref _titlebarHeight, value); - get => _titlebarHeight; - } - private double _bottombarHeight = SettingsHelper.Settings.WindowProperties.Fullscreen - || !SettingsHelper.Settings.UIProperties.ShowInterface ? 0 : SizeDefaults.BottombarHeight; - public double BottombarHeight - { - set => this.RaiseAndSetIfChanged(ref _bottombarHeight, value); - get => _bottombarHeight; - } + set => this.RaiseAndSetIfChanged(ref field, value); + get; + } = SettingsHelper.Settings.WindowProperties.Fullscreen + || !SettingsHelper.Settings.UIProperties.ShowInterface + ? 0 + : SizeDefaults.TitlebarHeight; - private int _scaleX = 1; + public double BottombarHeight + { + set => this.RaiseAndSetIfChanged(ref field, value); + get; + } = SettingsHelper.Settings.WindowProperties.Fullscreen + || !SettingsHelper.Settings.UIProperties.ShowInterface + ? 0 + : SizeDefaults.BottombarHeight; // Used to flip the flip button public int ScaleX { - get => _scaleX; - set => this.RaiseAndSetIfChanged(ref _scaleX, value); - } - - private UserControl? _currentView; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = 1; public UserControl? CurrentView { - get => _currentView; - set => this.RaiseAndSetIfChanged(ref _currentView, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } public ImageViewer? ImageViewer; - private uint _exifRating; - public uint EXIFRating { - get => _exifRating; - set => this.RaiseAndSetIfChanged(ref _exifRating, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private int _getIndex; - public int GetIndex { - get => _getIndex; - set => this.RaiseAndSetIfChanged(ref _getIndex, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _getSlideshowSpeed = SettingsHelper.Settings.UIProperties.SlideShowTimer; - public double GetSlideshowSpeed { - get => _getSlideshowSpeed; + get; set { var roundedValue = Math.Round(value, 2); - this.RaiseAndSetIfChanged(ref _getSlideshowSpeed, roundedValue); + this.RaiseAndSetIfChanged(ref field, roundedValue); SettingsHelper.Settings.UIProperties.SlideShowTimer = roundedValue; } - } - - private double _getNavSpeed = SettingsHelper.Settings.UIProperties.NavSpeed; + } = SettingsHelper.Settings.UIProperties.SlideShowTimer; public double GetNavSpeed { - get => Math.Round(_getNavSpeed, 2); + get => Math.Round(field, 2); set { - this.RaiseAndSetIfChanged(ref _getNavSpeed, value); + this.RaiseAndSetIfChanged(ref field, value); SettingsHelper.Settings.UIProperties.NavSpeed = value; } - } - - private double _getZoomSpeed = SettingsHelper.Settings.Zoom.ZoomSpeed; + } = SettingsHelper.Settings.UIProperties.NavSpeed; public double GetZoomSpeed { - get => _getZoomSpeed; + get; set { var roundedValue = Math.Round(value, 2); - this.RaiseAndSetIfChanged(ref _getZoomSpeed, roundedValue); + this.RaiseAndSetIfChanged(ref field, roundedValue); SettingsHelper.Settings.Zoom.ZoomSpeed = roundedValue; } - } + } = SettingsHelper.Settings.Zoom.ZoomSpeed; #region strings - private string? _getIsShowingUITranslation; - public string? GetIsShowingUITranslation { - get => _getIsShowingUITranslation; - set => this.RaiseAndSetIfChanged(ref _getIsShowingUITranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _getIsShowingBottomToolbarTranslation; - + public string? GetIsShowingBottomToolbarTranslation { - get => _getIsShowingBottomToolbarTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsShowingBottomToolbarTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getIsShowingFadingUIButtonsTranslation; - public string? GetIsShowingFadingUIButtonsTranslation { - get => _getIsShowingFadingUIButtonsTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsShowingFadingUIButtonsTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _getIsUsingTouchpadTranslation; - + public string? GetIsUsingTouchpadTranslation { - get => _getIsUsingTouchpadTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsUsingTouchpadTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _getIsFlipped; public string? GetIsFlippedTranslation { get => ScaleX == -1 ? UnFlip : Flip; - set => this.RaiseAndSetIfChanged(ref _getIsFlipped, value); + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getIsShowingBottomGalleryTranslation; - public string? GetIsShowingBottomGalleryTranslation { - get => _getIsShowingBottomGalleryTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsShowingBottomGalleryTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getIsLoopingTranslation; - public string? GetIsLoopingTranslation { - get => _getIsLoopingTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsLoopingTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getIsScrollingTranslation; - public string? GetIsScrollingTranslation { - get => _getIsScrollingTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsScrollingTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getIsCtrlZoomTranslation; - public string? GetIsCtrlZoomTranslation { - get => _getIsCtrlZoomTranslation; - set => this.RaiseAndSetIfChanged(ref _getIsCtrlZoomTranslation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getPrintSizeInch; - public string? GetPrintSizeInch { - get => _getPrintSizeInch; - set => this.RaiseAndSetIfChanged(ref _getPrintSizeInch, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getPrintSizeCm; - public string? GetPrintSizeCm { - get => _getPrintSizeCm; - set => this.RaiseAndSetIfChanged(ref _getPrintSizeCm, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getSizeMp; - public string? GetSizeMp { - get => _getSizeMp; - set => this.RaiseAndSetIfChanged(ref _getSizeMp, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getResolution; - public string? GetResolution { - get => _getResolution; - set => this.RaiseAndSetIfChanged(ref _getResolution, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getBitDepth; - public string? GetBitDepth { - get => _getBitDepth; - set => this.RaiseAndSetIfChanged(ref _getBitDepth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getAspectRatio; - public string? GetAspectRatio { - get => _getAspectRatio; - set => this.RaiseAndSetIfChanged(ref _getAspectRatio, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getLatitude; - public string? GetLatitude { - get => _getLatitude; - set => this.RaiseAndSetIfChanged(ref _getLatitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getLongitude; - public string? GetLongitude { - get => _getLongitude; - set => this.RaiseAndSetIfChanged(ref _getLongitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getAltitude; - public string? GetAltitude { - get => _getAltitude; - set => this.RaiseAndSetIfChanged(ref _getAltitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _googleLink; - public string? GoogleLink { - get => _googleLink; - set => this.RaiseAndSetIfChanged(ref _googleLink, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _bingLink; - public string? BingLink { - get => _bingLink; - set => this.RaiseAndSetIfChanged(ref _bingLink, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getAuthors; - public string? GetAuthors { - get => _getAuthors; - set => this.RaiseAndSetIfChanged(ref _getAuthors, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getDateTaken; - public string? GetDateTaken { - get => _getDateTaken; - set => this.RaiseAndSetIfChanged(ref _getDateTaken, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getCopyright; - public string? GetCopyright { - get => _getCopyright; - set => this.RaiseAndSetIfChanged(ref _getCopyright, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getTitle; - public string? GetTitle { - get => _getTitle; - set => this.RaiseAndSetIfChanged(ref _getTitle, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getSubject; - public string? GetSubject { - get => _getSubject; - set => this.RaiseAndSetIfChanged(ref _getSubject, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getSoftware; - public string? GetSoftware { - get => _getSoftware; - set => this.RaiseAndSetIfChanged(ref _getSoftware, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getResolutionUnit; - public string? GetResolutionUnit { - get => _getResolutionUnit; - set => this.RaiseAndSetIfChanged(ref _getResolutionUnit, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getColorRepresentation; - public string? GetColorRepresentation { - get => _getColorRepresentation; - set => this.RaiseAndSetIfChanged(ref _getColorRepresentation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getCompression; - public string? GetCompression { - get => _getCompression; - set => this.RaiseAndSetIfChanged(ref _getCompression, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getCompressedBitsPixel; - public string? GetCompressedBitsPixel { - get => _getCompressedBitsPixel; - set => this.RaiseAndSetIfChanged(ref _getCompressedBitsPixel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getCameraMaker; - public string? GetCameraMaker { - get => _getCameraMaker; - set => this.RaiseAndSetIfChanged(ref _getCameraMaker, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getCameraModel; - public string? GetCameraModel { - get => _getCameraModel; - set => this.RaiseAndSetIfChanged(ref _getCameraModel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _GetExposureProgram; - public string? GetExposureProgram { - get => _GetExposureProgram; - set => this.RaiseAndSetIfChanged(ref _GetExposureProgram, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getExposureTime; - public string? GetExposureTime { - get => _getExposureTime; - set => this.RaiseAndSetIfChanged(ref _getExposureTime, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _GetExposureBias; - public string? GetExposureBias { - get => _GetExposureBias; - set => this.RaiseAndSetIfChanged(ref _GetExposureBias, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _GetFNumber; - public string? GetFNumber { - get => _GetFNumber; - set => this.RaiseAndSetIfChanged(ref _GetFNumber, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getMaxAperture; - public string? GetMaxAperture { - get => _getMaxAperture; - set => this.RaiseAndSetIfChanged(ref _getMaxAperture, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getDigitalZoom; - public string? GetDigitalZoom { - get => _getDigitalZoom; - set => this.RaiseAndSetIfChanged(ref _getDigitalZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getFocalLength35Mm; - public string? GetFocalLength35Mm { - get => _getFocalLength35Mm; - set => this.RaiseAndSetIfChanged(ref _getFocalLength35Mm, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getFocalLength; - public string? GetFocalLength { - get => _getFocalLength; - set => this.RaiseAndSetIfChanged(ref _getFocalLength, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getISOSpeed; - public string? GetISOSpeed { - get => _getISOSpeed; - set => this.RaiseAndSetIfChanged(ref _getISOSpeed, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getMeteringMode; - public string? GetMeteringMode { - get => _getMeteringMode; - set => this.RaiseAndSetIfChanged(ref _getMeteringMode, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getContrast; - public string? GetContrast { - get => _getContrast; - set => this.RaiseAndSetIfChanged(ref _getContrast, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getSaturation; - public string? GetSaturation { - get => _getSaturation; - set => this.RaiseAndSetIfChanged(ref _getSaturation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getSharpness; - public string? GetSharpness { - get => _getSharpness; - set => this.RaiseAndSetIfChanged(ref _getSharpness, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getWhiteBalance; - public string? GetWhiteBalance { - get => _getWhiteBalance; - set => this.RaiseAndSetIfChanged(ref _getWhiteBalance, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getFlashMode; - public string? GetFlashMode { - get => _getFlashMode; - set => this.RaiseAndSetIfChanged(ref _getFlashMode, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getFlashEnergy; - public string? GetFlashEnergy { - get => _getFlashEnergy; - set => this.RaiseAndSetIfChanged(ref _getFlashEnergy, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getLightSource; - public string? GetLightSource { - get => _getLightSource; - set => this.RaiseAndSetIfChanged(ref _getLightSource, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getBrightness; - public string? GetBrightness { - get => _getBrightness; - set => this.RaiseAndSetIfChanged(ref _getBrightness, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getPhotometricInterpretation; - public string? GetPhotometricInterpretation { - get => _getPhotometricInterpretation; - set => this.RaiseAndSetIfChanged(ref _getPhotometricInterpretation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getOrientation; - public string? GetOrientation { - get => _getOrientation; - set => this.RaiseAndSetIfChanged(ref _getOrientation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getExifVersion; - public string? GetExifVersion { - get => _getExifVersion; - set => this.RaiseAndSetIfChanged(ref _getExifVersion, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _GetLensModel; - public string? GetLensModel { - get => _GetLensModel; - set => this.RaiseAndSetIfChanged(ref _GetLensModel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _getLensMaker; - public string? GetLensMaker { - get => _getLensMaker; - set => this.RaiseAndSetIfChanged(ref _getLensMaker, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion strings #region Window Properties - private string? _title = "Loading..."; - public string? Title { - get => _title; - set => this.RaiseAndSetIfChanged(ref _title, value); - } - - private string? _titleTooltip = "Loading..."; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = "Loading..."; public string? TitleTooltip { - get => _titleTooltip; - set => this.RaiseAndSetIfChanged(ref _titleTooltip, value); - } - - private string? _windowTitle = "PicView"; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = "Loading..."; public string? WindowTitle { - get => _windowTitle; - set => this.RaiseAndSetIfChanged(ref _windowTitle, value); - } - - private SizeToContent _sizeToContent; + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = "PicView"; public SizeToContent SizeToContent { - get => _sizeToContent; - set => this.RaiseAndSetIfChanged(ref _sizeToContent, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _canResize; - public bool CanResize { - get => _canResize; - set => this.RaiseAndSetIfChanged(ref _canResize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isRotationAnimationEnabled; - public bool IsRotationAnimationEnabled { - get => _isRotationAnimationEnabled; - set => this.RaiseAndSetIfChanged(ref _isRotationAnimationEnabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion Window Properties #region Size - private double _titleMaxWidth; - public double TitleMaxWidth { - get => _titleMaxWidth; - set => this.RaiseAndSetIfChanged(ref _titleMaxWidth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - + #endregion Size #region Zoom - private double _rotationAngle; - public double RotationAngle { - get => _rotationAngle; - set => this.RaiseAndSetIfChanged(ref _rotationAngle, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _zoomValue; - public double ZoomValue { - get => _zoomValue; - set => this.RaiseAndSetIfChanged(ref _zoomValue, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private ScrollBarVisibility _toggleScrollBarVisibility; - public ScrollBarVisibility ToggleScrollBarVisibility { - get => _toggleScrollBarVisibility; - set => this.RaiseAndSetIfChanged(ref _toggleScrollBarVisibility, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion Zoom #region Menus - private bool _isFileMenuVisible; - public bool IsFileMenuVisible { - get => _isFileMenuVisible; - set => this.RaiseAndSetIfChanged(ref _isFileMenuVisible, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isImageMenuVisible; - public bool IsImageMenuVisible { - get => _isImageMenuVisible; - set => this.RaiseAndSetIfChanged(ref _isImageMenuVisible, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isSettingsMenuVisible; - public bool IsSettingsMenuVisible { - get => _isSettingsMenuVisible; - set => this.RaiseAndSetIfChanged(ref _isSettingsMenuVisible, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isToolsMenuVisible; - public bool IsToolsMenuVisible { - get => _isToolsMenuVisible; - set => this.RaiseAndSetIfChanged(ref _isToolsMenuVisible, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion Menus @@ -1389,21 +1137,17 @@ public bool IsToolsMenuVisible #region Sorting Order - private FileListHelper.SortFilesBy _sortOrder; - public FileListHelper.SortFilesBy SortOrder { - get => _sortOrder; - set => this.RaiseAndSetIfChanged(ref _sortOrder, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private bool _isAscending = SettingsHelper.Settings.Sorting.Ascending; - public bool IsAscending { - get => _isAscending; - set => this.RaiseAndSetIfChanged(ref _isAscending, value); - } + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } = SettingsHelper.Settings.Sorting.Ascending; #endregion Sorting Order diff --git a/src/PicView.Avalonia/ViewModels/ViewModelBase.cs b/src/PicView.Avalonia/ViewModels/ViewModelBase.cs index 173d26b54..30c4aa05a 100644 --- a/src/PicView.Avalonia/ViewModels/ViewModelBase.cs +++ b/src/PicView.Avalonia/ViewModels/ViewModelBase.cs @@ -245,1887 +245,1467 @@ public void UpdateLanguage() DisableFadeInButtonsOnHover = TranslationHelper.Translation.DisableFadeInButtonsOnHover; UsingTouchpad = TranslationHelper.Translation.UsingTouchpad; UsingMouse = TranslationHelper.Translation.UsingMouse; + SourceFolder = TranslationHelper.Translation.SourceFolder; + OutputFolder = TranslationHelper.Translation.OutputFolder; + GenerateThumbnails = TranslationHelper.Translation.GenerateThumbnails; + Lossless = TranslationHelper.Translation.Lossless; + Lossy = TranslationHelper.Translation.Lossy; + Start = TranslationHelper.Translation.Start; + Thumbnail = TranslationHelper.Translation.Thumbnail; } #region Strings - private string? _usingTouchpad; - - public string? UsingTouchpad + public string? Thumbnail { - get => _usingTouchpad; - set => this.RaiseAndSetIfChanged(ref _usingTouchpad, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _usingMouse; + public string? Start + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } - public string? UsingMouse + public string? Lossless { - get => _usingMouse; - set => this.RaiseAndSetIfChanged(ref _usingMouse, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showFadeInButtonsOnHover; + public string? Lossy + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + public string? GenerateThumbnails + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + + public string? SourceFolder + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + + public string? OutputFolder + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + + public string? UsingTouchpad + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + + public string? UsingMouse + { + get; + set => this.RaiseAndSetIfChanged(ref field, value); + } + public string? ShowFadeInButtonsOnHover { - get => _showFadeInButtonsOnHover; - set => this.RaiseAndSetIfChanged(ref _showFadeInButtonsOnHover, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _disableFadeInButtonsOnHover; - + public string? DisableFadeInButtonsOnHover { - get => _disableFadeInButtonsOnHover; - set => this.RaiseAndSetIfChanged(ref _disableFadeInButtonsOnHover, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _advanceBy10Images; - + public string? AdvanceBy10Images { - get => _advanceBy10Images; - set => this.RaiseAndSetIfChanged(ref _advanceBy10Images, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _advanceBy100Images; - + public string? AdvanceBy100Images { - get => _advanceBy100Images; - set => this.RaiseAndSetIfChanged(ref _advanceBy100Images, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _goBackBy10Images; - + public string? GoBackBy10Images { - get => _goBackBy10Images; - set => this.RaiseAndSetIfChanged(ref _goBackBy10Images, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _goBackBy100Images; - + public string? GoBackBy100Images { - get => _goBackBy100Images; - set => this.RaiseAndSetIfChanged(ref _goBackBy100Images, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _reset; - + public string? Reset { - get => _reset; - set => this.RaiseAndSetIfChanged(ref _reset, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _saveAs; - + public string? SaveAs { - get => _saveAs; - set => this.RaiseAndSetIfChanged(ref _saveAs, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _quality; - + public string? Quality { - get => _quality; - set => this.RaiseAndSetIfChanged(ref _quality, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _percentage; - + public string? Percentage { - get => _percentage; - set => this.RaiseAndSetIfChanged(ref _percentage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _pixels; - + public string? Pixels { - get => _pixels.FirstCharToUpper(); - set => this.RaiseAndSetIfChanged(ref _pixels, value); + get => field.FirstCharToUpper(); + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _fit; - + public string? Fit { - get => _fit; - set => this.RaiseAndSetIfChanged(ref _fit, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _tile; public string? Tile { - get => _tile; - set => this.RaiseAndSetIfChanged(ref _tile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _center; - public string? Center { - get => _center; - set => this.RaiseAndSetIfChanged(ref _center, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _hideBottomToolbar; - + public string? HideBottomToolbar { - get => _hideBottomToolbar; - set => this.RaiseAndSetIfChanged(ref _hideBottomToolbar, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _changingThemeRequiresRestart; - + public string? ChangingThemeRequiresRestart { - get => _changingThemeRequiresRestart; - set => this.RaiseAndSetIfChanged(ref _changingThemeRequiresRestart, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _glassTheme; - + public string? GlassTheme { - get => _glassTheme; - set => this.RaiseAndSetIfChanged(ref _glassTheme, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _allowZoomOut; - + public string? AllowZoomOut { - get => _allowZoomOut; - set => this.RaiseAndSetIfChanged(ref _allowZoomOut, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _highlightColor; - + public string? HighlightColor { - get => _highlightColor; - set => this.RaiseAndSetIfChanged(ref _highlightColor, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _sideBySide; - + public string? SideBySide { - get => _sideBySide; - set => this.RaiseAndSetIfChanged(ref _sideBySide, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _sideBySideTooltip; - + public string? SideBySideTooltip { - get => _sideBySideTooltip; - set => this.RaiseAndSetIfChanged(ref _sideBySideTooltip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fullscreenTxt; - public string? FullscreenTxt { - get => _fullscreenTxt; - set => this.RaiseAndSetIfChanged(ref _fullscreenTxt, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _bottomGalleryThumbnailStretch; - + public string? BottomGalleryThumbnailStretch { - get => _bottomGalleryThumbnailStretch; - set => this.RaiseAndSetIfChanged(ref _bottomGalleryThumbnailStretch, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _galleryThumbnailStretch; - + public string? GalleryThumbnailStretch { - get => _galleryThumbnailStretch; - set => this.RaiseAndSetIfChanged(ref _galleryThumbnailStretch, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _gallerySettings; - + public string? GallerySettings { - get => _gallerySettings; - set => this.RaiseAndSetIfChanged(ref _gallerySettings, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _uniform; - + public string? Uniform { - get => _uniform; - set => this.RaiseAndSetIfChanged(ref _uniform, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _uniformToFill; + public string? UniformToFill { - get => _uniformToFill; - set => this.RaiseAndSetIfChanged(ref _uniformToFill, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _fill; - + public string? Fill { - get => _fill; - set => this.RaiseAndSetIfChanged(ref _fill, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _fillSquare; - + public string? FillSquare { - get => _fillSquare; - set => this.RaiseAndSetIfChanged(ref _fillSquare, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _square; - + public string? Square { - get => _square; - set => this.RaiseAndSetIfChanged(ref _square, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _bottomGalleryItemSize; - + public string? BottomGalleryItemSize { - get => _bottomGalleryItemSize; - set => this.RaiseAndSetIfChanged(ref _bottomGalleryItemSize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _expandedGalleryItemSize; - + public string? ExpandedGalleryItemSize { - get => _expandedGalleryItemSize; - set => this.RaiseAndSetIfChanged(ref _expandedGalleryItemSize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _colorPickerTool; - + public string? ColorPickerTool { - get => _colorPickerTool; - set => this.RaiseAndSetIfChanged(ref _colorPickerTool, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _colorPickerToolTooltip; - + public string? ColorPickerToolTooltip { - get => _colorPickerToolTooltip; - set => this.RaiseAndSetIfChanged(ref _colorPickerToolTooltip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _credits; - public string? Credits { - get => _credits; - set => this.RaiseAndSetIfChanged(ref _credits, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _checkForUpdates; - public string? CheckForUpdates { - get => _checkForUpdates; - set => this.RaiseAndSetIfChanged(ref _checkForUpdates, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _viewLicenseFile; - public string? ViewLicenseFile { - get => _viewLicenseFile; - set => this.RaiseAndSetIfChanged(ref _viewLicenseFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _version; - public string? Version { - get => _version; - set => this.RaiseAndSetIfChanged(ref _version, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _githubRepo; - public string? GithubRepo { - get => _githubRepo; - set => this.RaiseAndSetIfChanged(ref _githubRepo, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _moveWindow; - public string? MoveWindow { - get => _moveWindow; - set => this.RaiseAndSetIfChanged(ref _moveWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _doubleClick; - public string? DoubleClick { - get => _doubleClick; - set => this.RaiseAndSetIfChanged(ref _doubleClick, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _mouseDrag; - public string? MouseDrag { - get => _mouseDrag; - set => this.RaiseAndSetIfChanged(ref _mouseDrag, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lightTheme; - public string? LightTheme { - get => _lightTheme; - set => this.RaiseAndSetIfChanged(ref _lightTheme, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _darkTheme; - public string? DarkTheme { - get => _darkTheme; - set => this.RaiseAndSetIfChanged(ref _darkTheme, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _theme; - public string? Theme { - get => _theme; - set => this.RaiseAndSetIfChanged(ref _theme, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _removeStarRating; - public string? RemoveStarRating { - get => _removeStarRating; - set => this.RaiseAndSetIfChanged(ref _removeStarRating, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _5star; - public string? _5Star { - get => _5star; - set => this.RaiseAndSetIfChanged(ref _5star, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _4star; - public string? _4Star { - get => _4star; - set => this.RaiseAndSetIfChanged(ref _4star, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _3star; - public string? _3Star { - get => _3star; - set => this.RaiseAndSetIfChanged(ref _3star, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _2star; - public string? _2Star { - get => _2star; - set => this.RaiseAndSetIfChanged(ref _2star, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _1star; - public string? _1Star { - get => _1star; - set => this.RaiseAndSetIfChanged(ref _1star, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _setStarRating; - public string? SetStarRating { - get => _setStarRating; - set => this.RaiseAndSetIfChanged(ref _setStarRating, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _normalWindow; - public string? NormalWindow { - get => _normalWindow; - set => this.RaiseAndSetIfChanged(ref _normalWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _windowScaling; - public string? WindowScaling { - get => _windowScaling; - set => this.RaiseAndSetIfChanged(ref _windowScaling, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _centerWindow; - public string? CenterWindow { - get => _centerWindow; - set => this.RaiseAndSetIfChanged(ref _centerWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _windowManagement; - public string? WindowManagement { - get => _windowManagement; - set => this.RaiseAndSetIfChanged(ref _windowManagement, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showImageGallery; - public string? ShowImageGallery { - get => _showImageGallery; - set => this.RaiseAndSetIfChanged(ref _showImageGallery, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _toggleFullscreen; - public string? ToggleFullscreen { - get => _toggleFullscreen; - set => this.RaiseAndSetIfChanged(ref _toggleFullscreen, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileManagement; - public string? FileManagement { - get => _fileManagement; - set => this.RaiseAndSetIfChanged(ref _fileManagement, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _interfaceConfiguration; - public string? InterfaceConfiguration { - get => _interfaceConfiguration; - set => this.RaiseAndSetIfChanged(ref _interfaceConfiguration, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _changeBackground; - public string? ChangeBackground { - get => _changeBackground; - set => this.RaiseAndSetIfChanged(ref _changeBackground, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _imageControl; - public string? ImageControl { - get => _imageControl; - set => this.RaiseAndSetIfChanged(ref _imageControl, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resetZoom; - public string? ResetZoom { - get => _resetZoom; - set => this.RaiseAndSetIfChanged(ref _resetZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _pan; - public string? Pan { - get => _pan; - set => this.RaiseAndSetIfChanged(ref _pan, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _zoomOut; - public string? ZoomOut { - get => _zoomOut; - set => this.RaiseAndSetIfChanged(ref _zoomOut, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _zoomIn; - public string? ZoomIn { - get => _zoomIn; - set => this.RaiseAndSetIfChanged(ref _zoomIn, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _zoom; - public string? Zoom { - get => _zoom; - set => this.RaiseAndSetIfChanged(ref _zoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollToBottom; - public string? ScrollToBottom { - get => _scrollToBottom; - set => this.RaiseAndSetIfChanged(ref _scrollToBottom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollToTop; - public string? ScrollToTop { - get => _scrollToTop; - set => this.RaiseAndSetIfChanged(ref _scrollToTop, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollDown; - public string? ScrollDown { - get => _scrollDown; - set => this.RaiseAndSetIfChanged(ref _scrollDown, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollUp; - public string? ScrollUp { - get => _scrollUp; - set => this.RaiseAndSetIfChanged(ref _scrollUp, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollAndRotate; - public string? ScrollAndRotate { - get => _scrollAndRotate; - set => this.RaiseAndSetIfChanged(ref _scrollAndRotate, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _selectGalleryThumb; - public string? SelectGalleryThumb { - get => _selectGalleryThumb; - set => this.RaiseAndSetIfChanged(ref _selectGalleryThumb, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _navigation; - public string? Navigation { - get => _navigation; - set => this.RaiseAndSetIfChanged(ref _navigation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _prevFolder; - public string? PrevFolder { - get => _prevFolder; - set => this.RaiseAndSetIfChanged(ref _prevFolder, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _nextFolder; - public string? NextFolder { - get => _nextFolder; - set => this.RaiseAndSetIfChanged(ref _nextFolder, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _firstImage; - public string? FirstImage { - get => _firstImage; - set => this.RaiseAndSetIfChanged(ref _firstImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lastImage; - public string? LastImage { - get => _lastImage; - set => this.RaiseAndSetIfChanged(ref _lastImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _prevImage; - public string? PrevImage { - get => _prevImage; - set => this.RaiseAndSetIfChanged(ref _prevImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _nextImage; - public string? NextImage { - get => _nextImage; - set => this.RaiseAndSetIfChanged(ref _nextImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _changeKeybindingText; - public string? ChangeKeybindingText { - get => _changeKeybindingText; - set => this.RaiseAndSetIfChanged(ref _changeKeybindingText, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _toggleTaskbarProgress; - public string? ToggleTaskbarProgress { - get => _toggleTaskbarProgress; - set => this.RaiseAndSetIfChanged(ref _toggleTaskbarProgress, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _changeKeybindingTooltip; - public string? ChangeKeybindingTooltip { - get => _changeKeybindingTooltip; - set => this.RaiseAndSetIfChanged(ref _changeKeybindingTooltip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showBottomGalleryWhenUiIsHidden; - public string? ShowBottomGalleryWhenUiIsHidden { - get => _showBottomGalleryWhenUiIsHidden; - set => this.RaiseAndSetIfChanged(ref _showBottomGalleryWhenUiIsHidden, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showBottomToolbar; - public string? ShowBottomToolbar { - get => _showBottomToolbar; - set => this.RaiseAndSetIfChanged(ref _showBottomToolbar, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resetButtonText; - public string? ResetButtonText { - get => _resetButtonText; - set => this.RaiseAndSetIfChanged(ref _resetButtonText, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _secAbbreviation; - public string? SecAbbreviation { - get => _secAbbreviation; - set => this.RaiseAndSetIfChanged(ref _secAbbreviation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _adjustNavSpeed; - public string? AdjustNavSpeed { - get => _adjustNavSpeed; - set => this.RaiseAndSetIfChanged(ref _adjustNavSpeed, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _adjustTimingForZoom; - public string? AdjustTimingForZoom { - get => _adjustTimingForZoom; - set => this.RaiseAndSetIfChanged(ref _adjustTimingForZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _adjustTimingForSlideshow; - public string? AdjustTimingForSlideshow { - get => _adjustTimingForSlideshow; - set => this.RaiseAndSetIfChanged(ref _adjustTimingForSlideshow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _none; - public string? None { - get => _none; - set => this.RaiseAndSetIfChanged(ref _none, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _applicationStartup; - public string? ApplicationStartup { - get => _applicationStartup; - set => this.RaiseAndSetIfChanged(ref _applicationStartup, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _forward; - public string? Forward { - get => _forward; - set => this.RaiseAndSetIfChanged(ref _forward, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _reverse; - public string? Reverse { - get => _reverse; - set => this.RaiseAndSetIfChanged(ref _reverse, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollDirection; - public string? ScrollDirection { - get => _scrollDirection; - set => this.RaiseAndSetIfChanged(ref _scrollDirection, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _openInSameWindow; - public string? OpenInSameWindow { - get => _openInSameWindow; - set => this.RaiseAndSetIfChanged(ref _openInSameWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showFileSavingDialog; - public string? ShowFileSavingDialog { - get => _showFileSavingDialog; - set => this.RaiseAndSetIfChanged(ref _showFileSavingDialog, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _stayCentered; - public string? StayCentered { - get => _stayCentered; - set => this.RaiseAndSetIfChanged(ref _stayCentered, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _miscSettings; - public string? MiscSettings { - get => _miscSettings; - set => this.RaiseAndSetIfChanged(ref _miscSettings, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollToZoom; - public string? ScrollToZoom { - get => _scrollToZoom; - set => this.RaiseAndSetIfChanged(ref _scrollToZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _mouseWheel; - public string? MouseWheel { - get => _mouseWheel; - set => this.RaiseAndSetIfChanged(ref _mouseWheel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _language; - public string? Language { - get => _language; - set => this.RaiseAndSetIfChanged(ref _language, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _appearance; - public string? Appearance { - get => _appearance; - set => this.RaiseAndSetIfChanged(ref _appearance, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _generalSettings; - public string? GeneralSettings { - get => _generalSettings; - set => this.RaiseAndSetIfChanged(ref _generalSettings, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _ctrlToZoom; - public string? CtrlToZoom { - get => _ctrlToZoom; - set => this.RaiseAndSetIfChanged(ref _ctrlToZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileCut; - public string? FileCut { - get => _fileCut; - set => this.RaiseAndSetIfChanged(ref _fileCut, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileCopyPath; - public string? FileCopyPath { - get => _fileCopyPath; - set => this.RaiseAndSetIfChanged(ref _fileCopyPath, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _copyImage; - public string? CopyImage { - get => _copyImage; - set => this.RaiseAndSetIfChanged(ref _copyImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _imageTxt; - public string? ImageTxt { - get => _imageTxt; - set => this.RaiseAndSetIfChanged(ref _imageTxt, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _setAsLockScreenImage; - public string? SetAsLockScreenImage { - get => _setAsLockScreenImage; - set => this.RaiseAndSetIfChanged(ref _setAsLockScreenImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _setAsWallpaper; - public string? SetAsWallpaper { - get => _setAsWallpaper; - set => this.RaiseAndSetIfChanged(ref _setAsWallpaper, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _recentFiles; - public string? RecentFiles { - get => _recentFiles; - set => this.RaiseAndSetIfChanged(ref _recentFiles, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _ascending; - public string? Ascending { - get => _ascending; - set => this.RaiseAndSetIfChanged(ref _ascending, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _descending; - public string? Descending { - get => _descending; - set => this.RaiseAndSetIfChanged(ref _descending, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _random; - public string? Random { - get => _random; - set => this.RaiseAndSetIfChanged(ref _random, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _creationTime; - public string? CreationTime { - get => _creationTime; - set => this.RaiseAndSetIfChanged(ref _creationTime, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileExtension; - public string? FileExtension { - get => _fileExtension; - set => this.RaiseAndSetIfChanged(ref _fileExtension, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _sortFilesBy; - public string? SortFilesBy { - get => _sortFilesBy; - set => this.RaiseAndSetIfChanged(ref _sortFilesBy, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lensModel; - public string? LensModel { - get => _lensModel; - set => this.RaiseAndSetIfChanged(ref _lensModel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lensMaker; - public string? LensMaker { - get => _lensMaker; - set => this.RaiseAndSetIfChanged(ref _lensMaker, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _exifVersion; - public string? ExifVersion { - get => _exifVersion; - set => this.RaiseAndSetIfChanged(ref _exifVersion, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _orientation; - public string? Orientation { - get => _orientation; - set => this.RaiseAndSetIfChanged(ref _orientation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _photometricInterpretation; - public string? PhotometricInterpretation { - get => _photometricInterpretation; - set => this.RaiseAndSetIfChanged(ref _photometricInterpretation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _brightness; - public string? Brightness { - get => _brightness; - set => this.RaiseAndSetIfChanged(ref _brightness, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lightSource; - public string? LightSource { - get => _lightSource; - set => this.RaiseAndSetIfChanged(ref _lightSource, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _flashMode; - public string? FlashMode { - get => _flashMode; - set => this.RaiseAndSetIfChanged(ref _flashMode, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _flashEnergy; - public string? FlashEnergy { - get => _flashEnergy; - set => this.RaiseAndSetIfChanged(ref _flashEnergy, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _whiteBalance; - public string? WhiteBalance { - get => _whiteBalance; - set => this.RaiseAndSetIfChanged(ref _whiteBalance, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _sharpness; - public string? Sharpness { - get => _sharpness; - set => this.RaiseAndSetIfChanged(ref _sharpness, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _saturation; - public string? Saturation { - get => _saturation; - set => this.RaiseAndSetIfChanged(ref _saturation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _contrast; - public string? Contrast { - get => _contrast; - set => this.RaiseAndSetIfChanged(ref _contrast, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _meteringMode; - public string? MeteringMode { - get => _meteringMode; - set => this.RaiseAndSetIfChanged(ref _meteringMode, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _focalLength35mm; - public string? FocalLength35mm { - get => _focalLength35mm; - set => this.RaiseAndSetIfChanged(ref _focalLength35mm, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _isoSpeed; - public string? ISOSpeed { - get => _isoSpeed; - set => this.RaiseAndSetIfChanged(ref _isoSpeed, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _digitalZoom; - public string? DigitalZoom { - get => _digitalZoom; - set => this.RaiseAndSetIfChanged(ref _digitalZoom, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _exposureProgram; - public string? ExposureProgram { - get => _exposureProgram; - set => this.RaiseAndSetIfChanged(ref _exposureProgram, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _exposureBias; - public string? ExposureBias { - get => _exposureBias; - set => this.RaiseAndSetIfChanged(ref _exposureBias, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _maxAperture; - public string? MaxAperture { - get => _maxAperture; - set => this.RaiseAndSetIfChanged(ref _maxAperture, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fstop; - public string? Fstop { - get => _fstop; - set => this.RaiseAndSetIfChanged(ref _fstop, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fnumber; - public string? Fnumber { - get => _fnumber; - set => this.RaiseAndSetIfChanged(ref _fnumber, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _focalLength; - public string? FocalLength { - get => _focalLength; - set => this.RaiseAndSetIfChanged(ref _focalLength, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _cameraModel; - public string? CameraModel { - get => _cameraModel; - set => this.RaiseAndSetIfChanged(ref _cameraModel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _cameraMaker; - public string? CameraMaker { - get => _cameraMaker; - set => this.RaiseAndSetIfChanged(ref _cameraMaker, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _software; - public string? Software { - get => _software; - set => this.RaiseAndSetIfChanged(ref _software, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _xptitle; - public string? XPTitle { - get => _xptitle; - set => this.RaiseAndSetIfChanged(ref _xptitle, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _subject; - public string? Subject { - get => _subject; - set => this.RaiseAndSetIfChanged(ref _subject, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _created; - public string? Created { - get => _created; - set => this.RaiseAndSetIfChanged(ref _created, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _modified; - public string? Modified { - get => _modified; - set => this.RaiseAndSetIfChanged(ref _modified, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _lastAccessTime; - public string? LastAccessTime { - get => _lastAccessTime; - set => this.RaiseAndSetIfChanged(ref _lastAccessTime, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _convertTo; - public string? ConvertTo { - get => _convertTo; - set => this.RaiseAndSetIfChanged(ref _convertTo, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _copy; - public string? Copy { - get => _copy; - set => this.RaiseAndSetIfChanged(ref _copy, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _optimizeImage; - public string? OptimizeImage { - get => _optimizeImage; - set => this.RaiseAndSetIfChanged(ref _optimizeImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileProperties; - public string? FileProperties { - get => _fileProperties; - set => this.RaiseAndSetIfChanged(ref _fileProperties, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _imageInfo; - public string? ImageInfo { - get => _imageInfo; - set => this.RaiseAndSetIfChanged(ref _imageInfo, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _applicationShortcuts; - public string? ApplicationShortcuts { - get => _applicationShortcuts; - set => this.RaiseAndSetIfChanged(ref _applicationShortcuts, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _batchResize; - public string? BatchResize { - get => _batchResize; - set => this.RaiseAndSetIfChanged(ref _batchResize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _effects; - public string? Effects { - get => _effects; - set => this.RaiseAndSetIfChanged(ref _effects, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _effectsTooltip; - public string? EffectsTooltip { - get => _effectsTooltip; - set => this.RaiseAndSetIfChanged(ref _effectsTooltip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _file; - public string? File { - get => _file.FirstCharToUpper(); - set => this.RaiseAndSetIfChanged(ref _file, value); + get => field.FirstCharToUpper(); + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _selectFile; - public string? SelectFile { - get => _selectFile; - set => this.RaiseAndSetIfChanged(ref _selectFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _openLastFile; - public string? OpenLastFile { - get => _openLastFile; - set => this.RaiseAndSetIfChanged(ref _openLastFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _filePaste; - public string? FilePaste { - get => _filePaste; - set => this.RaiseAndSetIfChanged(ref _filePaste, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _reload; - public string? Reload { - get => _reload; - set => this.RaiseAndSetIfChanged(ref _reload, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _print; - public string? Print { - get => _print; - set => this.RaiseAndSetIfChanged(ref _print, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _deleteFile; - public string? DeleteFile { - get => _deleteFile; - set => this.RaiseAndSetIfChanged(ref _deleteFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _save; - public string? Save { - get => _save; - set => this.RaiseAndSetIfChanged(ref _save, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _copyFile; - public string? CopyFile { - get => _copyFile; - set => this.RaiseAndSetIfChanged(ref _copyFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _newWindow; - public string? NewWindow { - get => _newWindow; - set => this.RaiseAndSetIfChanged(ref _newWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _close; - public string? Close { - get => _close; - set => this.RaiseAndSetIfChanged(ref _close, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _restoreDown; - public string? RestoreDown { - get => _restoreDown; - set => this.RaiseAndSetIfChanged(ref _restoreDown, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _open; - public string? Open { - get => _open; - set => this.RaiseAndSetIfChanged(ref _open, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _openFileDialog; - public string? OpenFileDialog { - get => _openFileDialog; - set => this.RaiseAndSetIfChanged(ref _openFileDialog, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showInFolder; - public string? ShowInFolder { - get => _showInFolder; - set => this.RaiseAndSetIfChanged(ref _showInFolder, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _openWith; - public string? OpenWith { - get => _openWith; - set => this.RaiseAndSetIfChanged(ref _openWith, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _renameFile; - public string? RenameFile { - get => _renameFile; - set => this.RaiseAndSetIfChanged(ref _renameFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _duplicateFile; - public string? DuplicateFile { - get => _duplicateFile; - set => this.RaiseAndSetIfChanged(ref _duplicateFile, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _rotateLeft; - public string? RotateLeft { - get => _rotateLeft; - set => this.RaiseAndSetIfChanged(ref _rotateLeft, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _rotateRight; - public string? RotateRight { - get => _rotateRight; - set => this.RaiseAndSetIfChanged(ref _rotateRight, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _flip; - public string? Flip { - get => _flip; - set => this.RaiseAndSetIfChanged(ref _flip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _unFlip; - public string? UnFlip { - get => _unFlip; - set => this.RaiseAndSetIfChanged(ref _unFlip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showUI; - public string? ShowUI { - get => _showUI; - set => this.RaiseAndSetIfChanged(ref _showUI, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - - private string? _hideUI; - + public string? HideUI { - get => _hideUI; - set => this.RaiseAndSetIfChanged(ref _hideUI, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showBottomGallery; - public string? ShowBottomGallery { - get => _showBottomGallery; - set => this.RaiseAndSetIfChanged(ref _showBottomGallery, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _hideBottomGallery; - public string? HideBottomGallery { - get => _hideBottomGallery; - set => this.RaiseAndSetIfChanged(ref _hideBottomGallery, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _loopingDisabled; - public string? LoopingDisabled { - get => _loopingDisabled; - set => this.RaiseAndSetIfChanged(ref _loopingDisabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _loopingEnabled; - public string? LoopingEnabled { - get => _loopingEnabled; - set => this.RaiseAndSetIfChanged(ref _loopingEnabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _autoFitWindow; - public string? AutoFitWindow { - get => _autoFitWindow; - set => this.RaiseAndSetIfChanged(ref _autoFitWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _stretch; - public string? Stretch { - get => _stretch; - set => this.RaiseAndSetIfChanged(ref _stretch, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _crop; - public string? Crop { - get => _crop; - set => this.RaiseAndSetIfChanged(ref _crop, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resizeImage; - public string? ResizeImage { - get => _resizeImage; - set => this.RaiseAndSetIfChanged(ref _resizeImage, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _goToImageAtSpecifiedIndex; - public string? GoToImageAtSpecifiedIndex { - get => _goToImageAtSpecifiedIndex; - set => this.RaiseAndSetIfChanged(ref _goToImageAtSpecifiedIndex, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _toggleScroll; - public string? ToggleScroll { - get => _toggleScroll; - set => this.RaiseAndSetIfChanged(ref _toggleScroll, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollEnabled; - public string? ScrollEnabled { - get => _scrollEnabled; - set => this.RaiseAndSetIfChanged(ref _scrollEnabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _scrollDisabled; - public string? ScrollDisabled { - get => _scrollDisabled; - set => this.RaiseAndSetIfChanged(ref _scrollDisabled, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _slideshow; - public string? Slideshow { - get => _slideshow; - set => this.RaiseAndSetIfChanged(ref _slideshow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _settings; - public string? Settings { - get => _settings; - set => this.RaiseAndSetIfChanged(ref _settings, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _aboutWindow; - public string? AboutWindow { - get => _aboutWindow; - set => this.RaiseAndSetIfChanged(ref _aboutWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _about; - public string? About { - get => _about; - set => this.RaiseAndSetIfChanged(ref _about, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _showAllSettingsWindow; - public string? ShowAllSettingsWindow { - get => _showAllSettingsWindow; - set => this.RaiseAndSetIfChanged(ref _showAllSettingsWindow, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _stayTopMost; - public string? StayTopMost { - get => _stayTopMost; - set => this.RaiseAndSetIfChanged(ref _stayTopMost, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _searchSubdirectory; - public string? SearchSubdirectory { - get => _searchSubdirectory; - set => this.RaiseAndSetIfChanged(ref _searchSubdirectory, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _toggleLooping; - public string? ToggleLooping { - get => _toggleLooping; - set => this.RaiseAndSetIfChanged(ref _toggleLooping, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileName; - public string? FileName { - get => _fileName; - set => this.RaiseAndSetIfChanged(ref _fileName, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fileSize; - public string? FileSize { - get => _fileSize; - set => this.RaiseAndSetIfChanged(ref _fileSize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _folder; - public string? Folder { - get => _folder; - set => this.RaiseAndSetIfChanged(ref _folder, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _fullPath; - public string? FullPath { - get => _fullPath; - set => this.RaiseAndSetIfChanged(ref _fullPath, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resize; - public string? Resize { - get => _resize; - set => this.RaiseAndSetIfChanged(ref _resize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _noResize; - public string? NoResize { - get => _noResize; - set => this.RaiseAndSetIfChanged(ref _noResize, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _apply; - public string? Apply { - get => _apply; - set => this.RaiseAndSetIfChanged(ref _apply, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _cancel; - public string? Cancel { - get => _cancel; - set => this.RaiseAndSetIfChanged(ref _cancel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _bitDepth; - public string? BitDepth { - get => _bitDepth; - set => this.RaiseAndSetIfChanged(ref _bitDepth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _aspectRatio; - public string? AspectRatio { - get => _aspectRatio; - set => this.RaiseAndSetIfChanged(ref _aspectRatio, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _noConversion; - public string? NoConversion { - get => _noConversion; - set => this.RaiseAndSetIfChanged(ref _noConversion, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _width; - public string? Width { - get => _width; - set => this.RaiseAndSetIfChanged(ref _width, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _height; - public string? Height { - get => _height; - set => this.RaiseAndSetIfChanged(ref _height, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _sizeMp; - public string? SizeMp { - get => _sizeMp; - set => this.RaiseAndSetIfChanged(ref _sizeMp, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resolution; - public string? Resolution { - get => _resolution; - set => this.RaiseAndSetIfChanged(ref _resolution, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _printSizeIn; - public string? PrintSizeIn { - get => _printSizeIn; - set => this.RaiseAndSetIfChanged(ref _printSizeIn, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _printSizeCm; - public string? PrintSizeCm { - get => _printSizeCm; - set => this.RaiseAndSetIfChanged(ref _printSizeCm, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _centimeters; - public string? Centimeters { - get => _centimeters; - set => this.RaiseAndSetIfChanged(ref _centimeters, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _inches; - public string? Inches { - get => _inches; - set => this.RaiseAndSetIfChanged(ref _inches, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _sizeTooltip; - public string? SizeTooltip { - get => _sizeTooltip; - set => this.RaiseAndSetIfChanged(ref _sizeTooltip, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _latitude; - public string? Latitude { - get => _latitude; - set => this.RaiseAndSetIfChanged(ref _latitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _longitude; - public string? Longitude { - get => _longitude; - set => this.RaiseAndSetIfChanged(ref _longitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _altitude; - public string? Altitude { - get => _altitude; - set => this.RaiseAndSetIfChanged(ref _altitude, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _authors; - public string? Authors { - get => _authors; - set => this.RaiseAndSetIfChanged(ref _authors, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _dateTaken; - public string? DateTaken { - get => _dateTaken; - set => this.RaiseAndSetIfChanged(ref _dateTaken, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _copyright; - public string? Copyright { - get => _copyright; - set => this.RaiseAndSetIfChanged(ref _copyright, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _resolutionUnit; - public string? ResolutionUnit { - get => _resolutionUnit; - set => this.RaiseAndSetIfChanged(ref _resolutionUnit, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _colorRepresentation; - public string? ColorRepresentation { - get => _colorRepresentation; - set => this.RaiseAndSetIfChanged(ref _colorRepresentation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _compressedBitsPixel; - public string? CompressedBitsPixel { - get => _compressedBitsPixel; - set => this.RaiseAndSetIfChanged(ref _compressedBitsPixel, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _compression; - public string? Compression { - get => _compression; - set => this.RaiseAndSetIfChanged(ref _compression, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private string? _exposureTime; - public string? ExposureTime { - get => _exposureTime; - set => this.RaiseAndSetIfChanged(ref _exposureTime, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion Strings @@ -2134,52 +1714,40 @@ public string? ExposureTime #region Image - private FileInfo? _fileInfo; - public FileInfo? FileInfo { - get => _fileInfo; - set => this.RaiseAndSetIfChanged(ref _fileInfo, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private int _pixelWidth; - public int PixelWidth { - get => _pixelWidth; - set => this.RaiseAndSetIfChanged(ref _pixelWidth, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private int _pixelHeight; - public int PixelHeight { - get => _pixelHeight; - set => this.RaiseAndSetIfChanged(ref _pixelHeight, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _dpiX; - public double DpiX { - get => _dpiX; - set => this.RaiseAndSetIfChanged(ref _dpiX, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private double _dpiY; - public double DpiY { - get => _dpiY; - set => this.RaiseAndSetIfChanged(ref _dpiY, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } - private EXIFHelper.EXIFOrientation? _exifOrientation; - public EXIFHelper.EXIFOrientation? ExifOrientation { - get => _exifOrientation; - set => this.RaiseAndSetIfChanged(ref _exifOrientation, value); + get; + set => this.RaiseAndSetIfChanged(ref field, value); } #endregion Image diff --git a/src/PicView.Avalonia/Views/BatchResizeView.axaml b/src/PicView.Avalonia/Views/BatchResizeView.axaml index 76e4f7562..efeb6505d 100644 --- a/src/PicView.Avalonia/Views/BatchResizeView.axaml +++ b/src/PicView.Avalonia/Views/BatchResizeView.axaml @@ -8,10 +8,802 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls" + xmlns:converters="clr-namespace:PicView.Avalonia.Converters"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/PicView.Avalonia/Views/BatchResizeView.axaml.cs b/src/PicView.Avalonia/Views/BatchResizeView.axaml.cs index 891dbe83a..c49b476e3 100644 --- a/src/PicView.Avalonia/Views/BatchResizeView.axaml.cs +++ b/src/PicView.Avalonia/Views/BatchResizeView.axaml.cs @@ -1,12 +1,13 @@ using Avalonia.Controls; -namespace PicView.Avalonia.Views +namespace PicView.Avalonia.Views; +public partial class BatchResizeView : UserControl { - public partial class BatchResizeView : UserControl + public BatchResizeView() { - public BatchResizeView() + InitializeComponent(); + Loaded += delegate { - InitializeComponent(); - } + }; } -} \ No newline at end of file +} diff --git a/src/PicView.Avalonia/Views/BottomBar.axaml b/src/PicView.Avalonia/Views/BottomBar.axaml index 621b894c5..a0c132ffd 100644 --- a/src/PicView.Avalonia/Views/BottomBar.axaml +++ b/src/PicView.Avalonia/Views/BottomBar.axaml @@ -177,7 +177,7 @@ BorderThickness="1,0,1,0" Classes="noBorderHover" Command="{CompiledBinding ToggleFileMenuCommand}" - Data="M30.718,23.404l0.007-19.877c-0.003-0.611-0.499-1.107-1.109-1.107H15.597 c-0.433-0.01-0.771-0.807-0.771-1.111V1.182c0-0.648-0.528-1.182-1.18-1.182h-7.46C5.535,0,5.008,0.533,5.008,1.182v0.127 c0,0.309-0.341,1.117-0.784,1.117h0.013c-0.604,0.008-1.094,0.5-1.094,1.105l0.005,5.754H0.763c0,0-1.056-0.057-0.683,1.199 l2.516,12.92c0,0.65,0.453,1.176,1.104,1.176h26.474C30.824,24.58,30.718,23.404,30.718,23.404z M29.359,10.949l-0.014,12.975 l-2.502-13.908c-0.212-0.764-1.075-0.711-1.075-0.711H4.51V4.891h24.85V10.949z" + Data="{StaticResource AltFolderGeometry}" Foreground="{DynamicResource MainTextColor}" Height="25" IconHeight="20.091"