Merge classic-ui-modern-fixes into cursor/add-camera-placement-preview-tab-7452

Resolved conflict in SettingsPage.xaml by including both:
- WebCam tab (from this branch)
- Trim and About tabs (from classic-ui-modern-fixes)

Author: cursoragent

src/Captura.Base/Services/IHardwareInfoService.cs

@@ -0,0 +1,39 @@
+namespace Captura
+{
+    public enum GpuVendor
+    {
+        Unknown,
+        AMD,
+        NVIDIA,
+        Intel,
+        Other
+    }
+
+    public interface IHardwareInfoService
+    {
+        /// <summary>
+        /// Gets the primary GPU vendor
+        /// </summary>
+        GpuVendor GpuVendor { get; }
+
+        /// <summary>
+        /// Gets the GPU name/description
+        /// </summary>
+        string GpuName { get; }
+
+        /// <summary>
+        /// Checks if AMD hardware encoding is available
+        /// </summary>
+        bool HasAmdEncoder { get; }
+
+        /// <summary>
+        /// Checks if NVIDIA hardware encoding is available
+        /// </summary>
+        bool HasNvidiaEncoder { get; }
+
+        /// <summary>
+        /// Checks if Intel QuickSync encoding is available
+        /// </summary>
+        bool HasIntelQuickSync { get; }
+    }
+}

src/Captura.FFmpeg/Video/FFmpegWriterProvider.cs

@@ -12,33 +12,45 @@ public class FFmpegWriterProvider : IVideoWriterProvider
         public string Name => "FFmpeg";
 
         readonly FFmpegSettings _settings;
+        readonly IHardwareInfoService _hardwareInfo;
 
-        public FFmpegWriterProvider(FFmpegSettings Settings)
+        public FFmpegWriterProvider(FFmpegSettings Settings, IHardwareInfoService HardwareInfo)
         {
             _settings = Settings;
+            _hardwareInfo = HardwareInfo;
         }
 
         public IEnumerator<IVideoWriterItem> GetEnumerator()
         {
+            // Always show CPU-based encoders
             yield return new X264VideoCodec();
             yield return new XvidVideoCodec();
 
-            // AMD AMF
-            yield return AmfVideoCodec_Simple.CreateH264();
-            yield return AmfVideoCodec_Simple.CreateHevc();
-            yield return AmfVideoCodec.CreateH264();
-            yield return AmfVideoCodec.CreateHevc();
-            yield return AmfVideoCodec_VBR.CreateH264();
-            yield return AmfVideoCodec_VBR.CreateHevc();
+            // AMD AMF - only show if AMD GPU detected
+            if (_hardwareInfo.HasAmdEncoder)
+            {
+                yield return AmfVideoCodec_Simple.CreateH264();
+                yield return AmfVideoCodec_Simple.CreateHevc();
+                yield return AmfVideoCodec.CreateH264();
+                yield return AmfVideoCodec.CreateHevc();
+                yield return AmfVideoCodec_VBR.CreateH264();
+                yield return AmfVideoCodec_VBR.CreateHevc();
+            }
 
-            // Intel QuickSync
-            yield return new QsvHevcVideoCodec();
+            // Intel QuickSync - only show if Intel GPU detected
+            if (_hardwareInfo.HasIntelQuickSync)
+            {
+                yield return new QsvHevcVideoCodec();
+            }
 
-            // NVIDIA NVENC
-            yield return NvencVideoCodec.CreateH264();
-            yield return NvencVideoCodec.CreateHevc();
+            // NVIDIA NVENC - only show if NVIDIA GPU detected
+            if (_hardwareInfo.HasNvidiaEncoder)
+            {
+                yield return NvencVideoCodec.CreateH264();
+                yield return NvencVideoCodec.CreateHevc();
+            }
 
-            // Custom
+            // Custom - always show user's custom codecs
             foreach (var item in _settings.CustomCodecs)
             {
                 yield return new CustomFFmpegVideoCodec(item);

src/Captura.Windows/HardwareInfoService.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Linq;
+using SharpDX.DXGI;
+
+namespace Captura.Windows
+{
+    public class HardwareInfoService : IHardwareInfoService
+    {
+        public GpuVendor GpuVendor { get; }
+        public string GpuName { get; }
+        public bool HasAmdEncoder { get; }
+        public bool HasNvidiaEncoder { get; }
+        public bool HasIntelQuickSync { get; }
+
+        public HardwareInfoService()
+        {
+            try
+            {
+                using var factory = new Factory1();
+                var adapter = factory.Adapters1.FirstOrDefault();
+                
+                if (adapter != null)
+                {
+                    GpuName = adapter.Description.Description ?? "Unknown GPU";
+                    GpuVendor = DetectVendor(adapter);
+                    
+                    // Set encoder availability based on vendor
+                    HasAmdEncoder = GpuVendor == Captura.GpuVendor.AMD;
+                    HasNvidiaEncoder = GpuVendor == Captura.GpuVendor.NVIDIA;
+                    HasIntelQuickSync = GpuVendor == Captura.GpuVendor.Intel;
+                }
+                else
+                {
+                    GpuName = "No GPU detected";
+                    GpuVendor = Captura.GpuVendor.Unknown;
+                    HasAmdEncoder = false;
+                    HasNvidiaEncoder = false;
+                    HasIntelQuickSync = false;
+                }
+            }
+            catch (Exception)
+            {
+                // If detection fails, default to unknown and allow all encoders
+                // (better to show too many options than too few)
+                GpuName = "Detection failed";
+                GpuVendor = Captura.GpuVendor.Unknown;
+                HasAmdEncoder = true; // Allow all when detection fails
+                HasNvidiaEncoder = true;
+                HasIntelQuickSync = true;
+            }
+        }
+
+        private static GpuVendor DetectVendor(Adapter1 adapter)
+        {
+            var vendorId = adapter.Description.VendorId;
+            
+            // Common GPU vendor IDs
+            // AMD: 0x1002
+            // NVIDIA: 0x10DE
+            // Intel: 0x8086
+            
+            return vendorId switch
+            {
+                0x1002 => Captura.GpuVendor.AMD,
+                0x10DE => Captura.GpuVendor.NVIDIA,
+                0x8086 => Captura.GpuVendor.Intel,
+                _ => DetermineVendorFromName(adapter.Description.Description)
+            };
+        }
+
+        private static GpuVendor DetermineVendorFromName(string gpuName)
+        {
+            if (string.IsNullOrEmpty(gpuName))
+                return Captura.GpuVendor.Unknown;
+
+            var lowerName = gpuName.ToLowerInvariant();
+            
+            if (lowerName.Contains("amd") || lowerName.Contains("radeon") || lowerName.Contains("ati"))
+                return Captura.GpuVendor.AMD;
+                
+            if (lowerName.Contains("nvidia") || lowerName.Contains("geforce") || lowerName.Contains("quadro") || lowerName.Contains("tesla"))
+                return Captura.GpuVendor.NVIDIA;
+                
+            if (lowerName.Contains("intel") || lowerName.Contains("hd graphics") || lowerName.Contains("uhd graphics") || lowerName.Contains("iris"))
+                return Captura.GpuVendor.Intel;
+            
+            return Captura.GpuVendor.Unknown;
+        }
+    }
+}

src/Captura.Windows/WindowsModule.cs

@@ -12,6 +12,9 @@ public static class WindowsModule
     {
         public static void Load(IBinder Binder)
         {
+            // Register hardware detection service first, as it's used by encoder providers
+            Binder.Bind<IHardwareInfoService, HardwareInfoService>();
+
             if (Windows8OrAbove)
             {
                 try

src/Captura/Pages/AboutPage.xaml

@@ -118,26 +118,6 @@
                     </DockPanel>
                 </Button>
 
-                <Label Margin="0,15,0,5">
-                    <TextBlock Text="{Binding Tools, Source={StaticResource Loc}, Mode=OneWay}"/>
-                </Label>
-                
-                <WrapPanel Margin="3">
-                    <!-- Image Editor button removed - internal editor was removed, external editor is available via toggle in main UI -->
-                    <!-- Crop and Imgur upload buttons removed - features no longer working/supported -->
-
-                    <Button ToolTip="{Binding Trim, Source={StaticResource Loc}, Mode=OneWay}"
-                            Padding="5"
-                            Margin="0,0,10,10"
-                            Click="OpenAudioVideoTrimmer">
-                        <Path Data="{Binding Icons.Trim, Source={StaticResource ServiceLocator}}"
-                              Width="15"
-                              Height="15"
-                              Stretch="Uniform"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"/>
-                    </Button>
-                </WrapPanel>
             </StackPanel>
         </ScrollViewer>
     </Grid>

src/Captura/Pages/AboutPage.xaml.cs

@@ -14,12 +14,5 @@ void ViewCrashLogs(object Sender, RoutedEventArgs E)
         {
             NavigationService?.Navigate(new CrashLogsPage());
         }
-
-        // OpenImageEditor, OpenImageCropper, and UploadToImgur methods removed - features no longer supported
-
-        void OpenAudioVideoTrimmer(object Sender, RoutedEventArgs E)
-        {
-            new TrimmerWindow().ShowAndFocus();
-        }
     }
 }

src/Captura/Pages/MainPage.xaml

@@ -109,15 +109,6 @@
 
                 <Frame Source="RecentPage.xaml"/>
             </TabItem>
-            <TabItem>
-                <TabItem.Header>
-                    <Path Data="{Binding Icons.Help, Source={StaticResource ServiceLocator}}"
-                          Style="{StaticResource TabIcon}"
-                          ToolTip="{Binding About, Source={StaticResource Loc}, Mode=OneWay}"/>
-                </TabItem.Header>
-                
-                <Frame Source="AboutPage.xaml"/>
-            </TabItem>
         </TabControl>
     </DockPanel>
 </Page>

src/Captura/Pages/SettingsPage.xaml

@@ -56,6 +56,12 @@
             <TabItem Header="{Binding WebCam, Source={StaticResource Loc}, Mode=OneWay}">
                 <Frame Name="WebcamTabFrame"/>
             </TabItem>
+            <TabItem Header="{Binding Trim, Source={StaticResource Loc}, Mode=OneWay}">
+                <Frame Source="TrimmerPage.xaml"/>
+            </TabItem>
+            <TabItem Header="{Binding About, Source={StaticResource Loc}, Mode=OneWay}">
+                <Frame Source="AboutPage.xaml"/>
+            </TabItem>
         </TabControl>
     </Grid>
 </Page>

src/Captura/Windows/RegionSelector.xaml

@@ -18,6 +18,28 @@
         Name="This"
         ShowInTaskbar="False">
     <Window.InputBindings>
+        <KeyBinding Key="Left"
+                    Command="{Binding RegionSelectorViewModel.MoveLeftCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Right"
+                    Command="{Binding RegionSelectorViewModel.MoveRightCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Up"
+                    Command="{Binding RegionSelectorViewModel.MoveUpCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Down"
+                    Command="{Binding RegionSelectorViewModel.MoveDownCommand, Source={StaticResource ServiceLocator}}"/>
+
+        <KeyBinding Key="Left"
+                    Modifiers="Shift"
+                    Command="{Binding RegionSelectorViewModel.DecreaseWidthCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Right"
+                    Modifiers="Shift"
+                    Command="{Binding RegionSelectorViewModel.IncreaseWidthCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Up"
+                    Modifiers="Shift"
+                    Command="{Binding RegionSelectorViewModel.DecreaseHeightCommand, Source={StaticResource ServiceLocator}}"/>
+        <KeyBinding Key="Down"
+                    Modifiers="Shift"
+                    Command="{Binding RegionSelectorViewModel.IncreaseHeightCommand, Source={StaticResource ServiceLocator}}"/>
+        
         <KeyBinding Key="Escape"
                     Command="{Binding RegionSelectorViewModel.ExitDrawingModeCommand, Source={StaticResource ServiceLocator}}"/>
     </Window.InputBindings>