[MPlayer-DOCS] [skins]: r223 - in trunk/Blue: VERSION font.fnt skin symbols.fnt symbols2.png symbolsg.fnt

ib subversion at mplayerhq.hu
Tue Mar 18 16:07:36 CET 2014


Author: ib
Date: Tue Mar 18 16:07:36 2014
New Revision: 223

Log:
Update Blue to v1.9.

Utilize new skin configuration syntax, item and variables.
Fix issues with symbols.fnt and symbols2.png
and add new symbols to the font.

Additionally, brush up comments.

Modified:
   trunk/Blue/VERSION
   trunk/Blue/font.fnt
   trunk/Blue/skin
   trunk/Blue/symbols.fnt
   trunk/Blue/symbols2.png
   trunk/Blue/symbolsg.fnt

Modified: trunk/Blue/VERSION
==============================================================================
--- trunk/Blue/VERSION	Mon Mar 17 14:12:34 2014	(r222)
+++ trunk/Blue/VERSION	Tue Mar 18 16:07:36 2014	(r223)
@@ -1 +1 @@
-1.8
+1.9

Modified: trunk/Blue/font.fnt
==============================================================================
--- trunk/Blue/font.fnt	Mon Mar 17 14:12:34 2014	(r222)
+++ trunk/Blue/font.fnt	Tue Mar 18 16:07:36 2014	(r223)
@@ -1,7 +1,8 @@
-; image file
+;image=file
 image=font-pl
 
-; "character"=x,y,width,height
+;"character"=x,y,width,height
+
 "A"=  0,  0, 7, 12
 "B"=  7,  0, 6, 12
 "C"= 13,  0, 7, 12
@@ -87,7 +88,6 @@
 "³"= 160,24, 4, 12
 "£"= 165,24, 6, 12
 
-
 "!"=  0, 36, 3, 12
 "@"=  3, 36, 10, 12
 "#"= 13, 36, 7, 12

Modified: trunk/Blue/skin
==============================================================================
--- trunk/Blue/skin	Mon Mar 17 14:12:34 2014	(r222)
+++ trunk/Blue/skin	Tue Mar 18 16:07:36 2014	(r223)
@@ -10,11 +10,7 @@
 ;  base = main-silver, -2, -2
   base = main, -2, -2
 
-
   ;button=bitmap,x,y,sx,sy,msg
-  ; 1. bitmap: pressed  | x,y: position in window
-  ; 2. bitmap: released | msg: name of system message
-  ; 3. bitmap: disabled | sx,sy: size of button
 
   button = exit,     412,  47, 19, 24, evExit
   button = minimize, 169, 101, 28, 13, evIconify
@@ -27,7 +23,6 @@
   button = zoom-3,    79,  40, 10, 13, evFullScreen
   button = mute,      93,  40, 10, 14, evMute
 
-
   button = load,     168,   6, 28, 13, evLoadPlay
   button = play,     145,  21, 37, 29, evPlaySwitchToPause
   button = play,     145,  21, 37, 29, evPauseSwitchToPlay
@@ -40,100 +35,56 @@
 
   button = about,    322,  86, 80, 12, evAbout
 
-  ; hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg
+  ;hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg
   hpotmeter = pos, 13, 10, NULL, 100,  0, 242, 79, 82, 10, evSetMoviePosition
   hpotmeter = pos, 13, 10, NULL,  50, 50,  78, 59, 42, 10, evSetBalance
   hpotmeter = pos, 13, 10, NULL,  50, 50,  79, 78, 44, 10, evSetVolume
 
-  ; potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
-    potmeter = progres-long2d, 46, 0, 245, 67, 141, 5, evSetMoviePosition
-
-
-  ; font=fontname,fontid
-  font =  symbols, symbols2
-  font =     font, font-pl
-  font = symbolsg, symbols2
-
-  ; dynamic label
-  ; dlabel=x,y,sx,align,fontid,string ...
-  ;  align: 0: right 1: center 2: left
-  ;  str: $1  = hh:mm:ss
-  ;       $2  = mmmm:ss
-  ;       $3  = hh
-  ;       $4  = mm
-  ;       $5  = ss
-  ;       $6  = movie length, hh:mm:ss
-  ;       $7  = movie length, mmmm:ss
-  ;       $v  = volume, xxx.xx%
-  ;       $V  = volume, xxx.x
-  ;       $b  = balance, xxx.xx%
-  ;       $B  = balance, xxx.x
-  ;       $$  = draw $
-  ;       $a  = audio type ( nosound: char n, mono: char m, stereo: char t, etc )
-  ;       $t  = track number
-  ;       $o  = filename
-  ;       $f  = filename with lower case
-  ;       $F  = filename with upper case
-  ;
-  ;       $T  = stream type ( file: f, video cd: v, dvd: d, url: u ), if
-  ;              font contain needed symbol.
-  ;       $l  = draw play symbol, if mplayer is playing movie and font
-  ;              contain playing symbol. ( char l )
-  ;       $s  = draw stop symbol, if mplayer not playing movie and font
-  ;              contain stop symbol. ( char s )
-  ;       $e  = draw pause symbol, if playing is paused and font contain
-  ;              pause symbol ( char e )
+  ;pimage=phasebitmaps,phases,default value,x,y,sx,sy,msg
+;  pimage = progres-long2c, 46, 0, 245, 67, 141, 5, evSetMoviePosition
+  pimage = progres-long2d, 46, 0, 245, 67, 141, 5, evSetMoviePosition
 
+  ;font=fontfile
+  font =  symbols
+  font =     font
+  font = symbolsg
 
+  ;dynamic label
+  ;dlabel=x,y,sx,align,fontfile,string
 
   dlabel = 242, 26, 150, 0,    font, "$t - $o  "
 
   dlabel = 246, 42,  22, 0, symbols, "$T"
-  dlabel = 270, 42,   9, 0, symbols, "$l"
-  dlabel = 270, 42,   9, 0, symbols, "$e"
-  dlabel = 270, 42,   9, 0, symbols, "$s"
+  dlabel = 270, 42,   9, 0, symbols, "$P"
   dlabel = 280, 40,  56, 0,    font, "$1"
   dlabel = 324, 40,  62, 0,    font, "/"
   dlabel = 325, 40,  62, 0,    font, " $6"
 
-
   dlabel = 230, 55,  92, 1,    font, "v: $v"
   dlabel = 285, 55,  99, 1,    font, " bal:$b"
   dlabel = 364, 57,  25, 1, symbols, "$a"
 
-; dlabel = 117, 25,  50, 1, symbols, "$T"
-
-  ; static label
-  ; slabel=x,y,fontid,string ...
-  ; slabel =  10, 10, symbols, "12345 - 67890"
-  ; slabel = 120, 10,    font, "Eyes on Me"
-
  end
 
- window = sub
+ window = video
 
-  ;base=bitmap,x,y,sx,sy
-  ; x:            | y:
-  ;  -  0: left   |  -  0: top
-  ;  - -1: center |  - -1: center
-  ;  - -2: right  |  - -2: bottom
-  base = subblue, -1,-1, 640, 480
-  ; background=r,g,b
-  ; window background color, default is black
-  ; only subwindow, and decimal numbers
-  background = 128,128,255
+  base = subblue, -1, -1, 640, 480
+
+  ;background=r,g,b
+  background = 128, 128, 255
 
  end
 
  window = menu
 
-  ; base=bitmap
+  ;base=bitmap
   base = menu
 
-  ; selected=bitmap
+  ;selected=bitmap
   selected = menus
 
-  ; menu = x,y,width,height,msg
+  ;menu=x,y,width,height,msg
+
   menu = 3,   6, 122, 14, evAbout
   menu = 3,  28, 122, 14, evLoad
   menu = 3,  43, 122, 14, evNone         ; Add playlist
@@ -152,6 +103,7 @@
  end
 
  window = playbar
+
   base = playbar, -1, -2
 
   button = barstop,    77, 56, 30, 16, evStop
@@ -171,22 +123,14 @@
   button = barmute,   359, 52, 30, 16, evMute
   button = barexit,   386, 68, 30, 16, evExit
 
+  dlabel = 195, 59, 9, 0,   symbols, "$P"
 
-  dlabel = 195, 59, 9, 0,   symbols, "$l"
-  dlabel = 195, 59, 9, 0,   symbols, "$e"
-  dlabel = 195, 59, 9, 0,   symbols, "$s"
-
-
-  dlabel = 205, 58, 56, 0,     font, "$1"
-; dlabel = 264, 59, 22, 0,  symbols, "$T"
-
-  dlabel = 292, 65, 22, 1, symbolsg, "$a"
-
+  dlabel = 205, 57, 56, 0,     font, "$1"
+  dlabel = 264, 59, 22, 0, symbolsg, "$a"
 
   dlabel = 132, 70, 27, 0,  symbols, "$T "
   dlabel = 160, 68, 95, 0,     font, "$o "
 
-
   button = NULL, 258, 70, 11, 8, evDecVolume
   button = NULL, 331, 70, 11, 8, evIncVolume
 
@@ -196,4 +140,3 @@
  end
 
 end
-

Modified: trunk/Blue/symbols.fnt
==============================================================================
--- trunk/Blue/symbols.fnt	Mon Mar 17 14:12:34 2014	(r222)
+++ trunk/Blue/symbols.fnt	Tue Mar 18 16:07:36 2014	(r223)
@@ -1,19 +1,20 @@
-; image file
+;image=file
 image=symbols2
 
-; "character"=x,y,width,height
-
+;"character"=x,y,width,height
 "p"= 205,0,9,8  ; play symbol
 "e"=215,0,9,8  ; pause symbol
 ":"=224,0,4,8
-;" "=121,0,6,8
 "s"=195,0,9,8  ; stop symbol
 "f"=1,0,22,8 ; file: f
-"v"=246,0,42,8 ; video cd
-; "?"=289,0,42,0   ; super video cd (svcd)
-"d"=202,0,42,8 ; dvd
-"u"=377,0,42,8 ; url
+"v"=56,0,22,8 ; video cd
+; "?"=86,0,32,8   ; super video cd (svcd)
+"d"=26,0,22,8 ; dvd
+"u"=124,0,22,8 ; url
+"a"=64,0,22,8 ; cd
+"b"=255,0,22,8 ; tv/dvb
 ;"n"=185,0,9,8 ; no sound symbol
-"n"=227,0,9,8 ; no sound symbol
+"n"=228,0,9,8 ; no sound symbol
 "m"=150,0,9,8 ; mono symbol
 "t"=160,0,15,8 ; stereo symbol
+"r"=240,0,12,8 ; surround symbol

Modified: trunk/Blue/symbols2.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/Blue/symbolsg.fnt
==============================================================================
--- trunk/Blue/symbolsg.fnt	Mon Mar 17 14:12:34 2014	(r222)
+++ trunk/Blue/symbolsg.fnt	Tue Mar 18 16:07:36 2014	(r223)
@@ -1,9 +1,8 @@
-; image file
+;image=file
 image=symbols2
 
-; "character"=x,y,width,height
-
-
+;"character"=x,y,width,height
 "n"=185,0,9,8 ; no sound symbol
 "m"=150,0,9,8 ; mono symbol
 "t"=160,0,15,8 ; stereo symbol
+"r"=240,0,12,8 ; surround symbol


More information about the MPlayer-DOCS mailing list