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

Merge remote-tracking branch 'Greg/development' into development

Browse source 
Conflicts:
	PartPreviewWindow/View3DTransfromPart.cs
This commit is contained in:
larsbrubaker 2014-10-13 12:27:31 -07:00
commit 196c3e1c76
8 changed files with 97 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ActionBar/TemperatureWidgetBase.cs
View file

@ -32,6 +32,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.VertexSource;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl.ActionBar
{
@ -105,7 +106,7 @@ namespace MatterHackers.MatterControl.ActionBar
buttonContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
buttonContainer.Height = 18* TextWidget.GlobalPointSizeScaleRatio;
preheatButton = whiteButtonFactory.Generate("PREHEAT");
preheatButton = whiteButtonFactory.Generate("Preheat".Localize().ToUpper());
preheatButton.Cursor = Cursors.Hand;
preheatButton.Visible = false;

9
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -63,7 +63,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
buttonRow.HAnchor = HAnchor.ParentLeftRight;
buttonRow.Margin = new BorderDouble(0, 6);
TextWidget settingLabel = new TextWidget(LocalizedString.Get("Theme/Display Options"));
string settingLabelBeggining = LocalizedString.Get("Theme");
string settingLabelEnd = LocalizedString.Get("Display Options");
string settingLabelFull = String.Format("{0}/{1}", settingLabelBeggining, settingLabelEnd);
TextWidget settingLabel = new TextWidget(settingLabelFull);//"Theme/Display Options"
settingLabel.AutoExpandBoundsToText = true;
settingLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
settingLabel.HAnchor = Agg.UI.HAnchor.ParentLeft;
@ -123,8 +126,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
optionsContainer.AddChild(releaseOptionsDropList);
optionsContainer.Width = 200;
MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem("Normal", "responsive");
MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem("Touchscreen", "touchscreen");
MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem(LocalizedString.Get("Normal"), "responsive");
MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem(LocalizedString.Get("Touchscreen"), "touchscreen");
List<string> acceptableUpdateFeedTypeValues = new List<string>() { "responsive", "touchscreen" };
string currentUpdateFeedType = UserSettings.Instance.get("ApplicationDisplayMode");

2
ConfigurationPage/CloudSettings/CloudSettingsView.cs
View file

@ -209,7 +209,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
configureNotificationSettingsButton.VAnchor = VAnchor.ParentCenter;
configureNotificationSettingsButton.Click += new ButtonBase.ButtonEventHandler(configureNotificationSettingsButton_Click);
notificationSettingsLabel = new TextWidget("Notification Settings");
notificationSettingsLabel = new TextWidget(LocalizedString.Get("Notification Settings"));
notificationSettingsLabel.AutoExpandBoundsToText = true;
notificationSettingsLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
notificationSettingsLabel.VAnchor = VAnchor.ParentCenter;

6
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -28,12 +28,12 @@ namespace MatterHackers.MatterControl
bool partIsGCode = false;
string documentsPath;
public ExportPrintItemWindow(PrintItemWrapper printItemWraper)
public ExportPrintItemWindow(PrintItemWrapper printItemWrapper)
: base(400, 250)
{
this.printItemWrapper = printItemWraper;
this.printItemWrapper = printItemWrapper;
documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
if (Path.GetExtension(printItemWraper.FileLocation).ToUpper() == ".GCODE")
if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == ".GCODE")
{
partIsGCode = true;
}

47
PartPreviewWindow/View3DTransfromPart.cs
View file

@ -60,6 +60,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public class View3DTransformPart : PartPreview3DWidget
{
public WindowType windowType { get; set; }
public PrintItemWrapper PrintItemWrapper {
get { return this.printItemWrapper; }
}
FlowLayoutWidget viewOptionContainer;
FlowLayoutWidget rotateOptionContainer;
@ -87,9 +90,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
FlowLayoutWidget saveButtons;
Button applyScaleButton;
<<<<<<< HEAD
PrintItemWrapper printItemWrapper;
bool saveAsWindowIsOpen = false;
SaveAsWindow saveAsWindow;
=======
PrintItemWrapper printItemWrapper;
bool saveAsWindowIsOpen = false;
SaveAsWindow saveAsWindow;
ExportPrintItemWindow exportingWindow;
bool exportingWindowIsOpen = false;
>>>>>>> Greg/development
List<MeshGroup> asynchMeshGroupsList = new List<MeshGroup>();
List<ScaleRotateTranslate> asynchMeshGroupTransforms = new List<ScaleRotateTranslate>();
@ -343,7 +354,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
EnterEditAndCreateSelectionData();
};
Button exportButton = textImageButtonFactory.Generate(LocalizedString.Get("Export"));
exportButton.Margin = new BorderDouble(right: 10);
exportButton.Click += (sender, e) =>
{
UiThread.RunOnIdle((state) =>
{
OpenExportWindow();
});
};
enterEditButtonsContainer.AddChild(enterEdittingButton);
enterEditButtonsContainer.AddChild(exportButton);
}
editToolBar.AddChild(enterEditButtonsContainer);
@ -495,6 +519,29 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
private void OpenExportWindow()
{
if (exportingWindowIsOpen == false)
{
exportingWindow = new ExportPrintItemWindow(this.PrintItemWrapper);//
this.exportingWindowIsOpen = true;
exportingWindow.Closed += new EventHandler(ExportQueueItemWindow_Closed);
exportingWindow.ShowAsSystemWindow();
}
else
{
if (exportingWindow != null)
{
exportingWindow.BringToFront();
}
}
}
void ExportQueueItemWindow_Closed(object sender, EventArgs e)
{
this.exportingWindowIsOpen = false;
}
public void ThemeChanged(object sender, EventArgs e)
{
processingProgressControl.fillColor = ActiveTheme.Instance.PrimaryAccentColor;

2
PrintQueue/OptionsMenu/QueueOptionsMenu.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.PrintQueue
void SetMenuItems()
{
menuItems = new TupleList<string, Func<bool>>();
menuItems.Add(new Tuple<string,Func<bool>>("Design", null));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get("Design"), null));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get(" Import from Zip"), importQueueFromZipMenu_Click));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get(" Export to Zip"), exportQueueToZipMenu_Click));
menuItems.Add(new Tuple<string,Func<bool>>("GCode", null));

2
PrinterControls/TemperatureIndicator.cs
View file

@ -254,7 +254,7 @@ namespace MatterHackers.MatterControl
this.textImageButtonFactory.FixedWidth = 76* TextWidget.GlobalPointSizeScaleRatio;
{
Button tempButton = textImageButtonFactory.Generate(LocalizedString.Get("PREHEAT"));
Button tempButton = textImageButtonFactory.Generate("Preheat".Localize().ToUpper());
tempButton.Margin = new BorderDouble(right: 5)* TextWidget.GlobalPointSizeScaleRatio;
presetsContainer.AddChild(tempButton);

36
StaticData/Translations/Master.txt
View file

@ -2666,3 +2666,39 @@ Translated:Creating Edit Data
English:Finding Meshes
Translated:Finding Meshes
English:Preheat
Translated:Preheat
English:Extruder Temperature Override
Translated:Extruder Temperature Override
English:Bed Temperature Override
Translated:Bed Temperature Override
English:Hardware Settings
Translated:Hardware Settings
English:Cloud Settings
Translated:Cloud Settings
English:Application Settings
Translated:Application Settings
English:Update Notification Feed
Translated:Update Notification Feed
English:Pre-Release
Translated:Pre-Release
English:Development
Translated:Development
English:Language Options
Translated:Language Options
English:Change Display Mode
Translated:Change Display Mode
English:Theme/Display Options
Translated:Theme/Display Options