Added button for refreshing list of available cameras

sajmons · Oct 16, 2024 · f852d76 · f852d76
1 parent 8ebd18d
commit f852d76
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/CollimationCircles/Controls/StreamUserControl.axaml b/CollimationCircles/Controls/StreamUserControl.axaml
@@ -18,19 +18,32 @@
         Orientation="Vertical"
         IsEnabled="{Binding !IsPlaying}">
         <TextBlock Text="{DynamicResource Text.CameraType}"/>
-        <ComboBox
-          ItemsSource="{Binding CameraList}"
-          SelectedItem="{Binding SelectedCamera}">
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding APIType}" />
-                <TextBlock Text=": " />
-                <TextBlock Text="{Binding Name}" />
-              </StackPanel>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
+        <DockPanel>
+          <ComboBox
+            Width="180"
+            HorizontalAlignment="Left"
+            ItemsSource="{Binding CameraList}"
+            SelectedItem="{Binding SelectedCamera}"
+            DockPanel.Dock="Left">
+            <ComboBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding APIType}" />
+                  <TextBlock Text=": " />
+                  <TextBlock Text="{Binding Name}" />
+                </StackPanel>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+          <Button
+            HorizontalAlignment="Right"
+            Command="{Binding CameraRefreshCommand}"
+            ToolTip.Tip="{DynamicResource Text.RefreshCameras}">
+            <PathIcon
+              Foreground="{DynamicResource Color2}"
+              Data="{StaticResource IconData.Reset}" />
+          </Button>
+        </DockPanel>
         <StackPanel
           Orientation="Vertical"
           IsVisible="{Binding RemoteConnection}">

diff --git a/CollimationCircles/Resources/Lang/en-US.axaml b/CollimationCircles/Resources/Lang/en-US.axaml
@@ -132,6 +132,7 @@
   <system:String x:Key="Text.CameraControls">Camera controls</system:String>
   <system:String x:Key="Text.Default">Default</system:String>
   <system:String x:Key="Text.EnterRemoteAddress">Enter address</system:String>
+  <system:String x:Key="Text.RefreshCameras">Refresh camera list</system:String>
 
   <!-- Non translatable -->
   <system:String x:Key="Text.StarChar">*</system:String>

diff --git a/CollimationCircles/ViewModels/StreamViewModel.cs b/CollimationCircles/ViewModels/StreamViewModel.cs
@@ -181,6 +181,13 @@ private void CameraSettings()
             }
         }
 
+        [RelayCommand]
+        private void CameraRefresh()
+        {
+            CameraList = new ObservableCollection<ICamera>(cameraControlService.GetCameraList());
+            SelectedCamera = CameraList.FirstOrDefault(c => c.Name == settingsViewModel.LastSelectedCamera) ?? CameraList.First();
+        }
+
         public void OnClosed()
         {
             SettingsDialogViewModel = null;