Merging of the SVGDrawing branch into the trunk.

This adds the 'Observational Reference' feature to trunk.
Trawacho · May 18, 2010 · 6cea176 · 6cea176
1 parent f490555
commit 6cea176
Show file tree

Hide file tree

Showing 38 changed files with 13,146 additions and 37 deletions.
diff --git a/Refs/SharpVectorBindings.dll b/Refs/SharpVectorBindings.dll
diff --git a/Refs/SharpVectorCss.dll b/Refs/SharpVectorCss.dll
diff --git a/Refs/SharpVectorDom.dll b/Refs/SharpVectorDom.dll
diff --git a/Refs/SharpVectorObjectModel.dll b/Refs/SharpVectorObjectModel.dll
diff --git a/Refs/SharpVectorUtil.dll b/Refs/SharpVectorUtil.dll
diff --git a/Root/Kernel.cs b/Root/Kernel.cs
@@ -637,13 +637,10 @@ private void RefreshSubMenu(ToolStripItem item)
             }
 
             // This item
-            if (item.Tag != null)
+            ItemResourceInfo info = item.Tag as ItemResourceInfo;
+            if (info != null)
             {
-                item.Text = ((ItemResourceInfo)item.Tag).resManager.GetString(((ItemResourceInfo)item.Tag).strText, Thread.CurrentThread.CurrentUICulture);
-            }
-            else
-            {
-                // If tag is null, it's a non translatable text.
+                item.Text = info.resManager.GetString(info.strText, Thread.CurrentThread.CurrentUICulture);
             }
         }
         #endregion

diff --git a/Root/Root.csproj b/Root/Root.csproj
@@ -43,7 +43,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -346,4 +346,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <PropertyGroup>
+    <PostBuildEvent>"..\..\..\..\Tools\build events\postbuild.bat"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/ScreenManager/PlayerScreen/Drawings/DrawingSVG.cs b/ScreenManager/PlayerScreen/Drawings/DrawingSVG.cs
diff --git a/ScreenManager/PlayerScreen/Metadata.cs b/ScreenManager/PlayerScreen/Metadata.cs
@@ -385,6 +385,27 @@ public List<Bitmap> GetFullImages()
         	}
         	return images;
         }
+
+        public void ResizeFinished()
+        {
+        	// This function is used to trigger an update to drawings and guides that do not 
+        	// render in the same way when the user is resizing the window or not.
+        	// This is typically used for SVG Drawing, which take a long time to render themselves.
+        	foreach(Keyframe kf in m_Keyframes)
+        	{
+        		foreach(AbstractDrawing d in kf.Drawings)
+        		{
+        			DrawingSVG svg = d as DrawingSVG;
+        			if(svg != null)
+        			{
+        				svg.ResizeFinished();
+        			}
+        		}
+        	}
+
+
+        }
+
         #region Objects Hit Tests
         public void UnselectAll()
         {
@@ -548,6 +569,7 @@ public bool IsOnGrid(Point _MouseLocation)
             return bGridHit;
         }
         #endregion
+
         #endregion
 
         #region Lower level Helpers

diff --git a/ScreenManager/PlayerScreen/PlayerScreen.cs b/ScreenManager/PlayerScreen/PlayerScreen.cs
@@ -348,6 +348,11 @@ public void Save()
         {
         	m_PlayerScreenUI.Save();
         }
+        public void AddSVGDrawing(string filename)
+        {
+        	// todo, move up in Abstract screen ?
+        	m_PlayerScreenUI.AddSVGDrawing(filename);
+        }
         #endregion
     }
 }
diff --git a/ScreenManager/PlayerScreen/UserInterface/PlayerScreenUserInterface2.Designer.cs b/ScreenManager/PlayerScreen/UserInterface/PlayerScreenUserInterface2.Designer.cs