From 6cd5ea985c0f2f5b3491f2f83c28687d45b99986 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 26 Apr 2010 09:50:37 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.flash.php | 2 +- inc/ws/DAO/class.ws.dao.icone.php | 4 ++-- inc/ws/Metier/class.ws.icone.php | 19 +++++++++++++++++-- inc/ws/Metier/class.ws.theme.parametres.php | 2 +- swf/_src/wsComposer.fla | Bin 664064 -> 664064 bytes 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 49621096b..880d75462 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -173,7 +173,7 @@ class wsFlash extends cubeFlashGateway { { global $core; $dao = new wsDAOIcone($core->con); - $icones = $dao->selectAll(); + $icones = $dao->selectAll('ORDER BY icone_id DESC'); foreach($icones as $icone) { $i = $this->xml->addChild('icone'); $i->addAttribute('id', $icone->icone_id); diff --git a/inc/ws/DAO/class.ws.dao.icone.php b/inc/ws/DAO/class.ws.dao.icone.php index 8bfe03f88..e773126fb 100644 --- a/inc/ws/DAO/class.ws.dao.icone.php +++ b/inc/ws/DAO/class.ws.dao.icone.php @@ -16,9 +16,9 @@ class wsDAOIcone extends cubeDAO { return $this->singleton($r); } - public function selectAll() + public function selectAll($orderby='') { - $r = $this->con->select('SELECT * FROM icones'); + $r = $this->con->select('SELECT * FROM icones '.$orderby); return $this->factory($r); } } diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php index c2f9532f9..2fc9e9fbe 100644 --- a/inc/ws/Metier/class.ws.icone.php +++ b/inc/ws/Metier/class.ws.icone.php @@ -26,8 +26,11 @@ class wsIcone extends cubeMetier { return; } - $h = 0; + $h = 39; $w = 0; + if($this->isNew()){ + $w=8; + } $mod = 0; $liste = ($this->isNew())?wsIcone::$files_new:wsIcones::$files; @@ -38,8 +41,13 @@ class wsIcone extends cubeMetier { $mod = max(filemtime($image), $mod); $h = max($h, $dim[1]); $w += $dim[0]; + if($this->isNew()){ + $w+=16; + } } + $height = $h; + $im = imagecreatetruecolor($w, $h); imagelayereffect($im, IMG_EFFECT_REPLACE); $color = imagecolorallocatealpha($im, 255, 255, 255, 127); @@ -47,13 +55,20 @@ class wsIcone extends cubeMetier { imagesavealpha($im, true); imagealphablending($im, true); $x = 0; + if($this->isNew()){ + $x=8; + } foreach($liste as $file) { $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png'; $s = imagecreatefrompng($image); $w = imagesx($s); $h = imagesy($s); - imagecopy($im, $s , $x , 0 , 0 , 0 , $w , $h); + imagecopy($im, $s , $x , round(($height - $h) / 2) , 0 , 0 , $w , $h); + $x += $w; + if ($this->isNew()) { + $x += 16; + } } imagepng($im, $final); diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index 06984986d..e80129150 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -40,7 +40,7 @@ class wsThemeParametres extends wsParametres { 'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3); $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4); - $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3); $this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, 'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3); diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index 9843fff86b818c5cda6b35d1bf1acf6729826a37..c811efa8696f122c0913db298e5fc9db00c1de4b 100644 GIT binary patch delta 6715 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 P2k<1sW^Qe@?e+fxVjIdf delta 1653 zcmZWm3pA8z82-Qih72ElZPR zPo)_7mBKXb+3acEx{dpvlj;W+ez z@c;ZA16e?WB*SS9aUjxI%thJaJ&s{wIqFKp!J8T>Fo0Q!87CV^>4}_K;x;GlUoC_v ze>EVazdCuNB7Gcv1Sm2ce5~<&&$Y6UeGuILF~M2~ zcP@sQCL~72B#I))-^K%`nzw2~bEO}|`7r%q28aQBied@y9x2C|gG!&zH%g=KKftEv zD_@CmLmSX82BFqqQW_9ik4vhT)!Jclz(RJx6?vlmgO*RBt4{xP+nxz+7$ z!qG_saldRZ$xUss>191rPriAzUDbyv_o~udQd?I(PPbO{v-`D}cQ$othux;KAB>+; zzH?Pgc&4`bO@>_`pW6f!dxcv{%29D67#oob#=lifavB;lMlLw4oGjcT2tCB5>TLYD zCoIZs-Q&Z-X$N75y?k9(LXbT_q5FgtI?%N!oV&4z$SwtuBPCkJh_n6bR3 zAj_7R%PM<+(ejeA<#8-m?sqHLWP??i4$GkOl5#~xz=`Q`mCY990BJnVY_3qQRSS~U zU#f|9L}Q#Vs#@mK&FJz}61|2PAuPYyraa42Ei`|BMQ<`!Fa0*Tql=-pDZ6XXzV4}L2eg)GX&fF_2 z?_e)KQTR5NY}X2ApKgr})|z2uX_vNY)q=XJ#NycCnFYsU50^M@Ce*j(H(*_KY!24j~6-x;?L5yW?7UrSQ*L3 zTw;Qq65exchEFcl3cp^ToSs+H)^wRQ+Fp3Xw3@2*E4EFjNthcLy;E^O)Ds!&7GvI< z;uB~V|62j8GlWhvkti0^9?a_V%bIV-++Vo!d6~CE#DQOuTG)BWaC+`gG8N6dF8YJx zGCU#BjwYYJ=nUvs`mS(6jBfAkuCNn2z3=vCx!;bSvwmmKc(|AUzV?Z**kD6nZfBU4 zz55;mqFElfT;U^Oi`JW^?a6pvUN!E2)H|-{$jhOeW8p@TVJ-T3#qM9(7~S#Pj-Qra z+88deX*R5zbLWWp1>d@nE}^%-?`$1*_oJeY-Tpx*XJ78}yLl)mdu0UylZ2@S MQ=48{p>sa@PiODb;{X5v -- 2.39.5