From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 26 Aug 2010 18:05:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a352d0552c210272b02191eb2b7408cfe8b56553;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index a175cb42f..4b77877f7 100644
--- a/importWs.php
+++ b/importWs.php
@@ -161,28 +161,28 @@ if ($themes) {
 		$c->insert();
 	}
 	// Importe les jeux d'icones
-	$c = $core->con->openCursor('icones');
-	$c->icone_id = 1;
-	$c->nom = 'Vectoriel';
-	$c->date = TIME;
-	$c->proprietaire = getWsUser(5);
-	$c->insert();
-
+	for($i = 1;$i <= 2;$i++) {
+		$c = $core->con->openCursor('icones');
+		$c->icone_id = $i;
+		$c->nom = 'Vectoriel';
+		$c->date = TIME;
+		$c->proprietaire = getWsUser(5);
+		$c->insert();
+	}
 	// Import des thèmes
 	$r = $core->con->select('SELECT * FROM ws.theme');
 	$theme = new wsTheme();
 	while ($r->fetch()) {
 		$c = $core->con->openCursor('themes');
 		$c->theme_id = $r->tid;
-		$c->icones = 1;
+
 		$c->proprietaire = getWsUser($r->proprietaire);
 		$c->date = $r->date;
 		$c->nom = $r->titre;
 		$c->signature = $r->sigid;
 		$parametres = new wsThemeParametres($theme);
 		$parametres->fromRecord($r);
-		$parametres->iconSet = 1;
-		$parametres->couleurI = oldIconesToColor($r->iid);
+		$c->icones = oldIconesToColor($r->iid, $parametres);
 		$c->parametres = serialize($parametres);
 		$c->insert();
 	}
@@ -311,12 +311,30 @@ foreach($tables as $t) {
 	$core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS');
 }
 
-function oldIconesToColor($iid){
+function oldIconesToColor($iid, &$parametres)
+{
 	global $oldIconesColors;
-	if(!isset($oldIconesColors)){
-		$oldIconesColors=file('_doc/icones.txt');
+	if (!isset($oldIconesColors)) {
+		$oldIconesColors = array();
+		$fp = fopen('_doc/icones.csv', 'rb');
+		$i = 1;
+		while ($line = fgetcsv($fp, 1000, ';', '"')) {
+			$oldIconesColors[$i] = array('color' => trim($line[0]), 'iid' => trim($line[1]));
+			$i++;
+		}
 	}
-	return trim($oldIconesColors[$iid-1]);
+	$line = $oldIconesColors[$iid];
+	if ($line['iid'] != '') {
+		$parametres->iconSet = $line['iid'];
+		$parametres->colorizeIcons = false;
+		$parametres->couleurI = 'ffffff';
+		return $line['iid'];
+	}
+	$parametres->iconSet = 1;
+	$parametres->colorizeIcons = true;
+	$parametres->couleurI = $line['color'];
+
+	return 1;
 }
 
 function getWsUser($oldid)
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 5f40714c1..58ae8b6f0 100644
--- 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) {
 			$t->addChild($k, $v);
 		}
-		$files = $t->addChild('files');
-		foreach(wsTheme::$files as $k => $v) {
-			$f = THEMES . $theme->theme_id . '/' . $v;
-			$files->addChild($k, $f);
-		}
-		$oo = array('on', 'off');
-		foreach(wsIcone::$files as $v) {
-			foreach($oo as $o) {
-				$f = ICONS . $theme->icones . '/nav-' . $v . '-' . $o . '.png';
-				$files->addChild($v . '_' . $o, $f);
-			}
-		}
 	}
 
 	public function getThemeForms()
diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index 0266a2e36..1ea89abaa 100644
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -42,11 +42,10 @@
   </build>
   <!-- SWC Include Libraries -->
   <includeLibraries>
-    <!-- example: <element path="..." /> -->
+    <element path="wsComposerComponents.swc" />
   </includeLibraries>
   <!-- SWC Libraries -->
   <libraryPaths>
-    <element path="wsComposerComponents.swc" />
     <element path="composerLibrary.swc" />
     <element path="flash.swc" />
   </libraryPaths>
diff --git a/swf/_src/wsComposerComponents.fla b/swf/_src/wsComposerComponents.fla
index e3e54cd74..d8dc8cf40 100644
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 8b4e58a1e..42ab47d76 100644
Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ