Merge branch 'master' into xs6-editor

Conflicts:
	main/external/xwt
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
	main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs

4 files changed, 17 insertions, 8 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs
index 559bda975e..3fa2c6ec1a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs
@@ -90,10 +90,10 @@ namespace MonoDevelop.Ide.WelcomePage
 
 						public static class PinButton
 						{
-							public const string NormalImage = "unstar-overlay-light-16.png";
-							public const string NormalHoverImage = "unstar-overlay-hover-light-16.png";
-							public const string PinnedImage = "star-overlay-light-16.png";
-							public const string PinnedHoverImage = "star-overlay-hover-light-16.png";
+							public const string NormalImage = "unstar-overlay-16.png";
+							public const string NormalHoverImage = "unstar-overlay-hover-16.png";
+							public const string PinnedImage = "star-overlay-16.png";
+							public const string PinnedHoverImage = "star-overlay-hover-16.png";
 						}
 					}
 				}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
index 958cbd3cb0..a2a4e777ae 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
@@ -65,6 +65,13 @@ namespace MonoDevelop.Ide.WelcomePage
 			}
 		}
 
+		/// <summary>
+		/// If false the window button isn't inserted into the page bar.
+		/// </summary>
+		public virtual bool IsVisible { 
+			get { return true; }
+		}
+
 		public WelcomePageBarButton (string title, string href, string iconResource = null)
 		{
 			FontFamily = Platform.IsMac ? Styles.WelcomeScreen.FontFamilyMac : Styles.WelcomeScreen.FontFamilyWindows;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageButtonBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageButtonBar.cs
index 364dc0600b..7a38cb8fac 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageButtonBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageButtonBar.cs
@@ -40,6 +40,8 @@ namespace MonoDevelop.Ide.WelcomePage
 			Spacing = Styles.WelcomeScreen.Links.LinkSeparation;
 
 			foreach (var button in buttons) {
+				if (!button.IsVisible)
+					continue;
 				PackStart (button, false, false, 0);
 			}
 			ShowAll ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
index ac83476adc..08cc70f4cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
@@ -140,10 +140,10 @@ namespace MonoDevelop.Ide.WelcomePage
 
 		static WelcomePageListButton ()
 		{
-			starNormal = Xwt.Drawing.Image.FromResource ("unstar-overlay-light-16.png");
-			starNormalHover = Xwt.Drawing.Image.FromResource ("unstar-overlay-hover-light-16.png");
-			starPinned = Xwt.Drawing.Image.FromResource ("star-overlay-light-16.png");
-			starPinnedHover = Xwt.Drawing.Image.FromResource ("star-overlay-hover-light-16.png");
+			starNormal = Xwt.Drawing.Image.FromResource ("unstar-overlay-16.png");
+			starNormalHover = Xwt.Drawing.Image.FromResource ("unstar-overlay-hover-16.png");
+			starPinned = Xwt.Drawing.Image.FromResource ("star-overlay-16.png");
+			starPinnedHover = Xwt.Drawing.Image.FromResource ("star-overlay-hover-16.png");
 		}
 
 		public WelcomePageListButton (string title, string subtitle, Xwt.Drawing.Image icon, string actionUrl)