qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 16:22:47 +02:00
Code

qstardict: flite as default text-to-speech engine

Browse Source
This commit is contained in:
kyak 2011-05-27 10:40:04 +04:00
parent 11ff553937
commit 3051126e17
1 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
qstardict/patches/001-qstardict.patch
View File

@ -1,7 +1,8 @@
diff -ur qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp qstardict-0.13.1/plugins/stardict/dictziplib.cpp diff --git a/plugins/stardict/dictziplib.cpp b/plugins/stardict/dictziplib.cpp
--- qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp 2011-03-15 21:50:54.972060075 +0300 index 867e330..bb62a54 100644
+++ qstardict-0.13.1/plugins/stardict/dictziplib.cpp 2011-03-15 21:52:08.056059379 +0300 --- a/plugins/stardict/dictziplib.cpp
@@ -305,7 +305,7 @@ +++ b/plugins/stardict/dictziplib.cpp
@@ -305,7 +305,7 @@ bool dictData::open(const std::string& fname, int computeCRC)
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode)) if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode))
@ -10,10 +11,11 @@ diff -ur qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp qstardict-0.13.1/pl
if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG)) if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG))
#endif #endif
{ {
diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/keyboard.cpp diff --git a/qstardict/keyboard.cpp b/qstardict/keyboard.cpp
--- qstardict-0.13.1.or/qstardict/keyboard.cpp 2011-03-15 21:50:54.975059457 +0300 index cc6e406..5a6d514 100644
+++ qstardict-0.13.1/qstardict/keyboard.cpp 2011-03-15 21:51:35.430058700 +0300 --- a/qstardict/keyboard.cpp
@@ -82,7 +82,28 @@ +++ b/qstardict/keyboard.cpp
@@ -82,7 +82,28 @@ Qt::KeyboardModifiers Keyboard::activeModifiers()
} // namespace } // namespace
@ -43,9 +45,10 @@ diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/k
// vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc
diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.cpp diff --git a/qstardict/main.cpp b/qstardict/main.cpp
--- qstardict-0.13.1.or/qstardict/main.cpp 2011-03-15 21:50:54.974059661 +0300 index 8a13dc9..a726364 100644
+++ qstardict-0.13.1/qstardict/main.cpp 2011-03-15 21:51:35.430058700 +0300 --- a/qstardict/main.cpp
+++ b/qstardict/main.cpp
@@ -35,6 +35,10 @@ @@ -35,6 +35,10 @@
#include <QTranslator> #include <QTranslator>
#endif // QSTARDICT_WITH_TRANSLATIONS #endif // QSTARDICT_WITH_TRANSLATIONS
@ -57,7 +60,7 @@ diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QStarDict::Application app(argc, argv); QStarDict::Application app(argc, argv);
@@ -61,6 +65,9 @@ @@ -61,6 +65,9 @@ int main(int argc, char *argv[])
} }
#endif // Q_OS_WIN #endif // Q_OS_WIN
@ -67,10 +70,11 @@ diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.
return app.exec(); return app.exec();
} }
diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp diff --git a/qstardict/mainwindow.cpp b/qstardict/mainwindow.cpp
--- qstardict-0.13.1.or/qstardict/mainwindow.cpp 2011-03-15 21:50:54.975059457 +0300 index e8b9456..29ac486 100644
+++ qstardict-0.13.1/qstardict/mainwindow.cpp 2011-03-15 21:51:35.431060517 +0300 --- a/qstardict/mainwindow.cpp
@@ -93,7 +93,7 @@ +++ b/qstardict/mainwindow.cpp
@@ -93,7 +93,7 @@ void MainWindow::loadSettings()
setVisible(config.value("MainWindow/visible", true).toBool()); setVisible(config.value("MainWindow/visible", true).toBool());
wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool()); wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool());
wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect()); wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect());
@ -79,9 +83,10 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict
setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString()); setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString());
} }
diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui diff --git a/qstardict/mainwindow.ui b/qstardict/mainwindow.ui
--- qstardict-0.13.1.or/qstardict/mainwindow.ui 2011-03-15 21:50:54.975059457 +0300 index 68a37bf..fcabb84 100644
+++ qstardict-0.13.1/qstardict/mainwindow.ui 2011-03-15 21:51:35.431060517 +0300 --- a/qstardict/mainwindow.ui
+++ b/qstardict/mainwindow.ui
@@ -1,190 +1,241 @@ @@ -1,190 +1,241 @@
-<ui version="4.0" > -<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
@ -117,14 +122,6 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/
- <layout class="QGridLayout" > - <layout class="QGridLayout" >
- <property name="margin" > - <property name="margin" >
- <number>9</number> - <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <widget class="QWidget" name="centralwidget"> + <widget class="QWidget" name="centralwidget">
+ <property name="minimumSize"> + <property name="minimumSize">
+ <size> + <size>
@ -141,10 +138,16 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/
+ <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing"> + <property name="spacing">
+ <number>0</number> + <number>0</number>
+ </property> </property>
- <property name="spacing" >
- <number>6</number>
+ <property name="margin"> + <property name="margin">
+ <number>0</number> + <number>0</number>
+ </property> </property>
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item> + <item>
+ <layout class="QHBoxLayout"> + <layout class="QHBoxLayout">
+ <property name="spacing"> + <property name="spacing">
@ -467,9 +470,10 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/
<x>661</x> <x>661</x>
<y>51</y> <y>51</y>
</hint> </hint>
diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui diff --git a/qstardict/settingsdialog.ui b/qstardict/settingsdialog.ui
--- qstardict-0.13.1.or/qstardict/settingsdialog.ui 2011-03-15 21:50:54.975059457 +0300 index 357f15b..d08fbd5 100644
+++ qstardict-0.13.1/qstardict/settingsdialog.ui 2011-03-15 21:51:35.432063342 +0300 --- a/qstardict/settingsdialog.ui
+++ b/qstardict/settingsdialog.ui
@@ -1,84 +1,67 @@ @@ -1,84 +1,67 @@
-<ui version="4.0" > -<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
@ -1352,3 +1356,16 @@ diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstard
</hint> </hint>
</hints> </hints>
</connection> </connection>
diff --git a/qstardict/speaker.cpp b/qstardict/speaker.cpp
index ef31f03..723d4c8 100644
--- a/qstardict/speaker.cpp
+++ b/qstardict/speaker.cpp
@@ -29,7 +29,7 @@ Speaker::Speaker()
{
m_speechProcess = new QProcess;
QSettings settings;
- m_speechCmd = settings.value("Speaker/speechCmd", "festival --tts").toString();
+ m_speechCmd = settings.value("Speaker/speechCmd", "flite").toString();
}
Speaker::~Speaker()