rbutil: add a option to ignore specific files for .talk file generation.

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

4 files changed, 152 insertions, 138 deletions

diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp
index 81dcf01..bc3f5f9 100644
--- a/rbutil/rbutilqt/base/talkfile.cpp
+++ b/rbutil/rbutilqt/base/talkfile.cpp
@@ -159,6 +159,19 @@ bool TalkFileCreator::createTalkList(QDir startDir)
             // insert into List
             if( !fileInf.fileName().isEmpty() && !fileInf.fileName().endsWith(".talk") && m_talkFiles)
             {
+                //test if we should ignore this file
+                bool match = false;
+                for(int i=0; i < m_ignoreFiles.size();i++)
+                {
+                    QRegExp rx(m_ignoreFiles[i].trimmed());
+                    rx.setPatternSyntax(QRegExp::Wildcard);
+                    if(rx.exactMatch(fileInf.fileName()))
+                        match = true;
+                }
+                if(match)
+                    continue;
+                
+                //generate entry
                 TalkGenerator::TalkEntry entry;
                 if(m_stripExtensions)
                     entry.toSpeak = stripExtension(fileInf.fileName());
diff --git a/rbutil/rbutilqt/base/talkfile.h b/rbutil/rbutilqt/base/talkfile.h
index f824214..9c59693 100644
--- a/rbutil/rbutilqt/base/talkfile.h
+++ b/rbutil/rbutilqt/base/talkfile.h
@@ -45,7 +45,7 @@ public:
     void setStripExtensions(bool ov) {m_stripExtensions = ov;}
     void setTalkFolders(bool ov) {m_talkFolders = ov;} 
     void setTalkFiles(bool ov) {m_talkFiles = ov;}
-    
+    void setIgnoreFiles(QStringList wildcards) {m_ignoreFiles=wildcards;}
 public slots:
     void abort();
     
@@ -72,7 +72,8 @@ private:
     bool m_stripExtensions;
     bool m_talkFolders;
     bool m_talkFiles;
-
+    QStringList m_ignoreFiles;
+    
     bool m_abort;
     
     QList<TalkGenerator::TalkEntry> m_talkList;
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index 3b0f5a8..de41dca 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>InstallTalkFrm</class>
- <widget class="QDialog" name="InstallTalkFrm" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="InstallTalkFrm">
+  <property name="windowModality">
    <enum>Qt::WindowModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,87 +13,87 @@
     <height>450</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Install Talk Files</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <item rowspan="6" row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" rowspan="6">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string/>
      </property>
-     <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
+     <property name="pixmap">
+      <pixmap resource="rbutilqt.qrc">:/icons/wizard.xpm</pixmap>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
+   <item row="0" column="1" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
       <string>Select the Folder to generate Talkfiles for.</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="QLineEdit" name="lineTalkFolder" >
-     <property name="accessibleName" >
+   <item row="1" column="1" colspan="2">
+    <widget class="QLineEdit" name="lineTalkFolder">
+     <property name="accessibleName">
       <string>Talkfile Folder</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="3" >
-    <widget class="QPushButton" name="buttonBrowse" >
-     <property name="text" >
+   <item row="1" column="3">
+    <widget class="QPushButton" name="buttonBrowse">
+     <property name="text">
       <string>&amp;Browse</string>
      </property>
-     <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >
+     <property name="icon">
+      <iconset resource="rbutilqt.qrc">
        <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="3" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
+   <item row="2" column="1" colspan="3">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
       <string>Generation settings</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="labelEncProfile" >
-        <property name="text" >
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelEncProfile">
+        <property name="text">
          <string>Encoder profile:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="labelTtsProfile" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelTtsProfile">
+        <property name="text">
          <string>TTS profile:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="change" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+      <item row="2" column="0">
+       <widget class="QPushButton" name="change">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Change</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
+      <item row="2" column="1">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -103,81 +104,12 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="1" colspan="3" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Generation options</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="2" column="0" colspan="2" >
-       <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" colspan="2" >
-       <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" colspan="2" >
-       <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" colspan="2" >
-       <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" colspan="2" >
-       <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>
-     <zorder>recursive</zorder>
-     <zorder>StripExtensions</zorder>
-     <zorder>OverwriteTalk</zorder>
-     <zorder>talkFolders</zorder>
-     <zorder>talkFiles</zorder>
-     <zorder>label_3</zorder>
-     <zorder>fileFilter</zorder>
-    </widget>
-   </item>
-   <item row="4" column="2" >
+   <item row="4" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -185,12 +117,12 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="1" >
+   <item row="5" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -198,48 +130,115 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="2" colspan="2" >
-    <layout class="QHBoxLayout" >
+   <item row="5" column="2" colspan="2">
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QPushButton" name="buttonOk" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
         <string>&amp;Install</string>
        </property>
-       <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >
+       <property name="icon">
+        <iconset resource="rbutilqt.qrc">
          <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonCancel" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonCancel">
+       <property name="text">
         <string>&amp;Cancel</string>
        </property>
-       <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >
+       <property name="icon">
+        <iconset resource="rbutilqt.qrc">
          <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="3" column="1" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Generation options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="ignoreFiles"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Ignore files (comma seperated Wildcards):</string>
+        </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>
+      <item row="4" 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="5" 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="6" 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="7" column="0">
+       <widget class="QCheckBox" name="OverwriteTalk">
+        <property name="text">
+         <string>Overwrite Talkfiles</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>lineTalkFolder</tabstop>
   <tabstop>buttonBrowse</tabstop>
   <tabstop>change</tabstop>
-  <tabstop>talkFiles</tabstop>
-  <tabstop>talkFolders</tabstop>
-  <tabstop>recursive</tabstop>
-  <tabstop>StripExtensions</tabstop>
-  <tabstop>OverwriteTalk</tabstop>
   <tabstop>buttonOk</tabstop>
   <tabstop>buttonCancel</tabstop>
  </tabstops>
  <resources>
-  <include location="rbutilqt.qrc" />
+  <include location="rbutilqt.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -248,11 +247,11 @@
    <receiver>InstallTalkFrm</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>472</x>
      <y>418</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>382</x>
      <y>328</y>
     </hint>
@@ -264,11 +263,11 @@
    <receiver>InstallTalkFrm</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>561</x>
      <y>428</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>522</x>
      <y>332</y>
     </hint>
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 40f96e7..e8b2c29 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -108,6 +108,7 @@ void InstallTalkWindow::accept()
     talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
     talkcreator->setTalkFolders(ui.talkFolders->isChecked());
     talkcreator->setTalkFiles(ui.talkFiles->isChecked());
+    talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts));
     
     connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished()));
     connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));