(no commit message)

diff --git a/importWs.php b/importWs.php
index edf1a8e1cc16e04f3c14e8de8a1a4b3b8a3d8999..db233aa9b7dadb7b38233e8a9b66876ea1cb477b 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -166,7 +166,6 @@ while ($r->fetch()) {
 $r = $core->con->select('SELECT * FROM ws.theme');\r
 $theme=new wsTheme();\r
 while ($r->fetch()) {\r
-       //$r->iconSet = $r->iid;\r
        $c = $core->con->openCursor('themes');\r
        $c->theme_id = $r->tid;\r
        $c->icones = $r->iid;\r
@@ -176,6 +175,7 @@ while ($r->fetch()) {
        $c->signature = $r->sigid;\r
        $parametres = new wsThemeParametres($theme);\r
        $parametres->fromRecord($r);\r
+       $parametres->iconSet=$r->iid;\r
        $c->parametres = serialize($parametres);\r
        $c->insert();\r
 }\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 2e8216eb16eaa00fbb98f3d06ad6b2549f84550f..49621096be114fd468f9e9fa7c22487f9ad3f806 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -178,6 +178,7 @@ class wsFlash extends cubeFlashGateway {
                        $i = $this->xml->addChild('icone');\r
                        $i->addAttribute('id', $icone->icone_id);\r
                        $i->addAttribute('nom', $icone->nom);\r
+                       $i->addAttribute('newSet', $icone->isNew());\r
                        $i->addAttribute('path', ICONS . $icone->icone_id . '.png');\r
                }\r
        }\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 1991984d085806dd5c246c4707accc291ec20ba6..c2f9532f9ba2a692b482d48e8252aad81d5a1d86 100644 (file)
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -4,24 +4,38 @@ class wsIcone extends cubeMetier {
        public $nom;\r
        public $date;\r
 \r
+       protected $_is_new = null;\r
+\r
        public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help');\r
+       public static $files_new = array('index', 'normal', 'sommaire', 'print', 'sendfriend', 'bookmark', 'fullscreen', 'normalscreen', 'pdf', 'help');\r
+\r
+       public function isNew()\r
+       {\r
+               if (is_null($this->_is_new)) {\r
+                       $this->_is_new = !file_exists(ROOT . '/icones/' . $this->icone_id . '/nav-index-off.png');\r
+               }\r
+               return $this->_is_new;\r
+       }\r
 \r
        public function makeImage()\r
        {\r
                $root = ROOT . '/icones/' . $this->icone_id . '/';\r
                $final = ROOT . '/icones/' . $this->icone_id . '.png';\r
 \r
-               if ($this->date <= filemtime($final)) {\r
+               if (file_exists($final) && $this->date <= filemtime($final)) {\r
                        return;\r
                }\r
 \r
                $h = 0;\r
                $w = 0;\r
                $mod = 0;\r
-               foreach(wsIcone::$files as $file) {\r
-                       $image = $root . 'nav-' . $file . '-off.png';\r
+\r
+               $liste = ($this->isNew())?wsIcone::$files_new:wsIcones::$files;\r
+\r
+               foreach($liste as $file) {\r
+                       $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png';\r
                        $dim = getimagesize($image);\r
-                       $mod = max(filemtime($file), $mod);\r
+                       $mod = max(filemtime($image), $mod);\r
                        $h = max($h, $dim[1]);\r
                        $w += $dim[0];\r
                }\r
@@ -33,8 +47,8 @@ class wsIcone extends cubeMetier {
                imagesavealpha($im, true);\r
                imagealphablending($im, true);\r
                $x = 0;\r
-               foreach(self::$files as $file) {\r
-                       $image = $root . 'nav-' . $file . '-off.png';\r
+               foreach($liste as $file) {\r
+                       $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png';\r
                        $s = imagecreatefrompng($image);\r
                        $w = imagesx($s);\r
                        $h = imagesy($s);\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index aaa43df28f7407d61d712dc7c449c36394b9aa08..30efeb20c1b24b35f647f127d7745350aae0eaac 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -128,7 +128,11 @@ class wsParametres extends cubeMetier implements Iterator {
                        throw new Exception('You are getting an attribute (' . get_class($this) . '::' . $varname . ') which not exists');\r
                }\r
                if (!isset($this->datas[$varname]) || is_null($this->datas[$varname])) {\r
-                       return $this->fields[$varname]['default'];\r
+                       if (substr($this->fields[$varname]['default'], 0, 1) == '$') {\r
+                               return $this->get(substr($this->fields[$varname]['default'],1));\r
+                       } else {\r
+                               return $this->fields[$varname]['default'];\r
+                       }\r
                }\r
                return $this->datas[$varname];\r
        }\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 26567a6c85debdaf8e96430ff7ca8a26b73111c1..06984986d04dfbf5b9f55a0e13eadfce2958804c 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -12,7 +12,7 @@ class wsThemeParametres extends wsParametres {
                }\r
                parent::initFields();\r
                $this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
-                       'label' => __("Couleur principale (boutons, liens)"), 'extra' => false, 'grade' => 3);\r
+                       'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3);\r
                $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3);\r
                $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
@@ -40,8 +40,10 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3);\r
                $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);\r
-               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', 'editable' => true,\r
+               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);\r
+               $this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+                       'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3);\r
                $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
                $this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
@@ -86,9 +88,13 @@ class wsThemeParametres extends wsParametres {
                $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);\r
                $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
-                       'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4);\r
+                       'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4);\r
                $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['colorPageNumber'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+                       'label' => __('Couleur des numéros de page'), 'extra' => true, 'grade' => 4);\r
+               $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
+                       'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4);\r
                $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1);\r
 \r
@@ -99,11 +105,15 @@ class wsThemeParametres extends wsParametres {
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-                       'fieldsnames' => array('iconSet', 'colorizeIcons', 'couleurI'));\r
+                       'fieldsnames' => array('iconSet','iconShadColor','|', 'colorizeIcons', 'couleurI'));\r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
                        'fieldsnames' => array('pagesBar'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r
-                       'fieldsnames' => array('pageReflection', 'shadeAlpha', '|', 'usePageEdges', '|', 'bookShadeColor', 'bookShadeAlpha', '|', 'displayPageNumber'));\r
+                       'fieldsnames' => array('pageReflection', 'shadeAlpha',\r
+                               '|', 'usePageEdges',\r
+                               '|', 'bookShadeColor', 'bookShadeAlpha',\r
+                               '|', 'displayPageNumber', 'colorPageNumber',\r
+                               '|', 'linksColor'));\r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
                        'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition'));\r
                $this->forms['menu'] = array('label' => __('Personnalisation des menus'),\r

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index dc2757b7f413d4ac0f09a880bdd22d07b088f974..9843fff86b818c5cda6b35d1bf1acf6729826a37 100644 (file)
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ