From 34680425f92544e17503c0d68f358951f1ab1028 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 18 Dec 2005 17:31:50 +0000
Subject: [PATCH] Display name of AddIns: "Subversion AddIn" instead of
 "ICSharpCode.Svn"

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@914 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 AddIns/ICSharpCode.SharpDevelop.addin              |  2 +-
 .../Boo/BooBinding/Project/BooBinding.addin        |  2 +-
 .../CSharpBinding/Project/CSharpBinding.addin      |  2 +-
 .../ILAsmBinding/Project/ILAsmBinding.addin        |  2 +-
 .../VBNetBinding/Project/VBNetBinding.addin        |  2 +-
 .../FormsDesigner/Project/FormsDesigner.addin      |  2 +-
 .../ResourceEditor/Project/ResourceEditor.addin    |  2 +-
 .../XmlEditor/Project/XmlEditor.addin              |  2 +-
 .../Misc/AddInManager/Project/AddInManager.addin   |  2 +-
 .../Misc/AddInManager/Project/Src/AboutForm.cs     | 11 +++++++++--
 .../Misc/AddinScout/Project/AddInScout.addin       |  2 +-
 .../Debugger.AddIn/Project/Debugger.AddIn.addin    |  2 +-
 .../Project/FiletypeRegisterer.addin               |  2 +-
 .../Project/HighlightingEditor.addin               |  2 +-
 src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin  | 14 +++++++-------
 src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin  |  2 +-
 src/AddIns/Misc/NAntAddIn/Project/NAnt.addin       |  2 +-
 src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin    |  2 +-
 src/AddIns/Misc/StartPage/Project/StartPage.addin  |  2 +-
 .../SubversionAddIn/Project/ICSharpCode.Svn.addin  |  6 +++---
 20 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 69de599668..c2aec2e100 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "SharpDevelop"
        author      = "Mike Krueger"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        url         = "http://www.icsharpcode.net"
        description = "SharpDevelop main module">
 	
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
index 959b535e3f..5097d200c9 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Boo Binding"
        author      = "Daniel Grunwald"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        url         = "http://boo.codehaus.org/Boo+AddIn+For+SharpDevelop"
        description = "Backing binding for Boo">
 	
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index 1aeb1e5bdb..ad2777cef8 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "C# Binding"
        author      = "Mike Krueger"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Backing binding for C#">
 	
 	<Manifest>
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
index f4ab5ba7a5..b9ef1a7f0b 100644
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
+++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "ILAsm binding"
        author      = "Mike Krueger"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Backing binding for IL Assembler">
 	
 	<Manifest>
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index 9266202d93..6ed59331f4 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "VB Binding"
        author      = "Mike Krueger, Markus Palme"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Backing binding for VB.NET">
 	
 	<Manifest>
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
index b50a382033..6989f1dd0e 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Forms Designer"
        author      = "Mike Krueger"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Windows Forms Designer">
 	
 	<Manifest>
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
index 1e463fd1b2..816b9ebad1 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Resource Editor"
        author      = "Mike Krueger"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "A Display binding for *.resources and *.resx files.">
 	
 	<Runtime>
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
index 9dd294afca..140a32fd70 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Xml Editor"
        author      = "Matt Ward"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Xml Editor">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
index 20a1e3bd3f..a931052300 100644
--- a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
+++ b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "AddInManager"
        author      = "Daniel Grunwald"
-       copyright   = "GNU General Public License"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Can install, enable, disable and uninstall AddIns">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
index 1673ca88d9..c66f68bfa6 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
@@ -46,8 +46,15 @@ namespace ICSharpCode.AddInManager
 			}
 			
 			if (addIn.Properties["copyright"].Length > 0) {
-				titles.Add("Copyright");
-				values.Add(addIn.Properties["copyright"]);
+				if (!addIn.Properties["copyright"].StartsWith("prj:")) {
+					titles.Add("Copyright");
+					values.Add(addIn.Properties["copyright"]);
+				}
+			}
+			
+			if (addIn.Properties["license"].Length > 0) {
+				titles.Add("License");
+				values.Add(addIn.Properties["license"]);
 			}
 			
 			if (addIn.Properties["url"].Length > 0) {
diff --git a/src/AddIns/Misc/AddinScout/Project/AddInScout.addin b/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
index 7fe51b6e5b..3e9ade43d1 100644
--- a/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
+++ b/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "AddInScout"
        author      = "Satguru P Srivastava"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        url         = "http://home.mchsi.com/~ssatguru"
        description = "Display AddIn Information">
 	
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
index 9b55357d89..dfc48f6bad 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
@@ -1,4 +1,4 @@
-<AddIn name="Debugger" author="David Srbecký" copyright="GPL" url="" description="SharpDevelop Managed Debugger">
+<AddIn name="Debugger" author="David Srbecký" copyright="prj:///doc/copyright.txt" description="SharpDevelop Managed Debugger">
 	<Manifest>
 		<Identity name = "ICSharpCode.Debugger"/>
 	</Manifest>
diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
index 117ba7604c..c4b9928a37 100644
--- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
+++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Filetype Registerer"
        author      = "Georg Brandl"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Registers files in the Windows Explorer for #Develop">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin
index bbf705e381..c5dc4a4052 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin
+++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Highlighting Editor"
        author      = "Georg Brandl"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Editor for syntax highlighting styles for the text editor">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
index 53f95229d9..b5a010e229 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
@@ -8,7 +8,7 @@
 	</Runtime>
 	
 	<Path name = "/SharpDevelop/Views/Browser/SchemeExtensions">
-		<BrowserSchemeExtension id    = "ms-help" class = "HtmlHelp2.BrowserScheme"/>
+		<BrowserSchemeExtension id = "ms-help" class = "HtmlHelp2.BrowserScheme"/>
 	</Path>
 
 	<Path name = "/SharpDevelop/Services/HelpProvider">
@@ -45,8 +45,11 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
+		<MenuItem id           = "HtmlHelp2Separator2"
+		          type         = "Separator"
+		          insertafter  = "TipOfTheDay"/>
 		<MenuItem id           = "TocPadCommand"
-		          insertafter  = "Separator1"
+		          insertafter  = "HtmlHelp2Separator2"
 		          label        = "${res:AddIns.HtmlHelp2.Contents}"
 		          icon         = "HtmlHelp2.16x16.Toc"
 		          shortcut     = "Control|Alt|F1"
@@ -68,11 +71,8 @@
 		          icon         = "HtmlHelp2.16x16.IndexResults"
 		          shortcut     = "Shift|Alt|F2"
 		          class        = "HtmlHelp2.ShowIndexResultsMenuCommand"
-		          insertafter  = "SearchPadCommand"/>
-		<MenuItem id           = "HtmlHelp2Separator2"
-		          type         = "Separator"
-		          insertafter  = "IndexResultsPadCommand"
-		          insertbefore = "ViewGPL"/>
+		          insertafter  = "SearchPadCommand"
+		          insertbefore = "Separator1"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/ViewContent/Browser/Toolbar">
diff --git a/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin b/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin
index 6c5e81fb19..3af3f32133 100644
--- a/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin
+++ b/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "MbUnit-Addin"
        author      = "Daniel Grunwald"
-       copyright   = "GNU General Public License"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Runs MbUnit and NUnit tests inside #Develop">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin b/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin
index 7008314628..bff34be550 100644
--- a/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin
+++ b/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "NAnt Add-in"
        author      = "Matt Ward"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "NAnt integration for SharpDevelop.">
 
 	<Manifest>
diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
index 370d478752..564eb187fb 100644
--- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
+++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Regular expressions toolkit"
        author      = "Markus Palme"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "Testing toolkit for regular expressions">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.addin b/src/AddIns/Misc/StartPage/Project/StartPage.addin
index 4ed7c62725..7a7e28ade3 100644
--- a/src/AddIns/Misc/StartPage/Project/StartPage.addin
+++ b/src/AddIns/Misc/StartPage/Project/StartPage.addin
@@ -1,6 +1,6 @@
 <AddIn name        = "Start Page"
        author      = "Georg Brandl"
-       copyright   = "GPL"
+       copyright   = "prj:///doc/copyright.txt"
        description = "VS like Start Page for #develop">
 	
 	<Manifest>
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
index 9e1173e994..0595034848 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
+++ b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
@@ -1,7 +1,7 @@
-<AddIn name        = "ICSharpCode.Svn"
+<AddIn name        = "Subversion AddIn"
        author      = "Mike Krueger"
-       copyright   = "GPL"
-       description = "Subversion plugin">
+       copyright   = "prj:///doc/copyright.txt"
+       description = "Adds support for Subversion to the project browser">
 	
 	<Manifest>
 		<Identity name = "ICSharpCode.Svn"/>