4 files changed, 63 insertions, 7 deletions

diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index ddb5e877cc..d38784c130 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -78,39 +78,77 @@
       <string>Generation options</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" >
+      <item row="2" column="0" >
        <widget class="QCheckBox" name="OverwriteWav" >
         <property name="text" >
          <string>Overwrite Wavefiles</string>
         </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
-      <item row="1" column="0" >
+      <item row="3" column="0" >
        <widget class="QCheckBox" name="RemoveWav" >
         <property name="text" >
          <string>Remove Wavefiles</string>
         </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item row="4" column="0" >
        <widget class="QCheckBox" name="recursive" >
         <property name="text" >
          <string>Run recursive</string>
         </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
-      <item row="3" column="0" >
+      <item row="5" column="0" >
        <widget class="QCheckBox" name="StripExtensions" >
         <property name="text" >
          <string>Strip Extensions</string>
         </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
-      <item row="4" column="0" >
+      <item row="6" column="0" >
        <widget class="QCheckBox" name="OverwriteTalk" >
         <property name="text" >
          <string>Overwrite Talkfiles</string>
         </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="talkFolders" >
+        <property name="text" >
+         <string>Generate .talk files for Folders</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="talkFiles" >
+        <property name="text" >
+         <string>Generate .talk files for Files</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+        <property name="tristate" >
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
      </layout>
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 4c341fa793..fbe2a2749b 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -131,6 +131,8 @@ void InstallTalkWindow::accept()
     talkcreator->setRemoveWav(ui.RemoveWav->isChecked());
     talkcreator->setRecursive(ui.recursive->isChecked());
     talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
+    talkcreator->setTalkFolders(ui.talkFolders->isChecked());
+    talkcreator->setTalkFiles(ui.talkFiles->isChecked());
 
     talkcreator->createTalkFiles(logger);
 }
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index 5b484079f9..3b99b2c52c 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -96,11 +96,23 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
         }
         if(fileInf.isDir())  // if it is a dir
         {
+            // skip entry if folder talking isnt enabled
+            if(m_talkFolders == false) 
+            {
+              it.next();
+              continue;
+            }            
             toSpeak = fileInf.fileName();
             filename = fileInf.absolutePath() + "/_dirname.talk";
         }
         else   // if it is a file
         {
+            // skip entry if file talking isnt enabled
+            if(m_talkFiles == false)
+            {
+               it.next();
+               continue;
+            }
             if(m_stripExtensions)
                 toSpeak = fileInf.baseName();
             else
@@ -181,7 +193,7 @@ bool TalkFileCreator::encode(QString input,QString output)
 }
 
 bool TTSSapi::start()
-{
+{    
     QFileInfo tts(m_TTSexec);
     if(!tts.exists())
         return false;
@@ -244,4 +256,4 @@ bool TTSExes::voice(QString text,QString wavfile)
     QProcess::execute(execstring);
     return true;
 
-}
\ No newline at end of file
+}
diff --git a/rbutil/rbutilqt/talkfile.h b/rbutil/rbutilqt/talkfile.h
index b02060a708..1b8d9ca2e2 100644
--- a/rbutil/rbutilqt/talkfile.h
+++ b/rbutil/rbutilqt/talkfile.h
@@ -75,6 +75,8 @@ public:
     void setRemoveWav(bool ov) {m_removeWav = ov;}
     void setRecursive(bool ov) {m_recursive = ov;}
     void setStripExtensions(bool ov) {m_stripExtensions = ov;}
+    void setTalkFolders(bool ov) {m_talkFolders = ov;} 
+    void setTalkFiles(bool ov) {m_talkFiles = ov;}
 
 private slots:
     void abort();
@@ -106,6 +108,8 @@ private:
     bool m_removeWav;
     bool m_recursive;
     bool m_stripExtensions;
+    bool m_talkFolders;
+    bool m_talkFiles;
 
     ProgressloggerInterface* m_logger;