Merge pull request #516 from xamarin/dominique-UniqueResourceNames

Add pe- prefix to all image resources.

3 files changed, 13 insertions, 13 deletions

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;