Merge branch 'noscope'

KSP-RO · Mar 14, 2015 · a9a15b4 · a9a15b4
2 parents 4cb50e1 + 7da40e7
commit a9a15b4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll
diff --git a/TestFlight.userprefs b/TestFlight.userprefs
@@ -1,6 +1,6 @@
 <Properties StartupItem="TestFlight.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="TestFlightAPI/TestFlightAPI/FlightDataConfig.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestFlightCore/TestFlightCore/TestFlightCore.cs">
     <Files>
       <File FileName="TestFlightAPI/TestFlightAPI/EngineModuleWrapper.cs" Line="1" Column="1" />
       <File FileName="TestFlightCore/TestFlightCore/TestFlight.cs" Line="1" Column="1" />
@@ -11,30 +11,30 @@
       <File FileName="TestFlightFailure_ResourceLeak.cs" Line="1" Column="1" />
       <File FileName="TestFlightFailure_LockGimbal.cs" Line="1" Column="1" />
       <File FileName="TestFlightAPI/TestFlightAPI/TestFlightFailure.cs" Line="1" Column="1" />
-      <File FileName="TestFlightFailure_IgnitionFail.cs" Line="102" Column="102" />
+      <File FileName="TestFlightFailure_IgnitionFail.cs" Line="1" Column="1" />
       <File FileName="TestFlightFailure_Engine.cs" Line="1" Column="1" />
-      <File FileName="TestFlightCore/TestFlightCore/TestFlightCore.cs" Line="26" Column="26" />
+      <File FileName="TestFlightCore/TestFlightCore/TestFlightCore.cs" Line="1" Column="1" />
       <File FileName="TestFlightReliability.cs" Line="1" Column="1" />
       <File FileName="FlightDataRecorder_Engine.cs" Line="1" Column="1" />
       <File FileName="TestFlightCore/TestFlightCore/TestFlightWindow.cs" Line="1" Column="1" />
-      <File FileName="TestFlightCore/TestFlightCore/TestFlightHUD.cs" Line="13" Column="13" />
-      <File FileName="TestFlightAPI/TestFlightAPI/TestFlightAPI.cs" Line="53" Column="53" />
-      <File FileName="TestFlightCore/TestFlightCore/TestFlightKSC.cs" Line="43" Column="43" />
+      <File FileName="TestFlightCore/TestFlightCore/TestFlightHUD.cs" Line="1" Column="1" />
+      <File FileName="TestFlightAPI/TestFlightAPI/TestFlightAPI.cs" Line="1" Column="1" />
+      <File FileName="TestFlightCore/TestFlightCore/TestFlightKSC.cs" Line="1" Column="1" />
       <File FileName="TestFlightCore/TestFlightCore/FrameworkExt/MonoBehaviourWindowPlus.cs" Line="1" Column="1" />
-      <File FileName="TestFlightCore/TestFlightCore/UserSettings.cs" Line="42" Column="42" />
+      <File FileName="TestFlightCore/TestFlightCore/UserSettings.cs" Line="1" Column="1" />
       <File FileName="TestFlightCore/TestFlightCore/TestFlightInterface.cs" Line="1" Column="1" />
-      <File FileName="TestFlightAPI/TestFlightAPI/FlightDataConfig.cs" Line="32" Column="32" />
+      <File FileName="TestFlightAPI/TestFlightAPI/FlightDataConfig.cs" Line="32" Column="1" />
+      <File FileName="TestFlightAPI/TestFlightAPI/TestFlightReliability.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Node name="TestFlight" expanded="True" />
-          <Node name="TestFlightAPI" expanded="True">
-            <Node name="FlightDataConfig.cs" selected="True" />
-          </Node>
+          <Node name="TestFlightAPI" expanded="True" />
           <Node name="TestFlightCore" expanded="True">
             <Node name="References" expanded="True" />
             <Node name="FrameworkExt" expanded="True" />
+            <Node name="TestFlightCore.cs" selected="True" />
           </Node>
         </State>
       </Pad>

diff --git a/TestFlightCore/TestFlightCore/TestFlightKSC.cs b/TestFlightCore/TestFlightCore/TestFlightKSC.cs
@@ -67,6 +67,7 @@ internal void Startup()
             TooltipStatic = true;
             WindowCaption = "";
             StartCoroutine("AddToToolbar");
+            TestFlight.Resources.LoadTextures();
             List<string> views = new List<string>()
             {
                 "Visual Settings",
@@ -86,7 +87,7 @@ internal void CalculateWindowBounds()
             if (tfScenario == null)
                 return;
 
-            float windowWidth = 350f;
+            float windowWidth = 500f;
             float left = Screen.width - windowWidth - 75f;
             float windowHeight = 100f;
             float top = 40f;
@@ -116,7 +117,7 @@ IEnumerator AddToToolbar()
                     HoverOutButton,
                     null,
                     null,
-                    ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH,
+                    ApplicationLauncher.AppScenes.SPACECENTER,
                     iconTexture);
                 ApplicationLauncher.Instance.AddOnHideCallback(HideButton);
                 ApplicationLauncher.Instance.AddOnRepositionCallback(RepostionWindow);
@@ -145,7 +146,6 @@ void HideButton()
         void RepostionWindow()
         {
             CalculateWindowBounds();
-            Debug.Log("TestFlight MasterStatusDisplay: RepositionWindow");
         }
         void HoverInButton()
         {
@@ -159,9 +159,11 @@ void HoverOutButton()
         }
         internal override void OnGUIOnceOnly()
         {
+            Log("Initializing GUI styles and skins");
             Styles.InitStyles();
             Styles.InitSkins();
             SkinsLibrary.SetCurrent("SolarizedDark");
+            SkinsLibrary.CurrentSkin.label.wordWrap = true;
         }
         internal override void DrawWindow(int id)
         {
@@ -176,8 +178,8 @@ internal override void DrawWindow(int id)
             {
                 case 0:
                     GUILayout.Label("Research & Development");
-                    GUILayout.Label("Here you can allocate R&D teams to working on improving your hardware. Mouse over for help.");
-                    tfScenario.userSettings.currentResearchScrollPosition = GUILayout.BeginScrollView(tfScenario.userSettings.currentResearchScrollPosition);
+                    GUILayout.Label("Here you can allocate R&D teams to working on improving your hardware.\nMouse over for help.");
+//                    tfScenario.userSettings.currentResearchScrollPosition = GUILayout.BeginScrollView(tfScenario.userSettings.currentResearchScrollPosition);
                     break;
                 case 1:
                     if (ddlSettingsPage == null)

diff --git a/TestFlightCore/TestFlightCore/TestFlightWindow.cs b/TestFlightCore/TestFlightCore/TestFlightWindow.cs
@@ -123,6 +123,7 @@ internal override void OnGUIOnceOnly()
             Styles.InitStyles();
             Styles.InitSkins();
             SkinsLibrary.SetCurrent("SolarizedDark");
+            SkinsLibrary.CurrentSkin.label.wordWrap = false;
         }
 
         internal void CalculateWindowBounds()
@@ -145,7 +146,7 @@ internal void CalculateWindowBounds()
                 windowWidth -= 100f;
 
             float left = Screen.width - windowWidth;
-            float windowHeight = 10f;;
+            float windowHeight = 10f;
             float top = 40f;
 
             if (tfScenario.userSettings.currentMSDSize == 0)