summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2009-08-23 18:57:50 +0000
committerDominik Wenger <domonoky@googlemail.com>2009-08-23 18:57:50 +0000
commit7feb6399383eb3b5cb63ba5f1d2db3117fd09528 (patch)
treee262e6405619b51ebb2e6fcda39261c141c749cf
parent139127217aa7f4a2916a42153773b347095f5364 (diff)
downloadrockbox-7feb6399383eb3b5cb63ba5f1d2db3117fd09528.tar.gz
rockbox-7feb6399383eb3b5cb63ba5f1d2db3117fd09528.zip
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
Diffstat
-rw-r--r--rbutil/rbutilqt/base/talkfile.cpp13
-rw-r--r--rbutil/rbutilqt/base/talkfile.h5
-rw-r--r--rbutil/rbutilqt/installtalkfrm.ui271
-rw-r--r--rbutil/rbutilqt/installtalkwindow.cpp1
4 files changed, 152 insertions, 138 deletions
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp
index 81dcf01ff5..bc3f5f965d 100644
--- a/rbutil/rbutilqt/base/talkfile.cpp
+++ b/rbutil/rbutilqt/base/talkfile.cpp
@@ -159,6 +159,19 @@ bool TalkFileCreator::createTalkList(QDir startDir)
159 // insert into List 159 // insert into List
160 if( !fileInf.fileName().isEmpty() && !fileInf.fileName().endsWith(".talk") && m_talkFiles) 160 if( !fileInf.fileName().isEmpty() && !fileInf.fileName().endsWith(".talk") && m_talkFiles)
161 { 161 {
162 //test if we should ignore this file
163 bool match = false;
164 for(int i=0; i < m_ignoreFiles.size();i++)
165 {
166 QRegExp rx(m_ignoreFiles[i].trimmed());
167 rx.setPatternSyntax(QRegExp::Wildcard);
168 if(rx.exactMatch(fileInf.fileName()))
169 match = true;
170 }
171 if(match)
172 continue;
173
174 //generate entry
162 TalkGenerator::TalkEntry entry; 175 TalkGenerator::TalkEntry entry;
163 if(m_stripExtensions) 176 if(m_stripExtensions)
164 entry.toSpeak = stripExtension(fileInf.fileName()); 177 entry.toSpeak = stripExtension(fileInf.fileName());
diff --git a/rbutil/rbutilqt/base/talkfile.h b/rbutil/rbutilqt/base/talkfile.h
index f82421416a..9c596934ab 100644
--- a/rbutil/rbutilqt/base/talkfile.h
+++ b/rbutil/rbutilqt/base/talkfile.h
@@ -45,7 +45,7 @@ public:
45 void setStripExtensions(bool ov) {m_stripExtensions = ov;} 45 void setStripExtensions(bool ov) {m_stripExtensions = ov;}
46 void setTalkFolders(bool ov) {m_talkFolders = ov;} 46 void setTalkFolders(bool ov) {m_talkFolders = ov;}
47 void setTalkFiles(bool ov) {m_talkFiles = ov;} 47 void setTalkFiles(bool ov) {m_talkFiles = ov;}
48 48 void setIgnoreFiles(QStringList wildcards) {m_ignoreFiles=wildcards;}
49public slots: 49public slots:
50 void abort(); 50 void abort();
51 51
@@ -72,7 +72,8 @@ private:
72 bool m_stripExtensions; 72 bool m_stripExtensions;
73 bool m_talkFolders; 73 bool m_talkFolders;
74 bool m_talkFiles; 74 bool m_talkFiles;
75 75 QStringList m_ignoreFiles;
76
76 bool m_abort; 77 bool m_abort;
77 78
78 QList<TalkGenerator::TalkEntry> m_talkList; 79 QList<TalkGenerator::TalkEntry> m_talkList;
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index 3b0f5a8c91..de41dca67d 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -1,10 +1,11 @@
1<ui version="4.0" > 1<?xml version="1.0" encoding="UTF-8"?>
2<ui version="4.0">
2 <class>InstallTalkFrm</class> 3 <class>InstallTalkFrm</class>
3 <widget class="QDialog" name="InstallTalkFrm" > 4 <widget class="QDialog" name="InstallTalkFrm">
4 <property name="windowModality" > 5 <property name="windowModality">
5 <enum>Qt::WindowModal</enum> 6 <enum>Qt::WindowModal</enum>
6 </property> 7 </property>
7 <property name="geometry" > 8 <property name="geometry">
8 <rect> 9 <rect>
9 <x>0</x> 10 <x>0</x>
10 <y>0</y> 11 <y>0</y>
@@ -12,87 +13,87 @@
12 <height>450</height> 13 <height>450</height>
13 </rect> 14 </rect>
14 </property> 15 </property>
15 <property name="windowTitle" > 16 <property name="windowTitle">
16 <string>Install Talk Files</string> 17 <string>Install Talk Files</string>
17 </property> 18 </property>
18 <layout class="QGridLayout" name="gridLayout_2" > 19 <layout class="QGridLayout" name="gridLayout_2">
19 <item rowspan="6" row="0" column="0" > 20 <item row="0" column="0" rowspan="6">
20 <widget class="QLabel" name="label" > 21 <widget class="QLabel" name="label">
21 <property name="text" > 22 <property name="text">
22 <string/> 23 <string/>
23 </property> 24 </property>
24 <property name="pixmap" > 25 <property name="pixmap">
25 <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap> 26 <pixmap resource="rbutilqt.qrc">:/icons/wizard.xpm</pixmap>
26 </property> 27 </property>
27 <property name="alignment" > 28 <property name="alignment">
28 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> 29 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
29 </property> 30 </property>
30 </widget> 31 </widget>
31 </item> 32 </item>
32 <item row="0" column="1" colspan="3" > 33 <item row="0" column="1" colspan="3">
33 <widget class="QLabel" name="label_2" > 34 <widget class="QLabel" name="label_2">
34 <property name="text" > 35 <property name="text">
35 <string>Select the Folder to generate Talkfiles for.</string> 36 <string>Select the Folder to generate Talkfiles for.</string>
36 </property> 37 </property>
37 </widget> 38 </widget>
38 </item> 39 </item>
39 <item row="1" column="1" colspan="2" > 40 <item row="1" column="1" colspan="2">
40 <widget class="QLineEdit" name="lineTalkFolder" > 41 <widget class="QLineEdit" name="lineTalkFolder">
41 <property name="accessibleName" > 42 <property name="accessibleName">
42 <string>Talkfile Folder</string> 43 <string>Talkfile Folder</string>
43 </property> 44 </property>
44 </widget> 45 </widget>
45 </item> 46 </item>
46 <item row="1" column="3" > 47 <item row="1" column="3">
47 <widget class="QPushButton" name="buttonBrowse" > 48 <widget class="QPushButton" name="buttonBrowse">
48 <property name="text" > 49 <property name="text">
49 <string>&amp;Browse</string> 50 <string>&amp;Browse</string>
50 </property> 51 </property>
51 <property name="icon" > 52 <property name="icon">
52 <iconset resource="rbutilqt.qrc" > 53 <iconset resource="rbutilqt.qrc">
53 <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset> 54 <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset>
54 </property> 55 </property>
55 </widget> 56 </widget>
56 </item> 57 </item>
57 <item row="2" column="1" colspan="3" > 58 <item row="2" column="1" colspan="3">
58 <widget class="QGroupBox" name="groupBox_2" > 59 <widget class="QGroupBox" name="groupBox_2">
59 <property name="title" > 60 <property name="title">
60 <string>Generation settings</string> 61 <string>Generation settings</string>
61 </property> 62 </property>
62 <layout class="QGridLayout" > 63 <layout class="QGridLayout">
63 <item row="0" column="0" > 64 <item row="0" column="0">
64 <widget class="QLabel" name="labelEncProfile" > 65 <widget class="QLabel" name="labelEncProfile">
65 <property name="text" > 66 <property name="text">
66 <string>Encoder profile:</string> 67 <string>Encoder profile:</string>
67 </property> 68 </property>
68 </widget> 69 </widget>
69 </item> 70 </item>
70 <item row="1" column="0" > 71 <item row="1" column="0">
71 <widget class="QLabel" name="labelTtsProfile" > 72 <widget class="QLabel" name="labelTtsProfile">
72 <property name="text" > 73 <property name="text">
73 <string>TTS profile:</string> 74 <string>TTS profile:</string>
74 </property> 75 </property>
75 </widget> 76 </widget>
76 </item> 77 </item>
77 <item row="2" column="0" > 78 <item row="2" column="0">
78 <widget class="QPushButton" name="change" > 79 <widget class="QPushButton" name="change">
79 <property name="sizePolicy" > 80 <property name="sizePolicy">
80 <sizepolicy vsizetype="Minimum" hsizetype="Minimum" > 81 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
81 <horstretch>0</horstretch> 82 <horstretch>0</horstretch>
82 <verstretch>0</verstretch> 83 <verstretch>0</verstretch>
83 </sizepolicy> 84 </sizepolicy>
84 </property> 85 </property>
85 <property name="text" > 86 <property name="text">
86 <string>Change</string> 87 <string>Change</string>
87 </property> 88 </property>
88 </widget> 89 </widget>
89 </item> 90 </item>
90 <item row="2" column="1" > 91 <item row="2" column="1">
91 <spacer> 92 <spacer>
92 <property name="orientation" > 93 <property name="orientation">
93 <enum>Qt::Horizontal</enum> 94 <enum>Qt::Horizontal</enum>
94 </property> 95 </property>
95 <property name="sizeHint" stdset="0" > 96 <property name="sizeHint" stdset="0">
96 <size> 97 <size>
97 <width>40</width> 98 <width>40</width>
98 <height>20</height> 99 <height>20</height>
@@ -103,81 +104,12 @@
103 </layout> 104 </layout>
104 </widget> 105 </widget>
105 </item> 106 </item>
106 <item row="3" column="1" colspan="3" > 107 <item row="4" column="2">
107 <widget class="QGroupBox" name="groupBox" >
108 <property name="title" >
109 <string>Generation options</string>
110 </property>
111 <layout class="QGridLayout" name="gridLayout" >
112 <item row="2" column="0" colspan="2" >
113 <widget class="QCheckBox" name="recursive" >
114 <property name="text" >
115 <string>Run recursive</string>
116 </property>
117 <property name="checked" >
118 <bool>true</bool>
119 </property>
120 </widget>
121 </item>
122 <item row="3" column="0" colspan="2" >
123 <widget class="QCheckBox" name="StripExtensions" >
124 <property name="text" >
125 <string>Strip Extensions</string>
126 </property>
127 <property name="checked" >
128 <bool>false</bool>
129 </property>
130 </widget>
131 </item>
132 <item row="4" column="0" colspan="2" >
133 <widget class="QCheckBox" name="OverwriteTalk" >
134 <property name="text" >
135 <string>Overwrite Talkfiles</string>
136 </property>
137 <property name="checked" >
138 <bool>true</bool>
139 </property>
140 </widget>
141 </item>
142 <item row="1" column="0" colspan="2" >
143 <widget class="QCheckBox" name="talkFolders" >
144 <property name="text" >
145 <string>Generate .talk files for Folders</string>
146 </property>
147 <property name="checked" >
148 <bool>true</bool>
149 </property>
150 </widget>
151 </item>
152 <item row="0" column="0" colspan="2" >
153 <widget class="QCheckBox" name="talkFiles" >
154 <property name="text" >
155 <string>Generate .talk files for Files</string>
156 </property>
157 <property name="checked" >
158 <bool>true</bool>
159 </property>
160 <property name="tristate" >
161 <bool>false</bool>
162 </property>
163 </widget>
164 </item>
165 </layout>
166 <zorder>recursive</zorder>
167 <zorder>StripExtensions</zorder>
168 <zorder>OverwriteTalk</zorder>
169 <zorder>talkFolders</zorder>
170 <zorder>talkFiles</zorder>
171 <zorder>label_3</zorder>
172 <zorder>fileFilter</zorder>
173 </widget>
174 </item>
175 <item row="4" column="2" >
176 <spacer> 108 <spacer>
177 <property name="orientation" > 109 <property name="orientation">
178 <enum>Qt::Vertical</enum> 110 <enum>Qt::Vertical</enum>
179 </property> 111 </property>
180 <property name="sizeHint" stdset="0" > 112 <property name="sizeHint" stdset="0">
181 <size> 113 <size>
182 <width>20</width> 114 <width>20</width>
183 <height>40</height> 115 <height>40</height>
@@ -185,12 +117,12 @@
185 </property> 117 </property>
186 </spacer> 118 </spacer>
187 </item> 119 </item>
188 <item row="5" column="1" > 120 <item row="5" column="1">
189 <spacer> 121 <spacer>
190 <property name="orientation" > 122 <property name="orientation">
191 <enum>Qt::Horizontal</enum> 123 <enum>Qt::Horizontal</enum>
192 </property> 124 </property>
193 <property name="sizeHint" stdset="0" > 125 <property name="sizeHint" stdset="0">
194 <size> 126 <size>
195 <width>40</width> 127 <width>40</width>
196 <height>20</height> 128 <height>20</height>
@@ -198,48 +130,115 @@
198 </property> 130 </property>
199 </spacer> 131 </spacer>
200 </item> 132 </item>
201 <item row="5" column="2" colspan="2" > 133 <item row="5" column="2" colspan="2">
202 <layout class="QHBoxLayout" > 134 <layout class="QHBoxLayout">
203 <item> 135 <item>
204 <widget class="QPushButton" name="buttonOk" > 136 <widget class="QPushButton" name="buttonOk">
205 <property name="text" > 137 <property name="text">
206 <string>&amp;Install</string> 138 <string>&amp;Install</string>
207 </property> 139 </property>
208 <property name="icon" > 140 <property name="icon">
209 <iconset resource="rbutilqt.qrc" > 141 <iconset resource="rbutilqt.qrc">
210 <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset> 142 <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
211 </property> 143 </property>
212 </widget> 144 </widget>
213 </item> 145 </item>
214 <item> 146 <item>
215 <widget class="QPushButton" name="buttonCancel" > 147 <widget class="QPushButton" name="buttonCancel">
216 <property name="text" > 148 <property name="text">
217 <string>&amp;Cancel</string> 149 <string>&amp;Cancel</string>
218 </property> 150 </property>
219 <property name="icon" > 151 <property name="icon">
220 <iconset resource="rbutilqt.qrc" > 152 <iconset resource="rbutilqt.qrc">
221 <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset> 153 <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
222 </property> 154 </property>
223 </widget> 155 </widget>
224 </item> 156 </item>
225 </layout> 157 </layout>
226 </item> 158 </item>
159 <item row="3" column="1" colspan="3">
160 <widget class="QGroupBox" name="groupBox">
161 <property name="title">
162 <string>Generation options</string>
163 </property>
164 <layout class="QGridLayout" name="gridLayout">
165 <item row="2" column="1">
166 <widget class="QLineEdit" name="ignoreFiles"/>
167 </item>
168 <item row="2" column="0">
169 <widget class="QLabel" name="label_3">
170 <property name="text">
171 <string>Ignore files (comma seperated Wildcards):</string>
172 </property>
173 </widget>
174 </item>
175 <item row="0" column="0">
176 <widget class="QCheckBox" name="talkFiles">
177 <property name="text">
178 <string>Generate .talk files for Files</string>
179 </property>
180 <property name="checked">
181 <bool>true</bool>
182 </property>
183 <property name="tristate">
184 <bool>false</bool>
185 </property>
186 </widget>
187 </item>
188 <item row="4" column="0">
189 <widget class="QCheckBox" name="talkFolders">
190 <property name="text">
191 <string>Generate .talk files for Folders</string>
192 </property>
193 <property name="checked">
194 <bool>true</bool>
195 </property>
196 </widget>
197 </item>
198 <item row="5" column="0">
199 <widget class="QCheckBox" name="recursive">
200 <property name="text">
201 <string>Run recursive</string>
202 </property>
203 <property name="checked">
204 <bool>true</bool>
205 </property>
206 </widget>
207 </item>
208 <item row="6" column="0">
209 <widget class="QCheckBox" name="StripExtensions">
210 <property name="text">
211 <string>Strip Extensions</string>
212 </property>
213 <property name="checked">
214 <bool>false</bool>
215 </property>
216 </widget>
217 </item>
218 <item row="7" column="0">
219 <widget class="QCheckBox" name="OverwriteTalk">
220 <property name="text">
221 <string>Overwrite Talkfiles</string>
222 </property>
223 <property name="checked">
224 <bool>true</bool>
225 </property>
226 </widget>
227 </item>
228 </layout>
229 </widget>
230 </item>
227 </layout> 231 </layout>
228 </widget> 232 </widget>
229 <tabstops> 233 <tabstops>
230 <tabstop>lineTalkFolder</tabstop> 234 <tabstop>lineTalkFolder</tabstop>
231 <tabstop>buttonBrowse</tabstop> 235 <tabstop>buttonBrowse</tabstop>
232 <tabstop>change</tabstop> 236 <tabstop>change</tabstop>
233 <tabstop>talkFiles</tabstop>
234 <tabstop>talkFolders</tabstop>
235 <tabstop>recursive</tabstop>
236 <tabstop>StripExtensions</tabstop>
237 <tabstop>OverwriteTalk</tabstop>
238 <tabstop>buttonOk</tabstop> 237 <tabstop>buttonOk</tabstop>
239 <tabstop>buttonCancel</tabstop> 238 <tabstop>buttonCancel</tabstop>
240 </tabstops> 239 </tabstops>
241 <resources> 240 <resources>
242 <include location="rbutilqt.qrc" /> 241 <include location="rbutilqt.qrc"/>
243 </resources> 242 </resources>
244 <connections> 243 <connections>
245 <connection> 244 <connection>
@@ -248,11 +247,11 @@
248 <receiver>InstallTalkFrm</receiver> 247 <receiver>InstallTalkFrm</receiver>
249 <slot>accept()</slot> 248 <slot>accept()</slot>
250 <hints> 249 <hints>
251 <hint type="sourcelabel" > 250 <hint type="sourcelabel">
252 <x>472</x> 251 <x>472</x>
253 <y>418</y> 252 <y>418</y>
254 </hint> 253 </hint>
255 <hint type="destinationlabel" > 254 <hint type="destinationlabel">
256 <x>382</x> 255 <x>382</x>
257 <y>328</y> 256 <y>328</y>
258 </hint> 257 </hint>
@@ -264,11 +263,11 @@
264 <receiver>InstallTalkFrm</receiver> 263 <receiver>InstallTalkFrm</receiver>
265 <slot>reject()</slot> 264 <slot>reject()</slot>
266 <hints> 265 <hints>
267 <hint type="sourcelabel" > 266 <hint type="sourcelabel">
268 <x>561</x> 267 <x>561</x>
269 <y>428</y> 268 <y>428</y>
270 </hint> 269 </hint>
271 <hint type="destinationlabel" > 270 <hint type="destinationlabel">
272 <x>522</x> 271 <x>522</x>
273 <y>332</y> 272 <y>332</y>
274 </hint> 273 </hint>
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 40f96e724f..e8b2c292dd 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -108,6 +108,7 @@ void InstallTalkWindow::accept()
108 talkcreator->setStripExtensions(ui.StripExtensions->isChecked()); 108 talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
109 talkcreator->setTalkFolders(ui.talkFolders->isChecked()); 109 talkcreator->setTalkFolders(ui.talkFolders->isChecked());
110 talkcreator->setTalkFiles(ui.talkFiles->isChecked()); 110 talkcreator->setTalkFiles(ui.talkFiles->isChecked());
111 talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts));
111 112
112 connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished())); 113 connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished()));
113 connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); 114 connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-05 22:20:59 +0000