[Color Picker] Open settings (#13747)

* Add settings * Added try catch and icon update Co-authored-by: Laute <Niels.Laute@philips.com>
microsoft · Oct 11, 2021 · 0ca9b1b · 0ca9b1b
1 parent 85eddfc
commit 0ca9b1b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
+using System.IO;
 using System.Windows;
 using ColorPicker.Settings;
 using ColorPicker.ViewModelContracts;
@@ -134,6 +136,7 @@ private void ShowColorPickerEditor()
                 _colorEditorWindow = new ColorEditorWindow(this);
                 _colorEditorWindow.Content = _colorEditorViewModel;
                 _colorEditorViewModel.OpenColorPickerRequested += ColorEditorViewModel_OpenColorPickerRequested;
+                _colorEditorViewModel.OpenSettingsRequested += ColorEditorViewModel_OpenSettingsRequested;
                 _colorEditorViewModel.OpenColorPickerRequested += (object sender, EventArgs e) =>
                 {
                     SessionEventHelper.Event.EditorColorPickerOpened = true;
@@ -183,5 +186,20 @@ private void ColorEditorViewModel_OpenColorPickerRequested(object sender, EventA
 
             _colorEditorWindow.Hide();
         }
+
+        private void ColorEditorViewModel_OpenSettingsRequested(object sender, EventArgs e)
+        {
+            try
+            {
+                var assemblyPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                var fullPath = Directory.GetParent(assemblyPath).FullName;
+                Process.Start(new ProcessStartInfo(fullPath + "\\..\\PowerToys.exe") { Arguments = "--open-settings=ColorPicker" });
+            }
+#pragma warning disable CA1031 // Do not catch general exception types
+            catch
+#pragma warning restore CA1031 // Do not catch general exception types
+            {
+            }
+        }
     }
 }
diff --git a/src/modules/colorPicker/ColorPickerUI/ViewModelContracts/IColorEditorViewModel.cs b/src/modules/colorPicker/ColorPickerUI/ViewModelContracts/IColorEditorViewModel.cs
@@ -14,8 +14,12 @@ public interface IColorEditorViewModel
     {
         event EventHandler OpenColorPickerRequested;
 
+        event EventHandler OpenSettingsRequested;
+
         ICommand OpenColorPickerCommand { get; }
 
+        ICommand OpenSettingsCommand { get; }
+
         ICommand RemoveColorCommand { get; }
 
         ObservableCollection<ColorFormatModel> ColorRepresentations { get; }

diff --git a/src/modules/colorPicker/ColorPickerUI/ViewModels/ColorEditorViewModel.cs b/src/modules/colorPicker/ColorPickerUI/ViewModels/ColorEditorViewModel.cs
@@ -32,6 +32,7 @@ public class ColorEditorViewModel : ViewModelBase, IColorEditorViewModel
         public ColorEditorViewModel(IUserSettings userSettings)
         {
             OpenColorPickerCommand = new RelayCommand(() => OpenColorPickerRequested?.Invoke(this, EventArgs.Empty));
+            OpenSettingsCommand = new RelayCommand(() => OpenSettingsRequested?.Invoke(this, EventArgs.Empty));
             RemoveColorCommand = new RelayCommand(DeleteSelectedColor);
 
             SelectedColorChangedCommand = new RelayCommand((newColor) =>
@@ -47,8 +48,12 @@ public ColorEditorViewModel(IUserSettings userSettings)
 
         public event EventHandler OpenColorPickerRequested;
 
+        public event EventHandler OpenSettingsRequested;
+
         public ICommand OpenColorPickerCommand { get; }
 
+        public ICommand OpenSettingsCommand { get; }
+
         public ICommand RemoveColorCommand { get; }
 
         public ICommand SelectedColorChangedCommand { get; }

diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
@@ -82,17 +82,17 @@
                 VerticalAlignment="Center"
                 Margin="0,1,0,0" />
 
-            <!-- Enable once we have settings linking available -->
-            <!--<Button Width="46"
+            <Button Width="46"
+                    Command="{Binding OpenSettingsCommand}"
                     Height="32"
-                    Content="&#xE115;"
+                    Content="&#xE713;"
                     TabIndex="2"
                     Background="Transparent"
                     FontFamily="Segoe MDL2 Assets"
                     HorizontalAlignment="Right"
                     Margin="0,0,46,0"
                     ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}"
-                    AutomationProperties.Name="{x:Static p:Resources.Open_settings}" />-->
+                    AutomationProperties.Name="{x:Static p:Resources.Open_settings}" />
 
             <Button Width="64"
                     Height="32"