Root/qstardict/patches/001-qstardict.patch

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

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