(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 18b3a799d7679a6dfaa5cd11d459b03b927087e6..561dd2e85b7a4cef3e18bd221e332975f2cc2ba2 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -608,13 +608,13 @@ class wsDAOBook extends commonDAO {
                        }\r
                }\r
 \r
-               $flex->addSound(WS_SOUNDS . '/page-flip-2.mp3', 'soundCorner');\r
-\r
-               $flex->addSound(WS_SOUNDS . '/page-flip-9.mp3', 'soundCover0');\r
-               $flex->addSound(WS_SOUNDS . '/page-flip-10.mp3', 'soundCover1');\r
-\r
-               $flex->addSound(WS_SOUNDS . '/page-flip-6.mp3', 'soundPage0');\r
-               $flex->addSound(WS_SOUNDS . '/page-flip-7.mp3', 'soundPage1');\r
+               if ($book->parametres->soundTheme != '') {\r
+                       $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-drag.mp3', 'soundDragCorner');\r
+                       $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-release.mp3', 'soundReleaseCorner');\r
+                       $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/page-flip-1.mp3', 'soundPage0');\r
+                       $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/page-flip-2.mp3', 'soundPage1');\r
+                       $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/cover-flip.mp3', 'soundCover0');\r
+               }\r
 \r
                if ($complete) {\r
                        foreach($pages as $i => $infos) {\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 0624b062c230e7bae93c6aa708b28d81eb996f51..ae7f30af54cb15619110760a697580d97903f9bc 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -56,14 +56,18 @@ class wsBookParametres extends wsParametres {
                $this->forms['3d_mode'] = array('label' => __('Visualisation en 3D'),\r
                        'fieldsnames' => array('visualisationMode', 'pagesBaseAngle'));\r
 \r
-               $this->fields['sound'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les sons"), 'extra' => false, 'grade' => 1);\r
+               $this->fields['soundTheme'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Thème sonore"), 'extra' => false, 'grade' => 1,\r
+                       'datas' => array(__('Pas de son') => '',\r
+                               __('Classique') => 'classic',\r
+                               __("Papier épais") => 'heavy',\r
+                               __("Papier fin") => 'light'));\r
                $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"), 'extra' => false, 'grade' => 1);\r
                $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'), 'extra' => false, 'grade' => 1);\r
                $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'), 'extra' => false, 'grade' => 1);\r
                $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'), 'extra' => false, 'grade' => 1);\r
 \r
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
-                       'fieldsnames' => array('sound', 'print', 'search', 'bookmark', 'fullscreen', 'pages', 'width', 'height'));\r
+                       'fieldsnames' => array('soundTheme', 'print', 'search', 'bookmark', 'fullscreen', 'pages', 'width', 'height'));\r
                // .\r
                $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1);\r
                $this->forms['general_settings'] = array('label' => __('Paramètres généraux'),\r