Changeset 5087


Ignore:
Timestamp:
Jun 6, 2017, 10:17:30 AM (2 years ago)
Author:
joamuran
Message:

fixed release 1.1

Location:
casimir-editor/trunk/fuentes
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • casimir-editor/trunk/fuentes/debian/changelog

    r5059 r5087  
     1casimir-editor (1.1) UNRELEASED; urgency=high
     2
     3  * Added LliureX TTS (Google TTS + festival)
     4
     5 -- Jose A. Murcia <joamuran@gmail.com>  Tue, 06 Jun 2017 10:16:38 +0200
     6
    17casimir-editor (1.0.1-lliurex3) xenial; urgency=medium
    28
  • casimir-editor/trunk/fuentes/debian/control

    r5045 r5087  
    1111Package: casimir-editor
    1212Architecture: any
    13 Depends: ${misc:Depends}, nwjs0.12
    14 # Depends too of nw > 12
     13Depends: ${misc:Depends}, nwjs0.21, lliurex-tts
    1514Description: Text editor for dyslexics
    1615 WebODF text editor for dyslexics
    17 
    18 Package: casimir-naturalreaders-launcher
    19 Architecture: any
    20 Depends: ${misc:Depends}, nwjs0.12
    21 Description: Natural Readers
    22  Natural Readers Launcher
  • casimir-editor/trunk/fuentes/install.casimir-editor/usr/bin/casimir-editor

    r5037 r5087  
    11#! /bin/sh
    22
    3 nw0.12 /usr/share/casimir-editor/src
     3nw0.21 /usr/share/casimir-editor/src
  • casimir-editor/trunk/fuentes/install.casimir-editor/usr/share/casimir-editor/src/css/main.css

    r5037 r5087  
    9191    background-image: url('img/menu.png');
    9292    background-size: cover;
    93     background-color: #0099cc !important;
     93    background-color: #0091ea !important;
    9494}
    9595
     
    100100
    101101#speechChar{
    102     background-color: #0099cc !important;
     102    background-color: #0091ea !important;
    103103    background-image: url('img/character.png');
    104104    background-size: cover;
    105105}
     106#speechChar.btn_off, #speechWord.btn_off, #speechPhrase.btn_off{ background-color: #81d4fa !important; };
    106107
    107108#speechChar:hover, #speechWord:hover, #speechPhrase:hover{
    108     background-color: #33b5e5 !important;
     109    background-color: #e1f5fe !important;
    109110    }
    110111
    111112#speechWord{
    112     background-color: #0099cc !important;
     113    background-color: #0091ea !important;
    113114    background-image: url('img/word.png');
    114115    background-size: cover;
     
    117118
    118119#speechPhrase{
    119     background-color: #0099cc !important;
     120    background-color: #0091ea !important;
    120121    background-image: url('img/phrase.png');
    121122    background-size: cover;
  • casimir-editor/trunk/fuentes/install.casimir-editor/usr/share/casimir-editor/src/index.html

    r5037 r5087  
    6464        <div id="speechPhrase" class="swapButton btn_on" status="on"></div>
    6565        <div id="speechSelected" class="swapButton btn_on" status="on"></div>
    66         <div id="speechSelectedWithGoogle" class="swapButton btn_on" status="on"></div>
    67        
    68 <!--
    69        
    70 Botó de xarrar amb google...
    71        
    72 WIP HERE:
    73        
    74 Fem un .sh amb:
    75        
    76 -------------------
    77 #!/bin/bash
    78 say() { local IFS=+;/usr/bin/mplayer -ao alsa -really-quiet -noconsolecontrols "http://translate.google.com/translate_tts?ie=UTF-8&client=tw-ob&q=$*&tl=En-us"; }
    79 say $*
    80 ----------------------
    81 
    82 /tmp/speech.sh "Hello mister marshall"
    83 
    84 La idea és que el botó esta faça la crida i utilitze el tts de google per a les frases
    85 
    86 -->
    87        
     66        <!--div id="speechSelectedWithGoogle" class="swapButton btn_on" status="on"></div-->
     67               
    8868       
    8969</div>
     
    173153<div id="CasimirEditorContainer" style="width:100%; height:100%; margin:0px; padding:0px"> </div>
    174154
    175 <audio id="audioControls" controls>
     155<!--audio id="audioControls" controls>
    176156  <source id="audioSource" type="audio/mp3">
    177 </audio>
     157</audio-->
    178158
    179159
  • casimir-editor/trunk/fuentes/install.casimir-editor/usr/share/casimir-editor/src/js/editor.js

    r5037 r5087  
    22var fsxtrta = require('./node_modules/fs.extra');
    33var process=require('process');
    4 var sys = require('sys')
     4var sys = require('sys');
    55var archiver = require('archiver');
    6 
    7 exec = require('child_process').exec;
     6var exec = require('child_process').exec;
    87
    98function Ceditor(){
     
    4544                        color:    ""
    4645                }
    47         }
     46        };
    4847        //Wodo.createTextEditor(editoritem, self.editorOptions, self.onEditorCreated);
    4948       
     
    556555       
    557556       
    558         if (useGoogle) self.googleSay(speechtext, self.MyConfig.speakoptions);
    559         else meSpeak.speak(speechtext, self.MyConfig.speakoptions);
     557        /*if (useGoogle) self.googleSay(speechtext, self.MyConfig.speakoptions);
     558        else meSpeak.speak(speechtext, self.MyConfig.speakoptions);*/
     559        self.readLliureXTTS(speechtext, self.MyConfig.current_lang, self.MyConfig.speakoptions);
     560               
     561               
    560562               
    561563        //console.log($("anchor")[0].nextSibling.nodeValue);
     
    564566
    565567
    566 Ceditor.prototype.googleSay=function googleSay(text, lang) {
     568Ceditor.prototype.readLliureXTTS =function readLliureXTTS(text, lang, config){
     569        console.log(text);
     570        console.log(lang);
     571        console.log(config);
     572       
     573        if (lang=="en/en") lang="en";
     574       
     575        exec("simple-google-tts "+lang+" '"+text+"'", function(error, stdout, stderr){
     576                        console.log(error);
     577                        console.log(stdout);
     578                console.log(stderr);
     579                });
     580        console.log("end");
     581}
     582
     583
     584/*Ceditor.prototype.googleSay=function googleSay(text, lang) {
     585 *DEPRECATED: Replaced with lliurex-tts
    567586        text="Hola";
    568587        //var url="https://translate.google.es/translate_tts?ie=UTF-8&q="+text+"&tl=&total=1&idx=0&textlen="+text.length+"&tk=631050.1042929&client=t";
     
    577596       
    578597        // WIP: Cal saber com obtindre el tk...
    579 }
     598}*/
    580599
    581600Ceditor.prototype.getCurrentPhrase=function getCurrentPhrase() {
  • casimir-editor/trunk/fuentes/install.casimir-editor/usr/share/casimir-editor/src/package.json

    r5037 r5087  
    1111  "window": {
    1212    "title": "Editor Casimir",
    13     "icon": "/usr/share/pixmaps/casimir-editor.png",
     13    "icon": "icon/casimir-editor.png",
    1414    "frame": true,
    1515    "width": 1024,
Note: See TracChangeset for help on using the changeset viewer.