[Monodevelop-patches-list] r677 - in trunk/MonoDevelop: build/AddIns build/AddIns/AddIns/BackendBindings data/resources src/Main/Base/Gui/Workbench src/Main/Core/AddIns

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Tue Jan 27 00:26:08 EST 2004


Author: tberman
Date: 2004-01-27 00:26:07 -0500 (Tue, 27 Jan 2004)
New Revision: 677

Modified:
   trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
   trunk/MonoDevelop/build/AddIns/SharpDevelopDefaultTextEditor.addin
   trunk/MonoDevelop/data/resources/AddIn.xsd
   trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
   trunk/MonoDevelop/src/Main/Core/AddIns/AddIn.cs
Log:
revert bens patches that cause some feature regressions


Modified: trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin	2004-01-27 05:26:07 UTC (rev 677)
@@ -3,8 +3,7 @@
        copyright   = "GPL"
        url         = "http://www.icsharpcode.net"
        description = "NCvs core module"
-       version     = "1.0.0"
-       if-not-env = "NEW_EDITOR">
+       version     = "1.0.0">
 	
 	<Runtime>
 		<Import assembly = "CSharpBinding.dll"/>
@@ -127,7 +126,63 @@
 			<Class id ="JavaFormatter" insertbefore="DefaultFormatter" class = "JavaBinding.FormattingStrategy.JavaFormattingStrategy"/>
 		</Conditional>
 	</Extension>
+	
+	<Extension path = "/Workspace/Icons">
+		<!-- C# -->
+		<Icon id         = "C#Prj"
+		      language   = "C#"
+		      resource   = "C#.ProjectIcon"/>
 
+		<Icon id         = "C#File"
+		      extensions = ".cs"
+		      resource   = "C#.FileIcon"/>
+		
+		<!-- VB.NET -->
+		<Icon id         = "VBPrj"
+		      language   = "VBNET"
+		      resource   = "VB.ProjectIcon"/>
+		<Icon id         = "VBFile"
+		      extensions = ".vb"
+		      resource   = "VB.FileIcon"/>
+
+		<!-- Java -->
+                <Icon id         = "JavaPrj"
+		      language   = "Java"
+		      resource   = "Java.ProjectIcon"/>
+                <Icon id         = "JavaFile"
+		      extensions = ".java"
+		      resource   = "Java.FileIcon"/>
+		      
+		<!-- Java Script -->
+                <Icon id         = "JScriptPrj"
+		      language   = "JScript"
+		      resource   = "JScript.ProjectIcon"/>
+                <Icon id         = "JScriptFile"
+		      extensions = ".js"
+		      resource   = "JScript.FileIcon"/>
+		
+		<!-- C++ -->
+                <Icon id         = "C++Project"
+		      language   = "C++"
+		      resource   = "C++.ProjectIcon"/>
+                <Icon id         = "C++File"
+		      extensions = ".cpp"
+		      resource   = "C++.FileIcon"/>
+		
+		<!-- Resources -->
+		<Icon id         = "ResourceFileIcon"
+		      extensions = ".resources,.resx"
+		      resource   = "Icons.16x16.ResourceFileIcon" />
+		<!-- XML -->
+		<Icon id         = "XmlFileIcon"
+		      extensions = ".xml"
+		      resource   = "FileIcons.XmlIcon" />
+		<!-- TextFiles -->
+		<Icon id         = "TextFileIcon"
+		      extensions = ".txt,.doc"
+		      resource   = "Icons.16x16.TextFileIcon"/>
+	</Extension>
+
 	<Extension path = "/SharpDevelop/Workbench/LanguageBindings">
 		<LanguageBinding id    = "CSharp"
 		                 supportedextensions = ".cs"

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-01-27 05:26:07 UTC (rev 677)
@@ -20,7 +20,8 @@
 		       class = "ICSharpCode.SharpDevelop.Commands.InitializeWorkbenchCommand"/>
 		<Class id = "StartCodeCompletionWizard" 
 		       class = "ICSharpCode.SharpDevelop.Commands.StartCodeCompletionWizard"/>
-
+		<Class id = "StartParserServiceThread" 
+		       class = "ICSharpCode.SharpDevelop.Commands.StartParserServiceThread"/>
 		<!-- #assembly preload -->
 <!--		<Class id = "StartSharpAssemblyPreloadThread"
 		       class = "ICSharpCode.SharpDevelop.Commands.StartSharpAssemblyPreloadThread"/>-->
@@ -28,24 +29,25 @@
 		       class = "ICSharpCode.SharpDevelop.Commands.StartWorkbenchCommand"/>
 	</Extension>
 	
-	<Extension path = "/Workspace/Autostart" if-not-env = "NEW_EDITOR">
-		<Class id = "StartParserServiceThread" 
-		       class = "ICSharpCode.SharpDevelop.Commands.StartParserServiceThread"/>
-	</Extension>
-	
 	<Extension path = "/Workspace/Services">
 		<Class id    = "ProjectService"
 		       class = "ICSharpCode.SharpDevelop.Services.DefaultProjectService"/>
 		<Class id    = "FileService"
 		       class = "ICSharpCode.SharpDevelop.Services.DefaultFileService"/>
+		<Class id    = "ParserService"
+		       class = "ICSharpCode.SharpDevelop.Services.DefaultParserService"/>
 		<Class id    = "TaskService"
 		       class = "ICSharpCode.SharpDevelop.Services.TaskService"/>
 		<Class id    = "StatusBarService"
 		       class = "ICSharpCode.SharpDevelop.Services.DefaultStatusBarService"/>
 		<Class id    = "ToolbarService"
 		       class = "ICSharpCode.SharpDevelop.Services.ToolbarService"/>
+		<Class id    = "LanguageService"
+		       class = "ICSharpCode.SharpDevelop.Services.LanguageService"/>
 		<Class id    = "ClassBrowserIconsService"
 		       class = "ICSharpCode.SharpDevelop.Services.ClassBrowserIconsService"/>
+		<Class id    = "LanguageBindingService"
+		       class = "ICSharpCode.SharpDevelop.Services.LanguageBindingService"/>
 		<Class id    = "DisplayBindingService"
 		       class = "ICSharpCode.SharpDevelop.Services.DisplayBindingService"/>
 		<Class id    = "AmbienceService"
@@ -53,14 +55,7 @@
 		<Class id    = "MenuService"
 		       class = "ICSharpCode.SharpDevelop.Services.MenuService"/>
 	</Extension>
-	
-	<Extension path = "/Workspace/Services" if-not-env = "NEW_EDITOR">
-		<Class id    = "LanguageService"
-		       class = "ICSharpCode.SharpDevelop.Services.LanguageService"/>
-		<Class id    = "ParserService"
-		       class = "ICSharpCode.SharpDevelop.Services.DefaultParserService"/>
-	</Extension>
-	
+
 	<Extension path = "/SharpDevelop/Workbench/DisplayBindings">
 		<DisplayBinding id    = "Browser"
 		                supportedformats = "Web Pages"
@@ -491,9 +486,15 @@
 				             tooltip = "${res:XML.MainMenu.EditMenu.Delete.Description}"
 				             class = "ICSharpCode.SharpDevelop.Commands.Delete"/>
 			</Conditional>
-			<ToolbarItem id = "CutSeparator" tooltip = "-"/>
+			<ToolbarItem id = "CutSeparator" insertafter ="Delete" insertbefore ="Find" tooltip = "-"/>
+	                <Conditional action="Disable">
+	                	<Or>
+	                		<Condition activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
+	                		<Condition iscombineopen="True"/>
+	                	</Or>
+			</Conditional>
 			
-			
+			<ToolbarItem id = "CompileSeparator" insertafter = "ClearBookmarks" tooltip = "-"/>
 	                <Conditional action="Disable">
 	                	<Or>
 	                		<Condition activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
@@ -513,7 +514,6 @@
 				             tooltip = "${res:XML.MainMenu.RunMenu.Run.Description}"
 				             class = "ICSharpCode.SharpDevelop.Commands.RunCommand"/>
 			</Conditional>
-			<ToolbarItem id = "CompileSeparator" tooltip = "-"/>
 		</ToolbarItem>
 	</Extension>
 
@@ -1005,61 +1005,4 @@
 		          class = "ICSharpCode.SharpDevelop.Gui.Pads.PropertyPadShowDescriptionCommand"/>
 	</Extension>
 	
-	
-	<Extension path = "/Workspace/Icons">
-		<!-- C# -->
-		<Icon id         = "C#Prj"
-		      language   = "C#"
-		      resource   = "C#.ProjectIcon"/>
-
-		<Icon id         = "C#File"
-		      extensions = ".cs"
-		      resource   = "C#.FileIcon"/>
-		
-		<!-- VB.NET -->
-		<Icon id         = "VBPrj"
-		      language   = "VBNET"
-		      resource   = "VB.ProjectIcon"/>
-		<Icon id         = "VBFile"
-		      extensions = ".vb"
-		      resource   = "VB.FileIcon"/>
-
-		<!-- Java -->
-                <Icon id         = "JavaPrj"
-		      language   = "Java"
-		      resource   = "Java.ProjectIcon"/>
-                <Icon id         = "JavaFile"
-		      extensions = ".java"
-		      resource   = "Java.FileIcon"/>
-		      
-		<!-- Java Script -->
-                <Icon id         = "JScriptPrj"
-		      language   = "JScript"
-		      resource   = "JScript.ProjectIcon"/>
-                <Icon id         = "JScriptFile"
-		      extensions = ".js"
-		      resource   = "JScript.FileIcon"/>
-		
-		<!-- C++ -->
-                <Icon id         = "C++Project"
-		      language   = "C++"
-		      resource   = "C++.ProjectIcon"/>
-                <Icon id         = "C++File"
-		      extensions = ".cpp"
-		      resource   = "C++.FileIcon"/>
-		
-		<!-- Resources -->
-		<Icon id         = "ResourceFileIcon"
-		      extensions = ".resources,.resx"
-		      resource   = "Icons.16x16.ResourceFileIcon" />
-		<!-- XML -->
-		<Icon id         = "XmlFileIcon"
-		      extensions = ".xml"
-		      resource   = "FileIcons.XmlIcon" />
-		<!-- TextFiles -->
-		<Icon id         = "TextFileIcon"
-		      extensions = ".txt,.doc"
-		      resource   = "Icons.16x16.TextFileIcon"/>
-	</Extension>
-	
 </AddIn>

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopDefaultTextEditor.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopDefaultTextEditor.addin	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopDefaultTextEditor.addin	2004-01-27 05:26:07 UTC (rev 677)
@@ -3,8 +3,7 @@
        copyright   = "GPL"
        url         = "http://www.icsharpcode.net"
        description = "NCvs texteditor module"
-       version     = "1.0.0"
-       if-not-env  = "NEW_EDITOR">
+       version     = "1.0.0">
 	
 	<Runtime>
 		<Import assembly="../bin/MonoDevelop.TextEditor.dll"/>
@@ -134,7 +133,6 @@
 				</Or>
 			
 				<ToolbarItem id = "Find"
-				             insertafter = "CutSeparator"
 				             icon = "Icons.16x16.FindIcon" 
 				             tooltip = "${res:XML.MainMenu.SearchMenu.Find.Description}"
 				             class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.Find"/>

Modified: trunk/MonoDevelop/data/resources/AddIn.xsd
===================================================================
--- trunk/MonoDevelop/data/resources/AddIn.xsd	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/data/resources/AddIn.xsd	2004-01-27 05:26:07 UTC (rev 677)
@@ -13,8 +13,6 @@
 		<xs:attribute name="url" type="xs:anyURI" use="required"/>
 		<xs:attribute name="description" type="xs:string" use="required"/>
 		<xs:attribute name="version" type="xs:string" use="required"/>
-		<xs:attribute name="if-not-env" type="xs:string" use="optional"/>
-		<xs:attribute name="if-env" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:element name="AddIn" type="AddIn"/>
 	<xs:complexType name="Import">
@@ -41,8 +39,6 @@
 			<xs:element ref="MenuItem"/>
 		</xs:choice>
 		<xs:attribute name="path" type="xs:string" use="required"/>
-		<xs:attribute name="if-not-env" type="xs:string" use="optional"/>
-		<xs:attribute name="if-env" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:element name="Extension" type="Extension"/>
 	<xs:complexType name="Condition">

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-01-27 05:26:07 UTC (rev 677)
@@ -21,7 +21,6 @@
 using ICSharpCode.Core.Services;
 using ICSharpCode.SharpDevelop.Gui.Components;
 using ICSharpCode.SharpDevelop.Services;
-using ICSharpCode.SharpDevelop.Gui.Dialogs;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -179,11 +178,6 @@
 
 			CreateToolBars();
 			CreateMainMenu();
-			
-			
-			if (SplashScreenForm.SplashScreen != null) {
-				SplashScreenForm.SplashScreen.Hide();
-			}
 		}
 				
 		//		public void OpenCombine(string filename)

Modified: trunk/MonoDevelop/src/Main/Core/AddIns/AddIn.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Core/AddIns/AddIn.cs	2004-01-27 05:14:42 UTC (rev 676)
+++ trunk/MonoDevelop/src/Main/Core/AddIns/AddIn.cs	2004-01-27 05:26:07 UTC (rev 677)
@@ -182,14 +182,6 @@
 				url         = doc.DocumentElement.Attributes["url"].InnerText;
 				description = doc.DocumentElement.Attributes["description"].InnerText;
 				version     = doc.DocumentElement.Attributes["version"].InnerText;
-				
-				XmlAttribute if_env     = doc.DocumentElement.Attributes ["if-env"];
-				XmlAttribute if_not_env = doc.DocumentElement.Attributes ["if-not-env"];
-				
-				if (if_env != null && Environment.GetEnvironmentVariable (if_env.InnerText) == null)
-					return;
-				if (if_not_env != null && Environment.GetEnvironmentVariable (if_not_env.InnerText) != null)
-					return;
 			} catch (Exception) {
 				throw new AddInLoadException("No or malformed 'AddIn' node");
 			}
@@ -234,13 +226,7 @@
 		{
 			if (el.Attributes["path"] == null) {
 				throw new AddInLoadException("One extension node has no path attribute defined.");
-			}
-			
-			if (el.Attributes["if-not-env"] != null && Environment.GetEnvironmentVariable (el.Attributes["if-not-env"].InnerText) != null)
-				return;
-			if (el.Attributes["if-env"] != null && Environment.GetEnvironmentVariable (el.Attributes["if-env"].InnerText) == null)
-				return;
-			
+			}			
 			Extension e = new Extension(el.Attributes["path"].InnerText);
 			AddCodonsToExtension(e, el, new ConditionCollection());
 			extensions.Add(e);




More information about the Monodevelop-patches-list mailing list