[musicplayer~subversion:4] (Commit message missing)

[bulinha@kenai.com]

Project:    musicplayer
Repository: subversion
Revision:   4
Author:     bulinha
Date:       2009-08-30 21:31:42 UTC
Link:       

Log Message:
------------



Revisions:
----------
4


Modified Paths:
---------------
MusicPlayer/src/br/org/bl/musicplayer/PlayerSchema.fx
MusicPlayer/src/br/org/bl/musicplayer/Main.fx


Diffs:
------
Index: MusicPlayer/src/br/org/bl/musicplayer/Main.fx
===================================================================
--- MusicPlayer/src/br/org/bl/musicplayer/Main.fx       (revision 3)
+++ MusicPlayer/src/br/org/bl/musicplayer/Main.fx       (revision 4)
@@ -67,6 +67,8 @@
                 textDisplayColor: Color.LIGHTGREEN
                 backgroundColor:Color.DARKGRAY
                 colorStrokeBackground:null
+                colorDisplay:Color.BLACK
+                colorStrokeDisplay:null
                 flat:false
             },
             PlayerSchema {
@@ -77,6 +79,8 @@
                 textDisplayColor: Color.WHITE
                 backgroundColor:Color.TRANSPARENT
                 colorStrokeBackground:Color.WHITE
+                colorDisplay:Color.BLACK
+                colorStrokeDisplay:null
                 flat:true
             },
             PlayerSchema {
@@ -87,6 +91,8 @@
                 textDisplayColor: Color.WHITE
                 backgroundColor:Color.TRANSPARENT
                 colorStrokeBackground:Color.BLACK
+                colorDisplay:Color.BLACK
+                colorStrokeDisplay:null
                 flat:true
             },
             PlayerSchema {
@@ -97,16 +103,20 @@
                 textDisplayColor: Color.PINK
                 backgroundColor:Color.PINK
                 colorStrokeBackground:null
+                colorDisplay:Color.BLACK
+                colorStrokeDisplay:null
                 flat:false
             },
             PlayerSchema {
-                name:"CGA"
-                colorButton: Color.TRANSPARENT
+                name:"Console"
+                colorButton: Color.BLACK
                 colorButtonIcon:Color.GREEN
                 colorStrokeButton: Color.GREEN
                 textDisplayColor: Color.GREEN
-                backgroundColor:Color.TRANSPARENT
+                backgroundColor:Color.BLACK
                 colorStrokeBackground:Color.GREEN
+                colorDisplay:Color.BLACK
+                colorStrokeDisplay:Color.GREEN
                 flat:true
             }
         ];
@@ -176,7 +186,7 @@
             ]
        scene: Scene {
             content: [ Grid {
-                rows:[ Row {cells: [ Text { content: "Select Schema" } , 
listSchemas]},
+                rows:[ Row {cells: [ Text { content: "Select Theme" } , 
listSchemas]},
                        Row {cells: [ Text { content: "Twitter Status" } , 
CheckBox{ selected: bind postOnTwitter with inverse}]},
                        Row {cells: [ Text { content: "Twitter User" } , 
TextBox {text: bind twitterUser with inverse disable: bind not 
postOnTwitter}]},
                        Row {cells: [ Text { content: "Twitter Password" } , 
PasswordBox { text: bind twitterPassword with inverse disable: bind not 
postOnTwitter} ]},
@@ -297,10 +307,10 @@
 
 
 var b:FBButton= FBButton{
-                       layoutX: bind widget.width *.01
+                       layoutX: bind widget.width *.03
                        layoutY: bind (widget.height * .5)
-                       width: bind widget.width * .2375
-                       height: bind widget.height * .4
+                       width: bind widget.width * .2125
+                       height: bind widget.height * .38
                        fillIcon: bind schema.colorButtonIcon 
                        stroke: bind schema.colorStrokeButton 
                        fillBackground: bind schema.colorButton
@@ -311,10 +321,10 @@
                    };
 
 var p:PlayButton=PlayButton {
-                       layoutX: bind widget.width * (.2375 + .02)
+                       layoutX: bind widget.width * (.2125 + .06)
                        layoutY: bind (widget.height * .5)
-                       width: bind widget.width * .2375
-                       height: bind widget.height * .4
+                       width: bind widget.width * .2125
+                       height: bind widget.height * .38
                        fillIcon: bind schema.colorButtonIcon
                        stroke: bind schema.colorStrokeButton ;
                        fillBackground: bind schema.colorButton
@@ -325,10 +335,10 @@
                        }
                    };
 var ps:PauseButton=PauseButton {
-                       layoutX: bind widget.width * (.2375 + .02)
+                       layoutX: bind widget.width * (.2125 + .06)
                        layoutY: bind (widget.height * .5)
-                       width: bind widget.width * .2375
-                       height: bind widget.height * .4
+                       width: bind widget.width * .2125
+                       height: bind widget.height * .38
                        fillIcon: bind schema.colorButtonIcon
                        stroke: bind schema.colorStrokeButton ;
                        fillBackground: bind schema.colorButton
@@ -339,10 +349,10 @@
                        }
                    };
 var s:StopButton= StopButton{
-                       layoutX: bind widget.width * ((.2375 *2) + .03)
+                       layoutX: bind widget.width * ((.2125 *2) + .09)
                        layoutY: bind (widget.height * .5)
-                       width: bind widget.width * .2375
-                       height: bind widget.height * .4
+                       width: bind widget.width * .2125
+                       height: bind widget.height * .38
                        fillIcon: bind  schema.colorButtonIcon
                        stroke: bind   schema.colorStrokeButton ;
                        fillBackground: bind schema.colorButton
@@ -352,10 +362,10 @@
                        }
                    };
 var f:FFButton= FFButton{
-                       layoutX: bind widget.width * ((.2375 *3) + .04)
+                       layoutX: bind widget.width * ((.2125 *3) + .12)
                        layoutY: bind (widget.height * .5)
-                       width: bind widget.width * .2375
-                       height: bind widget.height * .4
+                       width: bind widget.width * .2125
+                       height: bind widget.height * .38
                        fillIcon: bind  schema.colorButtonIcon
                        stroke: bind   schema.colorStrokeButton ;
                        fillBackground: bind schema.colorButton
@@ -392,10 +402,7 @@
 
 
 
-var d:DragAndDropTarget;
-def group = Group{
-    content: [
-            d = DragAndDropTarget {
+var d:DragAndDropTarget = DragAndDropTarget {
                 layoutY:0
                 layoutX:0
                 width: bind widget.width
@@ -407,13 +414,17 @@
                     stop();
                     play();
                 }
-            },
+            };
+def group = Group{
+    content: [
+            d,
             Rectangle {
-              layoutY:0
-              layoutX:0
-              width: bind widget.width
-              height: bind widget.height
-              fill: bind schema.backgroundColor 
+              layoutY: bind widget.width * .01
+              layoutX: bind widget.width * .01
+              width: bind widget.width * .98
+              height: bind widget.height * .95
+              fill: bind schema.backgroundColor
+              strokeWidth: 2
               stroke: bind  schema.colorStrokeBackground 
               effect: bind if (schema.flat ) null else   Lighting {
                                diffuseConstant: .50
@@ -426,11 +437,12 @@
 
             },
                 Rectangle {
-                    layoutX: bind widget.width *.02
+                    layoutX: bind widget.width *.03
                     layoutY: bind (widget.height * .08)
                     height: bind (widget.height * .35)
-                    width: bind (widget.width * .96)
-                    fill: Color.BLACK
+                    width: bind (widget.width * .94)
+                    fill: bind schema.colorDisplay
+                    stroke: bind schema.colorStrokeDisplay
                     arcHeight:10
                     arcWidth:10
                     effect: bind if (schema.flat ) null else  InnerShadow {
@@ -474,7 +486,7 @@
     onLayout: function(){
         if (animText==null) {
         animText = TranslateTransition {
-            duration: bind 1s * (textDisplay.boundsInParent.width * .01);
+            duration: bind 3s * (textDisplay.boundsInParent.width * .02);
             node: bind textDisplay
             fromX: textDisplay.layoutX
             toX: bind (widget.width *.02) - textDisplay.boundsInParent.width
Index: MusicPlayer/src/br/org/bl/musicplayer/PlayerSchema.fx
===================================================================
--- MusicPlayer/src/br/org/bl/musicplayer/PlayerSchema.fx       (revision 3)
+++ MusicPlayer/src/br/org/bl/musicplayer/PlayerSchema.fx       (revision 4)
@@ -11,6 +11,8 @@
         public-init var textDisplayColor:Paint;
         public-init var backgroundColor:Paint;
         public-init var colorStrokeBackground:Paint;
+        public-init var colorDisplay:Paint;
+        public-init var colorStrokeDisplay:Paint;
         public-init var flat:Boolean;
 
         public override function toString():String {