From b10b4ec3c622b6b21f359836bf26eb4e3f26ff66 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 29 Oct 2015 11:31:09 -0700
Subject: [PATCH] Put in some more performance monitoring.

---
 ApplicationView/MainApplicationWidget.cs | 17 ++++++++++-------
 MatterControlApplication.cs              | 10 +++++-----
 StaticData/Translations/Master.txt       |  3 +++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs
index d7a4ef82f..96bd4a476 100644
--- a/ApplicationView/MainApplicationWidget.cs
+++ b/ApplicationView/MainApplicationWidget.cs
@@ -317,14 +317,17 @@ namespace MatterHackers.MatterControl
 			{
 				if (globalInstance == null)
 				{
-					globalInstance = new ApplicationController();
-					if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
+					using (new PerformanceTimer("Startup", "AppController Instance"))
 					{
-						globalInstance.MainView = new CompactApplicationView();
-					}
-					else
-					{
-						globalInstance.MainView = new ResponsiveApplicationView();
+						globalInstance = new ApplicationController();
+						if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
+						{
+							globalInstance.MainView = new CompactApplicationView();
+						}
+						else
+						{
+							globalInstance.MainView = new ResponsiveApplicationView();
+						}
 					}
 				}
 				return globalInstance;
diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs
index 3bb5f9e39..59054105f 100644
--- a/MatterControlApplication.cs
+++ b/MatterControlApplication.cs
@@ -297,10 +297,10 @@ namespace MatterHackers.MatterControl
 				TextWidget.GlobalPointSizeScaleRatio = 1.3;
 			}
 
-            using (new PerformanceTimer("Startup", "MainView"))
-            {
-                this.AddChild(ApplicationController.Instance.MainView);
-            }
+			using (new PerformanceTimer("Startup", "MainView"))
+			{
+				this.AddChild(ApplicationController.Instance.MainView);
+			}
 			this.MinimumSize = minSize;
 			this.Padding = new BorderDouble(0); //To be re-enabled once native borders are turned off
 
@@ -544,7 +544,7 @@ namespace MatterHackers.MatterControl
 		{
 			totalDrawTime.Restart();
 			GuiWidget.DrawCount = 0;
-			using (new PerformanceTimer("Draw Timer", "Total"))
+			using (new PerformanceTimer("Draw Timer", "MC Draw"))
 			{
 				base.OnDraw(graphics2D);
 			}
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index 5239b85d8..34be5d79d 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -3844,3 +3844,6 @@ Translated:Solid Infill works best when set tu LINES.
 English:Location: 'Settings & Controls' -> 'Settings' -> 'General' -> 'Infill Type'
 Translated:Location: 'Settings & Controls' -> 'Settings' -> 'General' -> 'Infill Type'
 
+English:Show normal text above the braille
+Translated:Show normal text above the braille
+