beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

FML Update 1.4

Browse Source
This commit is contained in:
Steffen Schröder
2014-08-11 23:15:53 +02:00
parent 44cc71c328
commit 300d817409
50 changed files with 123 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/libs/FML/Controls/Control.php
View File

@ -71,7 +71,7 @@ abstract class Control implements Renderable, ScriptFeatureable {
* @param string $controlId (optional) Control id
*/
public function __construct($controlId = null) {
if (!is_null($controlId)) {
if ($controlId !== null) {
$this->setId($controlId);
}
}
@ -141,7 +141,7 @@ abstract class Control implements Renderable, ScriptFeatureable {
public function setPosition($posX, $posY, $posZ = null) {
$this->setX($posX);
$this->setY($posY);
if (!is_null($posZ)) {
if ($posZ !== null) {
$this->setZ($posZ);
}
return $this;
@ -325,7 +325,7 @@ abstract class Control implements Renderable, ScriptFeatureable {
* @return static
*/
public function addActionTriggerFeature($actionName, $eventLabel = ScriptLabel::MOUSECLICK) {
if (is_object($actionName) && ($actionName instanceof ActionTrigger)) {
if ($actionName instanceof ActionTrigger) {
$this->addScriptFeature($actionName);
} else {
$actionTrigger = new ActionTrigger($actionName, $this, $eventLabel);

2
application/libs/FML/Controls/Entry.php
View File

@ -175,7 +175,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
if ($this->name) {
$xmlElement->setAttribute('name', $this->name);
}
if (!is_null($this->default)) {
if ($this->default !== null) {
$xmlElement->setAttribute('default', $this->default);
} else if ($this->autoComplete) {
$value = null;

2
application/libs/FML/Controls/FrameInstance.php
View File

@ -40,7 +40,7 @@ class FrameInstance extends Control {
*/
public function __construct($modelId = null, $controlId = null) {
parent::__construct($controlId);
if (!is_null($modelId)) {
if ($modelId !== null) {
$this->setModelId($modelId);
}
}

15
application/libs/FML/Controls/Gauge.php
View File

@ -28,7 +28,6 @@ class Gauge extends Control implements Styleable {
protected $ratio = 0.;
protected $grading = 1.;
protected $color = null;
protected $rotation = 0.;
protected $centered = null;
protected $clan = null;
protected $drawBg = 1;
@ -75,17 +74,6 @@ class Gauge extends Control implements Styleable {
return $this;
}
/**
* Set rotation
*
* @param float $rotation Gauge rotation
* @return static
*/
public function setRotation($rotation) {
$this->rotation = (float)$rotation;
return $this;
}
/**
* Set centered
*
@ -152,9 +140,6 @@ class Gauge extends Control implements Styleable {
if ($this->color) {
$xmlElement->setAttribute('color', $this->color);
}
if ($this->rotation) {
$xmlElement->setAttribute('rotation', $this->rotation);
}
if ($this->centered) {
$xmlElement->setAttribute('centered', $this->centered);
}

3
application/libs/FML/Controls/Quads/Quad_Bgs1.php
View File

@ -44,6 +44,7 @@ class Quad_Bgs1 extends Quad {
const SUBSTYLE_BgColorContour = 'BgColorContour';
const SUBSTYLE_BgDialogBlur = 'BgDialogBlur';
const SUBSTYLE_BgEmpty = 'BgEmpty';
const SUBSTYLE_BgGlow2 = 'BgGlow2';
const SUBSTYLE_BgGradBottom = 'BgGradBottom';
const SUBSTYLE_BgGradLeft = 'BgGradLeft';
const SUBSTYLE_BgGradRight = 'BgGradRight';
@ -53,11 +54,13 @@ class Quad_Bgs1 extends Quad {
const SUBSTYLE_BgIconBorder = 'BgIconBorder';
const SUBSTYLE_BgList = 'BgList';
const SUBSTYLE_BgListLine = 'BgListLine';
const SUBSTYLE_BgMetalBar = 'BgMetalBar';
const SUBSTYLE_BgPager = 'BgPager';
const SUBSTYLE_BgProgressBar = 'BgProgressBar';
const SUBSTYLE_BgShadow = 'BgShadow';
const SUBSTYLE_BgSlider = 'BgSlider';
const SUBSTYLE_BgSystemBar = 'BgSystemBar';
const SUBSTYLE_BgTitle = 'BgTitle';
const SUBSTYLE_BgTitle2 = 'BgTitle2';
const SUBSTYLE_BgTitle3 = 'BgTitle3';
const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1';

3
application/libs/FML/Controls/Quads/Quad_Bgs1InRace.php
View File

@ -44,6 +44,7 @@ class Quad_Bgs1InRace extends Quad {
const SUBSTYLE_BgColorContour = 'BgColorContour';
const SUBSTYLE_BgDialogBlur = 'BgDialogBlur';
const SUBSTYLE_BgEmpty = 'BgEmpty';
const SUBSTYLE_BgGlow2 = 'BgGlow2';
const SUBSTYLE_BgGradBottom = 'BgGradBottom';
const SUBSTYLE_BgGradLeft = 'BgGradLeft';
const SUBSTYLE_BgGradRight = 'BgGradRight';
@ -53,11 +54,13 @@ class Quad_Bgs1InRace extends Quad {
const SUBSTYLE_BgIconBorder = 'BgIconBorder';
const SUBSTYLE_BgList = 'BgList';
const SUBSTYLE_BgListLine = 'BgListLine';
const SUBSTYLE_BgMetalBar = 'BgMetalBar';
const SUBSTYLE_BgPager = 'BgPager';
const SUBSTYLE_BgProgressBar = 'BgProgressBar';
const SUBSTYLE_BgShadow = 'BgShadow';
const SUBSTYLE_BgSlider = 'BgSlider';
const SUBSTYLE_BgSystemBar = 'BgSystemBar';
const SUBSTYLE_BgTitle = 'BgTitle';
const SUBSTYLE_BgTitle2 = 'BgTitle2';
const SUBSTYLE_BgTitle3 = 'BgTitle3';
const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1';

1
application/libs/FML/Controls/Quads/Quad_BgsButtons.php
View File

@ -21,6 +21,7 @@ class Quad_BgsButtons extends Quad {
const SUBSTYLE_BgButtonMediumSelector = 'BgButtonMediumSelector';
const SUBSTYLE_BgButtonMediumSpecial = 'BgButtonMediumSpecial';
const SUBSTYLE_BgButtonSmall = 'BgButtonSmall';
const SUBSTYLE_BgButtonSmall2 = 'BgButtonSmall2';
const SUBSTYLE_BgButtonXSmall = 'BgButtonXSmall';
/*

6
application/libs/FML/Controls/Quads/Quad_Icons128x32_1.php
View File

@ -15,7 +15,11 @@ class Quad_Icons128x32_1 extends Quad {
/*
* Constants
*/
const STYLE = 'Icons128x32_1';
const STYLE = 'Icons128x32_1';
const SUBSTYLE_ArrowUp = 'ArrowUp';
const SUBSTYLE_BgQuadWhite = 'BgQuadWhite';
// TODO: validate existence of 'close'
const SUBSTYLE_Close = 'Close';
const SUBSTYLE_Empty = 'Empty';
const SUBSTYLE_ManiaLinkHome = 'ManiaLinkHome';
const SUBSTYLE_ManiaLinkSwitch = 'ManiaLinkSwitch';

1
application/libs/FML/Controls/Quads/Quad_Icons64x64_2.php
View File

@ -18,6 +18,7 @@ class Quad_Icons64x64_2 extends Quad {
const STYLE = 'Icons64x64_2';
const SUBSTYLE_ArrowElimination = 'ArrowElimination';
const SUBSTYLE_ArrowHit = 'ArrowHit';
const SUBSTYLE_Calendar = 'Calendar';
const SUBSTYLE_Disconnected = 'Disconnected';
const SUBSTYLE_DisconnectedLight = 'DisconnectedLight';
const SUBSTYLE_LaserElimination = 'LaserElimination';

1
application/libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
View File

@ -35,6 +35,7 @@ class Quad_UIConstruction_Buttons extends Quad {
const SUBSTYLE_Down = 'Down';
const SUBSTYLE_Drive = 'Drive';
const SUBSTYLE_Erase = 'Erase';
const SUBSTYLE_FreeItems = 'FreeItems';
const SUBSTYLE_GhostBlocks = 'GhostBlocks';
const SUBSTYLE_Help = 'Help';
const SUBSTYLE_Item = 'Item';