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

started mc settings

Browse Source
This commit is contained in:
kremsy
2014-01-05 19:00:11 +01:00
parent 797843e057
commit c60c1e5c30
4 changed files with 138 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/Configurators/Configurator.php
+45 -40
View File
@@ -2,30 +2,31 @@
namespace ManiaControl\Configurators;
use FML\Controls\Quads\Quad_UIConstruction_Buttons;
use ManiaControl\ManiaControl;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Manialinks\ManialinkManager;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Players\Player;
use FML\ManiaLink;
use FML\ManiaLinks;
use FML\Controls\Frame;
use FML\Controls\Label;
use FML\Controls\Labels\Label_Text;
use FML\Controls\Quad;
use FML\Controls\Quads\Quad_BgRaceScore2;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\Controls\Quads\Quad_UIConstruction_Buttons;
use FML\ManiaLink;
use FML\ManiaLinks;
use FML\Script\Menus;
use FML\Script\Pages;
use FML\Script\Script;
use FML\Script\Tooltips;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Commands\CommandListener;
use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkManager;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Players\Player;
require_once __DIR__ . '/ConfiguratorMenu.php';
require_once __DIR__ . '/ScriptSettings.php';
require_once __DIR__ . '/ServerSettings.php';
require_once __DIR__ . '/ManiaControlSettings.php';
/**
* Class managing ingame ManiaControl configuration
@@ -36,13 +37,13 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
/**
* Constants
*/
const ACTION_TOGGLEMENU = 'Configurator.ToggleMenuAction';
const ACTION_SAVECONFIG = 'Configurator.SaveConfigAction';
const SETTING_MENU_POSX = 'Menu Widget Position: X';
const SETTING_MENU_POSY = 'Menu Widget Position: Y';
const SETTING_MENU_WIDTH = 'Menu Widget Width';
const SETTING_MENU_HEIGHT = 'Menu Widget Height';
const SETTING_MENU_STYLE = 'Menu Widget BackgroundQuad Style';
const ACTION_TOGGLEMENU = 'Configurator.ToggleMenuAction';
const ACTION_SAVECONFIG = 'Configurator.SaveConfigAction';
const SETTING_MENU_POSX = 'Menu Widget Position: X';
const SETTING_MENU_POSY = 'Menu Widget Position: Y';
const SETTING_MENU_WIDTH = 'Menu Widget Width';
const SETTING_MENU_HEIGHT = 'Menu Widget Height';
const SETTING_MENU_STYLE = 'Menu Widget BackgroundQuad Style';
const SETTING_MENU_SUBSTYLE = 'Menu Widget BackgroundQuad Substyle';
/**
@@ -51,6 +52,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
private $maniaControl = null;
private $scriptSettings = null;
private $serverSettings = null;
private $maniaControlSettings = null;
private $menus = array();
private $playersMenuShown = array();
@@ -80,13 +82,17 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
$this->maniaControl->callbackManager->registerCallbackListener(ScriptSettings::CB_SCRIPTSETTING_CHANGED, $this, 'reopenMenu');
$this->maniaControl->callbackManager->registerCallbackListener(ServerSettings::CB_SERVERSETTING_CHANGED, $this, 'reopenMenu');
// Create server settings
$this->serverSettings = new ServerSettings($maniaControl);
$this->addMenu($this->serverSettings);
// Create script settings
$this->scriptSettings = new ScriptSettings($maniaControl);
$this->addMenu($this->scriptSettings);
// Create server settings
$this->serverSettings = new ServerSettings($maniaControl);
$this->addMenu($this->serverSettings);
// Create Mania Control Settings
$this->maniaControlSettings = new ServerSettings($maniaControl);
$this->addMenu($this->maniaControlSettings);
// Register for commands
$this->maniaControl->commandManager->registerCommandListener('config', $this, 'handleConfigCommand', true);
@@ -116,8 +122,8 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
* @param array $callback
*/
public function reopenMenu(array $callback) {
foreach ($this->playersMenuShown as $login => $shown) {
if ($shown == true) {
foreach($this->playersMenuShown as $login => $shown) {
if($shown == true) {
$player = $this->maniaControl->playerManager->getPlayer($login);
$this->showMenu($player);
}
@@ -127,7 +133,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
/**
* Handle toggle menu action
*
* @param array $callback
* @param array $callback
* @param Player $player
*/
public function handleToggleMenuAction(array $callback, Player $player) {
@@ -137,11 +143,11 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
/**
* Save the config data received from the manialink
*
* @param array $callback
* @param array $callback
* @param Player $player
*/
public function handleSaveConfigAction(array $callback, Player $player) {
foreach ($this->menus as $menu) {
foreach($this->menus as $menu) {
$menu->saveConfigData($callback[1], $player);
}
}
@@ -162,7 +168,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
* @param Player $player
*/
public function showMenu(Player $player) {
$manialink = $this->buildManialink();
$manialink = $this->buildManialink();
$manialinkText = $manialink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
$this->maniaControl->manialinkManager->disableAltMenu($player);
@@ -176,7 +182,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
*/
public function hideMenu(Player $player) {
$emptyManialink = new ManiaLink(ManialinkManager::MAIN_MLID);
$manialinkText = $emptyManialink->render()->saveXML();
$manialinkText = $emptyManialink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
$this->maniaControl->manialinkManager->enableAltMenu($player);
unset($this->playersMenuShown[$player->login]);
@@ -188,10 +194,9 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
* @param Player $player
*/
public function toggleMenu(Player $player) {
if (isset($this->playersMenuShown[$player->login])) {
if(isset($this->playersMenuShown[$player->login])) {
$this->hideMenu($player);
}
else {
} else {
$this->showMenu($player);
}
}
@@ -202,17 +207,17 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
* @param bool $forceBuild
*/
private function buildManialink($forceBuild = false) {
$menuPosX = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSX);
$menuPosY = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSY);
$menuWidth = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_WIDTH);
$menuHeight = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_HEIGHT);
$quadStyle = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_STYLE);
$menuPosX = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSX);
$menuPosY = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSY);
$menuWidth = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_WIDTH);
$menuHeight = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_HEIGHT);
$quadStyle = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_STYLE);
$quadSubstyle = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_SUBSTYLE);
$menuListWidth = $menuWidth * 0.3;
$menuListWidth = $menuWidth * 0.3;
$menuItemHeight = 10.;
$subMenuWidth = $menuWidth - $menuListWidth;
$subMenuHeight = $menuHeight;
$subMenuWidth = $menuWidth - $menuListWidth;
$subMenuHeight = $menuHeight;
$manialinks = new ManiaLinks();
@@ -246,8 +251,8 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
$manialink->setScript($script);
$menuRelationships = array();
$menuItemY = $menuHeight * 0.42;
foreach ($this->menus as $index => $menu) {
$menuItemY = $menuHeight * 0.42;
foreach($this->menus as $index => $menu) {
// Add title
$menuItemLabel = new Label();
$menuItemsFrame->add($menuItemLabel);
@@ -258,7 +263,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
// Add menu
$menuControl = $menu->getMenu($subMenuWidth, $subMenuHeight, $script);
if ($index > 0) {
if($index > 0) {
$menuControl->setVisible(false);
}
$menusFrame->add($menuControl);
application/core/Configurators/ManiaControlSettings.php
+66
View File
@@ -0,0 +1,66 @@
<?php
/**
* Class offering a Configurator for Script Settings
*
* @author steeffeen & kremsy
*/
namespace ManiaControl\Configurators;
use FML\Script\Script;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
class ManiaControlSettings implements ConfiguratorMenu{
/**
* Constants
*/
const TITLE = 'ManiaControl Settings';
/**
* Private Properties
*/
private $maniaControl = null;
/**
* Create a new Script Settings Instance
*
* @param ManiaControl $maniaControl
*/
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
}
/**
* Get the Menu Title
*
* @return string
*/
public function getTitle() {
self::TITLE;
}
/**
* Get the Configurator Menu Frame
*
* @param float $width
* @param float $height
* @param Script $script
* @return \FML\Controls\Frame
*/
public function getMenu($width, $height, Script $script) {
var_dump($this->maniaControl->settingManager->getSettings());
// TODO: Implement getMenu() method.
}
/**
* Save the Config Data
*
* @param array $configData
* @param Player $player
*/
public function saveConfigData(array $configData, Player $player) {
// TODO: Implement saveConfigData() method.
}
}
application/core/Maps/MapCommands.php
+2
View File
@@ -5,6 +5,8 @@ namespace ManiaControl\Maps;
use FML\Controls\Quad;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\Controls\Quads\Quad_UIConstruction_Buttons;
use FML\ManiaLink;
use FML\Script\EUISound;
use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
application/core/Maps/MapList.php
-1
View File
@@ -417,7 +417,6 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$switchToQuad->setText("»");
$switchToQuad->setTextColor("0F0");
//$switchToQuad->setAction(self::ACTION_CONFIRM_SWITCHTO_MAP . "." . ($id));
$confirmFrame = $this->buildConfirmFrame($maniaLink, $y, $id);
$script->addToggle($switchToQuad, $confirmFrame);