diff --git a/ActionBar/ActionBarBaseControls.cs b/ActionBar/ActionBarBaseControls.cs
index 25cdc4df9..998c81a92 100644
--- a/ActionBar/ActionBarBaseControls.cs
+++ b/ActionBar/ActionBarBaseControls.cs
@@ -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)
{
diff --git a/ActionBar/HelpTextWidget.cs b/ActionBar/HelpTextWidget.cs
index 3a66701f7..5c6bed18a 100644
--- a/ActionBar/HelpTextWidget.cs
+++ b/ActionBar/HelpTextWidget.cs
@@ -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;
diff --git a/MainSlidePanel.cs b/MainSlidePanel.cs
index 37df0a45e..84f502ffc 100644
--- a/MainSlidePanel.cs
+++ b/MainSlidePanel.cs
@@ -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);
}
diff --git a/MatterControl.userprefs b/MatterControl.userprefs
index f7cab3e51..5728f2341 100644
--- a/MatterControl.userprefs
+++ b/MatterControl.userprefs
@@ -2,15 +2,19 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/PrintLibrary/ExportLibraryItemWindow.cs b/PrintLibrary/ExportLibraryItemWindow.cs
index 516de3487..ae207963a 100644
--- a/PrintLibrary/ExportLibraryItemWindow.cs
+++ b/PrintLibrary/ExportLibraryItemWindow.cs
@@ -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
{
diff --git a/PrintLibrary/PrintLibraryListItem.cs b/PrintLibrary/PrintLibraryListItem.cs
index f00a29a73..b55ba67be 100644
--- a/PrintLibrary/PrintLibraryListItem.cs
+++ b/PrintLibrary/PrintLibraryListItem.cs
@@ -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
{
diff --git a/PrintQueue/PrintQueueItem.cs b/PrintQueue/PrintQueueItem.cs
index ea11b8809..10931edb4 100644
--- a/PrintQueue/PrintQueueItem.cs
+++ b/PrintQueue/PrintQueueItem.cs
@@ -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);
diff --git a/PrinterCommunication.cs b/PrinterCommunication.cs
index 139d82b6e..2675e1219 100644
--- a/PrinterCommunication.cs
+++ b/PrinterCommunication.cs
@@ -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.");
}