Changeset 1281

Timestamp:

03/07/10 17:37:59 (5 months ago)

Author:

dreisch

Message:

-fixed #1108

Location:

flash_player/trunk/src/org/korsakow

Files:

• domain/RuleType.as (modified) (1 diff)
• player/ApplicationBase.as (modified) (1 diff)
• player/EmbedApplication.as (modified) (5 diffs)
• player/widget/ImageArea.mxml (modified) (2 diffs)
• player/widget/MediaControls.mxml (modified) (2 diffs)

flash_player/trunk/src/org/korsakow/domain/RuleType.as

@@ -15 +15 @@
         public static const ExcludeKeywords:RuleType = new RuleType("org.korsakow.rule.ExcludeKeywords", ExcludeKeywordsRule);
         public static const SetBackgroundImage:RuleType = new RuleType("org.korsakow.rule.SetBackgroundImage", SetBackgroundImageRule);
+        public static const SetBackgroundSound:RuleType = new RuleType("org.korsakow.rule.SetBackgroundSound", SetBackgroundSoundRule);
         public static const ClearScores:RuleType = new RuleType("org.korsakow.rule.ClearScores", ClearScoresRule);
         public static const EndfilmLookup:RuleType = new RuleType("org.korsakow.rule.EndfilmLookup", EndfilmLookupRule);

flash_player/trunk/src/org/korsakow/player/ApplicationBase.as

@@ -125 +125 @@
                         dialog.title = title;
                         dialog.text = message;
+                        _view.stage.addEventListener(Event.RESIZE, function(...args):void {
+                                dialog.width = _view.stage.stageWidth;
+                                dialog.height = _view.stage.stageHeight;
+                        });
                         dialog.addEventListener(CloseEvent.CLOSE, function(...args):void {
                                 PopUpManager.removePopUp(dialog);

flash_player/trunk/src/org/korsakow/player/EmbedApplication.as

@@ -19 +19 @@
         import org.korsakow.player.event.MediaEvent;
         import org.korsakow.player.widget.IMediaArea;
+        import org.korsakow.player.widget.IWidgetComponent;
         import org.korsakow.player.widget.ImageArea;
         import org.korsakow.player.widget.LinkButton;
@@ -40 +41 @@
                         initExternalBindings();
                         try {
-                                Debug.log("Application.start");
-                                
-                                var starter:ISnu;
-                                if (!_config.has("starter"))
-                                        return;
-                                
-                                starter = domain.snuInputMapper.map(_config.getInt("starter"));
-                                if (!starter) {
-                                        Debug.log("starter not found: ", starter.id, starter.name);
-                                        return;
-                                }
-                                Debug.log("using start snu from config: ", starter.name);
-                                
                                 UIComponent(_view).percentWidth = 100;
                                 UIComponent(_view).percentHeight = 100;
@@ -58 +46 @@
                                 UIComponent(_view.interfaces).percentHeight = 100;
                                 
+                                Debug.log("Application.start");
+                                
+                                var starter:ISnu;
+
+                                if (!_config.has("starter")) {
+                                        Debug.log("No SNU specified");
+                                        showErrorDialog("No SNU specified");
+                                        return;
+                                }
+                                
+                                starter = domain.snuInputMapper.map(_config.getInt("starter"));
+                                if (!starter) {
+                                        Debug.log("starter not found: ", starter.id, starter.name);
+                                        showErrorDialog("SNU not found: #" + _config.getInt("starter"));
+                                        return;
+                                }
+                                Debug.log("using start snu from config: ", starter.name);
+
+//                              var starter:ISnu = domain.snuInputMapper.findAll()[0];
                                 var box:IChildList = _view.interfaces as IChildList;
 //                              IChildList(_view.interfaces).addChild(box as DisplayObject);
@@ -64 +71 @@
                                 box.addChild(preview as DisplayObject);
                                 preview.scalingPolicy = ScalingPolicy.MAINTAIN_ASPECT_RATIO;
-                                preview.left = 0;
+                                preview.left = 
                                 preview.right = 
                                 preview.top = 0;
@@ -114 +121 @@
                                 engine.currentInterface = interf;
 
-                                controls.registerWidget(engine);
-                                mediaArea.registerWidget(engine);
-                                preview.registerWidget(engine);
-                                controls.initializeWidget(engine);
-                                mediaArea.initializeWidget(engine);
-                                preview.initializeWidget(engine);
-                                linkButton.initializeWidget(engine);
-                                
-                                
+                                var widgets:Array = [controls, mediaArea, preview, linkButton];
+                                for each (var widget:IWidgetComponent in widgets) {
+                                        widget.registerWidget(engine);
+                                }
+                                for each (var widget:IWidgetComponent in widgets) {
+                                        widget.initializeWidget(engine);
+                                }
                                 
                                 view.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeydown);

flash_player/trunk/src/org/korsakow/player/widget/ImageArea.mxml

@@ -6 +6 @@
         xmlns:widget="org.korsakow.player.widget.*"
         
-        updateComplete="applyScalingPolicy()"
+        resize="applyScalingPolicy()"
         >
 <mx:Image id="image"
@@ -80 +80 @@
         private function onImageComplete(event:Event):void
         {
-                invalidateDisplayList();
+                invalidateSize();
                 this.mediaState = MediaState.READY;
                 if (_shouldPlay)

flash_player/trunk/src/org/korsakow/player/widget/MediaControls.mxml

@@ -133 +133 @@
                                 var widgets:Vector.<IWidgetComponent> = _env.currentInterface.widgetComponents;
                                 for each (var widget:IWidgetComponent in widgets) {
+                                        trace('caca', widget.model.id, mediaAreaId);
                                         if (widget.model.id == mediaAreaId) {
                                                 _mediaArea = widget as IMediaArea;
@@ -138 +139 @@
                                         }
                                 }
-                                _mediaArea = env.currentMainMedia;
+                                if (!_mediaArea)
+                                        _mediaArea = env.currentMainMedia;
                                 
                                 this.enabled = false;