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

Localized strings that were previously unmodified

Browse source 
Localized strings that were previously unmodified as well as deleted
translation form strings like "stl", "gcode", etc...
This commit is contained in:
gregory-diaz 2014-02-19 17:29:11 -08:00
parent 81b566f5fe
commit fc32be16f0
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ActionBar/HelpTextWidget.cs
View file

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

11
CustomWidgets/ExportQueueItemWindow.cs
View file

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

22
MatterControl.userprefs
View file

@ -1,20 +1,16 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="MainSlidePanel.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="..\MatterControlPlugins\PrintNotifications\NotificationForm.cs">
<Files>
<File FileName="PrinterCommunication.cs" Line="1" Column="1" />
<File FileName="PrinterControls\PrinterConnections\ConnectionWindow.cs" Line="1" Column="1" />
<File FileName="WidescreenPanel.cs" Line="1" Column="1" />
<File FileName="PrintQueue\QueueControlsWidget.cs" Line="1" Column="1" />
<File FileName="PrintLibrary\ExportLibraryItemWindow.cs" Line="1" Column="1" />
<File FileName="MainSlidePanel.cs" Line="328" Column="14" />
<File FileName="CustomWidgets\WizardControl.cs" Line="1" Column="1" />
<File FileName="PartPreviewWindow\PartPreviewMainWindow.cs" Line="1" Column="1" />
<File FileName="CustomWidgets\SavePartsSheetFeedbackWindow.cs" Line="1" Column="1" />
<File FileName="Localizations\LocalizedString.cs" Line="1" Column="1" />
<File FileName="PrintQueue\PrintQueueItem.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\Gui\SystemWindow.cs" Line="1" Column="1" />
<File FileName="Localizations\LocalizedString.cs" Line="18" Column="14" />
<File FileName="PrintLibrary\PrintLibraryListItem.cs" Line="1" Column="1" />
<File FileName="ActionBar\ActionBarBaseControls.cs" Line="218" Column="49" />
<File FileName="ActionBar\HelpTextWidget.cs" Line="145" Column="8" />
<File FileName="PrintQueue\PrintQueueMenu.cs" Line="1" Column="1" />
<File FileName="CustomWidgets\ExportQueueItemWindow.cs" Line="255" Column="5" />
<File FileName="ActionBar\ActionBarPlus.cs" Line="69" Column="23" />
<File FileName="ActionBar\PrintActionRow.cs" Line="15" Column="46" />
<File FileName="..\MatterControlPlugins\PrintNotifications\NotificationForm.cs" Line="210" Column="65" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>

4
PrintQueue/PrintQueueMenu.cs
View file

@ -61,10 +61,10 @@ namespace MatterHackers.MatterControl.PrintQueue
//Set the name and callback function of the menu items
menuItems = new TupleList<string, Func<bool>>
{
{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},