Merge branch 'master' into aspnet-project-wizard

Conflicts:
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/tests/UnitTests/UnitTests.csproj

4 files changed, 42 insertions, 14 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
index 1ae62d65bf..3b0e686d93 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
@@ -619,15 +619,15 @@
 			defaultHandler = "MonoDevelop.Ide.Commands.ZoomIn"
 			_label = "_Zoom In"
 			icon = "gtk-zoom-in"
-			shortcut = "Control|+"
-			macShortcut = "Meta|+"
+			shortcut = "Control|+ Control|="
+			macShortcut = "Meta|+ Meta|="
 			_description = "Zooms view in" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomOut"
 			defaultHandler = "MonoDevelop.Ide.Commands.ZoomOut"
 			_label = "Zoom _Out"
 			icon = "gtk-zoom-out"
-			shortcut = "Control|-"
-			macShortcut = "Meta|-"
+			shortcut = "Control|- Control|_"
+			macShortcut = "Meta|- Meta|_"
 			_description = "Zooms view out" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomReset"
 			defaultHandler = "MonoDevelop.Ide.Commands.ZoomReset"
@@ -683,26 +683,37 @@
 			defaultHandler = "MonoDevelop.Ide.Commands.InstrumentationViewerHandler"
 			_label = "Instrumentation Monitor" />
 
+	<Command id = "MonoDevelop.Ide.Commands.ToolCommands.ToggleSessionRecorder"
+			defaultHandler = "MonoDevelop.Ide.Commands.ToggleSessionRecorderHandler"
+			_label = "Start Session Recorder" />
+
+	<Command id = "MonoDevelop.Ide.Commands.ToolCommands.ReplaySession"
+			defaultHandler = "MonoDevelop.Ide.Commands.ReplaySessionHandler"
+			_label = "Replay Session..." />
 	</Category>
 
 
 	<!-- WindowCommands -->
 	<Category _name = "Window" id = "Window">
 
-	<Command id  = "MonoDevelop.Ide.Commands.WindowCommands.NextWindow"
-			defaultHandler = "MonoDevelop.Ide.Commands.NextWindowHandler"
-			_label = "_Next Window"
+	<Command id  = "MonoDevelop.Ide.Commands.WindowCommands.NextDocument"
+			defaultHandler = "MonoDevelop.Ide.Commands.NextDocumentHandler"
+			_label = "_Next Document"
 			icon = "gtk-go-forward"
-			_description = "Show next window"
+			_description = "Show next document"
 			shortcut = "Control|Page_Down"
 			macShortcut = "Meta|}" />
-	<Command id = "MonoDevelop.Ide.Commands.WindowCommands.PrevWindow"
-			defaultHandler = "MonoDevelop.Ide.Commands.PrevWindowHandler"
-			_label = "_Previous Window"
+	<Command id = "MonoDevelop.Ide.Commands.WindowCommands.PrevDocument"
+			defaultHandler = "MonoDevelop.Ide.Commands.PrevDocumentHandler"
+			_label = "_Previous Document"
 			icon = "gtk-go-back"
-			_description = "Show previous window"
+			_description = "Show previous document"
 			shortcut = "Control|Page_Up"
 			macShortcut = "Meta|{" />
+	<Command id = "MonoDevelop.Ide.Commands.WindowCommands.OpenDocumentList"
+			defaultHandler = "MonoDevelop.Ide.Commands.OpenDocumentListHandler"
+			type="radio|array"
+			_label = "Document List" />
 	<Command id = "MonoDevelop.Ide.Commands.WindowCommands.OpenWindowList"
 			defaultHandler = "MonoDevelop.Ide.Commands.OpenWindowListHandler"
 			type="radio|array"
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
index e3a7cc997a..28e93193d0 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
@@ -222,6 +222,10 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ToolList" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.InstrumentationViewer" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.InsertGuid" />
+		<ItemSet id = "SessionRecorder" _label = "Session Recorder" autohide = "true">
+			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ToggleSessionRecorder" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ReplaySession" />
+		</ItemSet>
 		<SeparatorItem id = "OptionsSection" />
 		<Condition id="Platform" value="windows">
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.MonodevelopPreferences" />
@@ -230,8 +234,8 @@
 	</ItemSet>
 
 	<ItemSet id = "Window" _label = "_Window">
-		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.NextWindow" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.PrevWindow" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.NextDocument" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.PrevDocument" />
 		<SeparatorItem id ="NxtPrvSeparator" /> 
 		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.CloseAllFiles" />
 <!--		<SeparatorItem id ="SplitSeparator" /> 
@@ -241,6 +245,9 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.SwitchSplitWindow" />-->
 		<SeparatorItem id = "contentSep" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.OpenWindowList" />
+		<SeparatorItem id = "windowDocSep" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.OpenDocumentList" />
+		<SeparatorItem id = "docMinimizeSep" />
 	</ItemSet> 
 
 	<ItemSet id = "Help" _label = "_Help">
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml
index 4a4bd5b95a..b27e0cb69b 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml
@@ -67,6 +67,11 @@
 	<MimeType id="text/x-apple-strings" _description="Apple Strings" isText="true">
 		<File pattern="*.strings" />
 	</MimeType>
+		
+	<MimeType id="text/x-sql" _description="sql files" isText="true">
+		<File pattern="*.sql" />
+	</MimeType>
+		
 	<MimeType id="application/json" _description="JSON files" isText="true">
 		<File pattern="*.json" />
 	</MimeType>
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml
index 2c791534fe..d53bd4470a 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml
@@ -94,6 +94,11 @@
 </Extension>
 
 <Extension path="/MonoDevelop/Ide/ProjectTemplateCategories">
+	<Category id="multiplat" name="Multi-platform" icon="md-platform-cross-platform">
+			<Category id="library" name="Library">
+				<Category id="general" name="General" mappedCategories="crossplat/library/general" />
+			</Category>
+		</Category>
 	<Category id="other" name="Other" icon="md-platform-other">
 		<Category id="net" name=".NET">
 			<Category id="general" name="General" mappedCategories="C#" />