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

More Localization

Browse source 
Fixed the translation for the queue widget on main slide panel and also
added translation for printer connection status on Action Bar.  Made
corrections to previously modified strings.
This commit is contained in:
gregory-diaz 2014-02-18 17:56:58 -08:00
parent 5cd0256141
commit 81b566f5fe
8 changed files with 33 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ActionBar/ActionBarBaseControls.cs
View file

@ -146,7 +146,10 @@ namespace MatterHackers.MatterControl.ActionBar
printerNameText.HAnchor = HAnchor.ParentCenter;
printerNameText.TextColor = textColor;
printerStatusText = new TextWidget("Status: Connected", pointSize:statusTextHeight);
string printerStatusTxtBeg = new LocalizedString("Status").Translated;
string printerStatusTxtEnd = new LocalizedString("Connected").Translated;
string printerStatusTxtFull = string.Format("{0}: {1}", printerStatusTxtBeg, printerStatusTxtEnd);
printerStatusText = new TextWidget(printerStatusTxtFull, pointSize:statusTextHeight);
printerStatusText.AutoExpandBoundsToText = true;
printerStatusText.HAnchor = HAnchor.ParentCenter;
printerStatusText.TextColor = textColor;
@ -191,8 +194,9 @@ namespace MatterHackers.MatterControl.ActionBar
}
else
{
string statusString = new LocalizedString("Status: {0}").Translated;
printerStatusText.Text = string.Format(statusString, PrinterCommunication.Instance.PrinterConnectionStatusVerbose);
string statusStringBeg = new LocalizedString ("Status").Translated;
string statusString = string.Format("{1}: {0}", PrinterCommunication.Instance.PrinterConnectionStatusVerbose, statusStringBeg);
printerStatusText.Text = string.Format(statusString,PrinterCommunication.Instance.PrinterConnectionStatusVerbose);
}
if (ActivePrinterProfile.Instance.ActivePrinter != null)
{

2
ActionBar/HelpTextWidget.cs
View file

@ -131,7 +131,7 @@ namespace MatterHackers.MatterControl
case PrinterCommunication.CommunicationStates.Disconnected:
return new LocalizedString("Not connected. Press 'Connect' to enable printing.").Translated;
case PrinterCommunication.CommunicationStates.AttemptingToConnect:
return "Attempting to connect...";
return new LocalizedString("Attempting to connect...").Translated;
case PrinterCommunication.CommunicationStates.ConnectionLost:
case PrinterCommunication.CommunicationStates.FailedToConnect:
return new LocalizedString("Unable to communicate with printer.").Translated;

8
MainSlidePanel.cs
View file

@ -1,5 +1,4 @@
//<<<<<<< HEAD
//=======
/*
Copyright (c) 2014, Lars Brubaker
All rights reserved.
@ -29,7 +28,7 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
//>>>>>>> upstream/development
using System;
using System.Collections.Generic;
using System.Linq;
@ -339,7 +338,8 @@ namespace MatterHackers.MatterControl
void NumQueueItemsChanged(object sender, EventArgs widgetEvent)
{
string queueString = ("Queue ({0})");
string queueStringBeg = new LocalizedString("Queue").Translated;
string queueString = string.Format("{1} ({0})",PrintQueue.PrintQueueControl.Instance.Count, queueStringBeg);
QueueTabPage.Text = string.Format(queueString, PrintQueue.PrintQueueControl.Instance.Count);
}

14
MatterControl.userprefs
View file

@ -2,15 +2,19 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="MainSlidePanel.cs">
<Files>
<File FileName="PrintQueue\PrintItemWrapper.cs" Line="1" Column="1" />
<File FileName="CustomWidgets\ExportQueueItemWindow.cs" Line="143" Column="6" />
<File FileName="..\agg-sharp\OpenGlGui\MeshViewerWidget.cs" Line="1" Column="1" />
<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="58" Column="53" />
<File FileName="MainSlidePanel.cs" Line="312" Column="54" />
<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="PrintLibrary\PrintLibraryListItem.cs" Line="1" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>

6
PrintLibrary/ExportLibraryItemWindow.cs
View file

@ -9,11 +9,11 @@ using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.GCodeVisualizer;
//<<<<<<< HEAD
using MatterHackers.Localizations;
//=======
using MatterHackers.MatterControl.SlicerConfiguration;
//>>>>>>> upstream/development
namespace MatterHackers.MatterControl.PrintLibrary
{

29
PrintLibrary/PrintLibraryListItem.cs
View file

@ -25,8 +25,6 @@ namespace MatterHackers.MatterControl.PrintLibrary
public class LibraryThumbnailWidget : ClickWidget
{
static Thread thumbNailThread = null;
bool viewWindowIsOpen = false;
PartPreviewMainWindow viewingWindow;
private PrintItemWrapper printItem;
public PrintItemWrapper PrintItem
{
@ -203,31 +201,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
//this.thumbNailHasBeenRequested = false;
this.Invalidate();
}
/*
private void OpenPartViewWindow()
{
if (viewWindowIsOpen == false)
{
viewingWindow = new PartPreviewMainWindow(printItem);
this.viewWindowIsOpen = true;
viewingWindow.Closed += new EventHandler(PartPreviewMainWindow_Closed);
}
else
{
if(viewingWindow != null)
{
viewingWindow.BringToFront();
}
}
}
void PartPreviewMainWindow_Closed(object sender, EventArgs e)
{
viewWindowIsOpen = false;
}
*/
private void onMouseClick(object sender, MouseEventArgs e)
{
if (printItem != null)
@ -542,7 +516,6 @@ namespace MatterHackers.MatterControl.PrintLibrary
if (File.Exists(pathAndFile))
{
OpenPartViewWindow ();
//new PartPreviewMainWindow(this.printItem);
}
else
{

1
PrintQueue/PrintQueueItem.cs
View file

@ -86,7 +86,6 @@ namespace MatterHackers.MatterControl.PrintQueue
{
string labelName = textInfo.ToTitleCase(PrintItemWrapper.Name);
labelName = labelName.Replace('_', ' ');
labelName = new LocalizedString (labelName).Translated;
partLabel = new TextWidget(labelName, pointSize: 14);
partLabel.TextColor = WidgetTextColor;
partLabel.MinimumSize = new Vector2(1, 16);

16
PrinterCommunication.cs
View file

@ -473,25 +473,25 @@ namespace MatterHackers.MatterControl
switch (CommunicationState)
{
case CommunicationStates.Disconnected:
return "Not Connected";
return new LocalizedString("Not Connected").Translated;
case CommunicationStates.Disconnecting:
return "Disconnecting";
return new LocalizedString("Disconnecting").Translated;
case CommunicationStates.AttemptingToConnect:
return "Connecting...";
case CommunicationStates.ConnectionLost:
return "Connection Lost";
return new LocalizedString("Connection Lost").Translated;
case CommunicationStates.FailedToConnect:
return string.Format("Unable to Connect");
case CommunicationStates.Connected:
return "Connected";
return new LocalizedString("Connected").Translated;
case CommunicationStates.PreparingToPrint:
return "Preparing To Print";
return new LocalizedString("Preparing To Print").Translated;
case CommunicationStates.Printing:
return "Printing";
return new LocalizedString("Printing").Translated;
case CommunicationStates.Paused:
return "Paused";
return new LocalizedString("Paused").Translated;
case CommunicationStates.FinishedPrint:
return "Finished Print";
return new LocalizedString("Finished Print").Translated;
default:
throw new NotImplementedException("Make sure very satus returns the correct connected state.");
}