diff --git a/ActionBar/HelpTextWidget.cs b/ActionBar/HelpTextWidget.cs index 5c6bed18a..e66fe7429 100644 --- a/ActionBar/HelpTextWidget.cs +++ b/ActionBar/HelpTextWidget.cs @@ -129,20 +129,20 @@ namespace MatterHackers.MatterControl switch (PrinterCommunication.Instance.CommunicationState) { case PrinterCommunication.CommunicationStates.Disconnected: - return new LocalizedString("Not connected. Press 'Connect' to enable printing.").Translated; + return new LocalizedString("Not connected. Press 'Connect' to enable printing.").Translated; case PrinterCommunication.CommunicationStates.AttemptingToConnect: - return new LocalizedString("Attempting to connect...").Translated; + return new LocalizedString("Attempting to connect...").Translated; case PrinterCommunication.CommunicationStates.ConnectionLost: case PrinterCommunication.CommunicationStates.FailedToConnect: - return new LocalizedString("Unable to communicate with printer.").Translated; + return new LocalizedString("Unable to communicate with printer.").Translated; case PrinterCommunication.CommunicationStates.Connected: if (PrinterCommunication.Instance.ActivePrintItem != null) { - return new LocalizedString("Item selected. Press 'Start' to begin your print.").Translated; + return new LocalizedString("Item selected. Press 'Start' to begin your print.").Translated; } else { - return new LocalizedString("No items to select. Press 'Add' to select a file to print.").Translated; + return new LocalizedString("No items to select. Press 'Add' to select a file to print.").Translated; } default: return ""; diff --git a/CustomWidgets/ExportQueueItemWindow.cs b/CustomWidgets/ExportQueueItemWindow.cs index 9464fa900..dc00955ce 100644 --- a/CustomWidgets/ExportQueueItemWindow.cs +++ b/CustomWidgets/ExportQueueItemWindow.cs @@ -115,11 +115,12 @@ namespace MatterHackers.MatterControl UiThread.RunOnIdle(DoExportGCode_Click); } - string GetExtension (string filename) + string GetExtension (string filename) { string extension; int indexOfDot = filename.LastIndexOf("."); - if (indexOfDot == -1) { + if (indexOfDot == -1) + { extension = ""; } else @@ -145,14 +146,12 @@ namespace MatterHackers.MatterControl string filePathToSave = saveParams.FileName; string extension = GetExtension(filePathToSave); - if(extension == "") { filePathToSave += ".gcode"; } - if (System.IO.Path.GetExtension(printQueueItem.PrintItemWrapper.FileLocation).ToUpper() == ".STL") { pathAndFilenameToSave = saveParams.FileName; @@ -249,10 +248,8 @@ namespace MatterHackers.MatterControl string filePathToSave = saveParams.FileName; string extension = CheckExtension(filePathToSave); - if (extension == "") - { - + { filePathToSave += ".stl"; } diff --git a/MatterControl.userprefs b/MatterControl.userprefs index 5728f2341..a0a90fa94 100644 --- a/MatterControl.userprefs +++ b/MatterControl.userprefs @@ -1,20 +1,16 @@  - + - - - - - - - - - - - - + + + + + + + + diff --git a/PrintQueue/PrintQueueMenu.cs b/PrintQueue/PrintQueueMenu.cs index 8a0a0a40f..36ce1daeb 100644 --- a/PrintQueue/PrintQueueMenu.cs +++ b/PrintQueue/PrintQueueMenu.cs @@ -61,10 +61,10 @@ namespace MatterHackers.MatterControl.PrintQueue //Set the name and callback function of the menu items menuItems = new TupleList> { - {new LocalizedString("STL").Translated, null}, + {"STL", null}, {new LocalizedString(" Import from Zip").Translated, importQueueFromZipMenu_Click}, {new LocalizedString(" Export to Zip").Translated, exportQueueToZipMenu_Click}, - {new LocalizedString("GCode").Translated, null}, + {"GCode", null}, {new LocalizedString(" Export to Folder").Translated, exportGCodeToFolderButton_Click}, //{" Export to SD Card", exportToSDCardButton_Click}, {new LocalizedString("Extra").Translated, null},