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

Fixed a regression, the export control again shows the buttons on the Mac.

Browse source
This commit is contained in:
Lars Brubaker 2014-05-22 12:11:56 -07:00
parent 47a5c6209d
commit 00b0997dca
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -75,10 +75,7 @@ namespace MatterHackers.MatterControl
cancelButton.Click += ( sender, e) => { cancelButton.Click += ( sender, e) => {
CloseOnIdle (); CloseOnIdle ();
}; };
GuiWidget gDSpacer = new GuiWidget ();
gDSpacer.HAnchor = HAnchor.ParentLeftRight;
if (!partIsGCode) if (!partIsGCode)
{ {
string exportStlText = LocalizedString.Get("Export as"); string exportStlText = LocalizedString.Get("Export as");
@ -120,16 +117,17 @@ namespace MatterHackers.MatterControl
buttonRow.Padding = new BorderDouble (0); buttonRow.Padding = new BorderDouble (0);
// TODO: make this work on the mac and then delete this if // TODO: make this work on the mac and then delete this if
if (MatterHackers.Agg.UI.WindowsFormsAbstract.GetOSType() == WindowsFormsAbstract.OSType.Windows) if (MatterHackers.Agg.UI.WindowsFormsAbstract.GetOSType () == WindowsFormsAbstract.OSType.Windows)
{ {
showInFolderAfterSave = new CheckBox(LocalizedString.Get("Show file in folder after save"), ActiveTheme.Instance.PrimaryTextColor, 10); showInFolderAfterSave = new CheckBox (LocalizedString.Get ("Show file in folder after save"), ActiveTheme.Instance.PrimaryTextColor, 10);
showInFolderAfterSave.Margin = new BorderDouble(top: 10); showInFolderAfterSave.Margin = new BorderDouble (top: 10);
exportSTLGCodeButtonsContainer.AddChild(showInFolderAfterSave); exportSTLGCodeButtonsContainer.AddChild (showInFolderAfterSave);
buttonRow.AddChild (gDSpacer); }
buttonRow.AddChild(cancelButton);
topToBottom.AddChild(exportSTLGCodeButtonsContainer); buttonRow.AddChild (new HorizontalSpacer());
topToBottom.AddChild (buttonRow); buttonRow.AddChild(cancelButton);
} topToBottom.AddChild(exportSTLGCodeButtonsContainer);
topToBottom.AddChild (buttonRow);
this.AddChild(topToBottom); this.AddChild(topToBottom);
} }

3
StaticData/Translations/Master.txt
View file

@ -2244,3 +2244,6 @@ Translated:Outline Distance
English:Distance Around Object English:Distance Around Object
Translated:Distance Around Object Translated:Distance Around Object
English:Minimum Travel\nRequiring Retraction
Translated:Minimum Travel\nRequiring Retraction