The application name is now displayed under the timeline. Quick filter buttons have been added under the calendar. The bug preventing website renaming has been fixed.

maksim0-debug · maksim0-debug · commit 463a887b2170 · 2026-03-21T21:04:33.000+02:00
diff --git a/Recap/Resources/AppFilterController.cs b/Recap/Resources/AppFilterController.cs
@@ -824,7 +824,16 @@ private void RenderChildren(NodeData parentNode, string parentRaw, string parent
                 bool isGroupExpanded = _expandedGroups.Contains(fullGroupKey) || isSearch;
 
                 string displayChildName = childName;
-                if (level == 2 && parentRaw != null && parentRaw.Contains("|github.com") && childName.Contains("/") && childName.Split('/').Length == 2)
+                bool hasAlias = false;
+                string aliasKey = $"{parentRaw}|{childName}";
+
+                if (_aliases != null && _aliases.TryGetValue(aliasKey, out string aliasName))
+                {
+                    displayChildName = aliasName;
+                    hasAlias = true;
+                }
+
+                if (!hasAlias && level == 2 && parentRaw != null && parentRaw.Contains("|github.com") && childName.Contains("/") && childName.Split('/').Length == 2)
                 {
                     string[] splitRepo = childName.Split('/');
                     displayChildName = $"{splitRepo[1]} - {splitRepo[0]}";
diff --git a/Recap/Resources/HistoryViewController.cs b/Recap/Resources/HistoryViewController.cs
@@ -30,6 +30,7 @@ public class HistoryViewController : IDisposable
 
         private readonly AppFilterController _appFilterController;
         private readonly TimelineController _timelineController;
+        private readonly IconManager _iconManager;
         
         private readonly TimelineDataManager _dataManager;
         private readonly MediaPlayerController _mediaController;
@@ -38,10 +39,13 @@ public class HistoryViewController : IDisposable
         private List<FrameIndex> _pendingFrames = new List<FrameIndex>();
         private bool _isInitialLoad = true;
         private bool _isGlobalMode = false;
+        public bool IsGlobalMode => _isGlobalMode;
 
         private DateTime _currentStartDate = DateTime.Today;
         private DateTime _currentEndDate = DateTime.Today;
 
+        public bool IsRangeMode => _currentStartDate.Date != _currentEndDate.Date;
+
         private List<string> _selectedAppFilter = null;
         
         private System.Windows.Forms.Timer _uiTimer;
@@ -74,6 +78,8 @@ public HistoryViewController(
             DarkListBox lstAppFilter,
             TextBox txtAppSearch,
             Label lblTime,
+            Label lblCurrentAppName,
+            PictureBox picCurrentAppIcon,
             Label lblInfo,
             CheckBox chkAutoScroll,
             Label lblFormatBadge,
@@ -92,6 +98,7 @@ public HistoryViewController(
             _settings = settings;
             _ocrDb = ocrDb;
             _txtOcrSearch = txtOcrSearch;
+            _iconManager = iconManager;
 
             _dataManager = new TimelineDataManager(frameRepository, ocrDb, settings);
             _mediaController = new MediaPlayerController(libVLC, mediaPlayer);
@@ -107,7 +114,7 @@ public HistoryViewController(
 
             _appFilterController = new AppFilterController(lstAppFilter, txtAppSearch, iconManager, _ocrDb, _frameRepository, settings);
             lstAppFilter.ShowFrameCount = settings.ShowFrameCount;   
-            _timelineController = new TimelineController(timeTrackBar, lblTime, lblInfo, chkAutoScroll, null, frameRepository, iconManager);
+            _timelineController = new TimelineController(timeTrackBar, lblTime, lblCurrentAppName, picCurrentAppIcon, lblInfo, chkAutoScroll, null, frameRepository, iconManager);
 
             _appFilterController.FilterChanged += OnAppFilterChanged;
             _appFilterController.AppHidden += OnAppHidden;
@@ -307,6 +314,45 @@ private void OnOcrSearchKeyDown(object sender, KeyEventArgs e)
         }
 
 
+        private string CleanAppNameForUI(string rawName)
+        {
+            if (string.IsNullOrEmpty(rawName)) return "";
+
+            var parts = rawName.Split('|');
+            string displayName = "";
+
+            if (parts.Length >= 3 && parts[1].Equals("YouTube", StringComparison.OrdinalIgnoreCase))
+            {
+                string title = parts[2];
+                int vIndex = title.LastIndexOf(" [v=");
+                if (vIndex > 0)
+                {
+                    title = title.Substring(0, vIndex);
+                }
+                displayName = title;
+            }
+            else if (parts.Length >= 2)
+            {
+                displayName = parts[parts.Length - 1];
+            }
+            else
+            {
+                displayName = rawName;
+            }
+
+            if (displayName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+            {
+                displayName = displayName.Substring(0, displayName.Length - 4);
+            }
+
+            if (displayName.Length > 0 && char.IsLower(displayName[0]) && parts.Length < 2)
+            {
+                displayName = char.ToUpper(displayName[0]) + displayName.Substring(1);
+            }
+
+            return displayName;
+        }
+
         private async void OnSearchKeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter && _settings.GlobalSearch)
@@ -325,7 +371,26 @@ private void OnUiTimerTick(object sender, EventArgs e)
                 {
                     var miniFrame = _dataManager.FilteredFrames[_wantedFrameIndex];
 
-                    _timelineController.UpdateTimeLabel(miniFrame.GetTime(), _isGlobalMode);
+                    bool isRangeMode = _currentStartDate.Date != _currentEndDate.Date;
+                    _timelineController.UpdateTimeLabel(miniFrame.GetTime(), _isGlobalMode || isRangeMode);
+                    
+                    string rawAppName = "";
+                    if (_dataManager.AppMap.TryGetValue(miniFrame.AppId, out string name))
+                    {
+                        rawAppName = name;
+                    }
+                    else
+                    {
+                        var frameData = _frameRepository.GetFrameIndex(miniFrame.TimestampTicks);
+                        if (frameData.TimestampTicks != 0)
+                        {
+                            rawAppName = frameData.AppName;
+                        }
+                    }
+
+                    Image appIcon = _iconManager.GetIcon(rawAppName);
+                    string cleanName = CleanAppNameForUI(rawAppName);
+                    _timelineController.UpdateCurrentApp(cleanName, appIcon);
 
                     if (_ocrTextForm != null && !_ocrTextForm.IsDisposed)
                     {
diff --git a/Recap/Resources/MainForm.cs b/Recap/Resources/MainForm.cs
@@ -21,10 +21,12 @@ public partial class MainForm : Form
         public MediaPlayer MainMediaPlayer { get; private set; }
 
         private Button btnStart, btnStop, btnBrowse, btnFullscreen, btnSettings, btnPrevMonth, btnNextMonth, btnHelp;
+        private Button btn7Days, btn14Days, btnCustomRange;
         private TextBox txtStoragePath, txtAppSearch, txtOcrSearch;
         private DateTimePicker datePicker;
         private TrackBar timeTrackBar;
-        private Label lblStatus, lblInfo, lblTime, lblPath, lblAppFilter, lblMonth, lblFormatBadge, lblOcrSearch;
+        private Label lblStatus, lblInfo, lblTime, lblPath, lblAppFilter, lblMonth, lblFormatBadge, lblOcrSearch, lblCurrentAppName;
+        private PictureBox picCurrentAppIcon;
         private DarkListBox lstAppFilter;
         private DarkListBox lstNotes;
         private SuggestionForm _suggestionForm;
@@ -136,7 +138,7 @@ private void InitializeControllers()
             _historyViewController = new HistoryViewController(
                 MainPictureBox, MainVideoView,
                 timeTrackBar, lstAppFilter, txtAppSearch,
-                lblTime, lblInfo, chkAutoScroll, lblFormatBadge,
+                lblTime, lblCurrentAppName, picCurrentAppIcon, lblInfo, chkAutoScroll, lblFormatBadge,
                 _frameRepository, _iconManager,
                 _currentSettings, _ocrDb, txtOcrSearch,
                 LibVLC, MainMediaPlayer);
@@ -412,9 +414,26 @@ private void InitializeComponent()
             statsTabControl.TabPages.Add(tabPageHourly);
             tabPageStats.Controls.Add(statsTabControl);
             datePicker = new DateTimePicker { Location = new Point(12, 15), Format = DateTimePickerFormat.Short, Width = 100 };
-            datePicker.ValueChanged += (s, e) =>
+            
+            bool dateChangedUnsuppressed = false;
+            datePicker.ValueChanged += async (s, e) =>
             {
-                if (!_suppressDateEvent) _historyViewController?.LoadFramesForDate(datePicker.Value);
+                if (!_suppressDateEvent)
+                {
+                    dateChangedUnsuppressed = true;
+                    if (_historyViewController != null) await _historyViewController.LoadFramesForDate(datePicker.Value);
+                }
+            };
+            datePicker.DropDown += (s, e) =>
+            {
+                dateChangedUnsuppressed = false;
+            };
+            datePicker.CloseUp += async (s, e) =>
+            {
+                if (!_suppressDateEvent && !dateChangedUnsuppressed && _historyViewController != null && (_historyViewController.IsRangeMode || _historyViewController.IsGlobalMode))
+                {
+                    await _historyViewController.LoadFramesForDate(datePicker.Value);
+                }
             };
 
             var dateMenu = new ContextMenuStrip();
@@ -454,7 +473,44 @@ private void InitializeComponent()
 
             timeTrackBar = new TrackBar { Location = new Point(190, 15), Size = new Size(tabPageView.ClientSize.Width - 364, 45), Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right, TickStyle = TickStyle.None, Minimum = 0, Maximum = 100 };
             lblTime = new Label { Name = "lblTime", AutoSize = true, Location = new Point(timeTrackBar.Right - 66, timeTrackBar.Bottom + -22), TextAlign = ContentAlignment.TopRight, Anchor = AnchorStyles.Top | AnchorStyles.Right };
-            chkAutoScroll = new CheckBox { Location = new Point(12, 65), AutoSize = true, Checked = false };
+            
+            picCurrentAppIcon = new PictureBox { Size = new Size(16, 16), SizeMode = PictureBoxSizeMode.Zoom, BackColor = Color.Transparent };
+            lblCurrentAppName = new Label { AutoSize = false, AutoEllipsis = true, Height = 20, Width = 200, TextAlign = ContentAlignment.MiddleRight, BackColor = Color.Transparent, ForeColor = Color.LightGray };
+            
+            btn7Days = new Button { Location = new Point(12, 44), Size = new Size(30, 24), Text = "7" };
+            btn7Days.Click += (s, e) => {
+                var end = DateTime.Now.Date;
+                var start = end.AddDays(-7);
+                _historyViewController?.LoadFramesForRange(start, end);
+            };
+
+            btn14Days = new Button { Location = new Point(47, 44), Size = new Size(30, 24), Text = "14" };
+            btn14Days.Click += (s, e) => {
+                var end = DateTime.Now.Date;
+                var start = end.AddDays(-14);
+                _historyViewController?.LoadFramesForRange(start, end);
+            };
+
+            btnCustomRange = new Button { Location = new Point(82, 44), Size = new Size(30, 24) };
+            btnCustomRange.Paint += (s, e) => {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                using (var pen = new Pen(btnCustomRange.ForeColor, 1.5f))
+                {
+                    int m = 6;
+                    int h = btnCustomRange.Height;
+                    int w = btnCustomRange.Width;
+                    e.Graphics.DrawLine(pen, m, m + 2, m, h - m - 2);
+                    e.Graphics.DrawLine(pen, w - m, m + 2, w - m, h - m - 2);
+                    e.Graphics.DrawLine(pen, m, h / 2, w - m, h / 2);
+                    e.Graphics.DrawLine(pen, m, h / 2, m + 3, h / 2 - 3);
+                    e.Graphics.DrawLine(pen, m, h / 2, m + 3, h / 2 + 3);
+                    e.Graphics.DrawLine(pen, w - m, h / 2, w - m - 3, h / 2 - 3);
+                    e.Graphics.DrawLine(pen, w - m, h / 2, w - m - 3, h / 2 + 3);
+                }
+            };
+            btnCustomRange.Click += (s, e) => ShowRangeSelectionDialog();
+
+            chkAutoScroll = new CheckBox { Location = new Point(12, 80), AutoSize = true, Checked = false };
             chkAutoScroll.CheckedChanged += (s, e) =>
             {
                 if (chkAutoScroll.Checked && _historyViewController != null)
@@ -474,8 +530,10 @@ private void InitializeComponent()
             MainVideoView = new VideoView { Location = new Point(12, 100), Size = new Size(tabPageView.ClientSize.Width - 214, tabPageView.ClientSize.Height - 112), Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left, Visible = false, MediaPlayer = MainMediaPlayer };
             MainVideoView.DoubleClick += BtnFullscreen_Click;
 
-            tabPageView.Controls.AddRange(new Control[] { datePicker, timeTrackBar, lblTime, chkGlobalSearch, lblOcrSearch, txtOcrSearch, lblAppFilter, txtAppSearch, lstAppFilter, lstNotes, chkAutoScroll, btnFullscreen, lblInfo, lblFormatBadge, MainPictureBox, MainVideoView });
+            tabPageView.Controls.AddRange(new Control[] { datePicker, btn7Days, btn14Days, btnCustomRange, timeTrackBar, lblTime, picCurrentAppIcon, lblCurrentAppName, chkGlobalSearch, lblOcrSearch, txtOcrSearch, lblAppFilter, txtAppSearch, lstAppFilter, lstNotes, chkAutoScroll, btnFullscreen, lblInfo, lblFormatBadge, MainPictureBox, MainVideoView });
             lblFormatBadge.BringToFront();
+            lblCurrentAppName.BringToFront();
+            picCurrentAppIcon.BringToFront();
 
             mainTabControl.TabPages.Add(tabPageView);
             mainTabControl.TabPages.Add(tabPageStats);
@@ -960,7 +1018,24 @@ private void UpdateLayout()
             if (newTrackBarWidth > 50)
             {
                 timeTrackBar.SetBounds(trackBarLeft, timeTrackBar.Top, newTrackBarWidth, timeTrackBar.Height);
-                lblTime.Left = timeTrackBar.Right - 66;
+                
+                lblCurrentAppName.Top = timeTrackBar.Bottom - 20;
+                lblCurrentAppName.Left = timeTrackBar.Right - lblCurrentAppName.Width;
+
+                lblTime.Top = lblCurrentAppName.Bottom - 2;
+                lblTime.Left = timeTrackBar.Right - Math.Max(66, lblTime.Width);
+                
+                int textLeftEdge = lblCurrentAppName.Left;
+                if (!string.IsNullOrEmpty(lblCurrentAppName.Text))
+                {
+                    int textWidth = TextRenderer.MeasureText(lblCurrentAppName.Text, lblCurrentAppName.Font).Width;
+                    if (textWidth > lblCurrentAppName.Width) textWidth = lblCurrentAppName.Width;
+                    textLeftEdge = lblCurrentAppName.Right - textWidth;
+                    if (textLeftEdge < lblCurrentAppName.Left) textLeftEdge = lblCurrentAppName.Left;
+                }
+                
+                picCurrentAppIcon.Left = textLeftEdge - picCurrentAppIcon.Width - 5;
+                picCurrentAppIcon.Top = lblCurrentAppName.Top + (lblCurrentAppName.Height - picCurrentAppIcon.Height) / 2;
             }
 
             if (lblFormatBadge != null)
diff --git a/Recap/Resources/TimelineController.cs b/Recap/Resources/TimelineController.cs
@@ -10,6 +10,8 @@ public class TimelineController : IDisposable
 
         private readonly TrackBar _timeTrackBar;
         private readonly Label _lblTime;
+        private readonly Label _lblCurrentAppName;
+        private readonly PictureBox _picCurrentAppIcon;
         private readonly Label _lblInfo;
         private readonly CheckBox _chkAutoScroll;
         private readonly DateTimePicker _datePicker;
@@ -24,6 +26,8 @@ public class TimelineController : IDisposable
         public TimelineController(
             TrackBar timeTrackBar,
             Label lblTime,
+            Label lblCurrentAppName,
+            PictureBox picCurrentAppIcon,
             Label lblInfo,
             CheckBox chkAutoScroll,
             DateTimePicker datePicker,
@@ -32,6 +36,8 @@ public TimelineController(
         {
             _timeTrackBar = timeTrackBar;
             _lblTime = lblTime;
+            _lblCurrentAppName = lblCurrentAppName;
+            _picCurrentAppIcon = picCurrentAppIcon;
             _lblInfo = lblInfo;
             _chkAutoScroll = chkAutoScroll;
             _datePicker = datePicker;
@@ -81,6 +87,8 @@ public void SetFrames(List<MiniFrame> frames, bool isLiveUpdate, bool isInitialL
                 _timeTrackBar.Minimum = 0;
                 _timeTrackBar.Maximum = 0;
                 _lblTime.Text = "";
+                if (_lblCurrentAppName != null) _lblCurrentAppName.Text = "";
+                if (_picCurrentAppIcon != null) _picCurrentAppIcon.Image = null;
                 UpdateInfoLabel();
             }
             else
@@ -117,18 +125,6 @@ public void Navigate(int offset)
             }
         }
 
-        public void UpdateTimeLabel(DateTime time, bool showDate)
-        {
-            if (showDate)
-            {
-                _lblTime.Text = $"{time:HH:mm:ss}\n{time:dd.MM.yyyy}";
-            }
-            else
-            {
-                _lblTime.Text = time.ToString("HH:mm:ss");
-            }
-        }
-
         public void UpdateInfoLabel()
         {
             if (_currentFrames == null || _currentFrames.Count == 0)
@@ -235,5 +231,67 @@ public void Dispose()
 
             _previewManager?.Dispose();
         }
+
+        public void UpdateCurrentApp(string displayName, System.Drawing.Image icon)
+        {
+            if (_lblCurrentAppName != null)
+            {
+                _lblCurrentAppName.Text = displayName;
+            }
+            if (_picCurrentAppIcon != null)
+            {
+                _picCurrentAppIcon.Image = icon;
+            }
+
+            SyncAppInfoLayout();
+        }
+
+        public void UpdateTimeLabel(DateTime time, bool showDate)
+        {
+            if (_lblTime == null) return;
+
+            if (showDate)
+            {
+                _lblTime.Text = $"{time:HH:mm:ss}\n{time:dd.MM.yyyy}";
+            }
+            else
+            {
+                _lblTime.Text = time.ToString("HH:mm:ss");
+            }
+            
+            Application.DoEvents();              
+            SyncAppInfoLayout();
+        }
+
+        private void SyncAppInfoLayout()
+        {
+            if (_lblCurrentAppName == null || _picCurrentAppIcon == null || _lblTime == null) return;
+
+            _lblCurrentAppName.Top = _timeTrackBar.Bottom - 20; 
+            _lblCurrentAppName.Left = _timeTrackBar.Right - _lblCurrentAppName.Width;
+
+            _lblTime.Top = _lblCurrentAppName.Bottom - 2;
+            _lblTime.Left = _timeTrackBar.Right - _lblTime.Width;
+
+            if (!string.IsNullOrEmpty(_lblCurrentAppName.Text))
+            {
+                int textWidth = TextRenderer.MeasureText(_lblCurrentAppName.Text, _lblCurrentAppName.Font).Width;
+                
+                if (textWidth > _lblCurrentAppName.Width)
+                {
+                    textWidth = _lblCurrentAppName.Width;
+                }
+                
+                int textLeftEdge = _lblCurrentAppName.Right - textWidth;
+                
+                if (textLeftEdge < _lblCurrentAppName.Left) 
+                {
+                    textLeftEdge = _lblCurrentAppName.Left;
+                }
+                
+                _picCurrentAppIcon.Left = textLeftEdge - _picCurrentAppIcon.Width - 5;
+                _picCurrentAppIcon.Top = _lblCurrentAppName.Top + (_lblCurrentAppName.Height - _picCurrentAppIcon.Height) / 2;
+            }
+        }
     }
 }
diff --git a/Recap/Utilities/AppNameParser.cs b/Recap/Utilities/AppNameParser.cs
