Merge pull request #195 from VPKSoft/194-move-left-righ-with-arrow-keys

Add keyboard seeking with arrow keys

EtoForms.Controls.Custom/Drawing/CellPainter.cs

@@ -52,7 +52,7 @@ public abstract class CellPainter<T, TValue> : IDisposable
     /// <exception cref="InvalidOperationException">The property name must exists within the type T.</exception>
     protected CellPainter(GridView gridView, GridColumn column, Func<T, TValue?> getValueFunc)
     {
-        this.GridView = gridView;
+        GridView = gridView;
         if (column.DataCell is DrawableCell drawableCell)
         {
             cell = drawableCell;
@@ -63,7 +63,7 @@ protected CellPainter(GridView gridView, GridColumn column, Func<T, TValue?> get
             column.DataCell = cell;
         }
 
-        this.GridView = gridView;
+        GridView = gridView;
         this.getValueFunc = getValueFunc;
         cell.Paint += DrawableCell_Paint;
     }

EtoForms.Controls.Custom/PositionSlider.cs

@@ -29,7 +29,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using EtoForms.Controls.Custom.EventArguments;
 using EtoForms.Controls.Custom.Interfaces.BaseClasses;
 using EtoForms.Controls.Custom.Properties;
-using FluentIcons.Resources.Filled;
 
 namespace EtoForms.Controls.Custom;
 

EtoForms.Controls.Custom/RatingSlider.cs

@@ -28,7 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Linq;
 using Eto.Drawing;
 using EtoForms.Controls.Custom.Interfaces.BaseClasses;
-using EtoForms.Controls.Custom.Properties;
 using EtoForms.Controls.Custom.Utilities;
 using FluentIcons.Resources.Filled;
 

EtoForms.Controls.Custom/SvgColorization/SvgColorize.cs

@@ -116,12 +116,12 @@ private static string NodeName(SvgElement element)
     /// <summary>
     /// A regex to match the fill value of the style attribute.
     /// </summary>
-    private static readonly Regex FillRegex = new("fill:.*?;", RegexOptions.Compiled);
+    private static readonly Regex fillRegex = new("fill:.*?;", RegexOptions.Compiled);
 
     /// <summary>
     /// A regex to match the stroke value of the style attribute.
     /// </summary>
-    private static readonly Regex StrokeRegex = new("stroke:.*?;", RegexOptions.Compiled);
+    private static readonly Regex strokeRegex = new("stroke:.*?;", RegexOptions.Compiled);
 
     /// <summary>
     /// Colorizes the elements of the SVG document specified by the <see cref="SvgElement"/> element type.
@@ -133,7 +133,7 @@ public SvgColorize ColorizeElementsStroke(SvgElement element, SvgColor? stroke)
     {
         if (SvgDocument.Root != null)
         {
-            ProcessNodes(SvgDocument.Root, element, StrokeRegex, stroke, false);
+            ProcessNodes(SvgDocument.Root, element, strokeRegex, stroke, false);
         }
 
         return this;
@@ -207,7 +207,7 @@ public SvgColorize ColorizeElementsFill(SvgElement element, SvgColor? fill)
     {
         if (SvgDocument.Root != null)
         {
-            ProcessNodes(SvgDocument.Root, element, FillRegex, fill, true);
+            ProcessNodes(SvgDocument.Root, element, fillRegex, fill, true);
         }
 
         return this;

EtoForms.Controls.Custom/UserIdle/UserIdleEventArgs.cs

@@ -48,5 +48,5 @@ public UserIdleEventArgs(bool isUserIdle)
     /// Gets a value indicating whether the user is currently idle.
     /// </summary>
     /// <value><c>true</c> if the user is currently idle; otherwise, <c>false</c>.</value>
-    private bool IsUserIdle { get; }
+    public bool IsUserIdle { get; }
 }

Help/amp-en/docs/keyboard_shortcuts.md

@@ -21,6 +21,11 @@
 ## Display all the album tracks
 <kbd>F9</kbd> - This function clears all search filters.
 
+## Track seeking
+<kbd>&larr;</kbd> - Seek the track 5 seconds backwards.
+
+<kbd>&rarr;</kbd> - Seek the track 5 seconds forwards.
+
 ## Stash current queue
 <kbd>Ctrl</kbd>+<kbd>T</kbd> or <kbd>⌘</kbd>+<kbd>T</kbd> - Saves to current queue into the stash.
 

Help/amp-fi/docs/keyboard_shortcuts.md

@@ -21,6 +21,11 @@
 ## Näytä kaikki albumin kappaleet
 <kbd>F9</kbd> - Tämä toiminto tyhjentää hakusuodattimet.
 
+## Kappaleen kelaus
+<kbd>&larr;</kbd> - Kelaa kappaletta 5 sekuntia taaksepäin.
+
+<kbd>&rarr;</kbd> - Kelaa kappaletta 5 sekuntia eteenpäin.
+
 ## Varastoi nykyinen jono
 <kbd>Ctrl</kbd>+<kbd>T</kbd> tai <kbd>⌘</kbd>+<kbd>T</kbd> - Tallentaa nykyisen jonon väliaikaiseen varastoon.
 

amp.EtoForms/Classes/CommandLineArguments.cs

@@ -38,20 +38,20 @@ public class CommandLineArguments
     /// Gets or sets the PID (Process Identifier) to wait for before starting the application.
     /// </summary>
     /// <value>The PID to wait for before starting the application.</value>
-    [Option('p', "pid", Required = false, HelpText = nameof(amp.Shared.Localization.Messages.AProcessIdentifierPIDToWaitForExitBeforeStartingTheApplication), ResourceType = typeof(amp.Shared.Localization.Messages))]
+    [Option('p', "pid", Required = false, HelpText = nameof(Shared.Localization.Messages.AProcessIdentifierPIDToWaitForExitBeforeStartingTheApplication), ResourceType = typeof(Shared.Localization.Messages))]
     public int? PidWait { get; set; }
 
     /// <summary>
     /// Gets or sets the name of the backup file to backup the application data before complete startup.
     /// </summary>
     /// <value>The name of the backup file.</value>
-    [Option('b', "backup", Required = false, HelpText = nameof(amp.Shared.Localization.Messages.AFileNameToBackupTheApplicationDataBeforeCompleteStartup), ResourceType = typeof(amp.Shared.Localization.Messages))]
+    [Option('b', "backup", Required = false, HelpText = nameof(Shared.Localization.Messages.AFileNameToBackupTheApplicationDataBeforeCompleteStartup), ResourceType = typeof(Shared.Localization.Messages))]
     public string? BackupFileName { get; set; }
 
     /// <summary>
     /// Gets or sets the name of the archive file to restore the backed up application data settings from.
     /// </summary>
     /// <value>The file name to restore backup the backup from.</value>
-    [Option('r', "restore", Required = false, HelpText = nameof(amp.Shared.Localization.Messages.RestoresABackupFromAZippedFileIntoTheProgramApplicationDataFolderOverridingTheExisting), ResourceType = typeof(amp.Shared.Localization.Messages))]
+    [Option('r', "restore", Required = false, HelpText = nameof(Shared.Localization.Messages.RestoresABackupFromAZippedFileIntoTheProgramApplicationDataFolderOverridingTheExisting), ResourceType = typeof(Shared.Localization.Messages))]
     public string? RestoreBackupFile { get; set; }
 }

amp.EtoForms/FormMain.Events.cs

@@ -64,7 +64,7 @@ private async void FormMain_KeyDown(object? sender, KeyEventArgs e)
         {
             if (e.Key is Keys.Up or Keys.Down or Keys.PageDown or Keys.PageUp or Keys.Equal or
                 Keys.F1 or Keys.F2 or Keys.F3 or Keys.F4 or Keys.F5 or Keys.F6 or Keys.F7 or Keys.F8 or Keys.F9 or
-                Keys.Escape or Keys.Enter or Keys.Add or Keys.Multiply)
+                Keys.Escape or Keys.Enter or Keys.Add or Keys.Multiply or Keys.Left or Keys.Right)
             {
                 if (gvAudioTracks.SelectedItem == null && gvAudioTracks.DataStore.Any())
                 {
@@ -184,6 +184,13 @@ await playbackOrder.MoveToQueueTopOrBottom(tracks, shift, e.Key == Keys.PageUp,
             return;
         }
 
+        if (e.Key is Keys.Right or Keys.Left)
+        {
+            playbackManager.SeekSeconds(e.Key == Keys.Right ? 5 : -5);
+            e.Handled = true;
+            return;
+        }
+
         if (e.Modifiers == Keys.None)
         {
             if (e.IsChar && !(e.Key is Keys.Up or Keys.Down or Keys.PageDown or Keys.PageUp))

amp.EtoForms/FormMain.Methods.cs

@@ -59,7 +59,10 @@ private void AddAudioFiles(bool toAlbum)
     {
         using var dialog = new OpenFileDialog { MultiSelect = true, };
         dialog.Filters.Add(new FileFilter(UI.MusicFiles, MusicConstants.SupportedExtensionArray));
-        if (dialog.ShowDialog(this) == DialogResult.Ok)
+
+        var result = dialog.ShowDialog(this); 
+
+        if (result is DialogResult.Ok or DialogResult.Ignore)
         {
             FormAddFilesProgress.Show(this, context, toAlbum ? CurrentAlbumId : 0, AddFilesAction, dialog.Filenames.ToArray());
         }
@@ -74,7 +77,9 @@ private void AddFilesAction(bool result)
     private void AddDirectory(bool toAlbum)
     {
         using var dialog = new SelectFolderDialog { Title = UI.SelectMusicFolder, };
-        if (dialog.ShowDialog(this) == DialogResult.Ok)
+        var result = dialog.ShowDialog(this); 
+
+        if (result is DialogResult.Ok or DialogResult.Ignore)
         {
             FormAddFilesProgress.Show(this, context, dialog.Directory, toAlbum ? CurrentAlbumId : 0, AddFilesAction);
         }
@@ -282,7 +287,6 @@ private void FilterTracks(bool fromUserIdleEvent)
                 userIdleSelectedRow = -1;
             }
 
-            var text = tbSearch.Text;
             var queueOnly = btnShowQueue.Checked;
             var userIdle = idleChecker.IsUserIdle;
             if (queueOnly)

amp.EtoForms/amp.EtoForms.csproj

@@ -18,7 +18,7 @@
 		<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
 		<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
 		<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-		<Version>1.0.4.0</Version>
+		<Version>1.0.5.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(IsOSX)'=='true'">

amp.Playback/PlaybackManager.cs

@@ -622,6 +622,25 @@ public double PlaybackPositionPercentage
         set => PlaybackPosition = value == 0 ? 0 : PlaybackLength * value / 100;
     }
 
+    /// <summary>
+    /// Seeks the <see cref="PlaybackPosition"/> with the specified amount of seconds.
+    /// </summary>
+    /// <param name="value">The value in seconds to seek.</param>
+    public void SeekSeconds(int value)
+    {
+        var newPosition = PlaybackPosition + value;
+        if (newPosition < 0)
+        {
+            PlaybackPosition = 0;
+            return;
+        }
+
+        if (newPosition >= 0 && newPosition < PlaybackLength)
+        {
+            PlaybackPosition = newPosition;
+        }
+    }
+
     /// <summary>
     /// Gets or sets the playback position in seconds.
     /// </summary>

amp.Shared/Classes/UtilityOS.cs

@@ -103,7 +103,7 @@ public static T GetValueForOSNotNull<T>(T windowsValue, T linuxValue, T macValue
     /// <summary>
     /// The macOS operating system name in lower case ("macos").
     /// </summary>
-    public const string MacOSNameLowerCase = "macos";
+    public const string MacOsNameLowerCase = "macos";
 
     /// <summary>
     /// The Windows operating system name in lower case ("windows").
@@ -126,7 +126,7 @@ public static string OsNameLowerCase
         {
             if (IsMacOS)
             {
-                return MacOSNameLowerCase;
+                return MacOsNameLowerCase;
             }
 
             if (IsLinuxOS)