Root/qstardict/patches/001-qstardict.patch

1diff -ur qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp qstardict-0.13.1/plugins/stardict/dictziplib.cpp
2--- qstardict-0.13.1.or/plugins/stardict/dictziplib.cpp 2011-03-15 21:50:54.972060075 +0300
3+++ qstardict-0.13.1/plugins/stardict/dictziplib.cpp 2011-03-15 21:52:08.056059379 +0300
4@@ -305,7 +305,7 @@
5 
6 #ifdef Q_OS_UNIX
7     if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode))
8-#elif def Q_OS_WIN32
9+#elif defined Q_OS_WIN32
10     if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG))
11 #endif
12     {
13diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/keyboard.cpp
14--- qstardict-0.13.1.or/qstardict/keyboard.cpp 2011-03-15 21:50:54.975059457 +0300
15+++ qstardict-0.13.1/qstardict/keyboard.cpp 2011-03-15 21:51:35.430058700 +0300
16@@ -82,7 +82,28 @@
17 
18 } // namespace
19 
20-#endif // Q_WS_WIN
21+#elif defined(Q_WS_QWS) // Q_WS_WIN
22+
23+namespace
24+{
25+const unsigned mAlt = 0010;
26+const unsigned mCtrl = 0004;
27+const unsigned mShift = 0001;
28+const unsigned mWin = 0100;
29+}
30+
31+namespace QStarDict
32+{
33+
34+Qt::KeyboardModifiers Keyboard::activeModifiers()
35+{
36+ Qt::KeyboardModifiers result;
37+ return result;
38+}
39+
40+} // namespace
41+
42+#endif // Q_WS_QWS
43 
44 // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc
45 
46diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.cpp
47--- qstardict-0.13.1.or/qstardict/main.cpp 2011-03-15 21:50:54.974059661 +0300
48+++ qstardict-0.13.1/qstardict/main.cpp 2011-03-15 21:51:35.430058700 +0300
49@@ -35,6 +35,10 @@
50 #include <QTranslator>
51 #endif // QSTARDICT_WITH_TRANSLATIONS
52 
53+#ifdef Q_WS_QWS
54+#include <QtGui/QWSServer>
55+#endif
56+
57 int main(int argc, char *argv[])
58 {
59     QStarDict::Application app(argc, argv);
60@@ -61,6 +65,9 @@
61     }
62 #endif // Q_OS_WIN
63 
64+#ifdef Q_WS_QWS
65+ QWSServer::setCursorVisible(false);
66+#endif
67 
68     return app.exec();
69 }
70diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp
71--- qstardict-0.13.1.or/qstardict/mainwindow.cpp 2011-03-15 21:50:54.975059457 +0300
72+++ qstardict-0.13.1/qstardict/mainwindow.cpp 2011-03-15 21:51:35.431060517 +0300
73@@ -93,7 +93,7 @@
74     setVisible(config.value("MainWindow/visible", true).toBool());
75     wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool());
76     wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect());
77- setInstantSearch(config.value("MainWindow/instantSearch", true).toBool());
78+ setInstantSearch(config.value("MainWindow/instantSearch", false).toBool());
79     setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString());
80 }
81 
82diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui
83--- qstardict-0.13.1.or/qstardict/mainwindow.ui 2011-03-15 21:50:54.975059457 +0300
84+++ qstardict-0.13.1/qstardict/mainwindow.ui 2011-03-15 21:51:35.431060517 +0300
85@@ -1,190 +1,241 @@
86-<ui version="4.0" >
87+<?xml version="1.0" encoding="UTF-8"?>
88+<ui version="4.0">
89  <class>QStarDict::MainWindow</class>
90- <widget class="QMainWindow" name="QStarDict::MainWindow" >
91- <property name="geometry" >
92+ <widget class="QMainWindow" name="QStarDict::MainWindow">
93+ <property name="geometry">
94    <rect>
95     <x>0</x>
96     <y>0</y>
97- <width>742</width>
98- <height>511</height>
99+ <width>326</width>
100+ <height>240</height>
101    </rect>
102   </property>
103- <property name="windowTitle" >
104+ <property name="cursor">
105+ <cursorShape>BlankCursor</cursorShape>
106+ </property>
107+ <property name="windowTitle">
108    <string>QStarDict</string>
109   </property>
110- <property name="windowIcon" >
111- <iconset resource="pixmaps/pixmaps.qrc" >
112+ <property name="windowIcon">
113+ <iconset resource="pixmaps/pixmaps.qrc">
114     <normaloff>:/icons/qstardict.png</normaloff>:/icons/qstardict.png</iconset>
115   </property>
116- <widget class="QWidget" name="centralwidget" >
117- <layout class="QGridLayout" >
118- <property name="margin" >
119- <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+ <widget class="QWidget" name="centralwidget">
129+ <property name="minimumSize">
130+ <size>
131+ <width>214</width>
132+ <height>130</height>
133+ </size>
134+ </property>
135+ <property name="maximumSize">
136+ <size>
137+ <width>320</width>
138+ <height>240</height>
139+ </size>
140+ </property>
141+ <layout class="QVBoxLayout" name="verticalLayout_2">
142+ <property name="spacing">
143+ <number>0</number>
144+ </property>
145+ <property name="margin">
146+ <number>0</number>
147+ </property>
148+ <item>
149+ <layout class="QHBoxLayout">
150+ <property name="spacing">
151+ <number>0</number>
152       </property>
153- <property name="margin" >
154+ <property name="margin">
155        <number>0</number>
156       </property>
157       <item>
158- <widget class="QToolButton" name="searchClearButton" >
159- <property name="toolTip" >
160+ <widget class="QToolButton" name="searchClearButton">
161+ <property name="toolTip">
162          <string>Clear the search box</string>
163         </property>
164- <property name="text" >
165+ <property name="text">
166          <string>Clear</string>
167         </property>
168- <property name="icon" >
169- <iconset resource="pixmaps/pixmaps.qrc" >
170+ <property name="icon">
171+ <iconset resource="pixmaps/pixmaps.qrc">
172           <normaloff>:/icons/clear-right.png</normaloff>:/icons/clear-right.png</iconset>
173         </property>
174- <property name="toolButtonStyle" >
175+ <property name="toolButtonStyle">
176          <enum>Qt::ToolButtonIconOnly</enum>
177         </property>
178        </widget>
179       </item>
180       <item>
181- <widget class="QLineEdit" name="searchBox" />
182+ <widget class="QLineEdit" name="searchBox"/>
183       </item>
184       <item>
185- <widget class="QToolButton" name="queryButton" >
186- <property name="toolTip" >
187+ <widget class="QToolButton" name="queryButton">
188+ <property name="toolTip">
189          <string>Fuzzy query</string>
190         </property>
191- <property name="text" >
192+ <property name="text">
193          <string>Search</string>
194         </property>
195- <property name="icon" >
196- <iconset resource="pixmaps/pixmaps.qrc" >
197+ <property name="icon">
198+ <iconset resource="pixmaps/pixmaps.qrc">
199           <normaloff>:/icons/search-filter.png</normaloff>:/icons/search-filter.png</iconset>
200         </property>
201- <property name="toolButtonStyle" >
202+ <property name="toolButtonStyle">
203          <enum>Qt::ToolButtonTextBesideIcon</enum>
204         </property>
205        </widget>
206       </item>
207      </layout>
208     </item>
209- <item row="1" column="0" >
210- <widget class="DictWidget" native="1" name="translationView" />
211+ <item>
212+ <widget class="DictWidget" name="translationView" native="true"/>
213     </item>
214    </layout>
215   </widget>
216- <widget class="QDockWidget" name="wordsListDock" >
217- <property name="features" >
218- <set>QDockWidget::AllDockWidgetFeatures</set>
219+ <widget class="QDockWidget" name="wordsListDock">
220+ <property name="minimumSize">
221+ <size>
222+ <width>100</width>
223+ <height>155</height>
224+ </size>
225+ </property>
226+ <property name="maximumSize">
227+ <size>
228+ <width>100</width>
229+ <height>240</height>
230+ </size>
231    </property>
232- <property name="allowedAreas" >
233+ <property name="features">
234+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
235+ </property>
236+ <property name="allowedAreas">
237     <set>Qt::NoDockWidgetArea</set>
238    </property>
239- <property name="windowTitle" >
240+ <property name="windowTitle">
241     <string>Words list</string>
242    </property>
243- <attribute name="dockWidgetArea" >
244+ <attribute name="dockWidgetArea">
245     <number>1</number>
246    </attribute>
247- <widget class="QWidget" name="dockWidgetContents" >
248- <layout class="QGridLayout" >
249- <property name="margin" >
250- <number>9</number>
251+ <widget class="QWidget" name="dockWidgetContents">
252+ <property name="minimumSize">
253+ <size>
254+ <width>100</width>
255+ <height>130</height>
256+ </size>
257+ </property>
258+ <property name="maximumSize">
259+ <size>
260+ <width>100</width>
261+ <height>240</height>
262+ </size>
263+ </property>
264+ <widget class="QListWidget" name="wordsList">
265+ <property name="geometry">
266+ <rect>
267+ <x>0</x>
268+ <y>5</y>
269+ <width>100</width>
270+ <height>190</height>
271+ </rect>
272+ </property>
273+ <property name="minimumSize">
274+ <size>
275+ <width>100</width>
276+ <height>130</height>
277+ </size>
278      </property>
279- <property name="spacing" >
280- <number>6</number>
281+ <property name="maximumSize">
282+ <size>
283+ <width>100</width>
284+ <height>240</height>
285+ </size>
286      </property>
287- <item row="0" column="0" >
288- <widget class="QListWidget" name="wordsList" />
289- </item>
290- </layout>
291+ </widget>
292    </widget>
293   </widget>
294- <widget class="QMenuBar" name="menubar" >
295- <property name="geometry" >
296+ <widget class="QMenuBar" name="menubar">
297+ <property name="geometry">
298     <rect>
299      <x>0</x>
300      <y>0</y>
301- <width>742</width>
302- <height>22</height>
303+ <width>326</width>
304+ <height>27</height>
305     </rect>
306    </property>
307- <widget class="QMenu" name="menu_File" >
308- <property name="title" >
309+ <widget class="QMenu" name="menu_File">
310+ <property name="title">
311      <string>&amp;File</string>
312     </property>
313- <addaction name="actionQuit" />
314+ <addaction name="actionQuit"/>
315    </widget>
316- <widget class="QMenu" name="menuHelp" >
317- <property name="title" >
318+ <widget class="QMenu" name="menuHelp">
319+ <property name="title">
320      <string>&amp;Help</string>
321     </property>
322- <addaction name="actionHelp" />
323- <addaction name="actionAbout" />
324- <addaction name="actionAboutQt" />
325+ <addaction name="actionHelp"/>
326+ <addaction name="actionAbout"/>
327+ <addaction name="actionAboutQt"/>
328    </widget>
329- <widget class="QMenu" name="menu_Options" >
330- <property name="title" >
331+ <widget class="QMenu" name="menu_Options">
332+ <property name="title">
333      <string>&amp;Settings</string>
334     </property>
335- <addaction name="actionScan" />
336- <addaction name="actionSettings" />
337+ <addaction name="actionScan"/>
338+ <addaction name="actionSettings"/>
339    </widget>
340- <addaction name="menu_File" />
341- <addaction name="menu_Options" />
342- <addaction name="menuHelp" />
343+ <addaction name="menu_File"/>
344+ <addaction name="menu_Options"/>
345+ <addaction name="menuHelp"/>
346   </widget>
347- <action name="actionQuit" >
348- <property name="icon" >
349- <iconset resource="pixmaps/pixmaps.qrc" >
350+ <action name="actionQuit">
351+ <property name="icon">
352+ <iconset resource="pixmaps/pixmaps.qrc">
353      <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset>
354    </property>
355- <property name="text" >
356+ <property name="text">
357     <string>&amp;Quit</string>
358    </property>
359- <property name="shortcut" >
360+ <property name="shortcut">
361     <string>Ctrl+Q</string>
362    </property>
363   </action>
364- <action name="actionAbout" >
365- <property name="text" >
366+ <action name="actionAbout">
367+ <property name="text">
368     <string>&amp;About</string>
369    </property>
370   </action>
371- <action name="actionAboutQt" >
372- <property name="text" >
373+ <action name="actionAboutQt">
374+ <property name="text">
375     <string>About &amp;Qt</string>
376    </property>
377   </action>
378- <action name="actionSettings" >
379- <property name="icon" >
380- <iconset resource="pixmaps/pixmaps.qrc" >
381+ <action name="actionSettings">
382+ <property name="icon">
383+ <iconset resource="pixmaps/pixmaps.qrc">
384      <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
385    </property>
386- <property name="text" >
387+ <property name="text">
388     <string>&amp;Configure QStarDict</string>
389    </property>
390   </action>
391- <action name="actionScan" >
392- <property name="checkable" >
393+ <action name="actionScan">
394+ <property name="checkable">
395     <bool>true</bool>
396    </property>
397- <property name="text" >
398+ <property name="text">
399     <string>&amp;Scan</string>
400    </property>
401   </action>
402- <action name="actionHelp" >
403- <property name="icon" >
404- <iconset resource="pixmaps/pixmaps.qrc" >
405+ <action name="actionHelp">
406+ <property name="icon">
407+ <iconset resource="pixmaps/pixmaps.qrc">
408      <normaloff>:/icons/help-contents.png</normaloff>:/icons/help-contents.png</iconset>
409    </property>
410- <property name="text" >
411+ <property name="text">
412     <string>QStarDict &amp;Help</string>
413    </property>
414- <property name="shortcut" >
415+ <property name="shortcut">
416     <string>F1</string>
417    </property>
418   </action>
419@@ -203,7 +254,7 @@
420   <tabstop>searchClearButton</tabstop>
421  </tabstops>
422  <resources>
423- <include location="pixmaps/pixmaps.qrc" />
424+ <include location="pixmaps/pixmaps.qrc"/>
425  </resources>
426  <connections>
427   <connection>
428@@ -212,11 +263,11 @@
429    <receiver>searchBox</receiver>
430    <slot>clear()</slot>
431    <hints>
432- <hint type="sourcelabel" >
433+ <hint type="sourcelabel">
434      <x>315</x>
435      <y>59</y>
436     </hint>
437- <hint type="destinationlabel" >
438+ <hint type="destinationlabel">
439      <x>647</x>
440      <y>61</y>
441     </hint>
442@@ -228,11 +279,11 @@
443    <receiver>searchBox</receiver>
444    <slot>setFocus()</slot>
445    <hints>
446- <hint type="sourcelabel" >
447+ <hint type="sourcelabel">
448      <x>315</x>
449      <y>59</y>
450     </hint>
451- <hint type="destinationlabel" >
452+ <hint type="destinationlabel">
453      <x>647</x>
454      <y>61</y>
455     </hint>
456@@ -244,11 +295,11 @@
457    <receiver>queryButton</receiver>
458    <slot>click()</slot>
459    <hints>
460- <hint type="sourcelabel" >
461+ <hint type="sourcelabel">
462      <x>438</x>
463      <y>50</y>
464     </hint>
465- <hint type="destinationlabel" >
466+ <hint type="destinationlabel">
467      <x>661</x>
468      <y>51</y>
469     </hint>
470diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui
471--- qstardict-0.13.1.or/qstardict/settingsdialog.ui 2011-03-15 21:50:54.975059457 +0300
472+++ qstardict-0.13.1/qstardict/settingsdialog.ui 2011-03-15 21:51:35.432063342 +0300
473@@ -1,84 +1,67 @@
474-<ui version="4.0" >
475+<?xml version="1.0" encoding="UTF-8"?>
476+<ui version="4.0">
477  <class>QStarDict::SettingsDialog</class>
478- <widget class="QDialog" name="QStarDict::SettingsDialog" >
479- <property name="geometry" >
480+ <widget class="QDialog" name="QStarDict::SettingsDialog">
481+ <property name="geometry">
482    <rect>
483     <x>0</x>
484     <y>0</y>
485- <width>463</width>
486- <height>498</height>
487+ <width>320</width>
488+ <height>240</height>
489    </rect>
490   </property>
491- <property name="windowTitle" >
492+ <property name="sizePolicy">
493+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
494+ <horstretch>0</horstretch>
495+ <verstretch>0</verstretch>
496+ </sizepolicy>
497+ </property>
498+ <property name="cursor">
499+ <cursorShape>BlankCursor</cursorShape>
500+ </property>
501+ <property name="windowTitle">
502    <string>QStarDict Settings</string>
503   </property>
504- <property name="toolTip" >
505+ <property name="toolTip">
506    <string/>
507   </property>
508- <layout class="QGridLayout" >
509- <property name="margin" >
510- <number>9</number>
511- </property>
512- <property name="spacing" >
513- <number>6</number>
514- </property>
515- <item row="1" column="0" >
516- <widget class="QDialogButtonBox" name="buttonBox" >
517- <property name="orientation" >
518- <enum>Qt::Horizontal</enum>
519- </property>
520- <property name="standardButtons" >
521- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
522- </property>
523- <property name="centerButtons" >
524- <bool>false</bool>
525- </property>
526- </widget>
527- </item>
528- <item row="0" column="0" >
529- <widget class="QTabWidget" name="tabWidget" >
530- <property name="currentIndex" >
531+ <layout class="QGridLayout" name="gridLayout">
532+ <item row="0" column="0">
533+ <widget class="QTabWidget" name="tabWidget">
534+ <property name="currentIndex">
535       <number>0</number>
536      </property>
537- <widget class="QWidget" name="tabGlobalSettings" >
538- <property name="geometry" >
539- <rect>
540- <x>0</x>
541- <y>0</y>
542- <width>441</width>
543- <height>414</height>
544- </rect>
545- </property>
546- <attribute name="title" >
547+ <widget class="QWidget" name="tabGlobalSettings">
548+ <attribute name="title">
549        <string>Global settings</string>
550       </attribute>
551- <layout class="QVBoxLayout" >
552+ <layout class="QVBoxLayout">
553        <item>
554- <widget class="QCheckBox" name="instantSearchBox" >
555- <property name="text" >
556+ <widget class="QCheckBox" name="instantSearchBox">
557+ <property name="text">
558           <string>Instant search</string>
559          </property>
560         </widget>
561        </item>
562        <item>
563- <layout class="QHBoxLayout" >
564- <property name="spacing" >
565+ <layout class="QVBoxLayout" name="verticalLayout_2">
566+ <property name="spacing">
567           <number>6</number>
568          </property>
569- <property name="margin" >
570+ <property name="margin">
571           <number>0</number>
572          </property>
573          <item>
574- <widget class="QLabel" name="label_7" >
575- <property name="text" >
576+ <widget class="QLabel" name="label_7">
577+ <property name="text">
578             <string>Pronounce words using this command:</string>
579            </property>
580           </widget>
581          </item>
582          <item>
583- <widget class="QLineEdit" name="speechCmdEdit" >
584- <property name="toolTip" >
585- <string>Enter cmd for the speaching program.&lt;br>If cmd contains "%s" it will be replaced to word, else word will be writen to stdin of speech process.</string>
586+ <widget class="QLineEdit" name="speechCmdEdit">
587+ <property name="toolTip">
588+ <string>Enter cmd for the speaching program.&lt;br&gt;If cmd contains &quot;%s&quot; it will be replaced to word, else word will be writen to stdin of speech process.</string>
589            </property>
590           </widget>
591          </item>
592@@ -86,104 +69,96 @@
593        </item>
594        <item>
595         <spacer>
596- <property name="orientation" >
597+ <property name="orientation">
598           <enum>Qt::Vertical</enum>
599          </property>
600- <property name="sizeHint" stdset="0" >
601+ <property name="sizeHint" stdset="0">
602           <size>
603- <width>369</width>
604- <height>171</height>
605+ <width>320</width>
606+ <height>240</height>
607           </size>
608          </property>
609         </spacer>
610        </item>
611       </layout>
612      </widget>
613- <widget class="QWidget" name="tabDictionaries" >
614- <property name="geometry" >
615- <rect>
616- <x>0</x>
617- <y>0</y>
618- <width>441</width>
619- <height>414</height>
620- </rect>
621- </property>
622- <attribute name="title" >
623+ <widget class="QWidget" name="tabDictionaries">
624+ <attribute name="title">
625        <string>Dictionaries</string>
626       </attribute>
627- <layout class="QVBoxLayout" >
628+ <layout class="QVBoxLayout">
629        <item>
630- <widget class="QGroupBox" name="groupBox_3" >
631- <property name="title" >
632+ <widget class="QGroupBox" name="groupBox_3">
633+ <property name="title">
634           <string>Dictionaries</string>
635          </property>
636- <layout class="QVBoxLayout" >
637+ <layout class="QVBoxLayout">
638           <item>
639- <widget class="QTableView" name="dictsTableView" >
640- <property name="editTriggers" >
641+ <widget class="QTableView" name="dictsTableView">
642+ <property name="editTriggers">
643              <set>QAbstractItemView::NoEditTriggers</set>
644             </property>
645- <property name="selectionMode" >
646+ <property name="selectionMode">
647              <enum>QAbstractItemView::SingleSelection</enum>
648             </property>
649- <property name="selectionBehavior" >
650+ <property name="selectionBehavior">
651              <enum>QAbstractItemView::SelectRows</enum>
652             </property>
653- <property name="showGrid" >
654+ <property name="showGrid">
655              <bool>false</bool>
656             </property>
657            </widget>
658           </item>
659           <item>
660- <layout class="QHBoxLayout" >
661+ <layout class="QHBoxLayout">
662             <item>
663- <widget class="QToolButton" name="dictsMoveUpButton" >
664- <property name="toolTip" >
665+ <widget class="QToolButton" name="dictsMoveUpButton">
666+ <property name="toolTip">
667                <string>Move up</string>
668               </property>
669- <property name="text" >
670+ <property name="text">
671                <string>Up</string>
672               </property>
673- <property name="icon" >
674- <iconset resource="pixmaps/pixmaps.qrc" >
675+ <property name="icon">
676+ <iconset resource="../plugins/stardict/pixmaps/pixmaps.qrc">
677                 <normaloff>:/icons/arrow-up.png</normaloff>:/icons/arrow-up.png</iconset>
678               </property>
679              </widget>
680             </item>
681             <item>
682- <widget class="QToolButton" name="dictsMoveDownButton" >
683- <property name="toolTip" >
684+ <widget class="QToolButton" name="dictsMoveDownButton">
685+ <property name="toolTip">
686                <string>Move down</string>
687               </property>
688- <property name="text" >
689+ <property name="text">
690                <string>Down</string>
691               </property>
692- <property name="icon" >
693- <iconset resource="pixmaps/pixmaps.qrc" >
694+ <property name="icon">
695+ <iconset resource="../plugins/stardict/pixmaps/pixmaps.qrc">
696                 <normaloff>:/icons/arrow-down.png</normaloff>:/icons/arrow-down.png</iconset>
697               </property>
698              </widget>
699             </item>
700             <item>
701- <widget class="QToolButton" name="dictsShowInfoButton" >
702- <property name="toolTip" >
703+ <widget class="QToolButton" name="dictsShowInfoButton">
704+ <property name="toolTip">
705                <string>Show information about dictionary</string>
706               </property>
707- <property name="text" >
708+ <property name="text">
709                <string>Show info</string>
710               </property>
711- <property name="icon" >
712- <iconset resource="pixmaps/pixmaps.qrc" >
713+ <property name="icon">
714+ <iconset resource="pixmaps/pixmaps.qrc">
715                 <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset>
716               </property>
717              </widget>
718             </item>
719             <item>
720              <spacer>
721- <property name="orientation" >
722+ <property name="orientation">
723                <enum>Qt::Horizontal</enum>
724               </property>
725- <property name="sizeHint" stdset="0" >
726+ <property name="sizeHint" stdset="0">
727                <size>
728                 <width>40</width>
729                 <height>20</height>
730@@ -196,73 +171,80 @@
731          </layout>
732         </widget>
733        </item>
734+ </layout>
735+ </widget>
736+ <widget class="QWidget" name="tabPlugins">
737+ <attribute name="title">
738+ <string>Plugins</string>
739+ </attribute>
740+ <layout class="QVBoxLayout" name="verticalLayout">
741        <item>
742- <widget class="QGroupBox" name="groupBox_4" >
743- <property name="maximumSize" >
744+ <widget class="QGroupBox" name="groupBox_5">
745+ <property name="maximumSize">
746           <size>
747            <width>16777215</width>
748- <height>196</height>
749+ <height>16777215</height>
750           </size>
751          </property>
752- <property name="title" >
753+ <property name="title">
754           <string>Plugins</string>
755          </property>
756- <property name="alignment" >
757+ <property name="alignment">
758           <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
759          </property>
760- <layout class="QVBoxLayout" >
761+ <layout class="QVBoxLayout" name="_2">
762           <item>
763- <widget class="QTableView" name="pluginsTableView" >
764- <property name="editTriggers" >
765+ <widget class="QTableView" name="pluginsTableView">
766+ <property name="editTriggers">
767              <set>QAbstractItemView::NoEditTriggers</set>
768             </property>
769- <property name="selectionMode" >
770+ <property name="selectionMode">
771              <enum>QAbstractItemView::SingleSelection</enum>
772             </property>
773- <property name="selectionBehavior" >
774+ <property name="selectionBehavior">
775              <enum>QAbstractItemView::SelectRows</enum>
776             </property>
777- <property name="showGrid" >
778+ <property name="showGrid">
779              <bool>false</bool>
780             </property>
781            </widget>
782           </item>
783           <item>
784- <layout class="QHBoxLayout" >
785+ <layout class="QHBoxLayout" name="_3">
786             <item>
787- <widget class="QToolButton" name="pluginsShowInfoButton" >
788- <property name="toolTip" >
789+ <widget class="QToolButton" name="pluginsShowInfoButton">
790+ <property name="toolTip">
791                <string>Show information about plugin</string>
792               </property>
793- <property name="text" >
794+ <property name="text">
795                <string>Info</string>
796               </property>
797- <property name="icon" >
798- <iconset resource="pixmaps/pixmaps.qrc" >
799+ <property name="icon">
800+ <iconset resource="pixmaps/pixmaps.qrc">
801                 <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset>
802               </property>
803              </widget>
804             </item>
805             <item>
806- <widget class="QToolButton" name="pluginsConfigureButton" >
807- <property name="toolTip" >
808+ <widget class="QToolButton" name="pluginsConfigureButton">
809+ <property name="toolTip">
810                <string>Configure plugin</string>
811               </property>
812- <property name="text" >
813+ <property name="text">
814                <string>Configure</string>
815               </property>
816- <property name="icon" >
817- <iconset resource="pixmaps/pixmaps.qrc" >
818+ <property name="icon">
819+ <iconset resource="pixmaps/pixmaps.qrc">
820                 <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
821               </property>
822              </widget>
823             </item>
824             <item>
825              <spacer>
826- <property name="orientation" >
827+ <property name="orientation">
828                <enum>Qt::Horizontal</enum>
829               </property>
830- <property name="sizeHint" stdset="0" >
831+ <property name="sizeHint" stdset="0">
832                <size>
833                 <width>40</width>
834                 <height>20</height>
835@@ -277,136 +259,128 @@
836        </item>
837       </layout>
838      </widget>
839- <widget class="QWidget" name="tabPopupWindow" >
840- <property name="geometry" >
841- <rect>
842- <x>0</x>
843- <y>0</y>
844- <width>640</width>
845- <height>409</height>
846- </rect>
847- </property>
848- <attribute name="title" >
849- <string>Popup window</string>
850+ <widget class="QWidget" name="tabPopupWindow">
851+ <attribute name="title">
852+ <string>Behaviour</string>
853       </attribute>
854- <layout class="QGridLayout" >
855- <property name="margin" >
856+ <layout class="QGridLayout">
857+ <property name="margin">
858         <number>9</number>
859        </property>
860- <property name="spacing" >
861+ <property name="spacing">
862         <number>6</number>
863        </property>
864- <item row="0" column="0" >
865- <widget class="QGroupBox" name="groupBox" >
866- <property name="title" >
867+ <item row="0" column="0">
868+ <widget class="QGroupBox" name="groupBox">
869+ <property name="title">
870           <string>Behavior</string>
871          </property>
872- <layout class="QGridLayout" >
873- <property name="margin" >
874+ <layout class="QGridLayout">
875+ <property name="margin">
876            <number>9</number>
877           </property>
878- <property name="spacing" >
879+ <property name="spacing">
880            <number>6</number>
881           </property>
882- <item row="4" column="0" >
883- <layout class="QVBoxLayout" >
884- <property name="spacing" >
885+ <item row="4" column="0">
886+ <layout class="QVBoxLayout">
887+ <property name="spacing">
888              <number>6</number>
889             </property>
890- <property name="margin" >
891+ <property name="margin">
892              <number>0</number>
893             </property>
894             <item>
895- <widget class="QCheckBox" name="pronounceWordBox" >
896- <property name="text" >
897+ <widget class="QCheckBox" name="pronounceWordBox">
898+ <property name="text">
899                <string>Pronounce the word</string>
900               </property>
901              </widget>
902             </item>
903            </layout>
904           </item>
905- <item row="3" column="0" >
906- <layout class="QHBoxLayout" >
907- <property name="spacing" >
908+ <item row="3" column="0">
909+ <layout class="QHBoxLayout">
910+ <property name="spacing">
911              <number>6</number>
912             </property>
913- <property name="margin" >
914+ <property name="margin">
915              <number>0</number>
916             </property>
917             <item>
918- <widget class="QLabel" name="label_4" >
919- <property name="text" >
920+ <widget class="QLabel" name="label_4">
921+ <property name="text">
922                <string>Timeout before hide after mouse over</string>
923               </property>
924              </widget>
925             </item>
926             <item>
927- <widget class="QDoubleSpinBox" name="timeoutBeforeHideSpin" >
928- <property name="specialValueText" >
929+ <widget class="QDoubleSpinBox" name="timeoutBeforeHideSpin">
930+ <property name="specialValueText">
931                <string>Don't hide</string>
932               </property>
933- <property name="suffix" >
934+ <property name="suffix">
935                <string> sec</string>
936               </property>
937- <property name="decimals" >
938+ <property name="decimals">
939                <number>1</number>
940               </property>
941- <property name="minimum" >
942+ <property name="minimum">
943                <double>0.000000000000000</double>
944               </property>
945- <property name="maximum" >
946+ <property name="maximum">
947                <double>10.000000000000000</double>
948               </property>
949- <property name="singleStep" >
950+ <property name="singleStep">
951                <double>0.100000000000000</double>
952               </property>
953- <property name="value" >
954+ <property name="value">
955                <double>0.500000000000000</double>
956               </property>
957              </widget>
958             </item>
959            </layout>
960           </item>
961- <item row="2" column="0" >
962- <layout class="QHBoxLayout" >
963- <property name="spacing" >
964+ <item row="2" column="0">
965+ <layout class="QHBoxLayout">
966+ <property name="spacing">
967              <number>6</number>
968             </property>
969- <property name="margin" >
970+ <property name="margin">
971              <number>0</number>
972             </property>
973             <item>
974- <widget class="QCheckBox" name="useScanModifierBox" >
975- <property name="enabled" >
976+ <widget class="QCheckBox" name="useScanModifierBox">
977+ <property name="enabled">
978                <bool>true</bool>
979               </property>
980- <property name="text" >
981+ <property name="text">
982                <string>Show only if modifier pressed</string>
983               </property>
984              </widget>
985             </item>
986             <item>
987- <widget class="QComboBox" name="modifierKeyBox" >
988- <property name="enabled" >
989+ <widget class="QComboBox" name="modifierKeyBox">
990+ <property name="enabled">
991                <bool>false</bool>
992               </property>
993               <item>
994- <property name="text" >
995+ <property name="text">
996                 <string>Alt</string>
997                </property>
998               </item>
999               <item>
1000- <property name="text" >
1001+ <property name="text">
1002                 <string>Control</string>
1003                </property>
1004               </item>
1005               <item>
1006- <property name="text" >
1007+ <property name="text">
1008                 <string>Shift</string>
1009                </property>
1010               </item>
1011               <item>
1012- <property name="text" >
1013+ <property name="text">
1014                 <string>Win</string>
1015                </property>
1016               </item>
1017@@ -414,19 +388,19 @@
1018             </item>
1019            </layout>
1020           </item>
1021- <item row="0" column="0" >
1022- <widget class="QCheckBox" name="useScanBox" >
1023- <property name="text" >
1024+ <item row="0" column="0">
1025+ <widget class="QCheckBox" name="useScanBox">
1026+ <property name="text">
1027              <string>Scan selection</string>
1028             </property>
1029- <property name="checked" >
1030+ <property name="checked">
1031              <bool>true</bool>
1032             </property>
1033            </widget>
1034           </item>
1035- <item row="1" column="0" >
1036- <widget class="QCheckBox" name="showIfNotFoundBox" >
1037- <property name="text" >
1038+ <item row="1" column="0">
1039+ <widget class="QCheckBox" name="showIfNotFoundBox">
1040+ <property name="text">
1041              <string>Show if word not found</string>
1042             </property>
1043            </widget>
1044@@ -434,108 +408,128 @@
1045          </layout>
1046         </widget>
1047        </item>
1048- <item row="1" column="0" >
1049- <widget class="QGroupBox" name="groupBox_2" >
1050- <property name="title" >
1051- <string>Apperance</string>
1052+ <item row="1" column="0">
1053+ <spacer>
1054+ <property name="orientation">
1055+ <enum>Qt::Vertical</enum>
1056+ </property>
1057+ <property name="sizeHint" stdset="0">
1058+ <size>
1059+ <width>20</width>
1060+ <height>101</height>
1061+ </size>
1062          </property>
1063- <layout class="QGridLayout" >
1064- <property name="margin" >
1065+ </spacer>
1066+ </item>
1067+ </layout>
1068+ </widget>
1069+ <widget class="QWidget" name="tabAppearance">
1070+ <attribute name="title">
1071+ <string>View</string>
1072+ </attribute>
1073+ <layout class="QVBoxLayout" name="verticalLayout_3">
1074+ <item>
1075+ <widget class="QGroupBox" name="groupBox_4">
1076+ <property name="title">
1077+ <string>View</string>
1078+ </property>
1079+ <layout class="QGridLayout" name="_4">
1080+ <property name="margin">
1081            <number>9</number>
1082           </property>
1083- <property name="spacing" >
1084+ <property name="spacing">
1085            <number>6</number>
1086           </property>
1087- <item row="2" column="0" >
1088- <layout class="QHBoxLayout" >
1089- <property name="spacing" >
1090+ <item row="2" column="0">
1091+ <layout class="QHBoxLayout" name="_5">
1092+ <property name="spacing">
1093              <number>6</number>
1094             </property>
1095- <property name="margin" >
1096+ <property name="margin">
1097              <number>0</number>
1098             </property>
1099             <item>
1100- <widget class="QLabel" name="label_3" >
1101- <property name="text" >
1102+ <widget class="QLabel" name="label_8">
1103+ <property name="text">
1104                <string>Opacity</string>
1105               </property>
1106              </widget>
1107             </item>
1108             <item>
1109- <widget class="QSpinBox" name="popupOpacitySpin" >
1110- <property name="suffix" >
1111+ <widget class="QSpinBox" name="popupOpacitySpin">
1112+ <property name="suffix">
1113                <string>%</string>
1114               </property>
1115- <property name="prefix" >
1116+ <property name="prefix">
1117                <string/>
1118               </property>
1119- <property name="minimum" >
1120+ <property name="minimum">
1121                <number>1</number>
1122               </property>
1123- <property name="maximum" >
1124+ <property name="maximum">
1125                <number>100</number>
1126               </property>
1127- <property name="value" >
1128+ <property name="value">
1129                <number>100</number>
1130               </property>
1131              </widget>
1132             </item>
1133            </layout>
1134           </item>
1135- <item row="0" column="0" >
1136- <layout class="QHBoxLayout" >
1137- <property name="spacing" >
1138+ <item row="0" column="0">
1139+ <layout class="QHBoxLayout" name="_6">
1140+ <property name="spacing">
1141              <number>6</number>
1142             </property>
1143- <property name="margin" >
1144+ <property name="margin">
1145              <number>0</number>
1146             </property>
1147             <item>
1148- <widget class="QLabel" name="label_5" >
1149- <property name="text" >
1150+ <widget class="QLabel" name="label_9">
1151+ <property name="text">
1152                <string>Default width</string>
1153               </property>
1154              </widget>
1155             </item>
1156             <item>
1157- <widget class="QSpinBox" name="popupDefaultWidthSpin" >
1158- <property name="minimum" >
1159+ <widget class="QSpinBox" name="popupDefaultWidthSpin">
1160+ <property name="minimum">
1161                <number>96</number>
1162               </property>
1163- <property name="maximum" >
1164+ <property name="maximum">
1165                <number>9999</number>
1166               </property>
1167- <property name="value" >
1168+ <property name="value">
1169                <number>320</number>
1170               </property>
1171              </widget>
1172             </item>
1173            </layout>
1174           </item>
1175- <item row="1" column="0" >
1176- <layout class="QHBoxLayout" >
1177- <property name="spacing" >
1178+ <item row="1" column="0">
1179+ <layout class="QHBoxLayout" name="_7">
1180+ <property name="spacing">
1181              <number>6</number>
1182             </property>
1183- <property name="margin" >
1184+ <property name="margin">
1185              <number>0</number>
1186             </property>
1187             <item>
1188- <widget class="QLabel" name="label_6" >
1189- <property name="text" >
1190+ <widget class="QLabel" name="label_10">
1191+ <property name="text">
1192                <string>Default height</string>
1193               </property>
1194              </widget>
1195             </item>
1196             <item>
1197- <widget class="QSpinBox" name="popupDefaultHeightSpin" >
1198- <property name="minimum" >
1199+ <widget class="QSpinBox" name="popupDefaultHeightSpin">
1200+ <property name="minimum">
1201                <number>96</number>
1202               </property>
1203- <property name="maximum" >
1204+ <property name="maximum">
1205                <number>9999</number>
1206               </property>
1207- <property name="value" >
1208+ <property name="value">
1209                <number>240</number>
1210               </property>
1211              </widget>
1212@@ -545,41 +539,40 @@
1213          </layout>
1214         </widget>
1215        </item>
1216- <item row="2" column="0" >
1217- <spacer>
1218- <property name="orientation" >
1219- <enum>Qt::Vertical</enum>
1220- </property>
1221- <property name="sizeHint" stdset="0" >
1222- <size>
1223- <width>20</width>
1224- <height>101</height>
1225- </size>
1226- </property>
1227- </spacer>
1228- </item>
1229       </layout>
1230      </widget>
1231- <widget class="QWidget" name="tab" >
1232- <property name="geometry" >
1233- <rect>
1234- <x>0</x>
1235- <y>0</y>
1236- <width>640</width>
1237- <height>409</height>
1238- </rect>
1239- </property>
1240- <attribute name="title" >
1241+ <widget class="QWidget" name="tab">
1242+ <attribute name="title">
1243        <string>Apperance</string>
1244       </attribute>
1245- <layout class="QGridLayout" >
1246- <item row="0" column="0" >
1247- <widget class="QStarDict::CSSEdit" native="1" name="apperanceCSSEdit" />
1248+ <layout class="QGridLayout">
1249+ <item row="0" column="0">
1250+ <widget class="QStarDict::CSSEdit" name="apperanceCSSEdit" native="true">
1251+ <property name="sizePolicy">
1252+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
1253+ <horstretch>0</horstretch>
1254+ <verstretch>0</verstretch>
1255+ </sizepolicy>
1256+ </property>
1257+ </widget>
1258        </item>
1259       </layout>
1260      </widget>
1261     </widget>
1262    </item>
1263+ <item row="1" column="0">
1264+ <widget class="QDialogButtonBox" name="buttonBox">
1265+ <property name="orientation">
1266+ <enum>Qt::Horizontal</enum>
1267+ </property>
1268+ <property name="standardButtons">
1269+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
1270+ </property>
1271+ <property name="centerButtons">
1272+ <bool>false</bool>
1273+ </property>
1274+ </widget>
1275+ </item>
1276   </layout>
1277  </widget>
1278  <customwidgets>
1279@@ -599,21 +592,16 @@
1280   <tabstop>dictsMoveUpButton</tabstop>
1281   <tabstop>dictsMoveDownButton</tabstop>
1282   <tabstop>dictsShowInfoButton</tabstop>
1283- <tabstop>pluginsTableView</tabstop>
1284- <tabstop>pluginsShowInfoButton</tabstop>
1285- <tabstop>pluginsConfigureButton</tabstop>
1286   <tabstop>useScanBox</tabstop>
1287   <tabstop>showIfNotFoundBox</tabstop>
1288   <tabstop>useScanModifierBox</tabstop>
1289   <tabstop>modifierKeyBox</tabstop>
1290   <tabstop>timeoutBeforeHideSpin</tabstop>
1291   <tabstop>pronounceWordBox</tabstop>
1292- <tabstop>popupDefaultWidthSpin</tabstop>
1293- <tabstop>popupDefaultHeightSpin</tabstop>
1294- <tabstop>popupOpacitySpin</tabstop>
1295  </tabstops>
1296  <resources>
1297- <include location="pixmaps/pixmaps.qrc" />
1298+ <include location="../plugins/stardict/pixmaps/pixmaps.qrc"/>
1299+ <include location="pixmaps/pixmaps.qrc"/>
1300  </resources>
1301  <connections>
1302   <connection>
1303@@ -622,11 +610,11 @@
1304    <receiver>QStarDict::SettingsDialog</receiver>
1305    <slot>accept()</slot>
1306    <hints>
1307- <hint type="sourcelabel" >
1308- <x>330</x>
1309- <y>587</y>
1310+ <hint type="sourcelabel">
1311+ <x>310</x>
1312+ <y>230</y>
1313     </hint>
1314- <hint type="destinationlabel" >
1315+ <hint type="destinationlabel">
1316      <x>410</x>
1317      <y>299</y>
1318     </hint>
1319@@ -638,11 +626,11 @@
1320    <receiver>QStarDict::SettingsDialog</receiver>
1321    <slot>reject()</slot>
1322    <hints>
1323- <hint type="sourcelabel" >
1324- <x>406</x>
1325- <y>587</y>
1326+ <hint type="sourcelabel">
1327+ <x>310</x>
1328+ <y>230</y>
1329     </hint>
1330- <hint type="destinationlabel" >
1331+ <hint type="destinationlabel">
1332      <x>410</x>
1333      <y>299</y>
1334     </hint>
1335@@ -654,13 +642,13 @@
1336    <receiver>modifierKeyBox</receiver>
1337    <slot>setEnabled(bool)</slot>
1338    <hints>
1339- <hint type="sourcelabel" >
1340- <x>165</x>
1341- <y>140</y>
1342+ <hint type="sourcelabel">
1343+ <x>194</x>
1344+ <y>85</y>
1345     </hint>
1346- <hint type="destinationlabel" >
1347- <x>273</x>
1348- <y>137</y>
1349+ <hint type="destinationlabel">
1350+ <x>289</x>
1351+ <y>85</y>
1352     </hint>
1353    </hints>
1354   </connection>
1355

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive