rbutil: make the sapi voice script builtin.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15933 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 17 insertions, 64 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index c344d6a..e22954b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -150,3 +150,10 @@ static {
     message("using static plugin")
 }
 
+# copy sapi script
+win32 {
+    system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs)
+}
+!win32 {
+    system(copy ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs)
+}
\ No newline at end of file
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 0e571d6..2df1a42 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -1,4 +1,7 @@
 <RCC>
+    <qresource prefix="/builtin" >
+        <file>builtin/sapi_voice.vbs</file>
+    </qresource>
     <qresource prefix="/docs" >
         <file>CREDITS</file>
         <file>gpl-2.0.html</file>
diff --git a/rbutil/rbutilqt/sapicfgfrm.ui b/rbutil/rbutilqt/sapicfgfrm.ui
index 34e3591..9e4cde4 100644
--- a/rbutil/rbutilqt/sapicfgfrm.ui
+++ b/rbutil/rbutilqt/sapicfgfrm.ui
@@ -20,33 +20,6 @@
      </property>
      <layout class="QVBoxLayout" >
       <item>
-       <widget class="QLabel" name="label" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>255</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>Path to TTS Engine</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="QLineEdit" name="ttspath" />
-        </item>
-        <item>
-         <widget class="QPushButton" name="browse" >
-          <property name="text" >
-           <string>&amp;Browse</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
        <widget class="QLabel" name="label_2" >
         <property name="text" >
          <string>TTS options</string>
diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp
index 63e1188..9014044 100644
--- a/rbutil/rbutilqt/tts.cpp
+++ b/rbutil/rbutilqt/tts.cpp
@@ -249,7 +249,6 @@ TTSSapi::TTSSapi(QWidget *parent) : TTSBase(parent)
     ui.setupUi(this);
     this->hide();
     connect(ui.reset,SIGNAL(clicked()),this,SLOT(reset()));
-    connect(ui.browse,SIGNAL(clicked()),this,SLOT(browse()));
 }
 
 
@@ -257,11 +256,13 @@ bool TTSSapi::start()
 {    
 
     userSettings->beginGroup("sapi");
-    m_TTSexec = userSettings->value("ttspath","").toString();
     m_TTSOpts = userSettings->value("ttsoptions","").toString();
     m_TTSLanguage =userSettings->value("ttslanguage","").toString();
     userSettings->endGroup();
 
+    QFile::copy(":/builtin/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
+    m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
+    
     QFileInfo tts(m_TTSexec);
     if(!tts.exists())
         return false;
@@ -301,7 +302,6 @@ bool TTSSapi::stop()
 
 void TTSSapi::reset()
 {
-    ui.ttspath->setText("");
     ui.ttsoptions->setText("");  
     ui.ttslanguage->setText(defaultLanguage);  
 }
@@ -310,13 +310,10 @@ void TTSSapi::showCfg()
 {
     // try to get config from settings
     userSettings->beginGroup("sapi");
-    QString exepath =userSettings->value("ttspath","").toString();
     ui.ttsoptions->setText(userSettings->value("ttsoptions","").toString());  
-    ui.ttslanguage->setText(userSettings->value("ttsoptions",defaultLanguage).toString());     
+    ui.ttslanguage->setText(userSettings->value("ttslanguage",defaultLanguage).toString());     
     userSettings->endGroup();
-     
-    ui.ttspath->setText(exepath);
-    
+      
      //show dialog
     this->exec();
     
@@ -328,7 +325,6 @@ void TTSSapi::accept(void)
     {
         //save settings in user config
         userSettings->beginGroup("sapi");
-        userSettings->setValue("ttspath",ui.ttspath->text());
         userSettings->setValue("ttsoptions",ui.ttsoptions->text());
         userSettings->setValue("ttslanguage",ui.ttslanguage->text());
         userSettings->endGroup();
@@ -345,32 +341,7 @@ void TTSSapi::reject(void)
 
 bool TTSSapi::configOk()
 {
-    userSettings->beginGroup("sapi");
-    QString path = userSettings->value("ttspath","").toString();
-    userSettings->endGroup();
-    
-    if (QFileInfo(path).exists())
-        return true;
-  
-    return false;
+    return true;
 }
 
-void TTSSapi::browse()
-{
-    BrowseDirtree browser(this);
-    browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-
-    if(QFileInfo(ui.ttspath->text()).isDir())
-    {
-        browser.setDir(ui.ttspath->text());
-    }
-    if(browser.exec() == QDialog::Accepted)
-    {
-        qDebug() << browser.getSelected();
-        QString exe = browser.getSelected();
-        if(!QFileInfo(exe).isExecutable())
-            return;
-        ui.ttspath->setText(exe);
-    }
-}
 
diff --git a/rbutil/rbutilqt/tts.h b/rbutil/rbutilqt/tts.h
index 83fcda3..f9439ba 100644
--- a/rbutil/rbutilqt/tts.h
+++ b/rbutil/rbutilqt/tts.h
@@ -73,8 +73,7 @@ public slots:
     virtual void accept(void);
     virtual void reject(void);
     virtual void reset(void);
-    void browse(void);
-    
+     
 private:
     Ui::SapiCfgFrm ui;
     QProcess* voicescript;