Merge from trunk. Fixed bug when saving Null gestures profile

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/shortcuts@4436 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
icsharpcode · Jul 13, 2009 · ffccf93 · ffccf93
2 parents b47f15d + cb3417a
commit ffccf93
Show file tree

Hide file tree

Showing 244 changed files with 6,993 additions and 1,503 deletions.
diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -1503,7 +1503,7 @@
 				          class = "ICSharpCode.SharpDevelop.Commands.ClearRecentProjects" />
 			</MenuItem>
 
-			<MenuItem id = "ExitSC:eparator" type = "Separator"  />
+			<MenuItem id = "ExitSeparator" type = "Separator"  />
 			<MenuItem id = "Exit"
 			          label = "${res:XML.MainMenu.FileMenu.Exit}"
 			          icon = "Icons.16x16.CancelIcon"
@@ -1807,7 +1807,7 @@
 			<MenuItem id = "ToggleBreakpointSeparator" type = "Separator" />
 			<ComplexCondition action="Disable">
 				<And>
-					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
+					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider"/>
 					<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
 				</And>
 				<MenuItem id       = "Toggle Breakpoint"
@@ -2070,21 +2070,20 @@
 		          label = "${res:XML.MainMenu.FileMenu.Close}"
 		          icon  = "Icons.16x16.CloseFileIcon"
 		          class ="ICSharpCode.SharpDevelop.Commands.CloseFile"/>
-	</Path>
-
-	<!-- DefaultTextEditor=old editor. TODO: remove this -->
-	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
-		<Include id="DefaultEditor" path="/SharpDevelop/ViewContent/TextEditor/ContextMenu"/>
 		<MenuItem id = "Separator2" type = "Separator" />
 		<MenuItem id = "Comment"
 		          icon  = "Icons.16x16.CommentRegion"
 		          label = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
-		          class= "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
+		          class = "ICSharpCode.SharpDevelop.Editor.Commands.CommentRegion"/>
 		<MenuItem id = "Indent"
 		          label = "${res:XML.TextAreaContextMenu.Indent}"
 		          shortcut = "Ctrl+I"
-		          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.IndentSelection" />
-
+		          class = "ICSharpCode.SharpDevelop.Editor.Commands.IndentSelection" />
+	</Path>
+
+	<!-- DefaultTextEditor=old editor. TODO: remove this -->
+	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
+		<Include id="DefaultEditor" path="/SharpDevelop/ViewContent/TextEditor/ContextMenu"/>
 		<MenuItem id = "FileMode" label = "${res:XML.TextAreaContextMenu.FileMode}"  type="Menu">
 			<MenuItem id = "HighlightBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.HighlightingTypeBuilder" />
 		</MenuItem>
@@ -2102,11 +2101,11 @@
 
 	<Path name = "/SharpDevelop/Workbench/ToolBar/Standard">
 		<ToolbarItem id = "SearchSeparator" type = "Separator"/>
-		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.ITextEditorProvider" action="Disable">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
 			<ToolbarItem id = "Comment"
 			             icon = "Icons.16x16.CommentRegion"
 			             tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
-			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
+			             class = "ICSharpCode.SharpDevelop.Editor.Commands.CommentRegion"/>
 			<!--				<ToolbarItem id = "Uncomment"
 				             icon = "Icons.16x16.UnCommentRegion"
 				             tooltip = "${res:XML.TextAreaContextMenu.UncommentSelection}"
@@ -2135,6 +2134,9 @@
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit">
 		<MenuItem insertafter = "Delete" id = "Separator2" type = "Separator" />
 		<MenuItem id = "Format" label = "${res:XML.MainMenu.EditMenu.FormatMenu}" type="Menu">
+			<MenuItem id = "Separator4" type = "Separator" />
+			<Include id = "Comment" item = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/Comment" />
+			<Include id = "Indent" item = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/Indent" />
 		</MenuItem>
 		<MenuItem id = "Folding" label = "${res:XML.MainMenu.EditMenu.FoldingMenu}" type="Menu">
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">

diff --git a/data/schemas/sql.xsd b/data/schemas/sql.xsd
@@ -72,7 +72,9 @@
             <xs:attribute name="Database" use="required" type="xs:string">
                 <xs:annotation>
                     <xs:documentation>
-                        The name of the database.  If the name does not follow the SQL server "Rules for Regular Identifiers" (see <html:a href="http://msdn.microsoft.com/en-us/library/ms175874.aspx">MSDN</html:a>) it must be surrounded by quotes or square brackets.  Since this value can be formatted text, this means that if you choose to use square brackets you must use the MSI method for escaping square brackets, for example: [\[]blah[\]].
+                        The name of the database. The value can be a literal value or derived from a
+                        Property element using the <html:a href='http://msdn.microsoft.com/library/aa368609.aspx' target='_blank'>Formatted</html:a>
+                        syntax.
                     </xs:documentation>
                 </xs:annotation>
             </xs:attribute>

diff --git a/data/schemas/vs.xsd b/data/schemas/vs.xsd
@@ -43,6 +43,9 @@
             <xs:attribute name="Name" use="required" type="xs:string">
                 <xs:annotation><xs:documentation>Internal Microsoft Help ID for this Namespace.</xs:documentation></xs:annotation>
             </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 
@@ -53,6 +56,7 @@
             </xs:documentation>
             <xs:appinfo>
                 <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
+                <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
                 <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
             </xs:appinfo>
         </xs:annotation>
@@ -66,6 +70,9 @@
             <xs:attribute name="Name" use="required" type="xs:string">
                 <xs:annotation><xs:documentation>Friendly name for Filter.</xs:documentation></xs:annotation>
             </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 
@@ -100,6 +107,9 @@
             <xs:attribute name="Search" type="xs:string">
                 <xs:annotation><xs:documentation>Key for HxQ (Query) file.</xs:documentation></xs:annotation>
             </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 
@@ -126,6 +136,9 @@
             <xs:attribute name="TargetFeature" type="xs:string">
                 <xs:annotation><xs:documentation>Key for the feature parent of this help collection.  Required only when plugging into external namespaces.</xs:documentation></xs:annotation>
             </xs:attribute>
+            <xs:attribute name="SuppressExternalNamespaces" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Visual Studio Help namespaces.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 
@@ -164,6 +177,7 @@
             <xs:documentation>Create a reference to a HelpCollection element in another Fragment.</xs:documentation>
             <xs:appinfo>
                 <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
+                <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
                 <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
             </xs:appinfo>
         </xs:annotation>
@@ -183,4 +197,13 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:simpleType name="YesNoType">
+        <xs:annotation>
+            <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base='xs:NMTOKEN'>
+            <xs:enumeration value="no"/>
+            <xs:enumeration value="yes"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>