Skip to content

Commit 115735d

Browse files
BZngrBZngr
committed
UI uses UI resources
1 parent dce7b5e commit 115735d

File tree

2 files changed

+29
-44
lines changed

2 files changed

+29
-44
lines changed

‎Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<RowDefinition Height="40" />
3434
</Grid.RowDefinitions>
3535
<StackPanel Grid.Row="0" Background="White">
36-
<Label Content="{Binding TitleText}"
36+
<Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_TitleText}"
3737
FontWeight="Bold" />
38-
<TextBlock Text="{Binding InstructionText}"
38+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_InstructionText}"
3939
Margin="5,0" />
4040
</StackPanel>
4141
<Grid Grid.Row="1"
@@ -61,7 +61,7 @@
6161
<CheckBox Name="WrapAsUDTCheckBox"
6262
Grid.Row="1"
6363
Grid.Column="0"
64-
Content="Wrap Fields in Private Type"
64+
Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_WrapFieldsInPrivateType}"
6565
IsChecked="{Binding ConvertFieldsToUDTMembers, Mode=TwoWay}"
6666
FontWeight="Bold"
6767
VerticalAlignment="Top"
@@ -135,11 +135,11 @@
135135
Margin="5,0,0,0"
136136
MinWidth="100">
137137
<Button Style="{StaticResource CommandButtonStyle}"
138-
Content="Select All"
138+
Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SelectAll_Button}"
139139
TabIndex="2"
140140
Command="{Binding SelectAllCommand}" />
141141
<Button Style="{StaticResource CommandButtonStyle}"
142-
Content="Deselect All"
142+
Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=DeselectAll_Button}"
143143
TabIndex="3"
144144
Command="{Binding DeselectAllCommand}">
145145
</Button>
@@ -169,7 +169,7 @@
169169
Margin="10,5,0,5"
170170
Height="22"
171171
VerticalAlignment="Center"
172-
Text="{Binding Path=PrivateUDTPropertyText}"
172+
Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_PrivateUDTPropertyText}"
173173
MinWidth="80" />
174174
<TextBox Name="PropertyName"
175175
Visibility="{Binding Path=SelectedFieldHasEditablePropertyName, Converter={StaticResource BoolToVisibleVisibility}}"
@@ -190,7 +190,7 @@
190190
</Grid.ColumnDefinitions>
191191
<CheckBox IsChecked="{Binding Path=IsReadOnly, Mode=TwoWay}"
192192
IsEnabled="{Binding Path=EnableReadOnlyOption}"
193-
Content="Read Only"
193+
Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_ReadOnlyCheckBoxContent}"
194194
Margin="10,5,5,2"
195195
FontWeight="Bold"
196196
IsTabStop="False"
@@ -215,7 +215,7 @@
215215
Name="PreviewInvalidIcon"
216216
Visibility="{Binding Path=HasValidNames, Converter={StaticResource BoolToHiddenVisibility}}"
217217
Margin="0,0,0,5"/>
218-
<TextBlock Text="{Binding Path=Preview}"
218+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_Preview}"
219219
HorizontalAlignment="Left"
220220
FontSize="14"
221221
FontWeight="Bold"

‎Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public bool DetailUpdateRequired
7171
}
7272
}
7373

74-
private MasterDetailSelectionManager _masterDetail;
74+
private MasterDetailSelectionManager _masterDetailManager;
7575
public RubberduckParserState State { get; }
7676

7777
public EncapsulateFieldViewModel(EncapsulateFieldModel model, RubberduckParserState state) : base(model)
@@ -88,7 +88,7 @@ public EncapsulateFieldViewModel(EncapsulateFieldModel model, RubberduckParserSt
8888

8989
_lastCheckedBoxes = EncapsulationFields.Where(ef => ef.EncapsulateFlag).ToList();
9090

91-
_masterDetail = new MasterDetailSelectionManager(model.SelectedFieldCandidates.SingleOrDefault());
91+
_masterDetailManager = new MasterDetailSelectionManager(model.SelectedFieldCandidates.SingleOrDefault());
9292

9393
ManageEncapsulationFlagsAndSelectedItem();
9494

@@ -177,18 +177,18 @@ public IEncapsulatedFieldViewData SelectedField
177177
{
178178
if (value is null) { return; }
179179

180-
_masterDetail.SelectionTargetID = value.TargetID;
180+
_masterDetailManager.SelectionTargetID = value.TargetID;
181181
OnPropertyChanged(nameof(SelectedField));
182-
if (_masterDetail.DetailUpdateRequired)
182+
if (_masterDetailManager.DetailUpdateRequired)
183183
{
184-
_masterDetail.DetailField = SelectedField;
184+
_masterDetailManager.DetailField = SelectedField;
185185
UpdateDetailForSelection();
186186
}
187187

188188
OnPropertyChanged(nameof(PropertiesPreview));
189189
}
190190

191-
get => EncapsulationFields.FirstOrDefault(f => f.TargetID.Equals(_masterDetail.SelectionTargetID));
191+
get => EncapsulationFields.FirstOrDefault(f => f.TargetID.Equals(_masterDetailManager.SelectionTargetID));
192192
}
193193

194194
private void UpdateDetailForSelection()
@@ -216,26 +216,26 @@ public string PropertyName
216216
{
217217
if (SelectedField is null || value is null) { return; }
218218

219-
_masterDetail.DetailField.PropertyName = value;
219+
_masterDetailManager.DetailField.PropertyName = value;
220220
UpdateDetailForSelection();
221221
}
222222

223-
get => _masterDetail.DetailField?.PropertyName ?? SelectedField?.PropertyName ?? string.Empty;
223+
get => _masterDetailManager.DetailField?.PropertyName ?? SelectedField?.PropertyName ?? string.Empty;
224224
}
225225

226226
public bool SelectedFieldIsNotFlagged
227-
=> !(_masterDetail.DetailField?.EncapsulateFlag ?? false);
227+
=> !(_masterDetailManager.DetailField?.EncapsulateFlag ?? false);
228228

229229
public bool SelectedFieldIsPrivateUDT
230-
=> (_masterDetail.DetailField?.IsPrivateUserDefinedType ?? false);
230+
=> (_masterDetailManager.DetailField?.IsPrivateUserDefinedType ?? false);
231231

232232
public bool SelectedFieldHasEditablePropertyName => !SelectedFieldIsPrivateUDT;
233233

234234
public bool EnableReadOnlyOption
235-
=> !(_masterDetail.DetailField?.IsRequiredToBeReadOnly ?? false);
235+
=> !(_masterDetailManager.DetailField?.IsRequiredToBeReadOnly ?? false);
236236

237-
public string GroupBoxHeaderContent
238-
=> $"{_masterDetail.DetailField?.TargetID ?? string.Empty} {EncapsulateFieldResources.GroupBoxHeaderSuffix} ";
237+
public string GroupBoxHeaderContent
238+
=> $"{_masterDetailManager.DetailField?.TargetID ?? string.Empty} {RubberduckUI.EncapsulateField_PropertyName} ";
239239

240240
private string _validationErrorMessage;
241241
public string ValidationErrorMessage => _validationErrorMessage;
@@ -265,9 +265,9 @@ public bool IsReadOnly
265265
{
266266
set
267267
{
268-
_masterDetail.DetailField.IsReadOnly = value;
268+
_masterDetailManager.DetailField.IsReadOnly = value;
269269
}
270-
get => _masterDetail.DetailField?.IsReadOnly ?? SelectedField?.IsReadOnly ?? false;
270+
get => _masterDetailManager.DetailField?.IsReadOnly ?? SelectedField?.IsReadOnly ?? false;
271271
}
272272

273273
public bool ConvertFieldsToUDTMembers
@@ -308,7 +308,7 @@ private void RefreshValidationResults()
308308
}
309309

310310
_hasValidNames = !_failedValidationResults.Any();
311-
if (_failedValidationResults.TryGetValue(_masterDetail.SelectionTargetID, out var errorMsg))
311+
if (_failedValidationResults.TryGetValue(_masterDetailManager.SelectionTargetID, out var errorMsg))
312312
{
313313
_validationErrorMessage = errorMsg;
314314
_selectionHasValidEncapsulationAttributes = false;
@@ -333,7 +333,7 @@ private void ToggleSelection(bool value)
333333
}
334334
else
335335
{
336-
_masterDetail.DetailField = null;
336+
_masterDetailManager.DetailField = null;
337337
}
338338
ReloadListAndPreview();
339339
RefreshValidationResults();
@@ -346,26 +346,11 @@ private void ToggleSelection(bool value)
346346
public CommandBase EncapsulateFlagChangeCommand { get; }
347347
public CommandBase ReadOnlyChangeCommand { get; }
348348

349-
public string Caption
350-
=> EncapsulateFieldResources.Caption;
351-
352-
public string InstructionText
353-
=> EncapsulateFieldResources.InstructionText;
354-
355-
public string Preview
356-
=> EncapsulateFieldResources.Preview;
357-
358-
public string TitleText
359-
=> EncapsulateFieldResources.TitleText;
360-
361-
public string PrivateUDTPropertyText
362-
=> EncapsulateFieldResources.PrivateUDTPropertyText;
363-
364349
private void ChangeIsReadOnlyFlag(object param)
365350
{
366351
if (SelectedField is null) { return; }
367352

368-
_masterDetail.DetailField.IsReadOnly = SelectedField.IsReadOnly;
353+
_masterDetailManager.DetailField.IsReadOnly = SelectedField.IsReadOnly;
369354
OnPropertyChanged(nameof(IsReadOnly));
370355
OnPropertyChanged(nameof(PropertiesPreview));
371356
}
@@ -412,11 +397,11 @@ private void ManageEncapsulationFlagsAndSelectedItem(object param = null)
412397

413398
private void SetSelectedField(IEncapsulatedFieldViewData selected)
414399
{
415-
_masterDetail.SelectionTargetID = selected?.TargetID ?? null;
400+
_masterDetailManager.SelectionTargetID = selected?.TargetID ?? null;
416401
OnPropertyChanged(nameof(SelectedField));
417-
if (_masterDetail.DetailUpdateRequired)
402+
if (_masterDetailManager.DetailUpdateRequired)
418403
{
419-
_masterDetail.DetailField = SelectedField;
404+
_masterDetailManager.DetailField = SelectedField;
420405
UpdateDetailForSelection();
421406
}
422407
}

0 commit comments

Comments
 (0)