From e8658c86031507c153d9311889174627e8c51419 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 1 Feb 2011 15:55:18 +0000 Subject: [PATCH] --- inc/ws/DAO/class.ws.dao.book.php | 14 +++++++------- inc/ws/Metier/class.ws.book.parametres.php | 8 ++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index 18b3a799d..561dd2e85 100644 --- 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 { } } - $flex->addSound(WS_SOUNDS . '/page-flip-2.mp3', 'soundCorner'); - - $flex->addSound(WS_SOUNDS . '/page-flip-9.mp3', 'soundCover0'); - $flex->addSound(WS_SOUNDS . '/page-flip-10.mp3', 'soundCover1'); - - $flex->addSound(WS_SOUNDS . '/page-flip-6.mp3', 'soundPage0'); - $flex->addSound(WS_SOUNDS . '/page-flip-7.mp3', 'soundPage1'); + if ($book->parametres->soundTheme != '') { + $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-drag.mp3', 'soundDragCorner'); + $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-release.mp3', 'soundReleaseCorner'); + $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/page-flip-1.mp3', 'soundPage0'); + $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/page-flip-2.mp3', 'soundPage1'); + $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/cover-flip.mp3', 'soundCover0'); + } if ($complete) { foreach($pages as $i => $infos) { diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 0624b062c..ae7f30af5 100644 --- 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'), 'fieldsnames' => array('visualisationMode', 'pagesBaseAngle')); - $this->fields['sound'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les sons"), 'extra' => false, 'grade' => 1); + $this->fields['soundTheme'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Thème sonore"), 'extra' => false, 'grade' => 1, + 'datas' => array(__('Pas de son') => '', + __('Classique') => 'classic', + __("Papier épais") => 'heavy', + __("Papier fin") => 'light')); $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"), 'extra' => false, 'grade' => 1); $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'), 'extra' => false, 'grade' => 1); $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'), 'extra' => false, 'grade' => 1); $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'), 'extra' => false, 'grade' => 1); $this->forms['general'] = array('label' => __('Fonctionnalités générales'), - 'fieldsnames' => array('sound', 'print', 'search', 'bookmark', 'fullscreen', 'pages', 'width', 'height')); + 'fieldsnames' => array('soundTheme', 'print', 'search', 'bookmark', 'fullscreen', 'pages', 'width', 'height')); // . $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1); $this->forms['general_settings'] = array('label' => __('Paramètres généraux'), -- 2.39.5