[cvs-annodex] commit (/annodex): AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xbl AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xul AnnodexFirefoxExtension/trunk/chrome/afeview/skin/afeview.css

[andre]

Update of /annodex (new revision 927)

Modified files:
   AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js
   AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xbl
   AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xul
   AnnodexFirefoxExtension/trunk/chrome/afeview/skin/afeview.css

Log Message:
AnnodexFirefoxExtension:
 * Fix video window resizing behaviour (as best as can be fixed) on Linux
 * Fixed double-clicking on clips to jump to them (yeah, that was a slightly offputting bug ...)



Modified: AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js
===================================================================
--- AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js	2005-02-23 05:27:10 UTC (rev 926)
+++ AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js	2005-02-23 05:58:17 UTC (rev 927)
@@ -108,17 +108,17 @@
   }
 
   // Check whether we can actually instantiate our chosen media engine
-  if (!canInstantiateMediaEngine(mediaEngineConstructor.videoViewXULElementName))
+  if (!canInstantiateMediaEngine(mediaEngineConstructor.videoViewXULElementName()))
   {
     alert("The Annodex viewer plugin ("
-          + mediaEngineConstructor.videoViewXULElementName
+          + mediaEngineConstructor.videoViewXULElementName()
           + ") was not found.  Please reinstall the Annodex Firefox "
 	  + "Extension.");
     return;
   }
 
   // Create the media engine and its associated view
-  var videoViewContainer = document.createElement(mediaEngineConstructor.videoViewXULElementName);
+  var videoViewContainer = document.createElement(mediaEngineConstructor.videoViewXULElementName());
   if (videoViewContainer == undefined)
   {
     // This should never happen
@@ -279,7 +279,7 @@
       // seconds)
       RequestedFragment = 0;
     }
-    PreviousHRef = document.location.href;
+    PreviousHRef = undefined;
   }
 
   // If the user asked to go to a particular fragment, try to go to it
@@ -298,7 +298,7 @@
 
 	if (clipId == RequestedFragment)
 	{
-	  secondsToGoTo = clip.getAttribute("start");
+	  secondsToGoTo = clip.getAttribute("clip-start");
 	  break;
 	}
       }
@@ -917,8 +917,14 @@
   var videoViewBox = document.getElementById("video-view-box");
   var videoView = document.getElementById("video-view");
 
-  videoView.setAttribute("height", videoViewBox.boxObject.height);
-  videoView.setAttribute("width", videoViewBox.boxObject.width);
+  var width = videoViewBox.boxObject.width;
+  var height = videoViewBox.boxObject.height;
+
+  videoView.setAttribute("width", width);
+  videoView.setAttribute("height", height);
+
+  videoViewBox.setAttribute("maxwidth", width);
+  videoViewBox.setAttribute("maxheight", height);
 }
 
 function resolveURL (baseURL, url)

Modified: AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xbl
===================================================================
--- AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xbl	2005-02-23 05:27:10 UTC (rev 926)
+++ AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xbl	2005-02-23 05:58:17 UTC (rev 927)
@@ -86,16 +86,29 @@
 
   <binding id="vlc-video-view" xul:flex="50">
     <content flex="50">
+      <html:embed
+	type="application/x-annodex-vlc-viewer-plugin"
+	autoplay="no"
+	loop="no"
+	hidden="no"
+	id="video-view"
+	width="60"
+	height="1000"
+	/>
+    </content>
+  </binding>
 
+  <binding id="vlc-video-view-linux" xul:flex="50">
+    <content flex="50">
       <html:embed
 	type="application/x-annodex-vlc-viewer-plugin"
 	autoplay="no"
 	loop="no"
 	hidden="no"
-	width="60"
 	id="video-view"
+	width="600"
+	height="1000"
 	/>
-
     </content>
   </binding>
 

Modified: AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xul
===================================================================
--- AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xul	2005-02-23 05:27:10 UTC (rev 926)
+++ AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.xul	2005-02-23 05:58:17 UTC (rev 927)
@@ -237,11 +237,17 @@
 
   <!-- main view -->
 
-  <vbox align="stretch" pack="center" flex="50">
+  <vbox align="stretch" pack="center" flex="1">
 
     <!-- movie view goes here -->
 
-    <hbox class="box-inset" pack="center" flex="50" type="content-primary" id="video-view-box">
+    <hbox class="box-inset"
+      align="center"
+      pack="center"
+      flex="1"
+      maxwidth="600"
+      type="content-primary"
+      id="video-view-box">
     </hbox>
 
     <separator/>

Modified: AnnodexFirefoxExtension/trunk/chrome/afeview/skin/afeview.css
===================================================================
--- AnnodexFirefoxExtension/trunk/chrome/afeview/skin/afeview.css	2005-02-23 05:27:10 UTC (rev 926)
+++ AnnodexFirefoxExtension/trunk/chrome/afeview/skin/afeview.css	2005-02-23 05:58:17 UTC (rev 927)
@@ -138,6 +138,12 @@
   -moz-box-sizing: content-box;
 }
 
+vlcview-linux
+{
+  -moz-binding: url('chrome://afeview/content/afeview.xbl#vlc-video-view-linux');
+  -moz-box-sizing: content-box;
+}
+
 label.time-display
 {
   font-family: monospace;
@@ -147,7 +153,8 @@
 
 #video-view-box
 {
-  background-color: #000000;
+  background-color: #00FF00;
+  color: #00FF00;
 }
 
 /* the default mozilla/firefox splitter is just far too ugly -- all we want is


-- 
andre