nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

no message

Browse source
This commit is contained in:
gregory-diaz 2014-06-25 17:31:08 -07:00
parent 3c6cee6dd1
commit 4cc51b6bab
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ConfigurationPage/PrinterConfigurationPage.cs
View file

@ -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;

18
MatterControl.csproj
View file

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0B8D6F56-BD7F-4426-B858-D9292B084656}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@ -44,7 +42,7 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;USE_CSHARP_SQLITE;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -54,7 +52,7 @@
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;USE_CSHARP_SQLITE;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
@ -68,7 +66,6 @@
<DefineConstants>TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
<CodeAnalysisLogFile>bin\Release\MatterControl.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
@ -78,6 +75,7 @@
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
@ -237,15 +235,12 @@
<Compile Include="EeProm\EePromRepetierWidget.cs" />
<Compile Include="EeProm\EePromRepetierStorage.cs" />
<Compile Include="PartPreviewWindow\SaveAsWindow.cs" />
<Compile Include="DataStorage\SQLiteAndroid.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\agg-sharp\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PdfSharp">
<HintPath>PdfSharp.dll</HintPath>
</Reference>
@ -266,6 +261,9 @@
<Reference Include="OpenTK">
<HintPath>..\agg-sharp\PlatformWin32\OpenTK.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\agg-sharp\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">