qstardict/patches/001-qstardict.patch |
1 | | diff -ur qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp qstardict-0.13.1/plugins/stardict/dictziplib.cpp |
2 | | +++ qstardict-0.13.1/plugins/stardict/dictziplib.cpp 2011-03-15 21:52:08.056059379 +0300 |
3 | | @@ -305,7 +305,7 @@ |
| 1 | diff --git a/plugins/stardict/dictziplib.cpp b/plugins/stardict/dictziplib.cpp |
| 2 | index 867e330..bb62a54 100644 |
| 3 | --- a/plugins/stardict/dictziplib.cpp |
| 4 | @@ -305,7 +305,7 @@ bool dictData::open(const std::string& fname, int computeCRC) |
4 | 5 | |
5 | 6 | #ifdef Q_OS_UNIX |
6 | 7 | if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode)) |
... | ... | |
10 | 11 | if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG)) |
11 | 12 | #endif |
12 | 13 | { |
13 | | diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/keyboard.cpp |
14 | | +++ qstardict-0.13.1/qstardict/keyboard.cpp 2011-03-15 21:51:35.430058700 +0300 |
15 | | @@ -82,7 +82,28 @@ |
| 14 | diff --git a/qstardict/keyboard.cpp b/qstardict/keyboard.cpp |
| 15 | index cc6e406..5a6d514 100644 |
| 16 | --- a/qstardict/keyboard.cpp |
| 17 | @@ -82,7 +82,28 @@ Qt::KeyboardModifiers Keyboard::activeModifiers() |
16 | 18 | |
17 | 19 | } // namespace |
18 | 20 | |
... | ... | |
43 | 45 | |
44 | 46 | // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc |
45 | 47 | |
46 | | diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.cpp |
47 | | +++ qstardict-0.13.1/qstardict/main.cpp 2011-03-15 21:51:35.430058700 +0300 |
| 48 | diff --git a/qstardict/main.cpp b/qstardict/main.cpp |
| 49 | index 8a13dc9..a726364 100644 |
| 50 | --- a/qstardict/main.cpp |
48 | 51 | @@ -35,6 +35,10 @@ |
49 | 52 | #include <QTranslator> |
50 | 53 | #endif // QSTARDICT_WITH_TRANSLATIONS |
... | ... | |
57 | 60 | int main(int argc, char *argv[]) |
58 | 61 | { |
59 | 62 | QStarDict::Application app(argc, argv); |
60 | | @@ -61,6 +65,9 @@ |
| 63 | @@ -61,6 +65,9 @@ int main(int argc, char *argv[]) |
61 | 64 | } |
62 | 65 | #endif // Q_OS_WIN |
63 | 66 | |
... | ... | |
67 | 70 | |
68 | 71 | return app.exec(); |
69 | 72 | } |
70 | | diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp |
71 | | +++ qstardict-0.13.1/qstardict/mainwindow.cpp 2011-03-15 21:51:35.431060517 +0300 |
72 | | @@ -93,7 +93,7 @@ |
| 73 | diff --git a/qstardict/mainwindow.cpp b/qstardict/mainwindow.cpp |
| 74 | index e8b9456..29ac486 100644 |
| 75 | --- a/qstardict/mainwindow.cpp |
| 76 | @@ -93,7 +93,7 @@ void MainWindow::loadSettings() |
73 | 77 | setVisible(config.value("MainWindow/visible", true).toBool()); |
74 | 78 | wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool()); |
75 | 79 | wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect()); |
... | ... | |
79 | 83 | setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString()); |
80 | 84 | } |
81 | 85 | |
82 | | diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui |
83 | | +++ qstardict-0.13.1/qstardict/mainwindow.ui 2011-03-15 21:51:35.431060517 +0300 |
| 86 | diff --git a/qstardict/mainwindow.ui b/qstardict/mainwindow.ui |
| 87 | index 68a37bf..fcabb84 100644 |
| 88 | --- a/qstardict/mainwindow.ui |
84 | 89 | @@ -1,190 +1,241 @@ |
85 | 90 | -<ui version="4.0" > |
86 | 91 | +<?xml version="1.0" encoding="UTF-8"?> |
... | ... | |
117 | 122 | - <layout class="QGridLayout" > |
118 | 123 | - <property name="margin" > |
119 | 124 | - <number>9</number> |
120 | | - </property> |
121 | | - <property name="spacing" > |
122 | | - <number>6</number> |
123 | | - </property> |
124 | | - <item row="0" column="0" > |
125 | | - <layout class="QHBoxLayout" > |
126 | | - <property name="spacing" > |
127 | | - <number>6</number> |
128 | 125 | + <widget class="QWidget" name="centralwidget"> |
129 | 126 | + <property name="minimumSize"> |
130 | 127 | + <size> |
... | ... | |
141 | 138 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
142 | 139 | + <property name="spacing"> |
143 | 140 | + <number>0</number> |
144 | | + </property> |
| 141 | </property> |
| 142 | - <property name="spacing" > |
| 143 | - <number>6</number> |
145 | 144 | + <property name="margin"> |
146 | 145 | + <number>0</number> |
147 | | + </property> |
| 146 | </property> |
| 147 | - <item row="0" column="0" > |
| 148 | - <layout class="QHBoxLayout" > |
| 149 | - <property name="spacing" > |
| 150 | - <number>6</number> |
148 | 151 | + <item> |
149 | 152 | + <layout class="QHBoxLayout"> |
150 | 153 | + <property name="spacing"> |
... | ... | |
467 | 470 | <x>661</x> |
468 | 471 | <y>51</y> |
469 | 472 | </hint> |
470 | | diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui |
471 | | +++ qstardict-0.13.1/qstardict/settingsdialog.ui 2011-03-15 21:51:35.432063342 +0300 |
| 473 | diff --git a/qstardict/settingsdialog.ui b/qstardict/settingsdialog.ui |
| 474 | index 357f15b..d08fbd5 100644 |
| 475 | --- a/qstardict/settingsdialog.ui |
472 | 476 | @@ -1,84 +1,67 @@ |
473 | 477 | -<ui version="4.0" > |
474 | 478 | +<?xml version="1.0" encoding="UTF-8"?> |
... | ... | |
1352 | 1356 | </hint> |
1353 | 1357 | </hints> |
1354 | 1358 | </connection> |
| 1359 | diff --git a/qstardict/speaker.cpp b/qstardict/speaker.cpp |
| 1360 | index ef31f03..723d4c8 100644 |
| 1361 | --- a/qstardict/speaker.cpp |
| 1362 | @@ -29,7 +29,7 @@ Speaker::Speaker() |
| 1363 | { |
| 1364 | m_speechProcess = new QProcess; |
| 1365 | QSettings settings; |
| 1366 | - m_speechCmd = settings.value("Speaker/speechCmd", "festival --tts").toString(); |
| 1367 | + m_speechCmd = settings.value("Speaker/speechCmd", "flite").toString(); |
| 1368 | } |
| 1369 | |
| 1370 | Speaker::~Speaker() |