- Karma plugin

- ColorUtil
- Minor improvements

application/core/FML/Controls/Control.php

@@ -121,19 +121,37 @@ abstract class Control implements Renderable {
 	 * @param real $z        	
 	 * @return \FML\Controls\Control
 	 */
-	public function setPosition($x = null, $y = null, $z = null) {
-		if ($x !== null) {
-			$this->setX($x);
-		}
-		if ($y !== null) {
-			$this->setY($y);
-		}
+	public function setPosition($x, $y, $z = null) {
+		$this->setX($x);
+		$this->setY($y);
 		if ($z !== null) {
 			$this->setZ($z);
 		}
 		return $this;
 	}
 
+	/**
+	 * Set width
+	 *
+	 * @param real $width        	
+	 * @return \FML\Controls\Control
+	 */
+	public function setWidth($width) {
+		$this->width = $width;
+		return $this;
+	}
+
+	/**
+	 * Set height
+	 *
+	 * @param real $height        	
+	 * @return \FML\Controls\Control
+	 */
+	public function setHeight($height) {
+		$this->height = $height;
+		return $this;
+	}
+
 	/**
 	 * Set size
 	 *
@@ -141,13 +159,9 @@ abstract class Control implements Renderable {
 	 * @param real $height        	
 	 * @return \FML\Controls\Control
 	 */
-	public function setSize($width = null, $height = null) {
-		if ($width !== null) {
-			$this->width = $width;
-		}
-		if ($height !== null) {
-			$this->height = $height;
-		}
+	public function setSize($width, $height) {
+		$this->setWidth($width);
+		$this->setHeight($height);
 		return $this;
 	}
 

application/core/FML/Controls/Gauge.php

@@ -2,6 +2,8 @@
 
 namespace FML\Controls;
 
+use FML\Types\Styleable;
+
 /**
  * Class representing CMlGauge
  *
@@ -13,11 +15,13 @@ class Gauge extends Control implements Styleable {
 	 */
 	protected $ratio = 1.;
 	protected $grading = 1.;
+	protected $color = '';
 	protected $rotation = 0.;
 	protected $centered = 0;
 	protected $clan = 0;
 	protected $drawBg = 1;
 	protected $drawBlockBg = 1;
+	protected $style = '';
 
 	/**
 	 * Construct a new gauge control
@@ -26,70 +30,104 @@ class Gauge extends Control implements Styleable {
 	 */
 	public function __construct($id = null) {
 		parent::__construct($id);
-		$this->name = 'gauge';
+		$this->tagName = 'gauge';
 	}
 
 	/**
 	 * Set ratio
 	 *
 	 * @param real $ratio        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setRatio($ratio) {
 		$this->ratio = $ratio;
+		return $this;
 	}
 
 	/**
 	 * Set grading
 	 *
 	 * @param real $grading        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setGrading($grading) {
 		$this->grading = $grading;
+		return $this;
+	}
+
+	/**
+	 * Set color
+	 *
+	 * @param string $color        	
+	 * @return \FML\Controls\Gauge
+	 */
+	public function setColor($color) {
+		$this->color = $color;
+		return $this;
 	}
 
 	/**
 	 * Set rotation
 	 *
 	 * @param real $rotation        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setRotation($rotation) {
 		$this->rotation = $rotation;
+		return $this;
 	}
 
 	/**
 	 * Set centered
 	 *
 	 * @param bool $centered        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setCentered($centered) {
 		$this->centered = ($centered ? 1 : 0);
+		return $this;
 	}
 
 	/**
 	 * Set clan
 	 *
 	 * @param int $clan        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setClan($clan) {
 		$this->clan = $clan;
+		return $this;
 	}
 
 	/**
 	 * Set draw background
 	 *
 	 * @param bool $drawBg        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setDrawBg($drawBg) {
 		$this->drawBg = ($drawBg ? 1 : 0);
+		return $this;
 	}
 
 	/**
 	 * Set draw block background
 	 *
 	 * @param bool $drawBlockBg        	
+	 * @return \FML\Controls\Gauge
 	 */
 	public function setDrawBlockBg($drawBlockBg) {
 		$this->drawBlockBg = ($drawBlockBg ? 1 : 0);
+		return $this;
+	}
+
+	/**
+	 *
+	 * @see \FML\Types\Styleable::setStyle()
+	 */
+	public function setStyle($style) {
+		$this->style = $style;
+		return $this;
 	}
 
 	/**
@@ -100,11 +138,23 @@ class Gauge extends Control implements Styleable {
 		$xml = parent::render($domDocument);
 		$xml->setAttribute('ratio', $this->ratio);
 		$xml->setAttribute('grading', $this->grading);
-		$xml->setAttribute('rotation', $this->rotation);
-		$xml->setAttribute('centered', $this->centered);
-		$xml->setAttribute('clan', $this->clan);
+		if ($this->color) {
+			$xml->setAttribute('color', $this->color);
+		}
+		if ($this->rotation) {
+			$xml->setAttribute('rotation', $this->rotation);
+		}
+		if ($this->centered) {
+			$xml->setAttribute('centered', $this->centered);
+		}
+		if ($this->clan) {
+			$xml->setAttribute('clan', $this->clan);
+		}
 		$xml->setAttribute('drawbg', $this->drawBg);
 		$xml->setAttribute('drawblockbg', $this->drawBlockBg);
+		if ($this->style) {
+			$xml->setAttribute('style', $this->style);
+		}
 		return $xml;
 	}
 }

application/core/FML/Controls/Label.php

@@ -20,6 +20,7 @@ class Label extends Control implements Linkable, NewLineable, Scriptable, Stylea
 	protected $text = '';
 	protected $textPrefix = '';
 	protected $textEmboss = 0;
+	protected $translate = 0;
 	protected $maxLines = 0;
 	protected $url = '';
 	protected $manialink = '';
@@ -75,6 +76,17 @@ class Label extends Control implements Linkable, NewLineable, Scriptable, Stylea
 		return $this;
 	}
 
+	/**
+	 * Set translate
+	 * 
+	 * @param bool $translate        	
+	 * @return \FML\Controls\Label
+	 */
+	public function setTranslate($translate) {
+		$this->translate = ($translate ? 1 : 0);
+		return $this;
+	}
+
 	/**
 	 * Set max lines
 	 *
@@ -191,6 +203,9 @@ class Label extends Control implements Linkable, NewLineable, Scriptable, Stylea
 		if ($this->textEmboss) {
 			$xml->setAttribute('textemboss', $this->textEmboss);
 		}
+		if ($this->translate) {
+			$xml->setAttribute('translate', $this->translate);
+		}
 		if ($this->maxLines) {
 			$xml->setAttribute('maxlines', $this->maxLines);
 		}