[XMToolbar] Fixup Debugger icons to use a sane pattern.

11 files changed, 16 insertions, 19 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index c27321d70f..c0646efee5 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -25,7 +25,6 @@
     </Execution>
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,7 +39,6 @@
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -56,7 +54,6 @@
     </Execution>
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -71,7 +68,6 @@
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -357,34 +353,34 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
-    <EmbeddedResource Include="icons\mac-yosemite-continue.png">
-      <LogicalName>continue-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-continue%402x.png">
-      <LogicalName>continue-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-pause.png">
+    <EmbeddedResource Include="icons\mac\pause.png">
       <LogicalName>pause-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-pause%402x.png">
+    <EmbeddedResource Include="icons\mac\pause%402x.png">
       <LogicalName>pause-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-in.png">
-      <LogicalName>step-in-16.png</LogicalName>
+    <EmbeddedResource Include="icons\mac\continue-16.png">
+      <LogicalName>continue-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-in%402x.png">
+    <EmbeddedResource Include="icons\mac\continue-16%402x.png">
+      <LogicalName>continue-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16%402x.png">
       <LogicalName>step-in-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-out.png">
+    <EmbeddedResource Include="icons\mac\step-in-16.png">
+      <LogicalName>step-in-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16.png">
       <LogicalName>step-out-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-out%402x.png">
+    <EmbeddedResource Include="icons\mac\step-out-16%402x.png">
       <LogicalName>step-out-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-over.png">
+    <EmbeddedResource Include="icons\mac\step-over-16.png">
       <LogicalName>step-over-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac-yosemite-step-over%402x.png">
+    <EmbeddedResource Include="icons\mac\step-over-16%402x.png">
       <LogicalName>step-over-16@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
@@ -393,5 +389,6 @@
     <Folder Include="MonoDevelop.Debugger.Visualizer\" />
     <Folder Include="MonoDevelop.Debugger.PreviewVisualizers\" />
     <Folder Include="MonoDevelop.Debugger.Converters\" />
+    <Folder Include="icons\mac\" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-continue.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png
index 7f4b859e17..7f4b859e17 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-continue.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-continue@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png
index 886ea86ad0..886ea86ad0 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-continue@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-pause.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png
index ccfad4c2ad..ccfad4c2ad 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-pause.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-pause@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png
index 65a0023255..65a0023255 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-pause@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-in.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png
index 001881e4d4..001881e4d4 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-in.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-in@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png
index 20c52386a8..20c52386a8 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-in@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-out.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png
index 2ad3a0f9e0..2ad3a0f9e0 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-out.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-out@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png
index ee02dc1234..ee02dc1234 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-out@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-over.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png
index 8ef8003514..8ef8003514 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-over.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-over@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png
index 42ee5a6461..42ee5a6461 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac-yosemite-step-over@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png