Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVáclav Vančura <vaclav@vancura.org>2020-01-22 20:30:10 +0300
committerVsevolod Kukol <sevoku@microsoft.com>2020-01-24 11:31:40 +0300
commit541dfe59b1de90af83e02bc07249f2af06bb3769 (patch)
tree2bf9467ce5484bcbaa1b50e2285f18ed040e0d48
parent112aa7995a368e6d0f361577f88677cb43c2c3db (diff)
[Icons][Deployment] Deduplicating project-32 (and similarly named) icons
Previously resulted in wrong icons used, picked from New Project Dialog. New Project Dialog now displays blue project base icons.
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml4
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj24
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project.pngbin0 -> 378 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project@2x.pngbin0 -> 855 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast.pngbin0 -> 265 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast@2x.pngbin0 -> 590 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark.pngbin0 -> 272 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark@2x.pngbin0 -> 616 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark.pngbin0 -> 375 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark@2x.pngbin0 -> 844 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel.png)bin242 -> 242 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel@2x.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark@2x.png)bin518 -> 518 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~sel.png)bin242 -> 242 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel@2x.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel@2x.png)bin518 -> 518 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template.png)bin1585 -> 1585 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar@2x.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template@2x.png)bin3322 -> 3322 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark.png)bin1585 -> 1585 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark@2x.png (renamed from main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark@2x.png)bin3322 -> 3322 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32.pngbin273 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32@2x.pngbin606 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast.pngbin236 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast@2x.pngbin521 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark.pngbin243 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark.pngbin277 -> 0 bytes
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark@2x.pngbin603 -> 0 bytes
25 files changed, 14 insertions, 14 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
index 54da8479f3..84a9913b94 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
@@ -141,7 +141,7 @@
</Extension>
<Extension path = "/MonoDevelop/Core/StockIcons">
- <StockIcon stockid = "md-package-project" resource = "project-package-32.png" size = "Dnd" />
+ <StockIcon stockid = "md-package-project" resource = "package-project.png" size = "Dnd" />
</Extension>
<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels">
@@ -163,6 +163,6 @@
</Extension>
<Extension path="/MonoDevelop/Ide/TemplateImages">
- <Image id="md-package-project" resource="project-package-template.png" />
+ <Image id="md-package-project" resource="package-sidebar.png" />
</Extension>
</ExtensionModel>
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
index 65f97ea50d..dae57a5def 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
@@ -167,19 +167,19 @@
<EmbeddedResource Include="icons\package-48~sel.png" />
<EmbeddedResource Include="icons\package-48~sel%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-32.png" />
- <EmbeddedResource Include="templates\images\project-package-32%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-32~dark.png" />
- <EmbeddedResource Include="templates\images\project-package-32~dark%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-32~dark~sel.png" />
- <EmbeddedResource Include="templates\images\project-package-32~dark~sel%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-32~sel.png" />
- <EmbeddedResource Include="templates\images\project-package-32~sel%402x.png" />
+ <EmbeddedResource Include="templates\images\package-project.png" />
+ <EmbeddedResource Include="templates\images\package-project%402x.png" />
+ <EmbeddedResource Include="templates\images\package-project~dark.png" />
+ <EmbeddedResource Include="templates\images\package-project~dark%402x.png" />
+ <EmbeddedResource Include="templates\images\package-project~dark~sel.png" />
+ <EmbeddedResource Include="templates\images\package-project~dark~sel%402x.png" />
+ <EmbeddedResource Include="templates\images\package-project~sel.png" />
+ <EmbeddedResource Include="templates\images\package-project~sel%402x.png" />
+ <EmbeddedResource Include="templates\images\package-sidebar.png" />
+ <EmbeddedResource Include="templates\images\package-sidebar%402x.png" />
+ <EmbeddedResource Include="templates\images\package-sidebar~dark.png" />
+ <EmbeddedResource Include="templates\images\package-sidebar~dark%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-template.png" />
- <EmbeddedResource Include="templates\images\project-package-template%402x.png" />
- <EmbeddedResource Include="templates\images\project-package-template~dark.png" />
- <EmbeddedResource Include="templates\images\project-package-template~dark%402x.png" />
<EmbeddedResource Include="templates\PackagingProject.xpt.xml" />
<EmbeddedResource Include="MonoDevelop.Deployment.addin.xml" />
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project.png
new file mode 100644
index 0000000000..a666f655f6
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project@2x.png
new file mode 100644
index 0000000000..5891638735
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast.png
new file mode 100644
index 0000000000..4f262dc59f
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast@2x.png
new file mode 100644
index 0000000000..40a2e7f9bc
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark.png
new file mode 100644
index 0000000000..c551ab05a5
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark@2x.png
new file mode 100644
index 0000000000..eeba32a417
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~contrast~dark@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark.png
new file mode 100644
index 0000000000..030472607d
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark@2x.png
new file mode 100644
index 0000000000..6070c3597c
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel.png
index 43ff254cd2..43ff254cd2 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel@2x.png
index a71c6ee139..a71c6ee139 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~dark~sel@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel.png
index 43ff254cd2..43ff254cd2 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~sel.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel@2x.png
index a71c6ee139..a71c6ee139 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark~sel@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-project~sel@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar.png
index fc1f83580c..fc1f83580c 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar@2x.png
index 319197d702..319197d702 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark.png
index e11f423e5e..e11f423e5e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark@2x.png
index 5939530cea..5939530cea 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-template~dark@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/package-sidebar~dark@2x.png
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32.png
deleted file mode 100644
index 2a50d68f14..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32@2x.png
deleted file mode 100644
index 9731051734..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32@2x.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast.png
deleted file mode 100644
index 19e6d95946..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast@2x.png
deleted file mode 100644
index d88c9b55ef..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast@2x.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark.png
deleted file mode 100644
index 566cff588f..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~contrast~dark.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark.png
deleted file mode 100644
index 488d403f36..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark.png
+++ /dev/null
Binary files differ
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark@2x.png
deleted file mode 100644
index ee8904242c..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/project-package-32~dark@2x.png
+++ /dev/null
Binary files differ