diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs index e349a00..32d93b2 100644 --- a/DS4Windows/DS4Control/ScpUtil.cs +++ b/DS4Windows/DS4Control/ScpUtil.cs @@ -421,7 +421,7 @@ namespace DS4Windows [DS4Controls.GyroXPos] = "Gyro X+", [DS4Controls.GyroXNeg] = "Gyro X-", [DS4Controls.GyroZPos] = "Gyro Z+", - [DS4Controls.GyroZNeg] = "Gyro Z+-", + [DS4Controls.GyroZNeg] = "Gyro Z-", [DS4Controls.SwipeLeft] = "Swipe Left", [DS4Controls.SwipeRight] = "Swipe Right", [DS4Controls.SwipeUp] = "Swipe Up", diff --git a/DS4Windows/DS4Forms/BindingWindow.xaml b/DS4Windows/DS4Forms/BindingWindow.xaml index d6c5301..9827ab8 100644 --- a/DS4Windows/DS4Forms/BindingWindow.xaml +++ b/DS4Windows/DS4Forms/BindingWindow.xaml @@ -25,12 +25,14 @@ @@ -52,12 +54,14 @@ - + diff --git a/DS4Windows/DS4Forms/BindingWindow.xaml.cs b/DS4Windows/DS4Forms/BindingWindow.xaml.cs index 7f18c48..3304c1b 100644 --- a/DS4Windows/DS4Forms/BindingWindow.xaml.cs +++ b/DS4Windows/DS4Forms/BindingWindow.xaml.cs @@ -488,7 +488,7 @@ namespace DS4WinWPF.DS4Forms new BindAssociation() { outputType = BindAssociation.OutType.Key, outkey = 0x52 }); rKey.Click += OutputKeyBtn_Click; associatedBindings.Add(tKey, - new BindAssociation() { outputType = BindAssociation.OutType.Key, outkey = 0x55 }); + new BindAssociation() { outputType = BindAssociation.OutType.Key, outkey = 0x54 }); tKey.Click += OutputKeyBtn_Click; associatedBindings.Add(yKey, new BindAssociation() { outputType = BindAssociation.OutType.Key, outkey = 0x59 }); diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs index be6db00..21bfcd4 100644 --- a/DS4Windows/DS4Forms/MainWindow.xaml.cs +++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs @@ -1213,6 +1213,7 @@ Properties.Resources.DS4Update, MessageBoxButton.YesNo, MessageBoxImage.Question private void NotifyIcon_TrayMiddleMouseDown(object sender, RoutedEventArgs e) { + contextclose = true; Close(); } @@ -1283,6 +1284,11 @@ Properties.Resources.DS4Update, MessageBoxButton.YesNo, MessageBoxImage.Question private void Editor_CreatedProfile(ProfileEditor sender, string profile) { profileListHolder.AddProfileSort(profile); + int devnum = sender.DeviceNum; + if (devnum >= 0 && devnum+1 <= conLvViewModel.ControllerCol.Count) + { + conLvViewModel.ControllerCol[devnum].ChangeSelectedProfile(profile); + } } private void NotifyIcon_TrayMouseDoubleClick(object sender, RoutedEventArgs e) diff --git a/DS4Windows/DS4Forms/ProfileEditor.xaml b/DS4Windows/DS4Forms/ProfileEditor.xaml index 45ee8ad..61bb2eb 100644 --- a/DS4Windows/DS4Forms/ProfileEditor.xaml +++ b/DS4Windows/DS4Forms/ProfileEditor.xaml @@ -100,7 +100,7 @@ - @@ -620,7 +620,8 @@ - +