diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index 4a71a5713..04ef36907 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -424,18 +424,18 @@ namespace MatterHackers.MatterControl TextWidget notificationSettingsLabel; private void CreateEditNotificationConfiguration(FlowLayoutWidget controlsTopToBottom) { - DisableableWidget container = new DisableableWidget (); + DisableableWidget container = new DisableableWidget(); - GroupBox notificationSettingsContainer = new GroupBox (LocalizedString.Get("Notification Settings")); + GroupBox notificationSettingsContainer = new GroupBox(LocalizedString.Get("Notification Settings")); - notificationSettingsContainer.Margin = new BorderDouble (0); + notificationSettingsContainer.Margin = new BorderDouble(0); notificationSettingsContainer.TextColor = ActiveTheme.Instance.PrimaryTextColor; notificationSettingsContainer.BorderColor = ActiveTheme.Instance.PrimaryTextColor; notificationSettingsContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight; notificationSettingsContainer.Height = 68; { - FlowLayoutWidget buttonRow = new FlowLayoutWidget (); + FlowLayoutWidget buttonRow = new FlowLayoutWidget(); buttonRow.HAnchor |= HAnchor.ParentLeftRight; buttonRow.VAnchor |= Agg.UI.VAnchor.ParentCenter; buttonRow.Margin = new BorderDouble (0, 0, 0, 0); @@ -443,9 +443,10 @@ namespace MatterHackers.MatterControl this.textImageButtonFactory.FixedHeight = TallButtonHeight; - Agg.Image.ImageBuffer notificationSettingsImage = new Agg.Image.ImageBuffer (); + Agg.Image.ImageBuffer notificationSettingsImage = new Agg.Image.ImageBuffer(); ImageIO.LoadImageData (Path.Combine (ApplicationDataStorage.Instance.ApplicationStaticDataPath, "Icons", "PrintStatusControls", "notify.png"), notificationSettingsImage); - if (!ActiveTheme.Instance.IsDarkTheme) { + if (!ActiveTheme.Instance.IsDarkTheme) + { InvertLightness.DoInvertLightness (notificationSettingsImage); } @@ -455,7 +456,7 @@ namespace MatterHackers.MatterControl configureNotificationSettingsButton = textImageButtonFactory.Generate ("Configure".Localize ().ToUpper ()); configureNotificationSettingsButton.Margin = new BorderDouble (left: 6); configureNotificationSettingsButton.VAnchor = VAnchor.ParentCenter; - //configureNotificationSettingsButton.Click += new ButtonBase.ButtonEventHandler (); + configureNotificationSettingsButton.Click += new ButtonBase.ButtonEventHandler(configureNotificationSettingsButton_Click); notificationSettingsLabel = new TextWidget ("Edit Notification Settings"); notificationSettingsLabel.AutoExpandBoundsToText = true; @@ -782,6 +783,19 @@ namespace MatterHackers.MatterControl } } + public delegate void OpenNotificationFormWindow(object state); + public static OpenNotificationFormWindow openPrintNotificationFunction = null; + void configureNotificationSettingsButton_Click(object sender, MouseEventArgs mouseEvent) + { + if(openPrintNotificationFunction != null) + { + UiThread.RunOnIdle ((state) => + { + openPrintNotificationFunction(null); + }); + } + } + void enablePrintLeveling_Click(object sender, MouseEventArgs mouseEvent) { ActivePrinterProfile.Instance.DoPrintLeveling = true; diff --git a/MatterControl.csproj b/MatterControl.csproj index 5e4900af2..b2c9f39e3 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -1,10 +1,8 @@  - Release + Debug AnyCPU - 8.0.50727 - 2.0 {0B8D6F56-BD7F-4426-B858-D9292B084656} WinExe Properties @@ -44,7 +42,7 @@ full False bin\Debug\ - TRACE;DEBUG + TRACE;DEBUG;USE_CSHARP_SQLITE; prompt 4 True @@ -54,7 +52,7 @@ none True bin\Release\ - TRACE + TRACE;USE_CSHARP_SQLITE; prompt 4 x86 @@ -68,7 +66,6 @@ TRACE true true - 4096 x64 bin\Release\MatterControl.exe.CodeAnalysisLog.xml true @@ -78,6 +75,7 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + 4 @@ -237,15 +235,12 @@ + ICSharpCode.SharpZipLib.dll - - False - ..\agg-sharp\Newtonsoft.Json.dll - PdfSharp.dll @@ -266,6 +261,9 @@ ..\agg-sharp\PlatformWin32\OpenTK.dll + + ..\agg-sharp\Newtonsoft.Json.dll +