From fd051d1f318308d2330e599605baf9dc5c3bf5c2 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 2 Feb 2026 09:32:32 +0100
Subject: [PATCH 1/3] Update EditMultipleTracksModal.de.resx

---
 .../Shared/Dialogs/EditMultipleTracksModal.de.resx              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
index 09c6ca6d..5961e76e 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
@@ -130,7 +130,7 @@
     <value>Ändern</value>
   </data>
   <data name="Edit tracks" xml:space="preserve">
-    <value>Spuren bearbeiten</value>
+    <value>Titel bearbeiten</value>
   </data>
   <data name="End" xml:space="preserve">
     <value>Ende</value>

From 12e382229112919e7d7abca9a78c631d34e1a7db Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 2 Feb 2026 09:32:38 +0100
Subject: [PATCH 2/3] Update DialogManager.cs

---
 AudioCuesheetEditor/Services/UI/DialogManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index f10ac2bb..040ced4b 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -63,7 +63,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         Boolean copyTrackLength = editMultipleTracksModalResult.LengthChanged;
                         Boolean copyTrackPreGap = editMultipleTracksModalResult.PregapChanged;
                         Boolean copyTrackPostGap = editMultipleTracksModalResult.PostgapChanged;
-                        //First process dynamic edit, because we need to increase each value seperately
+                        //First process dynamic edit, because we need to increase each value separately
                         switch (editMultipleTracksModalResult.PositionEditMode)
                         {
                             case DynamicEditValue.EnteredValueEquals:

From 9b2d068f2148beb19e22ddba7aedded576d530fc Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 2 Feb 2026 11:26:50 +0100
Subject: [PATCH 3/3] remove column in edit dialog

---
 .../Model/UI/EditMultipleTracksModalResult.cs |  35 ++--
 .../Services/UI/DialogManager.cs              |  42 +++-
 .../Dialogs/EditMultipleTracksModal.de.resx   |   3 -
 .../Dialogs/EditMultipleTracksModal.razor     | 189 ++++++++++--------
 .../Dialogs/EditMultipleTracksModal.resx      |   3 -
 5 files changed, 153 insertions(+), 119 deletions(-)

diff --git a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
index 0f1f4e33..5fcefbd1 100644
--- a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
+++ b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
@@ -19,28 +19,23 @@ namespace AudioCuesheetEditor.Model.UI
 {
     public enum DynamicEditValue
     {
-        EnteredValueEquals = 0,
-        EnteredValueAdd = 1,
-        EnteredValueSubstract = 2
+        DoNotChange = 0,
+        EnteredValueEquals = 1,
+        EnteredValueAdd = 2,
+        EnteredValueSubstract = 3
     }
-    public class EditMultipleTracksModalResult(Track editedTrack, Boolean isLinkedToPreviousTrackChanged, Boolean positionChanged, Boolean artistChanged, Boolean titleChanged, Boolean beginChanged, Boolean endChanged, Boolean lengthChanged, Boolean flagsChanged, Boolean pregapChanged, Boolean postgapChanged, DynamicEditValue? positionEditMode = null, DynamicEditValue? beginEditMode = null, DynamicEditValue? endEditMode = null, DynamicEditValue? lengthEditMode = null, DynamicEditValue? pregapEditMode = null, DynamicEditValue? postgapEditMode = null)
+    public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue positionEditMode, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
     {
         public Track EditedTrack { get; } = editedTrack;
-        public Boolean IsLinkedToPreviousTrackChanged { get; } = isLinkedToPreviousTrackChanged;
-        public Boolean PositionChanged { get; } = positionChanged;
-        public DynamicEditValue? PositionEditMode { get; } = positionEditMode;
-        public Boolean ArtistChanged { get; } = artistChanged;
-        public Boolean TitleChanged { get; } = titleChanged;
-        public Boolean BeginChanged { get; } = beginChanged;
-        public DynamicEditValue? BeginEditMode { get; } = beginEditMode;
-        public Boolean EndChanged { get; } = endChanged;
-        public DynamicEditValue? EndEditMode { get; } = endEditMode;
-        public Boolean LengthChanged { get; } = lengthChanged;
-        public DynamicEditValue? LengthEditMode { get; } = lengthEditMode;
-        public Boolean FlagsChanged { get; } = flagsChanged;
-        public Boolean PregapChanged { get; } = pregapChanged;
-        public DynamicEditValue? PregapEditMode { get; } = pregapEditMode;
-        public Boolean PostgapChanged { get; } = postgapChanged;
-        public DynamicEditValue? PostgapEditMode { get; } = postgapEditMode;
+        public DynamicEditValue IsLinkedToPreviousTrackEditMode { get; } = isLinkedToPreviousTrackChanged;
+        public DynamicEditValue PositionEditMode { get; } = positionEditMode;
+        public DynamicEditValue ArtistEditMode { get; } = artistEditMode;
+        public DynamicEditValue TitleEditMode { get; } = titleEditMode;
+        public DynamicEditValue BeginEditMode { get; } = beginEditMode;
+        public DynamicEditValue EndEditMode { get; } = endEditMode;
+        public DynamicEditValue LengthEditMode { get; } = lengthEditMode;
+        public DynamicEditValue FlagsEditMode { get; } = flagsEditMode;
+        public DynamicEditValue PregapEditMode { get; } = pregapEditMode;
+        public DynamicEditValue PostgapEditMode { get; } = postgapEditMode;
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 040ced4b..6c59f2dd 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -57,16 +57,24 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         var length = editMultipleTracksModalResult.EditedTrack.Length;
                         var preGap = editMultipleTracksModalResult.EditedTrack.PreGap;
                         var postGap = editMultipleTracksModalResult.EditedTrack.PostGap;
-                        Boolean copyTrackPosition = editMultipleTracksModalResult.PositionChanged;
-                        Boolean copyTrackBegin = editMultipleTracksModalResult.BeginChanged;
-                        Boolean copyTrackEnd = editMultipleTracksModalResult.EndChanged;
-                        Boolean copyTrackLength = editMultipleTracksModalResult.LengthChanged;
-                        Boolean copyTrackPreGap = editMultipleTracksModalResult.PregapChanged;
-                        Boolean copyTrackPostGap = editMultipleTracksModalResult.PostgapChanged;
+                        Boolean copyIsLinkedToPreviousTrack = editMultipleTracksModalResult.IsLinkedToPreviousTrackEditMode == DynamicEditValue.EnteredValueEquals;
+                        Boolean copyTrackPosition = true;
+                        Boolean copyTrackArtist = editMultipleTracksModalResult.ArtistEditMode == DynamicEditValue.EnteredValueEquals;
+                        Boolean copyTrackTitle = editMultipleTracksModalResult.TitleEditMode == DynamicEditValue.EnteredValueEquals;
+                        Boolean copyTrackBegin = true;
+                        Boolean copyTrackEnd = true;
+                        Boolean copyTrackLength = true;
+                        Boolean copyTrackFlags = editMultipleTracksModalResult.FlagsEditMode == DynamicEditValue.EnteredValueEquals;
+                        Boolean copyTrackPreGap = true;
+                        Boolean copyTrackPostGap = true;
                         //First process dynamic edit, because we need to increase each value separately
                         switch (editMultipleTracksModalResult.PositionEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackPosition = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackPosition = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 editMultipleTracksModalResult.EditedTrack.Position += track.Position;
@@ -83,7 +91,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         }
                         switch (editMultipleTracksModalResult.BeginEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackBegin = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackBegin = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.Begin + track.Begin;
@@ -100,7 +112,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         }
                         switch (editMultipleTracksModalResult.EndEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackEnd = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackEnd = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.End + track.End;
@@ -117,7 +133,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         }
                         switch (editMultipleTracksModalResult.LengthEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackLength = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackLength = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.Length + track.Length;
@@ -134,7 +154,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         }
                         switch (editMultipleTracksModalResult.PregapEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackPreGap = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackPreGap = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.PreGap + track.PreGap;
@@ -151,7 +175,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         }
                         switch (editMultipleTracksModalResult.PostgapEditMode)
                         {
+                            case DynamicEditValue.DoNotChange:
+                                copyTrackPostGap = false;
+                                break;
                             case DynamicEditValue.EnteredValueEquals:
+                                copyTrackPostGap = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.PostGap + track.PostGap;
@@ -173,7 +201,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         editMultipleTracksModalResult.EditedTrack.PreGap = preGap;
                         editMultipleTracksModalResult.EditedTrack.PostGap = postGap;
                         //Now copy all values
-                        track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: editMultipleTracksModalResult.IsLinkedToPreviousTrackChanged, setPosition: copyTrackPosition, setArtist: editMultipleTracksModalResult.ArtistChanged, setTitle: editMultipleTracksModalResult.TitleChanged, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: editMultipleTracksModalResult.FlagsChanged, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
+                        track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
                     }
                 }
             }
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
index 5961e76e..b03a5f25 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
@@ -123,9 +123,6 @@
   <data name="Begin" xml:space="preserve">
     <value>Start</value>
   </data>
-  <data name="Calculate" xml:space="preserve">
-    <value>Berechnen</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Ändern</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
index 1b00c418..9c8a87f7 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
@@ -29,28 +29,37 @@ along with Foobar.  If not, see
     <DialogContent>
         <MudForm Model="EditedTrack">
             <MudGrid Class="align-baseline">
-                <MudItem xs="2"><MudText>@_localizer["Change"]</MudText></MudItem>
-                <MudItem xs="7"><MudText>@_localizer["Value"]</MudText></MudItem>
-                <MudItem xs="3"><MudText>@_localizer["Calculate"]</MudText></MudItem>
+                <MudItem xs="4" sm="3"><MudText>@_localizer["Change"]</MudText></MudItem>
+                <MudItem xs="8" sm="9"><MudText>@_localizer["Value"]</MudText></MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackIsLinkedToPreviousTrack" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7"><MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Disabled="!editTrackIsLinkedToPreviousTrack" /></MudItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackIsLinkedToPreviousTrack" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                    </MudSelect>
+                </MudItem>
+                <MudItem xs="8" sm="9"><MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Disabled="editModeTrackIsLinkedToPreviousTrack == DynamicEditValue.DoNotChange" /></MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackPosition" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Disabled="!editTrackPosition" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackPosition, EditedTrack, nameof(Track.Position)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackPosition, EditedTrack, nameof(Track.Position))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackPosition" Disabled="!editTrackPosition">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackPosition" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Disabled="editModeTrackPosition == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position))" />
+                </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackArtist" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackArtist" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                    </MudSelect>
+                </MudItem>
+                <MudItem xs="8" sm="9">
                     @{
                         MusicBrainzArtist? autocompleteArtist = new()
                         {
@@ -58,8 +67,8 @@ along with Foobar.  If not, see
                         };
                     }
                     <MudAutocomplete T="MusicBrainzArtist" Label="@_localizer["Artist"]" Variant="Variant.Outlined" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(value) => value.Name"
-                                     @bind-Text="EditedTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator Disabled="!editTrackArtist"
-                                     Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackArtist, EditedTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(editTrackArtist, EditedTrack, nameof(Track.Artist))" 
+                                     @bind-Text="EditedTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator Disabled="editModeTrackArtist == DynamicEditValue.DoNotChange"
+                                     Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackArtist != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(editModeTrackArtist != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Artist))"
                                      MaxItems="null" CoerceText="false">
                         <ItemTemplate Context="autocompleteContext">
                             <MudText>@autocompleteContext.Name</MudText>
@@ -72,8 +81,13 @@ along with Foobar.  If not, see
                     </MudAutocomplete>
                 </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackTitle" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackTitle" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                    </MudSelect>
+                </MudItem>
+                <MudItem xs="8" sm="9">
                     @{
                         MusicBrainzTrack? autocompleteTrack = new()
                         {
@@ -82,8 +96,8 @@ along with Foobar.  If not, see
                         };
                     }
                     <MudAutocomplete T="MusicBrainzTrack" Label="@_localizer["Title"]" Variant="Variant.Outlined" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, EditedTrack.Artist, token)" ToStringFunc="(value) => value.Title"
-                                     @bind-Text="EditedTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator Disabled="!editTrackTitle"
-                                     Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackTitle, EditedTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(editTrackTitle, EditedTrack, nameof(Track.Title))" 
+                                     @bind-Text="EditedTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator Disabled="editModeTrackTitle == DynamicEditValue.DoNotChange"
+                                     Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackTitle != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(editModeTrackTitle != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Title))"
                                      MaxItems="null" CoerceText="false">
                         <ItemTemplate Context="autocompleteContext">
                             <MudText>@autocompleteContext.Title</MudText>
@@ -96,52 +110,57 @@ along with Foobar.  If not, see
                     </MudAutocomplete>
                 </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackBegin" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField Label="@_localizer["Begin"]" Variant="Variant.Outlined" Value="@EditedTrack.Begin.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.Begin, value)"
-                                  Disabled="!editTrackBegin" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackBegin, EditedTrack, nameof(Track.Begin)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackBegin, EditedTrack, nameof(Track.Begin))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackBegin" Disabled="!editTrackBegin">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackBegin" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField Label="@_localizer["Begin"]" Variant="Variant.Outlined" Value="@EditedTrack.Begin.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.Begin, value)"
+                                  Disabled="editModeTrackBegin == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackBegin != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Begin)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackBegin != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Begin))" />
+                </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackEnd" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField Label="@_localizer["End"]" Variant="Variant.Outlined" Value="@EditedTrack.End.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.End, value)" 
-                                  Disabled="!editTrackEnd" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackEnd, EditedTrack, nameof(Track.End)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackEnd, EditedTrack, nameof(Track.End))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackEnd" Disabled="!editTrackEnd">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackEnd" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField Label="@_localizer["End"]" Variant="Variant.Outlined" Value="@EditedTrack.End.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.End, value)" 
+                                  Disabled="editModeTrackEnd == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackEnd != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.End)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackEnd != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.End))" />
+                </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackLength" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField Label="@_localizer["Length"]" Variant="Variant.Outlined" Value="@EditedTrack.Length.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.Length, value)" 
-                                  Disabled="!editTrackLength" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackLength, EditedTrack, nameof(Track.Length)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackLength, EditedTrack, nameof(Track.Length))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackLength" Disabled="!editTrackLength">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackLength" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField Label="@_localizer["Length"]" Variant="Variant.Outlined" Value="@EditedTrack.Length.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.Length, value)" 
+                                  Disabled="editModeTrackLength == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackLength != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Length)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackLength != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Length))" />
+                </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackFlags" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackFlags" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                    </MudSelect>
+                </MudItem>
+                <MudItem xs="8" sm="9">
                     <MudField Label="@_localizer["Flags"]" Variant="Variant.Outlined">
-                        <MudChipSet T="Flag" SelectedValues="EditedTrack.Flags.ToList().AsReadOnly()" SelectedValuesChanged="(newFlags) => EditedTrack.Flags = newFlags" CheckMark SelectionMode="SelectionMode.MultiSelection" Variant="Variant.Text" Color="Color.Info" Disabled="!editTrackFlags">
+                        <MudChipSet T="Flag" SelectedValues="EditedTrack.Flags.ToList().AsReadOnly()" SelectedValuesChanged="(newFlags) => EditedTrack.Flags = newFlags" CheckMark SelectionMode="SelectionMode.MultiSelection" Variant="Variant.Text" Color="Color.Info" Disabled="editModeTrackFlags == DynamicEditValue.DoNotChange">
                             @foreach (var flag in Flag.AvailableFlags)
                             {
                                 <MudChip Value="flag">@flag.Name</MudChip>
@@ -150,33 +169,33 @@ along with Foobar.  If not, see
                     </MudField>
                 </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackPregap" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField Label="@_localizer["PreGap"]" Variant="Variant.Outlined" Value="@EditedTrack.PreGap.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.PreGap, value)" 
-                                  Disabled="!editTrackPregap" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackPregap, EditedTrack, nameof(Track.PreGap)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackPregap, EditedTrack, nameof(Track.PreGap))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackPregap" Disabled="!editTrackPregap">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackPregap" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField Label="@_localizer["PreGap"]" Variant="Variant.Outlined" Value="@EditedTrack.PreGap.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.PreGap, value)" 
+                                  Disabled="editModeTrackPregap == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackPregap != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.PreGap)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackPregap != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.PreGap))" />
+                </MudItem>
                 <MudFlexBreak />
-                <MudItem xs="2"><MudSwitch @bind-Value="editTrackPostgap" Color="Color.Primary" /></MudItem>
-                <MudItem xs="7">
-                    <MudTextField Label="@_localizer["PostGap"]" Variant="Variant.Outlined" Value="@EditedTrack.PostGap.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.PostGap, value)" 
-                                  Disabled="!editTrackPostgap" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editTrackPostgap, EditedTrack, nameof(Track.PostGap)))"
-                                  ErrorText="@GetValidationErrorMessage(editTrackPostgap, EditedTrack, nameof(Track.PostGap))" />
-                </MudItem>
-                <MudItem xs="3">
-                    <MudSelect @bind-Value="editModeTrackPostgap" Disabled="!editTrackPostgap">
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals">=</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd">+</MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract">-</MudSelectItem>
+                <MudItem xs="4" sm="3">
+                    <MudSelect @bind-Value="editModeTrackPostgap" Variant="Variant.Outlined" Modal>
+                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
+                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
                     </MudSelect>
                 </MudItem>
+                <MudItem xs="8" sm="9">
+                    <MudTextField Label="@_localizer["PostGap"]" Variant="Variant.Outlined" Value="@EditedTrack.PostGap.ToString()" ValueChanged="(string value) => _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TimeSpan?>(EditedTrack, x => x.PostGap, value)" 
+                                  Disabled="editModeTrackPostgap == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackPostgap != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.PostGap)))"
+                                  ErrorText="@GetValidationErrorMessage(editModeTrackPostgap != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.PostGap))" />
+                </MudItem>
             </MudGrid>
         </MudForm>
     </DialogContent>
@@ -193,14 +212,12 @@ along with Foobar.  If not, see
     [EditorRequired]
     public Track EditedTrack { get; set; } = null!;
 
-    Boolean editTrackIsLinkedToPreviousTrack, editTrackPosition, editTrackArtist, editTrackTitle, editTrackBegin, editTrackEnd, editTrackLength, editTrackFlags, editTrackPregap, editTrackPostgap;
-    DynamicEditValue editModeTrackPosition, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackPregap, editModeTrackPostgap;
+    DynamicEditValue editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap;
 
     void SaveClick()
     {
-        var result = new EditMultipleTracksModalResult(EditedTrack, editTrackIsLinkedToPreviousTrack, editTrackPosition, editTrackArtist, editTrackTitle, editTrackBegin, 
-            editTrackEnd, editTrackLength, editTrackFlags, editTrackPregap, editTrackPostgap, editModeTrackPosition, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, 
-            editModeTrackPregap, editModeTrackPostgap);
+        var result = new EditMultipleTracksModalResult(EditedTrack, editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, 
+                     editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap);
         MudDialog?.Close(DialogResult.Ok(result));
     }
 
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
index a0717338..2ffdb95c 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
@@ -123,9 +123,6 @@
   <data name="Begin" xml:space="preserve">
     <value>Begin</value>
   </data>
-  <data name="Calculate" xml:space="preserve">
-    <value>Calculate</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Change</value>
   </data>