From 5417507c3e076e2703f2cd2cd057aa0cb536a1ff Mon Sep 17 00:00:00 2001 From: Jose Medrano Date: Wed, 16 Feb 2022 19:07:57 +0100 Subject: Naming changes --- Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs | 4 ++-- .../Controls/BaseRectangleEditorControl.cs | 4 ++-- Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs | 2 +- .../Controls/CollectionInlineEditorControl.cs | 2 +- .../Controls/Custom/FocusableBooleanButton.cs | 8 ++++---- Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs | 8 ++++---- .../Controls/Custom/FocusablePopupButton.cs | 8 ++++---- Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs | 6 +++--- Xamarin.PropertyEditing.Mac/Controls/Custom/NumericTextField.cs | 6 +++--- Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs | 8 ++++---- Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs | 4 ++-- Xamarin.PropertyEditing.Mac/Controls/ProxyRowResponder.cs | 4 ++-- Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs | 2 +- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs index 9164f8d..d1465cc 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs @@ -49,7 +49,7 @@ namespace Xamarin.PropertyEditing.Mac this.textNextResponderDelegate = new BasePathEditordDelegate (this) { - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; this.currentTextField.Delegate = this.textNextResponderDelegate; AddSubview (this.currentTextField); diff --git a/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs index 341f93e..7300ed1 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs @@ -28,7 +28,7 @@ namespace Xamarin.PropertyEditing.Mac BackgroundColor = NSColor.Clear, Value = 0.0f }; - XEditor.ResponderProxy = new ProxyRowResponder(this, ProxyRowType.FirstView); + XEditor.ProxyResponder = new RowProxyResponder (this, ProxyRowType.FirstView); XEditor.ValueChanged += OnInputUpdated; YLabel = new UnfocusableTextField { @@ -40,7 +40,7 @@ namespace Xamarin.PropertyEditing.Mac BackgroundColor = NSColor.Clear, Value = 0.0f }; - YEditor.ResponderProxy = new ProxyRowResponder (this, ProxyRowType.LastView); + YEditor.ProxyResponder = new RowProxyResponder (this, ProxyRowType.LastView); YEditor.ValueChanged += OnInputUpdated; AddSubview (XLabel); diff --git a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs index c03ce60..8e426ee 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs @@ -33,7 +33,7 @@ namespace Xamarin.PropertyEditing.Mac BackgroundColor = NSColor.Clear, Value = 0.0f }; - XEditor.ResponderProxy = new ProxyRowResponder(this, ProxyRowType.FirstView); + XEditor.ProxyResponder = new RowProxyResponder (this, ProxyRowType.FirstView); XEditor.ValueChanged += OnInputUpdated; YLabel = new UnfocusableTextField { @@ -64,7 +64,7 @@ namespace Xamarin.PropertyEditing.Mac BackgroundColor = NSColor.Clear, Value = 0.0f }; - HeightEditor.ResponderProxy = new ProxyRowResponder(this, ProxyRowType.LastView); + HeightEditor.ProxyResponder = new RowProxyResponder (this, ProxyRowType.LastView); HeightEditor.ValueChanged += OnInputUpdated; AddSubview (XLabel); diff --git a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs index 47c40ce..a6196f2 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs @@ -13,7 +13,7 @@ namespace Xamarin.PropertyEditing.Mac { BooleanEditor = new FocusableBooleanButton () { - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; BooleanEditor.Title = string.Empty; diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs index aee5b0e..c8413ec 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs @@ -56,7 +56,7 @@ namespace Xamarin.PropertyEditing.Mac ControlSize = NSControlSize.Small, Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)), TranslatesAutoresizingMaskIntoConstraints = false, - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; this.popupButtonList = new NSMenu (); diff --git a/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs index c46ef2c..f6b22ff 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CharEditorControl.cs @@ -15,7 +15,7 @@ namespace Xamarin.PropertyEditing.Mac { var charDelegate = new CharDelegate (viewModel) { - ResponderProxy = new ProxyRowResponder (this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; return charDelegate; } diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs index 88456c6..0c839a3 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionInlineEditorControl.cs @@ -24,7 +24,7 @@ namespace Xamarin.PropertyEditing.Mac Title = Properties.Resources.CollectionEditButton, BezelStyle = NSBezelStyle.Rounded, AccessibilityEnabled = true, - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView), + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView), AccessibilityHelp = Properties.Resources.AccessibilityCollectionHelp }; diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableBooleanButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableBooleanButton.cs index 01ad5e0..0f30939 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableBooleanButton.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableBooleanButton.cs @@ -5,17 +5,17 @@ namespace Xamarin.PropertyEditing.Mac { internal class ProxyResponderButton : NSButton { - public ProxyRowResponder ResponderProxy { get; set; } + public RowProxyResponder ProxyResponder { get; set; } public override void KeyDown (NSEvent theEvent) { switch (theEvent.KeyCode) { case (int)NSKey.Tab: - if (ResponderProxy != null) { + if (ProxyResponder != null) { if (theEvent.ModifierFlags.HasFlag(NSEventModifierMask.ShiftKeyMask)) { - ResponderProxy.PreviousResponder (); + ProxyResponder.PreviousResponder (); } else { - ResponderProxy.NextResponder (); + ProxyResponder.NextResponder (); } } return; diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs index d75dde2..a9994c7 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs @@ -5,17 +5,17 @@ namespace Xamarin.PropertyEditing.Mac { internal class FocusableComboBox : NSComboBox { - public ProxyRowResponder ResponderProxy { get; set; } + public RowProxyResponder ProxyResponder { get; set; } public override void KeyDown (NSEvent theEvent) { switch (theEvent.KeyCode) { case (int)NSKey.Tab: - if (ResponderProxy != null) { + if (ProxyResponder != null) { if (theEvent.ModifierFlags.HasFlag(NSEventModifierMask.ShiftKeyMask)) { - ResponderProxy.PreviousResponder (); + ProxyResponder.PreviousResponder (); } else { - ResponderProxy.NextResponder (); + ProxyResponder.NextResponder (); } } return; diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusablePopupButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusablePopupButton.cs index 7cdfcfc..fa00bcf 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusablePopupButton.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusablePopupButton.cs @@ -8,7 +8,7 @@ namespace Xamarin.PropertyEditing.Mac { public override bool CanBecomeKeyView { get { return Enabled; } } - public ProxyRowResponder ResponderProxy { get; set; } + public RowProxyResponder ProxyResponder { get; set; } public FocusablePopUpButton () { @@ -19,11 +19,11 @@ namespace Xamarin.PropertyEditing.Mac { switch (theEvent.KeyCode) { case (int)NSKey.Tab: - if (ResponderProxy != null) { + if (ProxyResponder != null) { if (theEvent.ModifierFlags.HasFlag(NSEventModifierMask.ShiftKeyMask)) { - ResponderProxy.PreviousResponder (); + ProxyResponder.PreviousResponder (); } else { - ResponderProxy.NextResponder (); + ProxyResponder.NextResponder (); } } return; diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs index 0d44862..d7d5253 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs @@ -172,10 +172,10 @@ namespace Xamarin.PropertyEditing.Mac set { this.numericEditor.AccessibilityTitle = value; } } - public ProxyRowResponder ResponderProxy + public RowProxyResponder ProxyResponder { - get => this.numericEditor.ResponderProxy; - set => this.numericEditor.ResponderProxy = value; + get => this.numericEditor.ProxyResponder; + set => this.numericEditor.ProxyResponder = value; } public virtual void Reset () diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericTextField.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericTextField.cs index 7f324cf..e5293d7 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericTextField.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericTextField.cs @@ -51,18 +51,18 @@ namespace Xamarin.PropertyEditing.Mac Delegate = keyUpDownDelegate; } - public ProxyRowResponder ResponderProxy + public RowProxyResponder ProxyResponder { get { if (Delegate is KeyUpDownDelegate keydown) { - return keydown.ResponderProxy; + return keydown.ProxyResponder; } return null; } set { if (Delegate is KeyUpDownDelegate keydown) { - keydown.ResponderProxy = value; + keydown.ProxyResponder = value; } } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs index 230c42d..1ab1b64 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs @@ -8,19 +8,19 @@ namespace Xamarin.PropertyEditing.Mac { class TextNextResponderDelegate : NSTextFieldDelegate { - public ProxyRowResponder ResponderProxy { get; set; } + public RowProxyResponder ProxyResponder { get; set; } public override bool DoCommandBySelector (NSControl control, NSTextView textView, Selector commandSelector) { switch (commandSelector.Name) { case "insertTab:": - if (ResponderProxy?.NextResponder () ?? false) + if (ProxyResponder?.NextResponder () ?? false) { return true; } break; case "insertBacktab:": - if (ResponderProxy?.PreviousResponder () ?? false) + if (ProxyResponder?.PreviousResponder () ?? false) { return true; } @@ -88,7 +88,7 @@ namespace Xamarin.PropertyEditing.Mac { var propertyEditorDelegate = new EntryPropertyEditorDelegate (viewModel) { - ResponderProxy = new ProxyRowResponder (this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; return propertyEditorDelegate; } diff --git a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs index 2950ae2..7b34787 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs @@ -18,7 +18,7 @@ namespace Xamarin.PropertyEditing.Mac NumericEditor = new NumericSpinEditor (hostResources) { - ResponderProxy = new ProxyRowResponder (this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; NumericEditor.ValueChanged += OnValueChanged; diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs index 0f7b056..1ca92ee 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs @@ -113,7 +113,7 @@ namespace Xamarin.PropertyEditing.Mac Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)), TranslatesAutoresizingMaskIntoConstraints = false, StringValue = String.Empty, - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; this.popupButtonList = new NSMenu (); @@ -156,7 +156,7 @@ namespace Xamarin.PropertyEditing.Mac LineBreakMode = NSLineBreakMode.TruncatingTail, UsesSingleLineMode = true, }, - ResponderProxy = new ProxyRowResponder (this, ProxyRowType.SingleView), + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView), ControlSize = NSControlSize.Small, Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)), TranslatesAutoresizingMaskIntoConstraints = false, diff --git a/Xamarin.PropertyEditing.Mac/Controls/ProxyRowResponder.cs b/Xamarin.PropertyEditing.Mac/Controls/ProxyRowResponder.cs index 6f0784e..78f9563 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/ProxyRowResponder.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/ProxyRowResponder.cs @@ -9,13 +9,13 @@ namespace Xamarin.PropertyEditing.Mac LastView } - internal class ProxyRowResponder + internal class RowProxyResponder { protected WeakReference editorControl; readonly ProxyRowType rowType; - public ProxyRowResponder (PropertyEditorControl editorControl, ProxyRowType rowType) + public RowProxyResponder (PropertyEditorControl editorControl, ProxyRowType rowType) { this.rowType = rowType; this.editorControl = new WeakReference (editorControl); diff --git a/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs index 88ff2cb..872cce0 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs @@ -16,7 +16,7 @@ namespace Xamarin.PropertyEditing.Mac base.TranslatesAutoresizingMaskIntoConstraints = false; this.ratioEditor = new RatioEditor (hostResources); - this.ratioEditor.ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView); + this.ratioEditor.ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView); this.ratioEditor.SetFormatter (null); // update the value on keypress diff --git a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs index 4c60dfc..4755e15 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs @@ -14,7 +14,7 @@ namespace Xamarin.PropertyEditing.Mac protected override EntryPropertyEditorDelegate CreateDelegate (PropertyViewModel viewModel) { return new TimeSpanDelegate (viewModel) { - ResponderProxy = new ProxyRowResponder(this, ProxyRowType.SingleView) + ProxyResponder = new RowProxyResponder (this, ProxyRowType.SingleView) }; } -- cgit v1.2.3