Skip to content

Commit d931a6d

Browse files
committed
Fix a couple settings UI bugs
1 parent a9da168 commit d931a6d

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

RetailCoder.VBE/UI/Settings/InspectionSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
<ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}"
341341
Background="Transparent">
342342
<Button ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}"
343-
Command="{Binding AddWhitelistedNameCommand}"
343+
Click="AddNewItem"
344344
BorderThickness="0"
345345
Background="Transparent">
346346
<StackPanel Orientation="Horizontal">

RetailCoder.VBE/UI/Settings/InspectionSettings.xaml.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private void GroupingGrid_CellEditEnding(object sender, DataGridCellEditEndingEv
3131
var selectedSeverityName = ((ComboBox) e.EditingElement).SelectedItem.ToString();
3232

3333
var severities = Enum.GetValues(typeof(CodeInspectionSeverity)).Cast<CodeInspectionSeverity>();
34-
var selectedSeverity = severities.Single(s => RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + s, UI.Settings.Settings.Culture) == selectedSeverityName);
34+
var selectedSeverity = severities.Single(s => RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + s, Settings.Culture) == selectedSeverityName);
3535

3636
((InspectionSettingsViewModel) ViewModel).UpdateCollection(selectedSeverity);
3737
}
@@ -48,5 +48,12 @@ private void WhitelistedIdentifierGrid_CellEditEnding(object sender, DataGridCel
4848

4949
((InspectionSettingsViewModel)ViewModel).WhitelistedIdentifierSettings = new ObservableCollection<WhitelistedIdentifierSetting>(identifiers);
5050
}
51+
52+
private void AddNewItem(object sender, System.Windows.RoutedEventArgs e)
53+
{
54+
WhitelistedIdentifiersGrid.CommitEdit();
55+
((InspectionSettingsViewModel) ViewModel).AddWhitelistedNameCommand.Execute(null);
56+
e.Handled = true;
57+
}
5158
}
5259
}

RetailCoder.VBE/UI/Settings/TodoSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
<ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}"
267267
Background="Transparent">
268268
<Button ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}"
269-
Command="{Binding AddTodoCommand}"
269+
Click="AddNewTodoMarker"
270270
BorderThickness="0"
271271
Background="Transparent">
272272
<StackPanel Orientation="Horizontal">

RetailCoder.VBE/UI/Settings/TodoSettings.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,12 @@ private void TodoMarkerGrid_CellEditEnding(object sender, DataGridCellEditEnding
3535

3636
((TodoSettingsViewModel)ViewModel).TodoSettings = new ObservableCollection<ToDoMarker>(markers);
3737
}
38+
39+
private void AddNewTodoMarker(object sender, System.Windows.RoutedEventArgs e)
40+
{
41+
TodoMarkerGrid.CommitEdit();
42+
((TodoSettingsViewModel) ViewModel).AddTodoCommand.Execute(null);
43+
e.Handled = true;
44+
}
3845
}
3946
}

0 commit comments

Comments
 (0)