Skip to content

Commit f3e9d52

Browse files
Merge pull request #516 from NeoCoderMatrix86/494-save-changes-button-on-edit-track-modal-displayed-in-two-lines-on-mobile-devices
Remove abort button from dialogs
2 parents 4fd8446 + ed35ec3 commit f3e9d52

11 files changed

Lines changed: 3 additions & 24 deletions

AudioCuesheetEditor/Services/UI/DialogManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
3333
if (tracks.Count() == 1)
3434
{
3535
var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, tracks.First().Clone() } };
36-
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true };
36+
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
3737
var dialog = await _dialogService.ShowAsync<EditTrackModal>(null, parameters, options);
3838
var result = await dialog.Result;
3939
if ((result?.Canceled == false) && (result.Data is Track editedTrack))
@@ -44,7 +44,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
4444
if (tracks.Count() > 1)
4545
{
4646
var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() { AutomaticallyCalculateLength = false } } };
47-
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true };
47+
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
4848
var dialog = await _dialogService.ShowAsync<EditMultipleTracksModal>(null, parameters, options);
4949
var result = await dialog.Result;
5050
if ((result?.Canceled == false) && (result.Data is EditMultipleTracksModalResult editMultipleTracksModalResult))

AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Abort" xml:space="preserve">
121-
<value>Abbrechen</value>
122-
</data>
123120
<data name="Artist" xml:space="preserve">
124121
<value>Künstler</value>
125122
</data>

AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ along with Foobar. If not, see
182182
</DialogContent>
183183
<DialogActions>
184184
<MudButton Color="Color.Info" Variant="Variant.Filled" OnClick="SaveClick">@_localizer["Save changes"]</MudButton>
185-
<MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="(args) => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
186185
</DialogActions>
187186
</MudDialog>
188187

AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Abort" xml:space="preserve">
121-
<value>Abort</value>
122-
</data>
123120
<data name="Artist" xml:space="preserve">
124121
<value>Artist</value>
125122
</data>

AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.de.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,4 @@
153153
<data name="Save changes" xml:space="preserve">
154154
<value>Änderungen speichern</value>
155155
</data>
156-
<data name="Abort" xml:space="preserve">
157-
<value>Abbrechen</value>
158-
</data>
159156
</root>

AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ along with Foobar. If not, see
9191
</DialogContent>
9292
<DialogActions>
9393
<MudButton Color="Color.Info" Variant="Variant.Filled" OnClick="() => MudDialog?.Close(DialogResult.Ok(EditedTrack))">@_localizer["Save changes"]</MudButton>
94-
<MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="(args) => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
9594
</DialogActions>
9695
</MudDialog>
9796

AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,4 @@
153153
<data name="Save changes" xml:space="preserve">
154154
<value>Save changes</value>
155155
</data>
156-
<data name="Abort" xml:space="preserve">
157-
<value>Abort</value>
158-
</data>
159156
</root>

AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Abort" xml:space="preserve">
121-
<value>Abbrechen</value>
122-
</data>
123120
<data name="Record countdown in sconds" xml:space="preserve">
124121
<value>Aufnahmecountdown in Sekunden</value>
125122
</data>

AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ along with Foobar. If not, see
2929
</DialogContent>
3030
<DialogActions>
3131
<MudButton Color="Color.Primary" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Timer" OnClick="() => MudDialog?.Close(DialogResult.Ok(options?.RecordCountdownTimer))">@_localizer["Start countdown"]</MudButton>
32-
<MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="() => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
3332
</DialogActions>
3433
</MudDialog>
3534

AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Abort" xml:space="preserve">
121-
<value>Abort</value>
122-
</data>
123120
<data name="Record countdown in sconds" xml:space="preserve">
124121
<value>Record countdown in sconds</value>
125122
</data>

0 commit comments

Comments
 (0)