Merge pull request #1023 from picoe/hotfix/addin-dark-theme

Hotfix/addin dark theme

src/Addins/Eto.Addin.MonoDevelop/EtoInitializer.cs

@@ -1,20 +1,23 @@
 using System;
 using System.Linq;
 using Eto.Forms;
+using Eto.Designer;
 
 namespace Eto.Addin.MonoDevelop
 {
 	public static class EtoInitializer
 	{
-		static readonly string AddinPlatform = Eto.Platforms.Gtk2;
-
 		public static void Initialize()
 		{
 			if (Platform.Instance == null)
 			{
 				try
 				{
-					new Eto.Forms.Application(AddinPlatform).Attach();
+					var platform = new Eto.GtkSharp.Platform();
+
+					platform.LoadAssembly(typeof(EtoInitializer).Assembly);
+
+					new Eto.Forms.Application(platform).Attach();
 				}
 				catch (Exception ex)
 				{

src/Addins/Eto.Addin.MonoDevelop/Extensions.cs

@@ -0,0 +1,12 @@
+using System;
+using Eto.Drawing;
+namespace Eto.Addin.MonoDevelop
+{
+	public static class Extensions
+	{
+		public static Color ToEto(this Xwt.Drawing.Color color)
+		{
+			return new Color((float)color.Red, (float)color.Green, (float)color.Blue, (float)color.Alpha);
+		}
+	}
+}

src/Addins/Eto.Addin.MonoDevelop/PlatformThemeHandler.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Eto;
+using Eto.Addin.MonoDevelop;
+using Eto.Designer;
+using Eto.Drawing;
+using MonoDevelop.Ide.Gui;
+
+[assembly: ExportHandler(typeof(IPlatformTheme), typeof(PlatformThemeHandler))]
+
+namespace Eto.Addin.MonoDevelop
+{
+	public class PlatformThemeHandler : IPlatformTheme
+	{
+		public Color ProjectBackground => Styles.NewProjectDialog.ProjectConfigurationLeftHandBackgroundColor.ToEto();
+
+		public Color ProjectForeground => Styles.BaseForegroundColor.ToEto();
+
+		public Color ProjectDialogBackground => ProjectBackground; // not used on mac anyway..
+
+		public Color ErrorForeground => Styles.ErrorForegroundColor.ToEto();
+
+		public Color SummaryBackground => Styles.NewProjectDialog.ProjectConfigurationRightHandBackgroundColor.ToEto();
+
+		public Color SummaryForeground => Styles.NewProjectDialog.ProjectConfigurationPreviewLabelColor.ToEto();
+
+		public Color DesignerBackground => Styles.BaseBackgroundColor.ToEto();
+
+		public Color DesignerPanel => Styles.BackgroundColor.ToEto();
+
+		public IEnumerable<PlatformColor> AllColors => throw new NotImplementedException();
+	}
+}

src/Addins/Eto.Addin.Shared/BaseDialog.cs

@@ -1,4 +1,5 @@
-using Eto.Drawing;
+using Eto.Designer;
+using Eto.Drawing;
 using Eto.Forms;
 
 namespace Eto.Addin.Shared
@@ -16,6 +17,7 @@ public BaseDialog()
 		{
 			//ClientSize = new Size(800, 400);
 			Resizable = true;
+			BackgroundColor = Global.Theme.ProjectDialogBackground;
 
 			content = new Panel();
 

src/Addins/Eto.Addin.Shared/BasePageView.cs

@@ -1,10 +1,11 @@
-using Eto.Drawing;
+using Eto.Drawing;
 using Eto.Forms;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Eto.Designer;
 
 namespace Eto.Addin.Shared
 {
@@ -27,7 +28,7 @@ public Control Information
 
 		public BasePageView()
 		{
-			BackgroundColor = Color.FromArgb(225, 228, 232);
+			BackgroundColor = Global.Theme.ProjectBackground;
 
 			content.Padding = new Padding(50, 10, 20, 10);
 
@@ -38,7 +39,7 @@ public BasePageView()
 				Items =
 				{
 					new StackLayoutItem(content, VerticalAlignment.Center, expand: true),
-					new Panel { BackgroundColor = Colors.White, Size = new Size(280, 200), Content = information, Padding = new Padding(20) }
+					new Panel { BackgroundColor = Global.Theme.SummaryBackground, Size = new Size(280, 200), Content = information, Padding = new Padding(20) }
 				}
 			};
 		}

src/Addins/Eto.Addin.Shared/Eto.Addin.Shared.csproj

@@ -5,5 +5,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Eto\Eto.csproj" />
+    <ProjectReference Include="..\Eto.Designer\Eto.Designer.csproj" />
   </ItemGroup>
 </Project>

src/Addins/Eto.Addin.Shared/ProjectWizardPageModel.cs

@@ -24,6 +24,8 @@ public ProjectWizardPageModel(IParameterSource source, XElement optionsElement)
 			Separate = false;
 			Mode = "code";
 			IncludeSolution = false;
+			if (SupportsBase)
+				Base = "Panel";
 		}
 
 		public bool IsValid

src/Addins/Eto.Addin.Shared/ProjectWizardPageView.cs

@@ -1,6 +1,7 @@
 using System;
 using Eto.Forms;
 using Eto.Drawing;
+using Eto.Designer;
 
 namespace Eto.Addin.Shared
 {
@@ -9,17 +10,20 @@ public class ProjectWizardPageView : BasePageView
 	{
 		public ProjectWizardPageView(ProjectWizardPageModel model)
 		{
+			var radioSpacing = Platform.IsGtk ? Size.Empty : new Size(2, 2);
+
 			var content = new DynamicLayout
 			{
 				Spacing = new Size(10, 10)
 			};
+
 			if (model.SupportsAppName)
 			{
 				var nameBox = new TextBox();
 				nameBox.TextBinding.BindDataContext((ProjectWizardPageModel m) => m.AppName);
 				Application.Instance.AsyncInvoke(nameBox.Focus);
 
-				var nameValid = new Label { TextColor = Colors.Red };
+				var nameValid = new Label { TextColor = Global.Theme.ErrorForeground };
 				nameValid.BindDataContext(c => c.Visible, (ProjectWizardPageModel m) => m.AppNameInvalid);
 				nameValid.BindDataContext(c => c.Text, (ProjectWizardPageModel m) => m.AppNameValidationText);
 
@@ -40,7 +44,7 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				var platformTypeList = new RadioButtonList
 				{
 					Orientation = Orientation.Vertical,
-					Spacing = new Size(0, 0),
+					Spacing = radioSpacing,
 					Items =
 					{
 						new ListItem { Text = "Single Windows, Linux, and Mac desktop project", Key = "combined" },
@@ -89,7 +93,7 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				var sharedCodeList = new RadioButtonList
 				{
 					Orientation = Orientation.Vertical,
-					Spacing = new Size(0, 0),
+					Spacing = radioSpacing,
 				};
 				if (model.SupportsPCL)
 				{
@@ -118,7 +122,7 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				var panelTypeList = new RadioButtonList
 				{
 					Orientation = Orientation.Horizontal,
-					Spacing = new Size(0, 0),
+					Spacing = radioSpacing,
 				};
 
 				panelTypeList.Items.Add(new ListItem { Text = "Code", Key = "code" });
@@ -145,7 +149,7 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				var baseTypeList = new RadioButtonList
 				{
 					Orientation = Orientation.Horizontal,
-					Spacing = new Size(0, 0),
+					Spacing = radioSpacing,
 				};
 
 				baseTypeList.Items.Add(new ListItem { Text = "Panel", Key = "Panel" });
@@ -156,6 +160,12 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				content.AddRow(new Label { Text = "Base:", TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center }, baseTypeList);
 			}
 
+#if DEBUG
+			var showColorsButton = new Button { Text = "Show all themed colors" };
+			showColorsButton.Click += (sender, e) => new ThemedColorsDialog().ShowModal(this);
+			content.AddRow(new Panel(), showColorsButton);
+#endif
+
 			var informationLabel = new Label();
 			informationLabel.TextBinding.BindDataContext((ProjectWizardPageModel m) => m.Information);
 			Information = informationLabel;

src/Addins/Eto.Addin.Shared/ThemedColorsDialog.cs

@@ -0,0 +1,65 @@
+using System;
+using Eto.Forms;
+using Eto.Drawing;
+using Eto.Designer;
+using System.Linq;
+
+namespace Eto.Addin.Shared
+{
+	public partial class ThemedColorsDialog : Dialog
+	{
+		public ThemedColorsDialog()
+		{
+			Title = "All themed colors";
+			Resizable = true;
+			ClientSize = new Size(400, 350);
+
+			var okButton = new Button { Text = "Ok" };
+			okButton.Click += (sender, e) => Close();
+
+			var colorsPanel = new GridView();
+			colorsPanel.Columns.Add(new GridColumn
+			{
+				HeaderText = "Name",
+				DataCell = new TextBoxCell {  Binding = Binding.Property((PlatformColor m) => m.Name) }
+			});
+
+			colorsPanel.Columns.Add(new GridColumn
+			{
+				HeaderText = "Name",
+				Width = 40,
+				AutoSize = false,
+				DataCell = new CustomCell
+				{
+					CreateCell = e =>
+					{
+						var p = new Panel { Size = new Size(20, 20) };
+						p.BindDataContext(c => c.BackgroundColor, (PlatformColor m) => m.Color);
+						return p;
+					}
+				}
+			});
+			colorsPanel.DataStore = Global.Theme.AllColors.ToList();
+
+			Content = new StackLayout
+			{
+				Padding = 10,
+				Items =
+				{
+					new StackLayoutItem {
+						Expand = true,
+						HorizontalAlignment = HorizontalAlignment.Stretch,
+						Control = new Scrollable { Content = colorsPanel }
+					},
+
+					new StackLayoutItem
+					{
+						HorizontalAlignment = HorizontalAlignment.Right,
+						Control = okButton
+					}
+				}
+			};
+
+		}
+	}
+}

src/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj

@@ -73,6 +73,7 @@
     <Compile Include="Intellisense\XamlCompletionSource.cs" />
     <Compile Include="Intellisense\XmlParser.cs" />
     <Compile Include="IVsTextLinesExtensions.cs" />
+    <Compile Include="PlatformThemeHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services.cs" />
     <Compile Include="TextViewListener.cs" />
@@ -114,7 +115,9 @@
     <Resource Include="Templates\App-FSharp\App.ico" />
     <Content Include="Templates\App-FSharp\App.vstemplate" />
     <Content Include="Templates\File-CSharp\File.vstemplate" />
-    <None Include="Templates\App-CSharp\App.vstemplate" />
+    <None Include="Templates\App-CSharp\App.vstemplate">
+      <SubType>Designer</SubType>
+    </None>
     <Resource Include="Templates\App-CSharp\App.ico" />
     <None Include="Properties\wafflebuilder.targets">
       <SubType>Designer</SubType>
@@ -259,6 +262,7 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="ReachFramework" />
     <Reference Include="System" />
     <Reference Include="System.AddIn" />
     <Reference Include="System.AddIn.Contract" />
@@ -290,13 +294,22 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="FSharp.Core">
+      <Version>4.3.1</Version>
+    </PackageReference>
     <PackageReference Include="Portable.Xaml">
       <Version>0.21.0</Version>
     </PackageReference>
     <PackageReference Include="Extended.Wpf.Toolkit">
       <Version>3.2.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="theme\WindowStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
@@ -316,6 +329,7 @@
     <!-- this updates our PackageReferences to be copy local -->
     <ItemGroup>
       <ReferencePath Update="%(ReferencePath.Identity)" Condition="%(Filename) == 'Portable.Xaml'" CopyLocal="True" />
+      <ReferencePath Update="%(ReferencePath.Identity)" Condition="%(Filename) == 'FSharp.Compiler.CodeDom'" CopyLocal="True" />
     </ItemGroup>
     <Message Text="CopyLocal: %(ReferencePath.Identity), %(Filename)" Condition="%(ReferencePath.CopyLocal) == 'True'" Importance="high" />
   </Target>