Date:2010-12-08 20:09:24 (9 years 6 months ago)
Author:kyak
Commit:c97f2493eb4ea307539e3bfaf1953488aa5c0b83
Message:qstardict: adjust main window to look nicer

Files: qstardict/patches/001-qstardict.patch (2 diffs)

Change Details

qstardict/patches/001-qstardict.patch
3131
3232 // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc
3333
34diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp
35--- qstardict-0.13.1.or/qstardict/mainwindow.cpp 2009-02-10 15:33:30.000000000 +0300
36@@ -93,7 +93,7 @@
37     setVisible(config.value("MainWindow/visible", true).toBool());
38     wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool());
39     wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect());
40- setInstantSearch(config.value("MainWindow/instantSearch", true).toBool());
41+ setInstantSearch(config.value("MainWindow/instantSearch", false).toBool());
42     setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString());
43 }
44
45Только в qstardict-0.13.1/qstardict: mainwindow.cpp~
3446diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui
3547--- qstardict-0.13.1.or/qstardict/mainwindow.ui 2009-02-10 15:33:30.000000000 +0300
36+++ qstardict-0.13.1/qstardict/mainwindow.ui 2010-12-08 16:40:21.843773360 +0300
37@@ -5,8 +5,8 @@
48@@ -1,190 +1,238 @@
49-<ui version="4.0" >
50+<?xml version="1.0" encoding="UTF-8"?>
51+<ui version="4.0">
52  <class>QStarDict::MainWindow</class>
53- <widget class="QMainWindow" name="QStarDict::MainWindow" >
54- <property name="geometry" >
55+ <widget class="QMainWindow" name="QStarDict::MainWindow">
56+ <property name="geometry">
3857    <rect>
3958     <x>0</x>
4059     <y>0</y>
4160- <width>742</width>
4261- <height>511</height>
43+ <width>320</width>
62+ <width>326</width>
4463+ <height>240</height>
4564    </rect>
4665   </property>
47   <property name="windowTitle" >
48@@ -19,15 +19,15 @@
49   <widget class="QWidget" name="centralwidget" >
50    <layout class="QGridLayout" >
51     <property name="margin" >
66- <property name="windowTitle" >
67+ <property name="windowTitle">
68    <string>QStarDict</string>
69   </property>
70- <property name="windowIcon" >
71- <iconset resource="pixmaps/pixmaps.qrc" >
72+ <property name="windowIcon">
73+ <iconset resource="pixmaps/pixmaps.qrc">
74     <normaloff>:/icons/qstardict.png</normaloff>:/icons/qstardict.png</iconset>
75   </property>
76- <widget class="QWidget" name="centralwidget" >
77- <layout class="QGridLayout" >
78- <property name="margin" >
5279- <number>9</number>
53+ <number>0</number>
54     </property>
55     <property name="spacing" >
80- </property>
81- <property name="spacing" >
5682- <number>6</number>
57+ <number>0</number>
58     </property>
59     <item row="0" column="0" >
60      <layout class="QHBoxLayout" >
61       <property name="spacing" >
83- </property>
84- <item row="0" column="0" >
85- <layout class="QHBoxLayout" >
86- <property name="spacing" >
6287- <number>6</number>
88+ <widget class="QWidget" name="centralwidget">
89+ <property name="minimumSize">
90+ <size>
91+ <width>214</width>
92+ <height>130</height>
93+ </size>
94+ </property>
95+ <property name="maximumSize">
96+ <size>
97+ <width>320</width>
98+ <height>240</height>
99+ </size>
100+ </property>
101+ <layout class="QVBoxLayout" name="verticalLayout_2">
102+ <property name="spacing">
103+ <number>0</number>
104+ </property>
105+ <property name="margin">
106+ <number>0</number>
107+ </property>
108+ <item>
109+ <layout class="QHBoxLayout">
110+ <property name="spacing">
63111+ <number>0</number>
64112       </property>
65       <property name="margin" >
113- <property name="margin" >
114+ <property name="margin">
66115        <number>0</number>
67@@ -90,17 +90,16 @@
116       </property>
117       <item>
118- <widget class="QToolButton" name="searchClearButton" >
119- <property name="toolTip" >
120+ <widget class="QToolButton" name="searchClearButton">
121+ <property name="toolTip">
122          <string>Clear the search box</string>
123         </property>
124- <property name="text" >
125+ <property name="text">
126          <string>Clear</string>
127         </property>
128- <property name="icon" >
129- <iconset resource="pixmaps/pixmaps.qrc" >
130+ <property name="icon">
131+ <iconset resource="pixmaps/pixmaps.qrc">
132           <normaloff>:/icons/clear-right.png</normaloff>:/icons/clear-right.png</iconset>
133         </property>
134- <property name="toolButtonStyle" >
135+ <property name="toolButtonStyle">
136          <enum>Qt::ToolButtonIconOnly</enum>
137         </property>
138        </widget>
139       </item>
140       <item>
141- <widget class="QLineEdit" name="searchBox" />
142+ <widget class="QLineEdit" name="searchBox"/>
143       </item>
144       <item>
145- <widget class="QToolButton" name="queryButton" >
146- <property name="toolTip" >
147+ <widget class="QToolButton" name="queryButton">
148+ <property name="toolTip">
149          <string>Fuzzy query</string>
150         </property>
151- <property name="text" >
152+ <property name="text">
153          <string>Search</string>
154         </property>
155- <property name="icon" >
156- <iconset resource="pixmaps/pixmaps.qrc" >
157+ <property name="icon">
158+ <iconset resource="pixmaps/pixmaps.qrc">
159           <normaloff>:/icons/search-filter.png</normaloff>:/icons/search-filter.png</iconset>
160         </property>
161- <property name="toolButtonStyle" >
162+ <property name="toolButtonStyle">
163          <enum>Qt::ToolButtonTextBesideIcon</enum>
164         </property>
165        </widget>
166       </item>
167      </layout>
168     </item>
169- <item row="1" column="0" >
170- <widget class="DictWidget" native="1" name="translationView" />
171+ <item>
172+ <widget class="DictWidget" name="translationView" native="true"/>
173     </item>
174    </layout>
175   </widget>
176- <widget class="QDockWidget" name="wordsListDock" >
177- <property name="features" >
178- <set>QDockWidget::AllDockWidgetFeatures</set>
179+ <widget class="QDockWidget" name="wordsListDock">
180+ <property name="minimumSize">
181+ <size>
182+ <width>100</width>
183+ <height>155</height>
184+ </size>
185+ </property>
186+ <property name="maximumSize">
187+ <size>
188+ <width>100</width>
189+ <height>240</height>
190+ </size>
191+ </property>
192+ <property name="features">
193+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
194    </property>
195- <property name="allowedAreas" >
196+ <property name="allowedAreas">
197     <set>Qt::NoDockWidgetArea</set>
198    </property>
199- <property name="windowTitle" >
200+ <property name="windowTitle">
201     <string>Words list</string>
202    </property>
203- <attribute name="dockWidgetArea" >
204+ <attribute name="dockWidgetArea">
68205     <number>1</number>
69206    </attribute>
70    <widget class="QWidget" name="dockWidgetContents" >
207- <widget class="QWidget" name="dockWidgetContents" >
71208- <layout class="QGridLayout" >
72209- <property name="margin" >
73210- <number>9</number>
74- </property>
75- <property name="spacing" >
76- <number>6</number>
77+ <widget class="QListWidget" name="wordsList" >
211+ <widget class="QWidget" name="dockWidgetContents">
212+ <property name="minimumSize">
213+ <size>
214+ <width>100</width>
215+ <height>130</height>
216+ </size>
217+ </property>
218+ <property name="maximumSize">
219+ <size>
220+ <width>100</width>
221+ <height>240</height>
222+ </size>
223+ </property>
224+ <widget class="QListWidget" name="wordsList">
78225+ <property name="geometry">
79226+ <rect>
80+ <x>9</x>
81+ <y>9</y>
82+ <width>185</width>
83+ <height>184</height>
227+ <x>0</x>
228+ <y>5</y>
229+ <width>100</width>
230+ <height>190</height>
84231+ </rect>
232+ </property>
233+ <property name="minimumSize">
234+ <size>
235+ <width>100</width>
236+ <height>130</height>
237+ </size>
238      </property>
239- <property name="spacing" >
240- <number>6</number>
241+ <property name="maximumSize">
242+ <size>
243+ <width>100</width>
244+ <height>240</height>
245+ </size>
85246      </property>
86247- <item row="0" column="0" >
87248- <widget class="QListWidget" name="wordsList" />
...... 
90253+ </widget>
91254    </widget>
92255   </widget>
93   <widget class="QMenuBar" name="menubar" >
94@@ -108,8 +107,8 @@
256- <widget class="QMenuBar" name="menubar" >
257- <property name="geometry" >
258+ <widget class="QMenuBar" name="menubar">
259+ <property name="geometry">
95260     <rect>
96261      <x>0</x>
97262      <y>0</y>
98263- <width>742</width>
99264- <height>22</height>
100+ <width>320</width>
101+ <height>18</height>
265+ <width>326</width>
266+ <height>27</height>
102267     </rect>
103268    </property>
104    <widget class="QMenu" name="menu_File" >
269- <widget class="QMenu" name="menu_File" >
270- <property name="title" >
271+ <widget class="QMenu" name="menu_File">
272+ <property name="title">
273      <string>&amp;File</string>
274     </property>
275- <addaction name="actionQuit" />
276+ <addaction name="actionQuit"/>
277    </widget>
278- <widget class="QMenu" name="menuHelp" >
279- <property name="title" >
280+ <widget class="QMenu" name="menuHelp">
281+ <property name="title">
282      <string>&amp;Help</string>
283     </property>
284- <addaction name="actionHelp" />
285- <addaction name="actionAbout" />
286- <addaction name="actionAboutQt" />
287+ <addaction name="actionHelp"/>
288+ <addaction name="actionAbout"/>
289+ <addaction name="actionAboutQt"/>
290    </widget>
291- <widget class="QMenu" name="menu_Options" >
292- <property name="title" >
293+ <widget class="QMenu" name="menu_Options">
294+ <property name="title">
295      <string>&amp;Settings</string>
296     </property>
297- <addaction name="actionScan" />
298- <addaction name="actionSettings" />
299+ <addaction name="actionScan"/>
300+ <addaction name="actionSettings"/>
301    </widget>
302- <addaction name="menu_File" />
303- <addaction name="menu_Options" />
304- <addaction name="menuHelp" />
305+ <addaction name="menu_File"/>
306+ <addaction name="menu_Options"/>
307+ <addaction name="menuHelp"/>
308   </widget>
309- <action name="actionQuit" >
310- <property name="icon" >
311- <iconset resource="pixmaps/pixmaps.qrc" >
312+ <action name="actionQuit">
313+ <property name="icon">
314+ <iconset resource="pixmaps/pixmaps.qrc">
315      <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset>
316    </property>
317- <property name="text" >
318+ <property name="text">
319     <string>&amp;Quit</string>
320    </property>
321- <property name="shortcut" >
322+ <property name="shortcut">
323     <string>Ctrl+Q</string>
324    </property>
325   </action>
326- <action name="actionAbout" >
327- <property name="text" >
328+ <action name="actionAbout">
329+ <property name="text">
330     <string>&amp;About</string>
331    </property>
332   </action>
333- <action name="actionAboutQt" >
334- <property name="text" >
335+ <action name="actionAboutQt">
336+ <property name="text">
337     <string>About &amp;Qt</string>
338    </property>
339   </action>
340- <action name="actionSettings" >
341- <property name="icon" >
342- <iconset resource="pixmaps/pixmaps.qrc" >
343+ <action name="actionSettings">
344+ <property name="icon">
345+ <iconset resource="pixmaps/pixmaps.qrc">
346      <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
347    </property>
348- <property name="text" >
349+ <property name="text">
350     <string>&amp;Configure QStarDict</string>
351    </property>
352   </action>
353- <action name="actionScan" >
354- <property name="checkable" >
355+ <action name="actionScan">
356+ <property name="checkable">
357     <bool>true</bool>
358    </property>
359- <property name="text" >
360+ <property name="text">
361     <string>&amp;Scan</string>
362    </property>
363   </action>
364- <action name="actionHelp" >
365- <property name="icon" >
366- <iconset resource="pixmaps/pixmaps.qrc" >
367+ <action name="actionHelp">
368+ <property name="icon">
369+ <iconset resource="pixmaps/pixmaps.qrc">
370      <normaloff>:/icons/help-contents.png</normaloff>:/icons/help-contents.png</iconset>
371    </property>
372- <property name="text" >
373+ <property name="text">
374     <string>QStarDict &amp;Help</string>
375    </property>
376- <property name="shortcut" >
377+ <property name="shortcut">
378     <string>F1</string>
379    </property>
380   </action>
381@@ -203,7 +251,7 @@
382   <tabstop>searchClearButton</tabstop>
383  </tabstops>
384  <resources>
385- <include location="pixmaps/pixmaps.qrc" />
386+ <include location="pixmaps/pixmaps.qrc"/>
387  </resources>
388  <connections>
389   <connection>
390@@ -212,11 +260,11 @@
391    <receiver>searchBox</receiver>
392    <slot>clear()</slot>
393    <hints>
394- <hint type="sourcelabel" >
395+ <hint type="sourcelabel">
396      <x>315</x>
397      <y>59</y>
398     </hint>
399- <hint type="destinationlabel" >
400+ <hint type="destinationlabel">
401      <x>647</x>
402      <y>61</y>
403     </hint>
404@@ -228,11 +276,11 @@
405    <receiver>searchBox</receiver>
406    <slot>setFocus()</slot>
407    <hints>
408- <hint type="sourcelabel" >
409+ <hint type="sourcelabel">
410      <x>315</x>
411      <y>59</y>
412     </hint>
413- <hint type="destinationlabel" >
414+ <hint type="destinationlabel">
415      <x>647</x>
416      <y>61</y>
417     </hint>
418@@ -244,11 +292,11 @@
419    <receiver>queryButton</receiver>
420    <slot>click()</slot>
421    <hints>
422- <hint type="sourcelabel" >
423+ <hint type="sourcelabel">
424      <x>438</x>
425      <y>50</y>
426     </hint>
427- <hint type="destinationlabel" >
428+ <hint type="destinationlabel">
429      <x>661</x>
430      <y>51</y>
431     </hint>
432Только в qstardict-0.13.1/qstardict: mainwindow.ui~
105433diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui
106434--- qstardict-0.13.1.or/qstardict/settingsdialog.ui 2009-02-10 15:33:30.000000000 +0300
107435+++ qstardict-0.13.1/qstardict/settingsdialog.ui 2010-12-08 10:27:03.160773247 +0300

Archive Download the corresponding diff file



interactive