(no commit message)

diff --git a/importWs.php b/importWs.php
index a175cb42f1a6ad9c72c48d1dac6c515dbb450188..4b77877f74459552402f633eed0bf21b254cb22a 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -161,28 +161,28 @@ if ($themes) {
                $c->insert();\r
        }\r
        // Importe les jeux d'icones\r
-       $c = $core->con->openCursor('icones');\r
-       $c->icone_id = 1;\r
-       $c->nom = 'Vectoriel';\r
-       $c->date = TIME;\r
-       $c->proprietaire = getWsUser(5);\r
-       $c->insert();\r
-\r
+       for($i = 1;$i <= 2;$i++) {\r
+               $c = $core->con->openCursor('icones');\r
+               $c->icone_id = $i;\r
+               $c->nom = 'Vectoriel';\r
+               $c->date = TIME;\r
+               $c->proprietaire = getWsUser(5);\r
+               $c->insert();\r
+       }\r
        // Import des thèmes\r
        $r = $core->con->select('SELECT * FROM ws.theme');\r
        $theme = new wsTheme();\r
        while ($r->fetch()) {\r
                $c = $core->con->openCursor('themes');\r
                $c->theme_id = $r->tid;\r
-               $c->icones = 1;\r
+\r
                $c->proprietaire = getWsUser($r->proprietaire);\r
                $c->date = $r->date;\r
                $c->nom = $r->titre;\r
                $c->signature = $r->sigid;\r
                $parametres = new wsThemeParametres($theme);\r
                $parametres->fromRecord($r);\r
-               $parametres->iconSet = 1;\r
-               $parametres->couleurI = oldIconesToColor($r->iid);\r
+               $c->icones = oldIconesToColor($r->iid, $parametres);\r
                $c->parametres = serialize($parametres);\r
                $c->insert();\r
        }\r
@@ -311,12 +311,30 @@ foreach($tables as $t) {
        $core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS');\r
 }\r
 \r
-function oldIconesToColor($iid){\r
+function oldIconesToColor($iid, &$parametres)\r
+{\r
        global $oldIconesColors;\r
-       if(!isset($oldIconesColors)){\r
-               $oldIconesColors=file('_doc/icones.txt');\r
+       if (!isset($oldIconesColors)) {\r
+               $oldIconesColors = array();\r
+               $fp = fopen('_doc/icones.csv', 'rb');\r
+               $i = 1;\r
+               while ($line = fgetcsv($fp, 1000, ';', '"')) {\r
+                       $oldIconesColors[$i] = array('color' => trim($line[0]), 'iid' => trim($line[1]));\r
+                       $i++;\r
+               }\r
        }\r
-       return trim($oldIconesColors[$iid-1]);\r
+       $line = $oldIconesColors[$iid];\r
+       if ($line['iid'] != '') {\r
+               $parametres->iconSet = $line['iid'];\r
+               $parametres->colorizeIcons = false;\r
+               $parametres->couleurI = 'ffffff';\r
+               return $line['iid'];\r
+       }\r
+       $parametres->iconSet = 1;\r
+       $parametres->colorizeIcons = true;\r
+       $parametres->couleurI = $line['color'];\r
+\r
+       return 1;\r
 }\r
 \r
 function getWsUser($oldid)\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 5f40714c187b370b7e4c0975181a5d76d153bd9a..58ae8b6f0b27635f8aeebdfeed3b9df7d1bfb7a2 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -273,18 +273,6 @@ class wsFlash extends cubeFlashGateway {
                foreach($theme->parametres as $k => $v) {\r
                        $t->addChild($k, $v);\r
                }\r
-               $files = $t->addChild('files');\r
-               foreach(wsTheme::$files as $k => $v) {\r
-                       $f = THEMES . $theme->theme_id . '/' . $v;\r
-                       $files->addChild($k, $f);\r
-               }\r
-               $oo = array('on', 'off');\r
-               foreach(wsIcone::$files as $v) {\r
-                       foreach($oo as $o) {\r
-                               $f = ICONS . $theme->icones . '/nav-' . $v . '-' . $o . '.png';\r
-                               $files->addChild($v . '_' . $o, $f);\r
-                       }\r
-               }\r
        }\r
 \r
        public function getThemeForms()\r

diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index 0266a2e3626a77284209bc248c94343545bfe14e..1ea89abaa77be68798a4609ad980a0b969e81668 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -42,11 +42,10 @@
   </build>\r
   <!-- SWC Include Libraries -->\r
   <includeLibraries>\r
-    <!-- example: <element path="..." /> -->\r
+    <element path="wsComposerComponents.swc" />\r
   </includeLibraries>\r
   <!-- SWC Libraries -->\r
   <libraryPaths>\r
-    <element path="wsComposerComponents.swc" />\r
     <element path="composerLibrary.swc" />\r
     <element path="flash.swc" />\r
   </libraryPaths>\r

diff --git a/swf/_src/wsComposerComponents.fla b/swf/_src/wsComposerComponents.fla
index e3e54cd749e2b0b14577a0e7ea7fbbc576f5b3a3..d8dc8cf40d017a11b42e646830074f3ae653891f 100644 (file)
Binary files a/swf/_src/wsComposerComponents.fla and b/swf/_src/wsComposerComponents.fla differ

diff --git a/swf/_src/wsComposerComponents.swc b/swf/_src/wsComposerComponents.swc
index 8b4e58a1e9df82bc7cdbcd72a2295241170783ec..42ab47d76265cb10fab54761535f50d8a0f81cf6 100644 (file)
Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ