diff options
author | Dominique Louis <dominique@Dominiques-MacBook-Pro-2.local> | 2019-04-08 18:21:45 +0300 |
---|---|---|
committer | Dominique Louis <dominique@Dominiques-MacBook-Pro-2.local> | 2019-04-08 18:38:24 +0300 |
commit | e333ae9ace0f52192d8ed5cd6fc24e36812234b8 (patch) | |
tree | 72d1b8c5456e1b88822cbf4a32c7a5f4ad0ff6bc /Xamarin.PropertyEditing.Mac/Controls | |
parent | 031d650c59320206ca662753e938a40d473729eb (diff) |
[Mac] Centralise string resources.
Diffstat (limited to 'Xamarin.PropertyEditing.Mac/Controls')
24 files changed, 49 insertions, 70 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs index e3954ae..142e9dd 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs @@ -2,7 +2,6 @@ using System; using System.Collections;
using AppKit;
using Foundation; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac diff --git a/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs index 7a8b24f..e964340 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.Diagnostics; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -87,10 +86,10 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { XEditor.AccessibilityEnabled = XEditor.Enabled; - XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityXEditor, ViewModel.Property.Name); + XEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityXEditor, ViewModel.Property.Name); YEditor.AccessibilityEnabled = YEditor.Enabled; - YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityYEditor, ViewModel.Property.Name); + YEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityYEditor, ViewModel.Property.Name); } protected virtual void OnInputUpdated (object sender, EventArgs e) diff --git a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs index b7a68e4..d5e038c 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Drawing; using AppKit; using CoreGraphics; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -144,16 +143,16 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { XEditor.AccessibilityEnabled = XEditor.Enabled; - XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityXEditor, ViewModel.Property.Name); + XEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityXEditor, ViewModel.Property.Name); YEditor.AccessibilityEnabled = YEditor.Enabled; - YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityYEditor, ViewModel.Property.Name); + YEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityYEditor, ViewModel.Property.Name); WidthEditor.AccessibilityEnabled = WidthEditor.Enabled; - WidthEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityWidthEditor, ViewModel.Property.Name); + WidthEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityWidthEditor, ViewModel.Property.Name); HeightEditor.AccessibilityEnabled = HeightEditor.Enabled; - HeightEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityHeightEditor, ViewModel.Property.Name); + HeightEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityHeightEditor, ViewModel.Property.Name); } } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs index 3112680..1212fef 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs @@ -1,7 +1,6 @@ using System;
using System.Collections; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -67,7 +66,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { BooleanEditor.AccessibilityEnabled = BooleanEditor.Enabled; - BooleanEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityBoolean, ViewModel.Property.Name); + BooleanEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityBoolean, ViewModel.Property.Name); } } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs index cab556d..cdae3b1 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using AppKit; using CoreGraphics; using Xamarin.PropertyEditing.Drawing; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -97,13 +96,13 @@ namespace Xamarin.PropertyEditing.Mac string GetTitle () { - var title = LocalizationResources.CommonBrushTitleUnknown; + var title = Properties.Resources.CommonBrushTitleUnknown; switch (ViewModel.Value) { case CommonSolidBrush solid: title = solid.Color.ToString (); break; case CommonGradientBrush gradient: - title = LocalizationResources.CommonBrushTitleGradient; + title = Properties.Resources.CommonBrushTitleGradient; break; default: if (ViewModel.Value == null) diff --git a/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs index 075a9e3..f68457d 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs @@ -1,5 +1,4 @@ using System; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -20,7 +19,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { base.UpdateAccessibilityValues (); - Entry.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityChar, ViewModel.Property.Name); + Entry.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityChar, ViewModel.Property.Name); } protected override string GetValue (char value) diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs index 3cf807d..e300f08 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs @@ -34,7 +34,7 @@ namespace Xamarin.PropertyEditing.Mac var header = new DynamicBox (hostResources, NamedResources.ControlBackground, NamedResources.FrameBoxBorderColor) { BoxType = NSBoxType.NSBoxCustom, BorderWidth = 1, - ContentView = new UnfocusableTextField { StringValue = Resources.LocalizationResources.CollectionTargetsHeader }, + ContentView = new UnfocusableTextField { StringValue = Properties.Resources.CollectionTargetsHeader }, TranslatesAutoresizingMaskIntoConstraints = false, ContentViewMargins = new CGSize (8, 0), }; @@ -62,13 +62,13 @@ namespace Xamarin.PropertyEditing.Mac TranslatesAutoresizingMaskIntoConstraints = false, ControlSize = NSControlSize.Mini, Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Mini)), - AccessibilityTitle = Resources.LocalizationResources.AccessibilityCollectionTypeSelector + AccessibilityTitle = Properties.Resources.AccessibilityCollectionTypeSelector }; this.typeSelector.SelectionChanged += OnSelectedTypeChanged; this.add = new NSButton { BezelStyle = NSBezelStyle.SmallSquare, - AccessibilityTitle = Resources.LocalizationResources.AccessibilityCollectionAddButton, + AccessibilityTitle = Properties.Resources.AccessibilityCollectionAddButton, Bordered = false, }; this.add.Activated += OnAddChild; @@ -83,7 +83,7 @@ namespace Xamarin.PropertyEditing.Mac this.remove = new NSButton { BezelStyle = NSBezelStyle.SmallSquare, - AccessibilityTitle = Resources.LocalizationResources.AccessibilityCollectionRemoveButton, + AccessibilityTitle = Properties.Resources.AccessibilityCollectionRemoveButton, Bordered = false }; this.remove.Activated += OnRemoveChild; diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs index 23d9db0..5f83b00 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs @@ -17,7 +17,7 @@ namespace Xamarin.PropertyEditing.Mac : base (new CGRect (0, 0, 500, 400), NSWindowStyle.Titled | NSWindowStyle.Closable | NSWindowStyle.Resizable, NSBackingStore.Buffered, true) { Delegate = new ModalDialogDelegate (); - Title = String.Format (Resources.LocalizationResources.CollectionEditorTitle, viewModel.Property.Name); + Title = String.Format (Properties.Resources.CollectionEditorTitle, viewModel.Property.Name); this.collectionEditor = new CollectionEditorControl (hostResources) { ViewModel = viewModel, diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs index a499c06..bdb7bb4 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs @@ -18,10 +18,10 @@ namespace Xamarin.PropertyEditing.Mac AddSubview (this.label); this.openCollection = new FocusableButton { - Title = Resources.LocalizationResources.CollectionEditButton, + Title = Properties.Resources.CollectionEditButton, BezelStyle = NSBezelStyle.Rounded, AccessibilityEnabled = true, - AccessibilityHelp = Resources.LocalizationResources.AccessibilityCollectionHelp + AccessibilityHelp = Properties.Resources.AccessibilityCollectionHelp }; this.openCollection.Activated += (o, e) => { @@ -62,7 +62,7 @@ namespace Xamarin.PropertyEditing.Mac { base.UpdateAccessibilityValues (); - this.openCollection.AccessibilityTitle = (ViewModel != null) ? String.Format (Resources.LocalizationResources.AccessibilityCollection, ViewModel.Property.Name) : null; + this.openCollection.AccessibilityTitle = (ViewModel != null) ? String.Format (Properties.Resources.AccessibilityCollection, ViewModel.Property.Name) : null; } private readonly UnfocusableTextField label; diff --git a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs index c0feeab..c62c822 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs @@ -10,7 +10,6 @@ using CoreGraphics; using Cadenza.Collections; using Xamarin.PropertyEditing.ViewModels; -using Xamarin.PropertyEditing.Mac.Resources; namespace Xamarin.PropertyEditing.Mac { @@ -107,7 +106,7 @@ namespace Xamarin.PropertyEditing.Mac { foreach (var item in combinableList) { item.Key.AccessibilityEnabled = item.Key.Enabled; - item.Key.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityCombobox, ViewModel.Property.Name); + item.Key.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name); } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs index 31055ab..e8d908d 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs @@ -1,7 +1,6 @@ using System; using AppKit; using CoreGraphics; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -37,8 +36,8 @@ namespace Xamarin.PropertyEditing.Mac this.hostResources = hostResources; - AccessibilityTitle = LocalizationResources.AccessibilityPropertiesButton; - AccessibilityHelp = LocalizationResources.AccessibilityPropertiesButtonDescription; + AccessibilityTitle = Properties.Resources.AccessibilityPropertiesButton; + AccessibilityHelp = Properties.Resources.AccessibilityPropertiesButtonDescription; Enabled = true; Image = this.hostResources.GetNamedImage ("pe-property-button-default-mac-10"); ImageScaling = NSImageScale.None; diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs index 380791e..8428b69 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs @@ -2,7 +2,6 @@ using AppKit; using CoreGraphics; using Foundation; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -32,13 +31,13 @@ namespace Xamarin.PropertyEditing.Mac public void Initialize () { var nameColumn = new NSTableColumn (ResourceNameColId) { - Title = LocalizationResources.ColumnResourceName, + Title = Properties.Resources.ColumnResourceName, Width = 150, }; AddColumn (nameColumn); var previewColumn = new NSTableColumn (ResourcePreviewColId) { - Title = LocalizationResources.ColumnResourcePreview, + Title = Properties.Resources.ColumnResourcePreview, Width = 150, }; AddColumn (previewColumn); diff --git a/Xamarin.PropertyEditing.Mac/Controls/DateTimeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/DateTimeEditorControl.cs index d25bc88..36532e2 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/DateTimeEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/DateTimeEditorControl.cs @@ -1,6 +1,5 @@ using System; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -53,7 +52,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { - this.datePicker.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityDateTime, ViewModel.Property.Name);
+ this.datePicker.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityDateTime, ViewModel.Property.Name);
this.datePicker.Enabled = this.datePicker.Enabled; }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs index c43b694..32c7d7f 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using AppKit;
using CoreGraphics; -using Xamarin.PropertyEditing.Mac.Resources; using System.IO;
using Xamarin.PropertyEditing.Common; using Foundation; @@ -14,12 +13,12 @@ namespace Xamarin.PropertyEditing.Mac public FilePathEditorControl (IHostResourceProvider hostResource) : base (hostResource)
{
- this.currentTextField.ToolTip = this.currentTextField.PlaceholderString = string.Format (LocalizationResources.ChooseFileOrDirectory, LocalizationResources.File);
+ this.currentTextField.ToolTip = this.currentTextField.PlaceholderString = string.Format (Properties.Resources.ChooseFileOrDirectory, Properties.Resources.File);
this.panel.CanChooseFiles = true;
this.panel.CanChooseDirectories = false;
- this.revealPathButton.ToolTip = string.Format (LocalizationResources.RevealFileOrDirectory, LocalizationResources.File);
- this.browsePathButton.ToolTip = string.Format (LocalizationResources.BrowseFileOrDirectory, LocalizationResources.File);
- this.panel.Title = string.Format (LocalizationResources.ChooseFileOrDirectory, LocalizationResources.File); + this.revealPathButton.ToolTip = string.Format (Properties.Resources.RevealFileOrDirectory, Properties.Resources.File);
+ this.browsePathButton.ToolTip = string.Format (Properties.Resources.BrowseFileOrDirectory, Properties.Resources.File);
+ this.panel.Title = string.Format (Properties.Resources.ChooseFileOrDirectory, Properties.Resources.File); } protected override void OnRevealPathButtonActivated (object sender, EventArgs e) @@ -37,7 +36,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues ()
{
this.currentTextField.AccessibilityEnabled = this.currentTextField.Enabled;
- this.currentTextField.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityPathEditor, ViewModel.Property.Name, LocalizationResources.File);
+ this.currentTextField.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityPathEditor, ViewModel.Property.Name, Properties.Resources.File);
}
protected override void UpdateValue ()
diff --git a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs index 8290d2d..a7a67bb 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using AppKit; using Foundation; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -105,11 +104,11 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { NumericEditor.AccessibilityEnabled = NumericEditor.Enabled; - NumericEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityNumeric, ViewModel.Property.Name); + NumericEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityNumeric, ViewModel.Property.Name); if (this.inputModePopup != null) { this.inputModePopup.AccessibilityEnabled = this.inputModePopup.Enabled; - this.inputModePopup.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityInpueModeEditor, ViewModel.Property.Name); + this.inputModePopup.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityInputModeEditor, ViewModel.Property.Name); } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs index 3e7e488..5ad60e7 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs @@ -4,7 +4,6 @@ using System.IO; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -24,7 +23,7 @@ namespace Xamarin.PropertyEditing.Mac this.propertyObjectName = new PropertyTextField { ControlSize = controlSize, - PlaceholderString = LocalizationResources.ObjectNamePlaceholder, + PlaceholderString = Properties.Resources.ObjectNamePlaceholder, TranslatesAutoresizingMaskIntoConstraints = false, }; @@ -132,7 +131,7 @@ namespace Xamarin.PropertyEditing.Mac private void UpdateValue () { this.propertyObjectName.StringValue = this.viewModel.ObjectName ?? string.Empty; - this.propertyObjectName.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityObjectName, nameof (viewModel.ObjectName)); + this.propertyObjectName.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityObjectName, nameof (viewModel.ObjectName)); this.propertyObjectName.Enabled = !this.viewModel.IsObjectNameReadOnly; } diff --git a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs index b35a094..d514798 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs @@ -4,7 +4,6 @@ using AppKit; using CoreGraphics; using Foundation; using Xamarin.PropertyEditing.Drawing; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs index f284c8a..d7abd38 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs @@ -5,7 +5,6 @@ using Foundation; using AppKit; using Xamarin.PropertyEditing.ViewModels; -using Xamarin.PropertyEditing.Mac.Resources; namespace Xamarin.PropertyEditing.Mac { @@ -137,10 +136,10 @@ namespace Xamarin.PropertyEditing.Mac { if (ViewModel.IsConstrainedToPredefined) { this.popUpButton.AccessibilityEnabled = this.popUpButton.Enabled; - this.popUpButton.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityCombobox, ViewModel.Property.Name); + this.popUpButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name); } else { this.comboBox.AccessibilityEnabled = this.comboBox.Enabled; - this.comboBox.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityCombobox, ViewModel.Property.Name); + this.comboBox.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name); } } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs index 7cd49f4..2fd4404 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.ComponentModel; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -50,7 +49,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { this.ratioEditor.AccessibilityEnabled = this.ratioEditor.Enabled; - this.ratioEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityNumeric, ViewModel.Property.Name); + this.ratioEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityNumeric, ViewModel.Property.Name); } protected override void UpdateValue () diff --git a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourcePanel.cs b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourcePanel.cs index 0d6df02..f71fad7 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourcePanel.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourcePanel.cs @@ -3,7 +3,6 @@ using System.ComponentModel; using AppKit; using CoreGraphics; using Xamarin.PropertyEditing.Drawing; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -95,16 +94,16 @@ namespace Xamarin.PropertyEditing.Mac this.resourceTable.Delegate = resourceTableDelegate; this.resourceTable.DataSource = dataSource; - NSTableColumn resourceImages = new NSTableColumn (ResourceImageColId) { Title = LocalizationResources.ResourceTableImageColumnTitle, Width = 32 }; + NSTableColumn resourceImages = new NSTableColumn (ResourceImageColId) { Title = Properties.Resources.ResourceTableImageColumnTitle, Width = 32 }; this.resourceTable.AddColumn (resourceImages); - NSTableColumn resourceTypes = new NSTableColumn (ResourceTypeColId) { Title = LocalizationResources.ResourceTableTypeColumnTitle, Width = 150 }; + NSTableColumn resourceTypes = new NSTableColumn (ResourceTypeColId) { Title = Properties.Resources.ResourceTableTypeColumnTitle, Width = 150 }; this.resourceTable.AddColumn (resourceTypes); - NSTableColumn resourceName = new NSTableColumn (ResourceNameColId) { Title = LocalizationResources.ResourceTableNameColumnTitle, Width = 150 }; + NSTableColumn resourceName = new NSTableColumn (ResourceNameColId) { Title = Properties.Resources.ResourceTableNameColumnTitle, Width = 150 }; resourceTable.AddColumn (resourceName); - NSTableColumn resourceValue = new NSTableColumn (ResourceValueColId) { Title = LocalizationResources.ResourceTableValueColumnTitle, Width = 45 }; + NSTableColumn resourceValue = new NSTableColumn (ResourceValueColId) { Title = Properties.Resources.ResourceTableValueColumnTitle, Width = 45 }; this.resourceTable.AddColumn (resourceValue); this.resourceTable.DoubleClick += (object sender, EventArgs e) => { diff --git a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs index 77e9f98..7dad3f4 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs @@ -4,7 +4,6 @@ using AppKit; using CoreGraphics; using Foundation; using Xamarin.PropertyEditing.Drawing; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -31,8 +30,8 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { - XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityWidthEditor, ViewModel.Property.Name); - YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityHeightEditor, ViewModel.Property.Name); + XEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityWidthEditor, ViewModel.Property.Name); + YEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityHeightEditor, ViewModel.Property.Name); } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs index 7696f79..e20e85a 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs @@ -4,7 +4,6 @@ using System.Linq; using AppKit; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -94,11 +93,11 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { base.UpdateAccessibilityValues (); - Entry.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityString, ViewModel.Property.Name); + Entry.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityString, ViewModel.Property.Name); if (this.inputModePopup != null) { this.inputModePopup.AccessibilityEnabled = this.inputModePopup.Enabled; - this.inputModePopup.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityInpueModeEditor, ViewModel.Property.Name); + this.inputModePopup.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityInputModeEditor, ViewModel.Property.Name); } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs index 018a3f1..05618d1 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs @@ -3,7 +3,6 @@ using AppKit; using CoreGraphics; using Foundation; using Xamarin.PropertyEditing.Drawing; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -44,16 +43,16 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { XEditor.AccessibilityEnabled = XEditor.Enabled; - XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityLeftEditor, ViewModel.Property.Name); + XEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityLeftEditor, ViewModel.Property.Name); YEditor.AccessibilityEnabled = YEditor.Enabled; - YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityTopEditor, ViewModel.Property.Name); + YEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityTopEditor, ViewModel.Property.Name); WidthEditor.AccessibilityEnabled = WidthEditor.Enabled; - WidthEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityRightEditor, ViewModel.Property.Name); + WidthEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityRightEditor, ViewModel.Property.Name); HeightEditor.AccessibilityEnabled = HeightEditor.Enabled; - HeightEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityBottomEditor, ViewModel.Property.Name); + HeightEditor.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityBottomEditor, ViewModel.Property.Name); } protected override void UpdateValue () diff --git a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs index 7277acb..222af81 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs @@ -1,5 +1,4 @@ using System; -using Xamarin.PropertyEditing.Mac.Resources; using Xamarin.PropertyEditing.ViewModels; namespace Xamarin.PropertyEditing.Mac @@ -20,7 +19,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateAccessibilityValues () { base.UpdateAccessibilityValues (); - Entry.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityTimeSpan, ViewModel.Property.Name); + Entry.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityTimeSpan, ViewModel.Property.Name); } private class TimeSpanDelegate |