Browse Source

Included file icons from Wolfgang Bartelme.

Fixed exception when loading project that has a .xml file declared as "compile".

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@90 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
b8367938c5
  1. 41
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 13
      data/resources/image/BitmapResources/BitmapResources.res
  3. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/ASP_16.png
  4. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/ASP_32.png
  5. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/CSS_16.png
  6. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/CSS_32.png
  7. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/DTD_16.png
  8. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/DTD_32.png
  9. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.CombineIcon.png
  10. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.HTMLIcon.png
  11. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.TextFileIcon.png
  12. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.XMLFileIcon.png
  13. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.ASPFileIcon.png
  14. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.HTMLFileIcon.png
  15. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.TextFileIcon.png
  16. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.XMLFileIcon.png
  17. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/XSD_16.png
  18. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/XSD_32.png
  19. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/XSL_16.png
  20. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/XSL_32.png
  21. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/XmlFileIcon.png
  22. 2
      data/resources/image/BitmapResources/backendicons/miscFiles/readme.txt
  23. 4
      src/Main/Base/Project/Src/Services/ParserService/CaseSensitiveProjectContent.cs
  24. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources

41
AddIns/ICSharpCode.SharpDevelop.addin

@ -1805,4 +1805,45 @@ @@ -1805,4 +1805,45 @@
tooltip = "Search"
class = "SearchAndReplace.FindComboBox"/>
</Path>
<Path name = "/Workspace/Icons">
<!-- Resources -->
<Icon id = "ResourceFileIcon"
extensions = ".resources,.resx"
resource = "Icons.16x16.ResourceFileIcon" />
<!-- XML -->
<Icon id = "XmlFileIcon"
extensions = ".xml"
resource = "FileIcons.XmlIcon" />
<Icon id = "DtdFileIcon"
extensions = ".dtd"
resource = "Icons.16x16.DTDIcon"/>
<Icon id = "XsdFileIcon"
extensions = ".xsd"
resource = "Icons.16x16.XSDIcon"/>
<Icon id = "XslFileIcon"
extensions = ".xsl"
resource = "Icons.16x16.XSLIcon"/>
<Icon id = "HtmlFileIcon"
extensions = ".html,.htm"
resource = "Icons.16x16.HTMLIcon"/>
<Icon id = "AspFileIcon"
extensions = ".asp,.aspx"
resource = "Icons.16x16.ASPFileIcon"/>
<!-- TextFiles -->
<Icon id = "TextFileIcon"
extensions = ".txt,.doc"
resource = "Icons.16x16.TextFileIcon"/>
<Icon id = "CssFileIcon"
extensions = ".css"
resource = "Icons.16x16.CSSIcon"/>
</Path>
</AddIn>

13
data/resources/image/BitmapResources/BitmapResources.res

@ -382,7 +382,7 @@ C++.Project.Library = backendicons\cpp\project\Lib @@ -382,7 +382,7 @@ C++.Project.Library = backendicons\cpp\project\Lib
C++.Project.ControlLibrary = backendicons\cpp\project\ControlLibrary.png
# misc backend icons
FileIcons.XmlIcon = backendicons\miscFiles\XmlFileIcon.png
FileIcons.XmlIcon = backendicons\miscFiles\Icons.16x16.XMLFileIcon.png
Icons.16x16.ResourceFileIcon = backendicons\miscFiles\Icons.16x16.ResourceFileIcon.png
Icons.16x16.HTMLIcon = backendicons\miscFiles\Icons.16x16.HTMLIcon.png
Icons.16x16.XMLFileIcon = backendicons\miscFiles\Icons.16x16.XMLFileIcon.png
@ -395,8 +395,17 @@ Icons.32x32.EmptyFileIcon = backendicons\miscFiles\Icons @@ -395,8 +395,17 @@ Icons.32x32.EmptyFileIcon = backendicons\miscFiles\Icons
Icons.32x32.HTMLFileIcon = backendicons\miscFiles\Icons.32x32.HTMLFileIcon.png
Icons.32x32.XMLFileIcon = backendicons\miscFiles\Icons.32x32.XMLFileIcon.png
Icons.32x32.TextFileIcon = backendicons\miscFiles\Icons.32x32.TextFileIcon.png
Icons.32x32.ASPFileIcon = backendicons\miscFiles\Icons.32x32.ASPFileIcon.png
Icons.32x32.EmptyProjectIcon = backendicons\miscFiles\Icons.32x32.EmptyProjectIcon.png
Icons.32x32.CombineIcon = backendicons\miscFiles\Icons.32x32.CombineIcon.png
Icons.32x32.ResourceFileIcon = backendicons\miscFiles\Icons.32x32.ResourceFileIcon.png
Icons.16x16.CSSIcon = backendicons\miscFiles\CSS_16.png
Icons.32x32.CSSIcon = backendicons\miscFiles\CSS_32.png
Icons.16x16.DTDIcon = backendicons\miscFiles\DTD_16.png
Icons.32x32.DTDIcon = backendicons\miscFiles\DTD_32.png
Icons.16x16.XSDIcon = backendicons\miscFiles\XSD_16.png
Icons.32x32.XSDIcon = backendicons\miscFiles\XSD_32.png
Icons.16x16.XSLIcon = backendicons\miscFiles\XSL_16.png
Icons.32x32.XSLIcon = backendicons\miscFiles\XSL_32.png
Icons.16x16.ASPFileIcon = backendicons\miscFiles\ASP_16.png
Icons.32x32.ASPFileIcon = backendicons\miscFiles\ASP_32.png

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/ASP_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 805 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/ASP_32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/CSS_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/CSS_32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/DTD_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/DTD_32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.CombineIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 842 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.HTMLIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 881 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.TextFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

After

Width:  |  Height:  |  Size: 818 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.16x16.XMLFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 781 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.ASPFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.HTMLFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.TextFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/Icons.32x32.XMLFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/XSD_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/XSD_32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/XSL_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/XSL_32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/XmlFileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1015 B

2
data/resources/image/BitmapResources/backendicons/miscFiles/readme.txt

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
HTML, ASP, XML, TXT, CSS, DTD, XSD and XSL icons by
Wolfgang Bartelme http://www.bartelme.at/

4
src/Main/Base/Project/Src/Services/ParserService/CaseSensitiveProjectContent.cs

@ -108,7 +108,9 @@ namespace ICSharpCode.Core @@ -108,7 +108,9 @@ namespace ICSharpCode.Core
break;
case ItemType.Compile:
ParseInformation parseInfo = ParserService.ParseFile(item.FileName, null, true, false);
newProjectContent.UpdateCompilationUnit(null, parseInfo.BestCompilationUnit as ICompilationUnit, item.FileName, true);
if (parseInfo != null) {
newProjectContent.UpdateCompilationUnit(null, parseInfo.BestCompilationUnit as ICompilationUnit, item.FileName, true);
}
break;
}
}

BIN
src/Main/StartUp/Project/Resources/BitmapResources.resources

Binary file not shown.
Loading…
Cancel
Save