Merge pull request #516 from xamarin/dominique-UniqueResourceNames

Add pe- prefix to all image resources.

8 files changed, 25 insertions, 25 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BaseEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BaseEditorControl.cs
index 5cabf77..d5044b6 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BaseEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BaseEditorControl.cs
@@ -77,7 +77,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		public override void ViewDidChangeEffectiveAppearance ()
 		{
-			this.actionButton.Image = this.actionButton.Enabled ? HostResources.GetNamedImage ("action-warning-16") : null;
+			this.actionButton.Image = this.actionButton.Enabled ? HostResources.GetNamedImage ("pe-action-warning-16") : null;
 		}
 
 		protected IHostResourceProvider HostResources
@@ -93,7 +93,7 @@ namespace Xamarin.PropertyEditing.Mac
 			this.actionButton.Hidden = !this.actionButton.Enabled;
 
 			// Using NSImageName.Caution for now, we can change this later at the designers behest
-			this.actionButton.Image = this.actionButton.Enabled ? HostResources.GetNamedImage ("action-warning-16") : null;
+			this.actionButton.Image = this.actionButton.Enabled ? HostResources.GetNamedImage ("pe-action-warning-16") : null;
 		}
 
 		void NotifyActionButtonClicked ()
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/BrushTabViewController.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/BrushTabViewController.cs
index dc956e3..6fa2dd5 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/BrushTabViewController.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/BrushTabViewController.cs
@@ -94,7 +94,7 @@ namespace Xamarin.PropertyEditing.Mac
 						solid.ViewModel = ViewModel;
 						item.ViewController = solid;
 						item.ToolTip = Properties.Resources.SolidBrush;
-						image = "property-brush-solid-16"; 
+						image = "pe-property-brush-solid-16"; 
 						break;

 
 					case CommonBrushType.MaterialDesign:
@@ -102,7 +102,7 @@ namespace Xamarin.PropertyEditing.Mac
 						material.ViewModel = ViewModel;
 						item.ViewController = material;
 						item.ToolTip = Properties.Resources.MaterialDesignColorBrush;
-						image = "property-brush-palette-16";

+						image = "pe-property-brush-palette-16";

 						break;

 
 					case CommonBrushType.Resource:
@@ -110,7 +110,7 @@ namespace Xamarin.PropertyEditing.Mac
 						this.resource.ViewModel = ViewModel;
 						item.ViewController = this.resource;
 						item.ToolTip = Properties.Resources.ResourceBrush;
-						image = "property-brush-resources-16"; 

+						image = "pe-property-brush-resources-16"; 

 						break;

 
 					case CommonBrushType.Gradient:
@@ -118,7 +118,7 @@ namespace Xamarin.PropertyEditing.Mac
 						gradient.ViewModel = ViewModel;
 						item.ViewController = gradient;
 						item.ToolTip = item.Label;
-						image = "property-brush-gradient-16"; 

+						image = "pe-property-brush-gradient-16"; 

 						break;

 
 					default:
@@ -127,7 +127,7 @@ namespace Xamarin.PropertyEditing.Mac
 							none.ViewModel = ViewModel;
 							item.ViewController = none;
 							item.ToolTip = Properties.Resources.NoBrush;
-							image = "property-brush-none-16"; 

+							image = "pe-property-brush-none-16"; 

 							break;
 				}

 

diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
index 9846e2c..012fbc7 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
@@ -40,7 +40,7 @@ namespace Xamarin.PropertyEditing.Mac
 			AccessibilityTitle = LocalizationResources.AccessibilityPropertiesButton;
 			AccessibilityHelp = LocalizationResources.AccessibilityPropertiesButtonDescription;
 			Enabled = true;
-			Image = this.hostResources.GetNamedImage ("property-button-default-mac-10");
+			Image = this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
 			ImageScaling = NSImageScale.None;
 			ToolTip = Properties.Resources.Default;
 
@@ -125,27 +125,27 @@ namespace Xamarin.PropertyEditing.Mac
 				
 				switch (viewModel.ValueSource) {
 				case ValueSource.Binding:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-bound-mac-active-10") : this.hostResources.GetNamedImage ("property-button-bound-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-bound-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-bound-mac-10");
 					break;
 
 				case ValueSource.Default:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("property-button-default-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
 					break;
 
 				case ValueSource.Local:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-local-mac-active-10") : this.hostResources.GetNamedImage ("property-button-local-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-local-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-local-mac-10");
 					break;
 
 				case ValueSource.Inherited:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("property-button-inherited-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
 					break;
 
 				case ValueSource.Resource:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("property-button-inherited-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
 					break;
 
 				case ValueSource.Unset:
-					Image = focused ? this.hostResources.GetNamedImage ("property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("property-button-default-mac-10");
+					Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
 					break;
 
 				default:
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/SpinnerButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/SpinnerButton.cs
index e45d84c..bec2871 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/SpinnerButton.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/SpinnerButton.cs
@@ -40,7 +40,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		private readonly IHostResourceProvider hostResources;
 		private bool isMouseOver;
-		private string imageBase = "stepper-";
+		private string imageBase = "pe-stepper-";
 
 		private NSImage image;
 		private NSImage mouseOverImage;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
index 18cb156..94ec4cd 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
@@ -15,7 +15,7 @@ namespace Xamarin.PropertyEditing.Mac
 		PropertyInfo customExpressionPropertyInfo;
 
 		public CustomExpressionView (IHostResourceProvider hostResources, PropertyViewModel viewModel)
-			: base (hostResources, viewModel,  Properties.Resources.CustomExpression, "custom-expression-32")
+			: base (hostResources, viewModel,  Properties.Resources.CustomExpression, "pe-custom-expression-32")
 		{
 			Frame = new CGRect (CGPoint.Empty, new CGSize (250, 80));
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/ErrorMessageView.cs b/Xamarin.PropertyEditing.Mac/Controls/ErrorMessageView.cs
index 8f76498..725779e 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/ErrorMessageView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/ErrorMessageView.cs
@@ -22,7 +22,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 			var iconView = new NSButton (new CGRect (5, Frame.Height - 25, DefaultIconButtonSize, DefaultIconButtonSize)) {
 				Bordered = false,
-				Image = hostResources.GetNamedImage ("action-warning-16"),
+				Image = hostResources.GetNamedImage ("pe-action-warning-16"),
 				Title = string.Empty,
 				TranslatesAutoresizingMaskIntoConstraints = false,
 			};
diff --git a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs
index f810428..607d453 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs
@@ -45,7 +45,7 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 
 		public RequestResourceView (IHostResourceProvider hostResources, PropertyViewModel propertyViewModel)
-			: base (hostResources, propertyViewModel, Properties.Resources.SelectResourceTitle, "resource-editor-32")
+			: base (hostResources, propertyViewModel, Properties.Resources.SelectResourceTitle, "pe-resource-editor-32")
 		{
 			Initialize (propertyViewModel);
 		}
@@ -97,21 +97,21 @@ namespace Xamarin.PropertyEditing.Mac
 				switch (this.segmentedControl.SelectedSegment) {
 				case 0:
 					this.resourceSelectorPanel.ViewModel.ShowBothResourceTypes = true;
-					this.segmentedControl.SetImage (HostResources.GetNamedImage ("resource-editor-16"), 2);
+					this.segmentedControl.SetImage (HostResources.GetNamedImage ("pe-resource-editor-16"), 2);
 					break;
 				case 1:
 					this.resourceSelectorPanel.ViewModel.ShowOnlyLocalResources = true;
-					this.segmentedControl.SetImage (HostResources.GetNamedImage ("resource-editor-16"), 2);
+					this.segmentedControl.SetImage (HostResources.GetNamedImage ("pe-resource-editor-16"), 2);
 					break;
 				case 2:
 					this.resourceSelectorPanel.ViewModel.ShowOnlySystemResources = true;
-					this.segmentedControl.SetImage (HostResources.GetNamedImage ("resource-editor-16~sel"), 2);
+					this.segmentedControl.SetImage (HostResources.GetNamedImage ("pe-resource-editor-16~sel"), 2);
 					break;
 				}
 
 				this.resourceSelectorPanel.ReloadData ();
 			});
-			this.segmentedControl.SetImage (HostResources.GetNamedImage ("resource-editor-16"), 2);
+			this.segmentedControl.SetImage (HostResources.GetNamedImage ("pe-resource-editor-16"), 2);
 			this.segmentedControl.Frame = new CGRect ((FrameWidthThird - (segmentedControl.Bounds.Width) / 2), 5, (Frame.Width - (FrameWidthThird)) - 10, 24);
 			this.segmentedControl.Font = NSFont.FromFontName (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize);
 			this.segmentedControl.TranslatesAutoresizingMaskIntoConstraints = false;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
index 8861ac6..55f20ad 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
@@ -38,7 +38,7 @@ namespace Xamarin.PropertyEditing.Mac
 						var iconView = (NSImageView)tableView.MakeView (iconIdentifier, this);
 						if (iconView == null) {
 							iconView = new NSImageView {
-								Image = this.hostResources.GetNamedImage ("resource-editor-32"),
+								Image = this.hostResources.GetNamedImage ("pe-resource-editor-32"),
 								ImageScaling = NSImageScale.None,
 								Identifier = iconIdentifier,
 							};
@@ -95,12 +95,12 @@ namespace Xamarin.PropertyEditing.Mac
 				if (previousRow != -1
 				    && previousRow < tableView.RowCount
 				    && tableView.GetView (0, previousRow, false) is NSImageView previousIconColumn) {
-					previousIconColumn.Image = this.hostResources.GetNamedImage ("resource-editor-32");
+					previousIconColumn.Image = this.hostResources.GetNamedImage ("pe-resource-editor-32");
 				}
 
 				if (tableView.SelectedRow != -1
 				    && tableView.GetView (0, tableView.SelectedRow, false) is NSImageView selectedIconColumn) {
-					selectedIconColumn.Image = this.hostResources.GetNamedImage ("resource-editor-32~sel");
+					selectedIconColumn.Image = this.hostResources.GetNamedImage ("pe-resource-editor-32~sel");
 					previousRow = tableView.SelectedRow;
 				}
 			}