Commit d375f899bf4ec43de243a5741f3773aaf456cf3f

Authored by Peter Zhigalov
1 parent 552556a9

Сделал резиновую форму и подправил настройки в проекте с Qt

src_qt/l10ns/fem_draw_qt_en.ts
... ... @@ -4,7 +4,7 @@
4 4 <context>
5 5 <name>Dock</name>
6 6 <message>
7   - <location filename="../mainwindow.cpp" line="624"/>
  7 + <location filename="../mainwindow.cpp" line="636"/>
8 8 <source>New Window</source>
9 9 <translation type="unfinished">New Window</translation>
10 10 </message>
... ... @@ -12,416 +12,416 @@
12 12 <context>
13 13 <name>MainWindow</name>
14 14 <message>
15   - <location filename="../mainwindow.ui" line="41"/>
  15 + <location filename="../mainwindow.ui" line="63"/>
16 16 <source>Draw color image</source>
17 17 <translation type="unfinished">Draw color image</translation>
18 18 </message>
19 19 <message>
20   - <location filename="../mainwindow.ui" line="44"/>
  20 + <location filename="../mainwindow.ui" line="66"/>
21 21 <source>Color</source>
22 22 <translation type="unfinished">Color</translation>
23 23 </message>
24 24 <message>
25   - <location filename="../mainwindow.ui" line="57"/>
  25 + <location filename="../mainwindow.ui" line="85"/>
26 26 <source>Data component for colors and isolines</source>
27 27 <translation type="unfinished">Data component for colors and isolines</translation>
28 28 </message>
29 29 <message>
30   - <location filename="../mainwindow.ui" line="70"/>
  30 + <location filename="../mainwindow.ui" line="109"/>
31 31 <source>Draw isolines</source>
32 32 <translation type="unfinished">Draw isolines</translation>
33 33 </message>
34 34 <message>
35   - <location filename="../mainwindow.ui" line="73"/>
36   - <location filename="../mainwindow.ui" line="227"/>
  35 + <location filename="../mainwindow.ui" line="112"/>
  36 + <location filename="../mainwindow.ui" line="346"/>
37 37 <source>Isolines</source>
38 38 <translation type="unfinished">Isolines</translation>
39 39 </message>
40 40 <message>
41   - <location filename="../mainwindow.ui" line="86"/>
  41 + <location filename="../mainwindow.ui" line="131"/>
42 42 <source>Number of isolines</source>
43 43 <translation type="unfinished">Number of isolines</translation>
44 44 </message>
45 45 <message>
46   - <location filename="../mainwindow.ui" line="99"/>
  46 + <location filename="../mainwindow.ui" line="155"/>
47 47 <source>Draw vectors</source>
48 48 <translation type="unfinished">Draw vectors</translation>
49 49 </message>
50 50 <message>
51   - <location filename="../mainwindow.ui" line="102"/>
52   - <location filename="../mainwindow.ui" line="235"/>
  51 + <location filename="../mainwindow.ui" line="158"/>
  52 + <location filename="../mainwindow.ui" line="354"/>
53 53 <source>Vectors</source>
54 54 <translation type="unfinished">Vectors</translation>
55 55 </message>
56 56 <message>
57   - <location filename="../mainwindow.ui" line="115"/>
  57 + <location filename="../mainwindow.ui" line="177"/>
58 58 <source>Draw vectors for every i value</source>
59 59 <translation type="unfinished">Draw vectors for every i value</translation>
60 60 </message>
61 61 <message>
62   - <location filename="../mainwindow.ui" line="128"/>
  62 + <location filename="../mainwindow.ui" line="210"/>
63 63 <source>Data component for first vector axis</source>
64 64 <translation type="unfinished">Data component for first vector axis</translation>
65 65 </message>
66 66 <message>
67   - <location filename="../mainwindow.ui" line="141"/>
  67 + <location filename="../mainwindow.ui" line="243"/>
68 68 <source>Data component for second vector axis</source>
69 69 <translation type="unfinished">Data component for second vector axis</translation>
70 70 </message>
71 71 <message>
72   - <location filename="../mainwindow.ui" line="154"/>
  72 + <location filename="../mainwindow.ui" line="188"/>
73 73 <source>U:</source>
74 74 <translation type="unfinished">U:</translation>
75 75 </message>
76 76 <message>
77   - <location filename="../mainwindow.ui" line="167"/>
  77 + <location filename="../mainwindow.ui" line="221"/>
78 78 <source>V:</source>
79 79 <translation type="unfinished">V:</translation>
80 80 </message>
81 81 <message>
82   - <location filename="../mainwindow.ui" line="182"/>
  82 + <location filename="../mainwindow.ui" line="301"/>
83 83 <source>File</source>
84 84 <translation type="unfinished">File</translation>
85 85 </message>
86 86 <message>
87   - <location filename="../mainwindow.ui" line="195"/>
  87 + <location filename="../mainwindow.ui" line="314"/>
88 88 <source>Interpolation</source>
89 89 <translation type="unfinished">Interpolation</translation>
90 90 </message>
91 91 <message>
92   - <location filename="../mainwindow.ui" line="202"/>
93   - <location filename="../mainwindow.cpp" line="677"/>
  92 + <location filename="../mainwindow.ui" line="321"/>
  93 + <location filename="../mainwindow.cpp" line="689"/>
94 94 <source>About</source>
95 95 <translation type="unfinished">About</translation>
96 96 </message>
97 97 <message>
98   - <location filename="../mainwindow.ui" line="210"/>
  98 + <location filename="../mainwindow.ui" line="329"/>
99 99 <source>Configuration</source>
100 100 <translation type="unfinished">Configuration</translation>
101 101 </message>
102 102 <message>
103   - <location filename="../mainwindow.ui" line="214"/>
  103 + <location filename="../mainwindow.ui" line="333"/>
104 104 <source>Language</source>
105 105 <translation type="unfinished">Language</translation>
106 106 </message>
107 107 <message>
108   - <location filename="../mainwindow.ui" line="252"/>
109   - <location filename="../mainwindow.ui" line="255"/>
  108 + <location filename="../mainwindow.ui" line="371"/>
  109 + <location filename="../mainwindow.ui" line="374"/>
110 110 <source>Open Tecplot File...</source>
111 111 <translation type="unfinished">Open Tecplot File...</translation>
112 112 </message>
113 113 <message>
114   - <location filename="../mainwindow.ui" line="258"/>
  114 + <location filename="../mainwindow.ui" line="377"/>
115 115 <source>Ctrl+O</source>
116 116 <translation type="unfinished"></translation>
117 117 </message>
118 118 <message>
119   - <location filename="../mainwindow.ui" line="263"/>
  119 + <location filename="../mainwindow.ui" line="382"/>
120 120 <source>Copy Image to Clipboard</source>
121 121 <translation type="unfinished">Copy Image to Clipboard</translation>
122 122 </message>
123 123 <message>
124   - <location filename="../mainwindow.ui" line="266"/>
  124 + <location filename="../mainwindow.ui" line="385"/>
125 125 <source>Ctrl+C</source>
126 126 <translation type="unfinished"></translation>
127 127 </message>
128 128 <message>
129   - <location filename="../mainwindow.ui" line="271"/>
130   - <location filename="../mainwindow.ui" line="274"/>
  129 + <location filename="../mainwindow.ui" line="390"/>
  130 + <location filename="../mainwindow.ui" line="393"/>
131 131 <source>Save Image File...</source>
132 132 <translation type="unfinished">Save Image File...</translation>
133 133 </message>
134 134 <message>
135   - <location filename="../mainwindow.ui" line="277"/>
  135 + <location filename="../mainwindow.ui" line="396"/>
136 136 <source>Ctrl+S</source>
137 137 <translation type="unfinished"></translation>
138 138 </message>
139 139 <message>
140   - <location filename="../mainwindow.ui" line="282"/>
  140 + <location filename="../mainwindow.ui" line="401"/>
141 141 <source>New Window</source>
142 142 <translation type="unfinished">New Window</translation>
143 143 </message>
144 144 <message>
145   - <location filename="../mainwindow.ui" line="287"/>
  145 + <location filename="../mainwindow.ui" line="406"/>
146 146 <source>Exit</source>
147 147 <translation type="unfinished">Exit</translation>
148 148 </message>
149 149 <message>
150   - <location filename="../mainwindow.ui" line="290"/>
  150 + <location filename="../mainwindow.ui" line="409"/>
151 151 <source>Ctrl+Q</source>
152 152 <translation type="unfinished"></translation>
153 153 </message>
154 154 <message>
155   - <location filename="../mainwindow.ui" line="298"/>
  155 + <location filename="../mainwindow.ui" line="417"/>
156 156 <source>Increase Interpolation</source>
157 157 <translation type="unfinished">Increase Interpolation</translation>
158 158 </message>
159 159 <message>
160   - <location filename="../mainwindow.ui" line="301"/>
  160 + <location filename="../mainwindow.ui" line="420"/>
161 161 <source>Increase number of interpolation (bilinear)</source>
162 162 <translation type="unfinished">Increase number of interpolation (bilinear)</translation>
163 163 </message>
164 164 <message>
165   - <location filename="../mainwindow.ui" line="304"/>
  165 + <location filename="../mainwindow.ui" line="423"/>
166 166 <source>=</source>
167 167 <translation type="unfinished"></translation>
168 168 </message>
169 169 <message>
170   - <location filename="../mainwindow.ui" line="309"/>
  170 + <location filename="../mainwindow.ui" line="428"/>
171 171 <source>Decrease Interpolation</source>
172 172 <translation type="unfinished">Decrease Interpolation</translation>
173 173 </message>
174 174 <message>
175   - <location filename="../mainwindow.ui" line="312"/>
  175 + <location filename="../mainwindow.ui" line="431"/>
176 176 <source>Decrease number of interpolation (bilinear)</source>
177 177 <translation type="unfinished">Decrease number of interpolation (bilinear)</translation>
178 178 </message>
179 179 <message>
180   - <location filename="../mainwindow.ui" line="315"/>
  180 + <location filename="../mainwindow.ui" line="434"/>
181 181 <source>-</source>
182 182 <translation type="unfinished"></translation>
183 183 </message>
184 184 <message>
185   - <location filename="../mainwindow.ui" line="320"/>
  185 + <location filename="../mainwindow.ui" line="439"/>
186 186 <source>About FEM Draw...</source>
187 187 <translation type="unfinished">About FEM Draw...</translation>
188 188 </message>
189 189 <message>
190   - <location filename="../mainwindow.ui" line="328"/>
  190 + <location filename="../mainwindow.ui" line="447"/>
191 191 <source>About Third Party Libraries...</source>
192 192 <translation type="unfinished">About Third Party Libraries...</translation>
193 193 </message>
194 194 <message>
195   - <location filename="../mainwindow.ui" line="336"/>
  195 + <location filename="../mainwindow.ui" line="455"/>
196 196 <source>About Qt...</source>
197 197 <translation type="unfinished">About Qt...</translation>
198 198 </message>
199 199 <message>
200   - <location filename="../mainwindow.ui" line="347"/>
  200 + <location filename="../mainwindow.ui" line="466"/>
201 201 <source>Transparent Image</source>
202 202 <translation type="unfinished">Transparent Image</translation>
203 203 </message>
204 204 <message>
205   - <location filename="../mainwindow.ui" line="355"/>
  205 + <location filename="../mainwindow.ui" line="474"/>
206 206 <source>Show Isolines</source>
207 207 <translation type="unfinished">Show Isolines</translation>
208 208 </message>
209 209 <message>
210   - <location filename="../mainwindow.ui" line="360"/>
  210 + <location filename="../mainwindow.ui" line="479"/>
211 211 <source>Isolines Color...</source>
212 212 <translation type="unfinished">Isolines Color...</translation>
213 213 </message>
214 214 <message>
215   - <location filename="../mainwindow.ui" line="365"/>
  215 + <location filename="../mainwindow.ui" line="484"/>
216 216 <source>Isolines Width...</source>
217 217 <translation type="unfinished">Isolines Width...</translation>
218 218 </message>
219 219 <message>
220   - <location filename="../mainwindow.ui" line="373"/>
  220 + <location filename="../mainwindow.ui" line="492"/>
221 221 <source>Show Vectors</source>
222 222 <translation type="unfinished">Show Vectors</translation>
223 223 </message>
224 224 <message>
225   - <location filename="../mainwindow.ui" line="378"/>
  225 + <location filename="../mainwindow.ui" line="497"/>
226 226 <source>Vectors Color...</source>
227 227 <translation type="unfinished">Vectors Color...</translation>
228 228 </message>
229 229 <message>
230   - <location filename="../mainwindow.ui" line="383"/>
  230 + <location filename="../mainwindow.ui" line="502"/>
231 231 <source>Vectors Width...</source>
232 232 <translation type="unfinished">Vectors Width...</translation>
233 233 </message>
234 234 <message>
235   - <location filename="../mainwindow.ui" line="388"/>
  235 + <location filename="../mainwindow.ui" line="507"/>
236 236 <source>Vectors Length...</source>
237 237 <translation type="unfinished">Vectors Length...</translation>
238 238 </message>
239 239 <message>
240   - <location filename="../mainwindow.ui" line="393"/>
  240 + <location filename="../mainwindow.ui" line="512"/>
241 241 <source>Vectors Arrow Size...</source>
242 242 <translation type="unfinished">Vectors Arrow Size...</translation>
243 243 </message>
244 244 <message>
245   - <location filename="../mainwindow.ui" line="401"/>
  245 + <location filename="../mainwindow.ui" line="520"/>
246 246 <source>English</source>
247 247 <translation type="unfinished">English</translation>
248 248 </message>
249 249 <message>
250   - <location filename="../mainwindow.ui" line="409"/>
  250 + <location filename="../mainwindow.ui" line="528"/>
251 251 <source>Russian</source>
252 252 <translation type="unfinished">Russian</translation>
253 253 </message>
254 254 <message>
255   - <location filename="../mainwindow.ui" line="417"/>
  255 + <location filename="../mainwindow.ui" line="536"/>
256 256 <source>Show Legend</source>
257 257 <translation type="unfinished">Show Legend</translation>
258 258 </message>
259 259 <message>
260   - <location filename="../mainwindow.ui" line="425"/>
  260 + <location filename="../mainwindow.ui" line="544"/>
261 261 <source>Use Light Colors</source>
262 262 <translation type="unfinished">Use Light Colors</translation>
263 263 </message>
264 264 <message>
265   - <location filename="../mainwindow.ui" line="433"/>
  265 + <location filename="../mainwindow.ui" line="552"/>
266 266 <source>Use Purple Colors</source>
267 267 <translation type="unfinished">Use Purple Colors</translation>
268 268 </message>
269 269 <message>
270   - <location filename="../mainwindow.ui" line="441"/>
  270 + <location filename="../mainwindow.ui" line="560"/>
271 271 <source>1 GiB Memory Limit</source>
272 272 <translation type="unfinished">1 GiB Memory Limit</translation>
273 273 </message>
274 274 <message>
275 275 <location filename="../mainwindow.ui" line="14"/>
276   - <location filename="../mainwindow.cpp" line="66"/>
277   - <location filename="../mainwindow.cpp" line="137"/>
278   - <location filename="../mainwindow.cpp" line="195"/>
279   - <location filename="../mainwindow.cpp" line="678"/>
  276 + <location filename="../mainwindow.cpp" line="67"/>
  277 + <location filename="../mainwindow.cpp" line="146"/>
  278 + <location filename="../mainwindow.cpp" line="204"/>
  279 + <location filename="../mainwindow.cpp" line="690"/>
280 280 <source>FEM Draw</source>
281 281 <translation type="unfinished"></translation>
282 282 </message>
283 283 <message>
284   - <location filename="../mainwindow.cpp" line="85"/>
  284 + <location filename="../mainwindow.cpp" line="86"/>
285 285 <source>draw.png</source>
286 286 <translation type="unfinished"></translation>
287 287 </message>
288 288 <message>
289   - <location filename="../mainwindow.cpp" line="217"/>
  289 + <location filename="../mainwindow.cpp" line="226"/>
290 290 <source>Open Tecplot File</source>
291 291 <translation type="unfinished">Open Tecplot File</translation>
292 292 </message>
293 293 <message>
294   - <location filename="../mainwindow.cpp" line="282"/>
  294 + <location filename="../mainwindow.cpp" line="291"/>
295 295 <source>Images</source>
296 296 <translation type="unfinished">Images</translation>
297 297 </message>
298 298 <message>
299   - <location filename="../mainwindow.cpp" line="291"/>
  299 + <location filename="../mainwindow.cpp" line="300"/>
300 300 <source>Save Image File</source>
301 301 <translation type="unfinished">Save Image File</translation>
302 302 </message>
303 303 <message>
304   - <location filename="../mainwindow.cpp" line="323"/>
  304 + <location filename="../mainwindow.cpp" line="332"/>
305 305 <source>Generated with FEM Draw</source>
306 306 <translation type="unfinished"></translation>
307 307 </message>
308 308 <message>
309   - <location filename="../mainwindow.cpp" line="404"/>
310   - <location filename="../mainwindow.cpp" line="441"/>
311   - <location filename="../mainwindow.cpp" line="456"/>
312   - <location filename="../mainwindow.cpp" line="840"/>
  309 + <location filename="../mainwindow.cpp" line="413"/>
  310 + <location filename="../mainwindow.cpp" line="450"/>
  311 + <location filename="../mainwindow.cpp" line="465"/>
  312 + <location filename="../mainwindow.cpp" line="852"/>
313 313 <source>Error</source>
314 314 <translation type="unfinished">Error</translation>
315 315 </message>
316 316 <message>
317   - <location filename="../mainwindow.cpp" line="405"/>
  317 + <location filename="../mainwindow.cpp" line="414"/>
318 318 <source>Error: Can&apos;t save file</source>
319 319 <translation type="unfinished">Error: Can&apos;t save file</translation>
320 320 </message>
321 321 <message>
322   - <location filename="../mainwindow.cpp" line="442"/>
  322 + <location filename="../mainwindow.cpp" line="451"/>
323 323 <source>Error: Memory limit exceeded</source>
324 324 <translation type="unfinished">Error: Memory limit exceeded</translation>
325 325 </message>
326 326 <message>
327   - <location filename="../mainwindow.cpp" line="457"/>
  327 + <location filename="../mainwindow.cpp" line="466"/>
328 328 <source>Error: More than 10x interpolation is not supported</source>
329 329 <translation type="unfinished">Error: More than 10x interpolation is not supported</translation>
330 330 </message>
331 331 <message>
332   - <location filename="../mainwindow.cpp" line="485"/>
  332 + <location filename="../mainwindow.cpp" line="494"/>
333 333 <source>Select Isolines Color</source>
334 334 <translation type="unfinished">Select Isolines Color</translation>
335 335 </message>
336 336 <message>
337   - <location filename="../mainwindow.cpp" line="500"/>
338   - <location filename="../mainwindow.cpp" line="534"/>
  337 + <location filename="../mainwindow.cpp" line="509"/>
  338 + <location filename="../mainwindow.cpp" line="543"/>
339 339 <source>Width</source>
340 340 <translation type="unfinished">Width</translation>
341 341 </message>
342 342 <message>
343   - <location filename="../mainwindow.cpp" line="500"/>
  343 + <location filename="../mainwindow.cpp" line="509"/>
344 344 <source>Select Isolines Width:</source>
345 345 <translation type="unfinished">Select Isolines Width:</translation>
346 346 </message>
347 347 <message>
348   - <location filename="../mainwindow.cpp" line="519"/>
  348 + <location filename="../mainwindow.cpp" line="528"/>
349 349 <source>Select Vectors Color</source>
350 350 <translation type="unfinished">Select Vectors Color</translation>
351 351 </message>
352 352 <message>
353   - <location filename="../mainwindow.cpp" line="534"/>
  353 + <location filename="../mainwindow.cpp" line="543"/>
354 354 <source>Select Vectors Width:</source>
355 355 <translation type="unfinished">Select Vectors Width:</translation>
356 356 </message>
357 357 <message>
358   - <location filename="../mainwindow.cpp" line="547"/>
  358 + <location filename="../mainwindow.cpp" line="556"/>
359 359 <source>Length</source>
360 360 <translation type="unfinished">Length</translation>
361 361 </message>
362 362 <message>
363   - <location filename="../mainwindow.cpp" line="547"/>
  363 + <location filename="../mainwindow.cpp" line="556"/>
364 364 <source>Select Vectors Length:</source>
365 365 <translation type="unfinished">Select Vectors Length:</translation>
366 366 </message>
367 367 <message>
368   - <location filename="../mainwindow.cpp" line="560"/>
  368 + <location filename="../mainwindow.cpp" line="569"/>
369 369 <source>Arrow Size</source>
370 370 <translation type="unfinished">Arrow Size</translation>
371 371 </message>
372 372 <message>
373   - <location filename="../mainwindow.cpp" line="560"/>
  373 + <location filename="../mainwindow.cpp" line="569"/>
374 374 <source>Select Arrow Size:</source>
375 375 <translation type="unfinished">Select Arrow Size:</translation>
376 376 </message>
377 377 <message>
378   - <location filename="../mainwindow.cpp" line="684"/>
  378 + <location filename="../mainwindow.cpp" line="696"/>
379 379 <source>Peter Zhigalov</source>
380 380 <translation type="unfinished">Peter Zhigalov</translation>
381 381 </message>
382 382 <message>
383   - <location filename="../mainwindow.cpp" line="699"/>
  383 + <location filename="../mainwindow.cpp" line="711"/>
384 384 <source>About Third Party Libraries</source>
385 385 <translation type="unfinished">About Third Party Libraries</translation>
386 386 </message>
387 387 <message>
388   - <location filename="../mainwindow.cpp" line="700"/>
  388 + <location filename="../mainwindow.cpp" line="712"/>
389 389 <source>Third Party Libraries</source>
390 390 <translation type="unfinished">Third Party Libraries</translation>
391 391 </message>
392 392 <message>
393   - <location filename="../mainwindow.cpp" line="717"/>
  393 + <location filename="../mainwindow.cpp" line="729"/>
394 394 <source>Library</source>
395 395 <translation type="unfinished">Library</translation>
396 396 </message>
397 397 <message>
398   - <location filename="../mainwindow.cpp" line="684"/>
399   - <location filename="../mainwindow.cpp" line="717"/>
  398 + <location filename="../mainwindow.cpp" line="696"/>
  399 + <location filename="../mainwindow.cpp" line="729"/>
400 400 <source>License</source>
401 401 <translation type="unfinished">License</translation>
402 402 </message>
403 403 <message>
404   - <location filename="../mainwindow.cpp" line="218"/>
  404 + <location filename="../mainwindow.cpp" line="227"/>
405 405 <source>Tecplot Data Files</source>
406 406 <translation type="unfinished">Tecplot Data Files</translation>
407 407 </message>
408 408 <message>
409   - <location filename="../mainwindow.cpp" line="218"/>
  409 + <location filename="../mainwindow.cpp" line="227"/>
410 410 <source>All Files</source>
411 411 <translation type="unfinished">All Files</translation>
412 412 </message>
413 413 <message>
414   - <location filename="../mainwindow.cpp" line="287"/>
  414 + <location filename="../mainwindow.cpp" line="296"/>
415 415 <source>All Images</source>
416 416 <translation type="unfinished">All Images</translation>
417 417 </message>
418 418 <message>
419   - <location filename="../mainwindow.cpp" line="717"/>
  419 + <location filename="../mainwindow.cpp" line="729"/>
420 420 <source>Website</source>
421 421 <translation type="unfinished">Website</translation>
422 422 </message>
423 423 <message>
424   - <location filename="../mainwindow.cpp" line="841"/>
  424 + <location filename="../mainwindow.cpp" line="853"/>
425 425 <source>Error: You can open only one file simultaneously</source>
426 426 <translation type="unfinished">Error: You can open only one file simultaneously</translation>
427 427 </message>
... ...
src_qt/l10ns/fem_draw_qt_ru.ts
... ... @@ -4,7 +4,7 @@
4 4 <context>
5 5 <name>Dock</name>
6 6 <message>
7   - <location filename="../mainwindow.cpp" line="624"/>
  7 + <location filename="../mainwindow.cpp" line="636"/>
8 8 <source>New Window</source>
9 9 <translation type="unfinished">Новое окно</translation>
10 10 </message>
... ... @@ -12,416 +12,416 @@
12 12 <context>
13 13 <name>MainWindow</name>
14 14 <message>
15   - <location filename="../mainwindow.ui" line="41"/>
  15 + <location filename="../mainwindow.ui" line="63"/>
16 16 <source>Draw color image</source>
17 17 <translation type="unfinished">Отрисовывать цветовую картину</translation>
18 18 </message>
19 19 <message>
20   - <location filename="../mainwindow.ui" line="44"/>
  20 + <location filename="../mainwindow.ui" line="66"/>
21 21 <source>Color</source>
22 22 <translation type="unfinished">Цвет</translation>
23 23 </message>
24 24 <message>
25   - <location filename="../mainwindow.ui" line="57"/>
  25 + <location filename="../mainwindow.ui" line="85"/>
26 26 <source>Data component for colors and isolines</source>
27 27 <translation type="unfinished">Компонета для отрисовки цветом и изолиниями</translation>
28 28 </message>
29 29 <message>
30   - <location filename="../mainwindow.ui" line="70"/>
  30 + <location filename="../mainwindow.ui" line="109"/>
31 31 <source>Draw isolines</source>
32 32 <translation type="unfinished">Отрисовывать изолинии</translation>
33 33 </message>
34 34 <message>
35   - <location filename="../mainwindow.ui" line="73"/>
36   - <location filename="../mainwindow.ui" line="227"/>
  35 + <location filename="../mainwindow.ui" line="112"/>
  36 + <location filename="../mainwindow.ui" line="346"/>
37 37 <source>Isolines</source>
38 38 <translation type="unfinished">Изолинии</translation>
39 39 </message>
40 40 <message>
41   - <location filename="../mainwindow.ui" line="86"/>
  41 + <location filename="../mainwindow.ui" line="131"/>
42 42 <source>Number of isolines</source>
43 43 <translation type="unfinished">Количество изолиний</translation>
44 44 </message>
45 45 <message>
46   - <location filename="../mainwindow.ui" line="99"/>
  46 + <location filename="../mainwindow.ui" line="155"/>
47 47 <source>Draw vectors</source>
48 48 <translation type="unfinished">Отрисовывать векторное поле</translation>
49 49 </message>
50 50 <message>
51   - <location filename="../mainwindow.ui" line="102"/>
52   - <location filename="../mainwindow.ui" line="235"/>
  51 + <location filename="../mainwindow.ui" line="158"/>
  52 + <location filename="../mainwindow.ui" line="354"/>
53 53 <source>Vectors</source>
54 54 <translation type="unfinished">Векторы</translation>
55 55 </message>
56 56 <message>
57   - <location filename="../mainwindow.ui" line="115"/>
  57 + <location filename="../mainwindow.ui" line="177"/>
58 58 <source>Draw vectors for every i value</source>
59 59 <translation type="unfinished">Отрисовывать векторы для каждого i-го значения</translation>
60 60 </message>
61 61 <message>
62   - <location filename="../mainwindow.ui" line="128"/>
  62 + <location filename="../mainwindow.ui" line="210"/>
63 63 <source>Data component for first vector axis</source>
64 64 <translation type="unfinished">Компонента для оси абсцисс векторного поля</translation>
65 65 </message>
66 66 <message>
67   - <location filename="../mainwindow.ui" line="141"/>
  67 + <location filename="../mainwindow.ui" line="243"/>
68 68 <source>Data component for second vector axis</source>
69 69 <translation type="unfinished">Компонента для оси ординат векторного поля</translation>
70 70 </message>
71 71 <message>
72   - <location filename="../mainwindow.ui" line="154"/>
  72 + <location filename="../mainwindow.ui" line="188"/>
73 73 <source>U:</source>
74 74 <translation type="unfinished">U:</translation>
75 75 </message>
76 76 <message>
77   - <location filename="../mainwindow.ui" line="167"/>
  77 + <location filename="../mainwindow.ui" line="221"/>
78 78 <source>V:</source>
79 79 <translation type="unfinished">V:</translation>
80 80 </message>
81 81 <message>
82   - <location filename="../mainwindow.ui" line="182"/>
  82 + <location filename="../mainwindow.ui" line="301"/>
83 83 <source>File</source>
84 84 <translation type="unfinished">Файл</translation>
85 85 </message>
86 86 <message>
87   - <location filename="../mainwindow.ui" line="195"/>
  87 + <location filename="../mainwindow.ui" line="314"/>
88 88 <source>Interpolation</source>
89 89 <translation type="unfinished">Интерполяция</translation>
90 90 </message>
91 91 <message>
92   - <location filename="../mainwindow.ui" line="202"/>
93   - <location filename="../mainwindow.cpp" line="677"/>
  92 + <location filename="../mainwindow.ui" line="321"/>
  93 + <location filename="../mainwindow.cpp" line="689"/>
94 94 <source>About</source>
95 95 <translation type="unfinished">Справка</translation>
96 96 </message>
97 97 <message>
98   - <location filename="../mainwindow.ui" line="210"/>
  98 + <location filename="../mainwindow.ui" line="329"/>
99 99 <source>Configuration</source>
100 100 <translation type="unfinished">Конфигурация</translation>
101 101 </message>
102 102 <message>
103   - <location filename="../mainwindow.ui" line="214"/>
  103 + <location filename="../mainwindow.ui" line="333"/>
104 104 <source>Language</source>
105 105 <translation type="unfinished">Язык</translation>
106 106 </message>
107 107 <message>
108   - <location filename="../mainwindow.ui" line="252"/>
109   - <location filename="../mainwindow.ui" line="255"/>
  108 + <location filename="../mainwindow.ui" line="371"/>
  109 + <location filename="../mainwindow.ui" line="374"/>
110 110 <source>Open Tecplot File...</source>
111 111 <translation type="unfinished">Открыть файл Tecplot...</translation>
112 112 </message>
113 113 <message>
114   - <location filename="../mainwindow.ui" line="258"/>
  114 + <location filename="../mainwindow.ui" line="377"/>
115 115 <source>Ctrl+O</source>
116 116 <translation type="unfinished"></translation>
117 117 </message>
118 118 <message>
119   - <location filename="../mainwindow.ui" line="263"/>
  119 + <location filename="../mainwindow.ui" line="382"/>
120 120 <source>Copy Image to Clipboard</source>
121 121 <translation type="unfinished">Скопировать в буфер обмена</translation>
122 122 </message>
123 123 <message>
124   - <location filename="../mainwindow.ui" line="266"/>
  124 + <location filename="../mainwindow.ui" line="385"/>
125 125 <source>Ctrl+C</source>
126 126 <translation type="unfinished"></translation>
127 127 </message>
128 128 <message>
129   - <location filename="../mainwindow.ui" line="271"/>
130   - <location filename="../mainwindow.ui" line="274"/>
  129 + <location filename="../mainwindow.ui" line="390"/>
  130 + <location filename="../mainwindow.ui" line="393"/>
131 131 <source>Save Image File...</source>
132 132 <translation type="unfinished">Сохранить изображение в файл...</translation>
133 133 </message>
134 134 <message>
135   - <location filename="../mainwindow.ui" line="277"/>
  135 + <location filename="../mainwindow.ui" line="396"/>
136 136 <source>Ctrl+S</source>
137 137 <translation type="unfinished"></translation>
138 138 </message>
139 139 <message>
140   - <location filename="../mainwindow.ui" line="282"/>
  140 + <location filename="../mainwindow.ui" line="401"/>
141 141 <source>New Window</source>
142 142 <translation type="unfinished">Новое окно</translation>
143 143 </message>
144 144 <message>
145   - <location filename="../mainwindow.ui" line="287"/>
  145 + <location filename="../mainwindow.ui" line="406"/>
146 146 <source>Exit</source>
147 147 <translation type="unfinished">Выход</translation>
148 148 </message>
149 149 <message>
150   - <location filename="../mainwindow.ui" line="290"/>
  150 + <location filename="../mainwindow.ui" line="409"/>
151 151 <source>Ctrl+Q</source>
152 152 <translation type="unfinished"></translation>
153 153 </message>
154 154 <message>
155   - <location filename="../mainwindow.ui" line="298"/>
  155 + <location filename="../mainwindow.ui" line="417"/>
156 156 <source>Increase Interpolation</source>
157 157 <translation type="unfinished">Увеличить уровень интерполяции</translation>
158 158 </message>
159 159 <message>
160   - <location filename="../mainwindow.ui" line="301"/>
  160 + <location filename="../mainwindow.ui" line="420"/>
161 161 <source>Increase number of interpolation (bilinear)</source>
162 162 <translation type="unfinished">Увеличить уровень интерполяции (билинейная интерполяция)</translation>
163 163 </message>
164 164 <message>
165   - <location filename="../mainwindow.ui" line="304"/>
  165 + <location filename="../mainwindow.ui" line="423"/>
166 166 <source>=</source>
167 167 <translation type="unfinished"></translation>
168 168 </message>
169 169 <message>
170   - <location filename="../mainwindow.ui" line="309"/>
  170 + <location filename="../mainwindow.ui" line="428"/>
171 171 <source>Decrease Interpolation</source>
172 172 <translation type="unfinished">Уменьшить уровень интерполяции</translation>
173 173 </message>
174 174 <message>
175   - <location filename="../mainwindow.ui" line="312"/>
  175 + <location filename="../mainwindow.ui" line="431"/>
176 176 <source>Decrease number of interpolation (bilinear)</source>
177 177 <translation type="unfinished">Уменьшить уровень интерполяции (билинейная интерполяция)</translation>
178 178 </message>
179 179 <message>
180   - <location filename="../mainwindow.ui" line="315"/>
  180 + <location filename="../mainwindow.ui" line="434"/>
181 181 <source>-</source>
182 182 <translation type="unfinished"></translation>
183 183 </message>
184 184 <message>
185   - <location filename="../mainwindow.ui" line="320"/>
  185 + <location filename="../mainwindow.ui" line="439"/>
186 186 <source>About FEM Draw...</source>
187 187 <translation type="unfinished">О FEM Draw...</translation>
188 188 </message>
189 189 <message>
190   - <location filename="../mainwindow.ui" line="328"/>
  190 + <location filename="../mainwindow.ui" line="447"/>
191 191 <source>About Third Party Libraries...</source>
192 192 <translation type="unfinished">О библиотеках...</translation>
193 193 </message>
194 194 <message>
195   - <location filename="../mainwindow.ui" line="336"/>
  195 + <location filename="../mainwindow.ui" line="455"/>
196 196 <source>About Qt...</source>
197 197 <translation type="unfinished">О Qt...</translation>
198 198 </message>
199 199 <message>
200   - <location filename="../mainwindow.ui" line="347"/>
  200 + <location filename="../mainwindow.ui" line="466"/>
201 201 <source>Transparent Image</source>
202 202 <translation type="unfinished">Прозрачные изображения</translation>
203 203 </message>
204 204 <message>
205   - <location filename="../mainwindow.ui" line="355"/>
  205 + <location filename="../mainwindow.ui" line="474"/>
206 206 <source>Show Isolines</source>
207 207 <translation type="unfinished">Показывать изолинии</translation>
208 208 </message>
209 209 <message>
210   - <location filename="../mainwindow.ui" line="360"/>
  210 + <location filename="../mainwindow.ui" line="479"/>
211 211 <source>Isolines Color...</source>
212 212 <translation type="unfinished">Цвет изолиний...</translation>
213 213 </message>
214 214 <message>
215   - <location filename="../mainwindow.ui" line="365"/>
  215 + <location filename="../mainwindow.ui" line="484"/>
216 216 <source>Isolines Width...</source>
217 217 <translation type="unfinished">Толщина изолиний...</translation>
218 218 </message>
219 219 <message>
220   - <location filename="../mainwindow.ui" line="373"/>
  220 + <location filename="../mainwindow.ui" line="492"/>
221 221 <source>Show Vectors</source>
222 222 <translation type="unfinished">Показывать векторы</translation>
223 223 </message>
224 224 <message>
225   - <location filename="../mainwindow.ui" line="378"/>
  225 + <location filename="../mainwindow.ui" line="497"/>
226 226 <source>Vectors Color...</source>
227 227 <translation type="unfinished">Цвет векторов...</translation>
228 228 </message>
229 229 <message>
230   - <location filename="../mainwindow.ui" line="383"/>
  230 + <location filename="../mainwindow.ui" line="502"/>
231 231 <source>Vectors Width...</source>
232 232 <translation type="unfinished">Толщина векторов...</translation>
233 233 </message>
234 234 <message>
235   - <location filename="../mainwindow.ui" line="388"/>
  235 + <location filename="../mainwindow.ui" line="507"/>
236 236 <source>Vectors Length...</source>
237 237 <translation type="unfinished">Длина векторов...</translation>
238 238 </message>
239 239 <message>
240   - <location filename="../mainwindow.ui" line="393"/>
  240 + <location filename="../mainwindow.ui" line="512"/>
241 241 <source>Vectors Arrow Size...</source>
242 242 <translation type="unfinished">Размер стрелок...</translation>
243 243 </message>
244 244 <message>
245   - <location filename="../mainwindow.ui" line="401"/>
  245 + <location filename="../mainwindow.ui" line="520"/>
246 246 <source>English</source>
247 247 <translation type="unfinished">English</translation>
248 248 </message>
249 249 <message>
250   - <location filename="../mainwindow.ui" line="409"/>
  250 + <location filename="../mainwindow.ui" line="528"/>
251 251 <source>Russian</source>
252 252 <translation type="unfinished">Русский</translation>
253 253 </message>
254 254 <message>
255   - <location filename="../mainwindow.ui" line="417"/>
  255 + <location filename="../mainwindow.ui" line="536"/>
256 256 <source>Show Legend</source>
257 257 <translation type="unfinished">Показывать легенду</translation>
258 258 </message>
259 259 <message>
260   - <location filename="../mainwindow.ui" line="425"/>
  260 + <location filename="../mainwindow.ui" line="544"/>
261 261 <source>Use Light Colors</source>
262 262 <translation type="unfinished">Осветлять цвета</translation>
263 263 </message>
264 264 <message>
265   - <location filename="../mainwindow.ui" line="433"/>
  265 + <location filename="../mainwindow.ui" line="552"/>
266 266 <source>Use Purple Colors</source>
267 267 <translation type="unfinished">Использовать фиолетовые оттенки</translation>
268 268 </message>
269 269 <message>
270   - <location filename="../mainwindow.ui" line="441"/>
  270 + <location filename="../mainwindow.ui" line="560"/>
271 271 <source>1 GiB Memory Limit</source>
272 272 <translation type="unfinished">Лимит памяти 1 ГиБ</translation>
273 273 </message>
274 274 <message>
275 275 <location filename="../mainwindow.ui" line="14"/>
276   - <location filename="../mainwindow.cpp" line="66"/>
277   - <location filename="../mainwindow.cpp" line="137"/>
278   - <location filename="../mainwindow.cpp" line="195"/>
279   - <location filename="../mainwindow.cpp" line="678"/>
  276 + <location filename="../mainwindow.cpp" line="67"/>
  277 + <location filename="../mainwindow.cpp" line="146"/>
  278 + <location filename="../mainwindow.cpp" line="204"/>
  279 + <location filename="../mainwindow.cpp" line="690"/>
280 280 <source>FEM Draw</source>
281 281 <translation type="unfinished"></translation>
282 282 </message>
283 283 <message>
284   - <location filename="../mainwindow.cpp" line="85"/>
  284 + <location filename="../mainwindow.cpp" line="86"/>
285 285 <source>draw.png</source>
286 286 <translation type="unfinished"></translation>
287 287 </message>
288 288 <message>
289   - <location filename="../mainwindow.cpp" line="217"/>
  289 + <location filename="../mainwindow.cpp" line="226"/>
290 290 <source>Open Tecplot File</source>
291 291 <translation type="unfinished">Открыть файл Tecplot</translation>
292 292 </message>
293 293 <message>
294   - <location filename="../mainwindow.cpp" line="282"/>
  294 + <location filename="../mainwindow.cpp" line="291"/>
295 295 <source>Images</source>
296 296 <translation type="unfinished">Изображения</translation>
297 297 </message>
298 298 <message>
299   - <location filename="../mainwindow.cpp" line="291"/>
  299 + <location filename="../mainwindow.cpp" line="300"/>
300 300 <source>Save Image File</source>
301 301 <translation type="unfinished">Сохранить изображение в файл</translation>
302 302 </message>
303 303 <message>
304   - <location filename="../mainwindow.cpp" line="323"/>
  304 + <location filename="../mainwindow.cpp" line="332"/>
305 305 <source>Generated with FEM Draw</source>
306 306 <translation type="unfinished"></translation>
307 307 </message>
308 308 <message>
309   - <location filename="../mainwindow.cpp" line="404"/>
310   - <location filename="../mainwindow.cpp" line="441"/>
311   - <location filename="../mainwindow.cpp" line="456"/>
312   - <location filename="../mainwindow.cpp" line="840"/>
  309 + <location filename="../mainwindow.cpp" line="413"/>
  310 + <location filename="../mainwindow.cpp" line="450"/>
  311 + <location filename="../mainwindow.cpp" line="465"/>
  312 + <location filename="../mainwindow.cpp" line="852"/>
313 313 <source>Error</source>
314 314 <translation type="unfinished">Ошибка</translation>
315 315 </message>
316 316 <message>
317   - <location filename="../mainwindow.cpp" line="405"/>
  317 + <location filename="../mainwindow.cpp" line="414"/>
318 318 <source>Error: Can&apos;t save file</source>
319 319 <translation type="unfinished">Ошибка: Не удалось сохранить файл</translation>
320 320 </message>
321 321 <message>
322   - <location filename="../mainwindow.cpp" line="442"/>
  322 + <location filename="../mainwindow.cpp" line="451"/>
323 323 <source>Error: Memory limit exceeded</source>
324 324 <translation type="unfinished">Ошибка: Превышен лимит памяти</translation>
325 325 </message>
326 326 <message>
327   - <location filename="../mainwindow.cpp" line="457"/>
  327 + <location filename="../mainwindow.cpp" line="466"/>
328 328 <source>Error: More than 10x interpolation is not supported</source>
329 329 <translation type="unfinished">Ошибка: Не поддерживаются уровни интерполяции больше 10</translation>
330 330 </message>
331 331 <message>
332   - <location filename="../mainwindow.cpp" line="485"/>
  332 + <location filename="../mainwindow.cpp" line="494"/>
333 333 <source>Select Isolines Color</source>
334 334 <translation type="unfinished">Выберите цвет изолиний</translation>
335 335 </message>
336 336 <message>
337   - <location filename="../mainwindow.cpp" line="500"/>
338   - <location filename="../mainwindow.cpp" line="534"/>
  337 + <location filename="../mainwindow.cpp" line="509"/>
  338 + <location filename="../mainwindow.cpp" line="543"/>
339 339 <source>Width</source>
340 340 <translation type="unfinished">Толщина</translation>
341 341 </message>
342 342 <message>
343   - <location filename="../mainwindow.cpp" line="500"/>
  343 + <location filename="../mainwindow.cpp" line="509"/>
344 344 <source>Select Isolines Width:</source>
345 345 <translation type="unfinished">Укажите толщину изолиний:</translation>
346 346 </message>
347 347 <message>
348   - <location filename="../mainwindow.cpp" line="519"/>
  348 + <location filename="../mainwindow.cpp" line="528"/>
349 349 <source>Select Vectors Color</source>
350 350 <translation type="unfinished">Выберите цвет векторов</translation>
351 351 </message>
352 352 <message>
353   - <location filename="../mainwindow.cpp" line="534"/>
  353 + <location filename="../mainwindow.cpp" line="543"/>
354 354 <source>Select Vectors Width:</source>
355 355 <translation type="unfinished">Укажите толщину векторов:</translation>
356 356 </message>
357 357 <message>
358   - <location filename="../mainwindow.cpp" line="547"/>
  358 + <location filename="../mainwindow.cpp" line="556"/>
359 359 <source>Length</source>
360 360 <translation type="unfinished">Длина</translation>
361 361 </message>
362 362 <message>
363   - <location filename="../mainwindow.cpp" line="547"/>
  363 + <location filename="../mainwindow.cpp" line="556"/>
364 364 <source>Select Vectors Length:</source>
365 365 <translation type="unfinished">Укажите длину векторов:</translation>
366 366 </message>
367 367 <message>
368   - <location filename="../mainwindow.cpp" line="560"/>
  368 + <location filename="../mainwindow.cpp" line="569"/>
369 369 <source>Arrow Size</source>
370 370 <translation type="unfinished">Размер стрелок</translation>
371 371 </message>
372 372 <message>
373   - <location filename="../mainwindow.cpp" line="560"/>
  373 + <location filename="../mainwindow.cpp" line="569"/>
374 374 <source>Select Arrow Size:</source>
375 375 <translation type="unfinished">Укажите размер стрелок:</translation>
376 376 </message>
377 377 <message>
378   - <location filename="../mainwindow.cpp" line="684"/>
  378 + <location filename="../mainwindow.cpp" line="696"/>
379 379 <source>Peter Zhigalov</source>
380 380 <translation type="unfinished">Жигалов Петр</translation>
381 381 </message>
382 382 <message>
383   - <location filename="../mainwindow.cpp" line="699"/>
  383 + <location filename="../mainwindow.cpp" line="711"/>
384 384 <source>About Third Party Libraries</source>
385 385 <translation type="unfinished">О библиотеках</translation>
386 386 </message>
387 387 <message>
388   - <location filename="../mainwindow.cpp" line="700"/>
  388 + <location filename="../mainwindow.cpp" line="712"/>
389 389 <source>Third Party Libraries</source>
390 390 <translation type="unfinished">Библиотеки</translation>
391 391 </message>
392 392 <message>
393   - <location filename="../mainwindow.cpp" line="717"/>
  393 + <location filename="../mainwindow.cpp" line="729"/>
394 394 <source>Library</source>
395 395 <translation type="unfinished">Библиотека</translation>
396 396 </message>
397 397 <message>
398   - <location filename="../mainwindow.cpp" line="684"/>
399   - <location filename="../mainwindow.cpp" line="717"/>
  398 + <location filename="../mainwindow.cpp" line="696"/>
  399 + <location filename="../mainwindow.cpp" line="729"/>
400 400 <source>License</source>
401 401 <translation type="unfinished">Лицензия</translation>
402 402 </message>
403 403 <message>
404   - <location filename="../mainwindow.cpp" line="218"/>
  404 + <location filename="../mainwindow.cpp" line="227"/>
405 405 <source>Tecplot Data Files</source>
406 406 <translation type="unfinished">Файлы данных Tecplot</translation>
407 407 </message>
408 408 <message>
409   - <location filename="../mainwindow.cpp" line="218"/>
  409 + <location filename="../mainwindow.cpp" line="227"/>
410 410 <source>All Files</source>
411 411 <translation type="unfinished">Все файлы</translation>
412 412 </message>
413 413 <message>
414   - <location filename="../mainwindow.cpp" line="287"/>
  414 + <location filename="../mainwindow.cpp" line="296"/>
415 415 <source>All Images</source>
416 416 <translation type="unfinished">Все изображения</translation>
417 417 </message>
418 418 <message>
419   - <location filename="../mainwindow.cpp" line="717"/>
  419 + <location filename="../mainwindow.cpp" line="729"/>
420 420 <source>Website</source>
421 421 <translation type="unfinished">Веб-сайт</translation>
422 422 </message>
423 423 <message>
424   - <location filename="../mainwindow.cpp" line="841"/>
  424 + <location filename="../mainwindow.cpp" line="853"/>
425 425 <source>Error: You can open only one file simultaneously</source>
426 426 <translation type="unfinished">Ошибка: Нельзя открывать несколько файлов одновременно</translation>
427 427 </message>
... ...
src_qt/main.cpp
... ... @@ -15,8 +15,8 @@ int main(int argc, char *argv[])
15 15 {
16 16 Application a(argc, argv);
17 17 a.setOrganizationDomain("fami.codefreak.ru");
18   - a.setOrganizationName("FAMI Net Team");
19   - a.setApplicationName("FEM Draw Qt");
  18 + a.setOrganizationName("fami_net_team");
  19 + a.setApplicationName("fem_draw");
20 20 a.setApplicationVersion("1.7");
21 21 MainWindow w;
22 22 w.update_translations();
... ...
src_qt/mainwindow.cpp
... ... @@ -16,6 +16,7 @@
16 16 #include <QMenu>
17 17 #include <QSettings>
18 18 #include <QLocale>
  19 +#include <QResizeEvent>
19 20 #include <algorithm>
20 21 #include <cmath>
21 22 #include "libs/jo_images.h"
... ... @@ -118,7 +119,15 @@ void MainWindow::resizeEvent(QResizeEvent *event)
118 119 // Подгонка размеров виджета при изменении размеров окна
119 120 QRect main = ui->centralwidget->geometry();
120 121 QRect widget = ui->widget->geometry();
121   - ui->widget->setGeometry(widget.x(), widget.y(), main.width() - widget.x(), main.height() - widget.y());
  122 + int widget_y = ui->verticalSpacer->geometry().top();
  123 + ui->widget->setGeometry(widget.x(), widget_y, main.width() - widget.x(), main.height() - widget_y);
  124 +}
  125 +
  126 +// Показать окно
  127 +void MainWindow::show()
  128 +{
  129 + QMainWindow::show();
  130 + QApplication::postEvent(this, new QResizeEvent(size(), size()));
122 131 }
123 132  
124 133 // Открытие файла по имени
... ... @@ -612,6 +621,9 @@ void MainWindow::update_translations(QString language)
612 621  
613 622 // Меню в доке OS X также нуждается в переводе
614 623 update_dock_menu();
  624 +
  625 + // Также следует пересчитать геометрию виждетов
  626 + QApplication::postEvent(this, new QResizeEvent(size(), size()));
615 627 }
616 628  
617 629 // Функция, устанавливающая меню в доке OS X
... ...
src_qt/mainwindow.h
... ... @@ -35,6 +35,8 @@ public:
35 35 void dragMoveEvent(QDragMoveEvent * event);
36 36 void dragLeaveEvent(QDragLeaveEvent * event);
37 37 void dropEvent(QDropEvent * event);
  38 + // Показать окно
  39 + void show();
38 40 public slots:
39 41 // Открытие файла по имени
40 42 void open_file(const QString & filename);
... ...
src_qt/mainwindow.ui
... ... @@ -18,154 +18,273 @@
18 18 <normaloff>:/resources/icon.ico</normaloff>:/resources/icon.ico</iconset>
19 19 </property>
20 20 <widget class="QWidget" name="centralwidget">
21   - <widget class="paintwidget" name="widget" native="true">
  21 + <widget class="QWidget" name="verticalLayoutWidget">
22 22 <property name="geometry">
23 23 <rect>
24 24 <x>0</x>
25   - <y>25</y>
26   - <width>640</width>
27   - <height>525</height>
28   - </rect>
29   - </property>
30   - </widget>
31   - <widget class="QCheckBox" name="checkBox_Color">
32   - <property name="geometry">
33   - <rect>
34   - <x>10</x>
35   - <y>0</y>
36   - <width>65</width>
37   - <height>25</height>
38   - </rect>
39   - </property>
40   - <property name="toolTip">
41   - <string>Draw color image</string>
42   - </property>
43   - <property name="text">
44   - <string>Color</string>
45   - </property>
46   - </widget>
47   - <widget class="QComboBox" name="comboBox_Color">
48   - <property name="geometry">
49   - <rect>
50   - <x>75</x>
51   - <y>0</y>
52   - <width>70</width>
53   - <height>25</height>
54   - </rect>
55   - </property>
56   - <property name="toolTip">
57   - <string>Data component for colors and isolines</string>
58   - </property>
59   - </widget>
60   - <widget class="QCheckBox" name="checkBox_Isolines">
61   - <property name="geometry">
62   - <rect>
63   - <x>160</x>
64   - <y>0</y>
65   - <width>80</width>
66   - <height>25</height>
67   - </rect>
68   - </property>
69   - <property name="toolTip">
70   - <string>Draw isolines</string>
71   - </property>
72   - <property name="text">
73   - <string>Isolines</string>
74   - </property>
75   - </widget>
76   - <widget class="QSpinBox" name="spinBox_Isolines">
77   - <property name="geometry">
78   - <rect>
79   - <x>240</x>
80   - <y>0</y>
81   - <width>55</width>
82   - <height>25</height>
83   - </rect>
84   - </property>
85   - <property name="toolTip">
86   - <string>Number of isolines</string>
87   - </property>
88   - </widget>
89   - <widget class="QCheckBox" name="checkBox_Vectors">
90   - <property name="geometry">
91   - <rect>
92   - <x>310</x>
93 25 <y>0</y>
94   - <width>80</width>
95   - <height>25</height>
96   - </rect>
97   - </property>
98   - <property name="toolTip">
99   - <string>Draw vectors</string>
100   - </property>
101   - <property name="text">
102   - <string>Vectors</string>
103   - </property>
104   - </widget>
105   - <widget class="QSpinBox" name="spinBox_Vectors">
106   - <property name="geometry">
107   - <rect>
108   - <x>390</x>
109   - <y>0</y>
110   - <width>55</width>
111   - <height>25</height>
112   - </rect>
113   - </property>
114   - <property name="toolTip">
115   - <string>Draw vectors for every i value</string>
116   - </property>
117   - </widget>
118   - <widget class="QComboBox" name="comboBox_Vectors_U">
119   - <property name="geometry">
120   - <rect>
121   - <x>470</x>
122   - <y>0</y>
123   - <width>70</width>
124   - <height>25</height>
125   - </rect>
126   - </property>
127   - <property name="toolTip">
128   - <string>Data component for first vector axis</string>
129   - </property>
130   - </widget>
131   - <widget class="QComboBox" name="comboBox_Vectors_V">
132   - <property name="geometry">
133   - <rect>
134   - <x>565</x>
135   - <y>0</y>
136   - <width>70</width>
137   - <height>25</height>
138   - </rect>
139   - </property>
140   - <property name="toolTip">
141   - <string>Data component for second vector axis</string>
142   - </property>
143   - </widget>
144   - <widget class="QLabel" name="label">
145   - <property name="geometry">
146   - <rect>
147   - <x>455</x>
148   - <y>0</y>
149   - <width>25</width>
150   - <height>25</height>
  26 + <width>640</width>
  27 + <height>150</height>
151 28 </rect>
152 29 </property>
153   - <property name="text">
154   - <string>U:</string>
155   - </property>
  30 + <layout class="QVBoxLayout" name="verticalLayout">
  31 + <property name="spacing">
  32 + <number>0</number>
  33 + </property>
  34 + <item>
  35 + <layout class="QHBoxLayout" name="horizontalLayout">
  36 + <property name="spacing">
  37 + <number>4</number>
  38 + </property>
  39 + <property name="leftMargin">
  40 + <number>5</number>
  41 + </property>
  42 + <property name="rightMargin">
  43 + <number>5</number>
  44 + </property>
  45 + <item>
  46 + <spacer name="horizontalSpacer">
  47 + <property name="orientation">
  48 + <enum>Qt::Horizontal</enum>
  49 + </property>
  50 + <property name="sizeHint" stdset="0">
  51 + <size>
  52 + <width>40</width>
  53 + <height>20</height>
  54 + </size>
  55 + </property>
  56 + </spacer>
  57 + </item>
  58 + <item>
  59 + <layout class="QHBoxLayout" name="horizontalLayout_6">
  60 + <item>
  61 + <widget class="QCheckBox" name="checkBox_Color">
  62 + <property name="toolTip">
  63 + <string>Draw color image</string>
  64 + </property>
  65 + <property name="text">
  66 + <string>Color</string>
  67 + </property>
  68 + </widget>
  69 + </item>
  70 + <item>
  71 + <widget class="QComboBox" name="comboBox_Color">
  72 + <property name="minimumSize">
  73 + <size>
  74 + <width>70</width>
  75 + <height>25</height>
  76 + </size>
  77 + </property>
  78 + <property name="maximumSize">
  79 + <size>
  80 + <width>70</width>
  81 + <height>25</height>
  82 + </size>
  83 + </property>
  84 + <property name="toolTip">
  85 + <string>Data component for colors and isolines</string>
  86 + </property>
  87 + </widget>
  88 + </item>
  89 + </layout>
  90 + </item>
  91 + <item>
  92 + <spacer name="horizontalSpacer_2">
  93 + <property name="orientation">
  94 + <enum>Qt::Horizontal</enum>
  95 + </property>
  96 + <property name="sizeHint" stdset="0">
  97 + <size>
  98 + <width>40</width>
  99 + <height>20</height>
  100 + </size>
  101 + </property>
  102 + </spacer>
  103 + </item>
  104 + <item>
  105 + <layout class="QHBoxLayout" name="horizontalLayout_5">
  106 + <item>
  107 + <widget class="QCheckBox" name="checkBox_Isolines">
  108 + <property name="toolTip">
  109 + <string>Draw isolines</string>
  110 + </property>
  111 + <property name="text">
  112 + <string>Isolines</string>
  113 + </property>
  114 + </widget>
  115 + </item>
  116 + <item>
  117 + <widget class="QSpinBox" name="spinBox_Isolines">
  118 + <property name="minimumSize">
  119 + <size>
  120 + <width>55</width>
  121 + <height>0</height>
  122 + </size>
  123 + </property>
  124 + <property name="maximumSize">
  125 + <size>
  126 + <width>55</width>
  127 + <height>25</height>
  128 + </size>
  129 + </property>
  130 + <property name="toolTip">
  131 + <string>Number of isolines</string>
  132 + </property>
  133 + </widget>
  134 + </item>
  135 + </layout>
  136 + </item>
  137 + <item>
  138 + <spacer name="horizontalSpacer_3">
  139 + <property name="orientation">
  140 + <enum>Qt::Horizontal</enum>
  141 + </property>
  142 + <property name="sizeHint" stdset="0">
  143 + <size>
  144 + <width>40</width>
  145 + <height>20</height>
  146 + </size>
  147 + </property>
  148 + </spacer>
  149 + </item>
  150 + <item>
  151 + <layout class="QHBoxLayout" name="horizontalLayout_4">
  152 + <item>
  153 + <widget class="QCheckBox" name="checkBox_Vectors">
  154 + <property name="toolTip">
  155 + <string>Draw vectors</string>
  156 + </property>
  157 + <property name="text">
  158 + <string>Vectors</string>
  159 + </property>
  160 + </widget>
  161 + </item>
  162 + <item>
  163 + <widget class="QSpinBox" name="spinBox_Vectors">
  164 + <property name="minimumSize">
  165 + <size>
  166 + <width>55</width>
  167 + <height>0</height>
  168 + </size>
  169 + </property>
  170 + <property name="maximumSize">
  171 + <size>
  172 + <width>55</width>
  173 + <height>25</height>
  174 + </size>
  175 + </property>
  176 + <property name="toolTip">
  177 + <string>Draw vectors for every i value</string>
  178 + </property>
  179 + </widget>
  180 + </item>
  181 + </layout>
  182 + </item>
  183 + <item>
  184 + <layout class="QHBoxLayout" name="horizontalLayout_3">
  185 + <item>
  186 + <widget class="QLabel" name="label">
  187 + <property name="text">
  188 + <string>U:</string>
  189 + </property>
  190 + <property name="alignment">
  191 + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
  192 + </property>
  193 + </widget>
  194 + </item>
  195 + <item>
  196 + <widget class="QComboBox" name="comboBox_Vectors_U">
  197 + <property name="minimumSize">
  198 + <size>
  199 + <width>70</width>
  200 + <height>0</height>
  201 + </size>
  202 + </property>
  203 + <property name="maximumSize">
  204 + <size>
  205 + <width>70</width>
  206 + <height>25</height>
  207 + </size>
  208 + </property>
  209 + <property name="toolTip">
  210 + <string>Data component for first vector axis</string>
  211 + </property>
  212 + </widget>
  213 + </item>
  214 + </layout>
  215 + </item>
  216 + <item>
  217 + <layout class="QHBoxLayout" name="horizontalLayout_2">
  218 + <item>
  219 + <widget class="QLabel" name="label_2">
  220 + <property name="text">
  221 + <string>V:</string>
  222 + </property>
  223 + <property name="alignment">
  224 + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
  225 + </property>
  226 + </widget>
  227 + </item>
  228 + <item>
  229 + <widget class="QComboBox" name="comboBox_Vectors_V">
  230 + <property name="minimumSize">
  231 + <size>
  232 + <width>70</width>
  233 + <height>0</height>
  234 + </size>
  235 + </property>
  236 + <property name="maximumSize">
  237 + <size>
  238 + <width>70</width>
  239 + <height>25</height>
  240 + </size>
  241 + </property>
  242 + <property name="toolTip">
  243 + <string>Data component for second vector axis</string>
  244 + </property>
  245 + </widget>
  246 + </item>
  247 + </layout>
  248 + </item>
  249 + <item>
  250 + <spacer name="horizontalSpacer_4">
  251 + <property name="orientation">
  252 + <enum>Qt::Horizontal</enum>
  253 + </property>
  254 + <property name="sizeHint" stdset="0">
  255 + <size>
  256 + <width>40</width>
  257 + <height>20</height>
  258 + </size>
  259 + </property>
  260 + </spacer>
  261 + </item>
  262 + </layout>
  263 + </item>
  264 + <item>
  265 + <spacer name="verticalSpacer">
  266 + <property name="orientation">
  267 + <enum>Qt::Vertical</enum>
  268 + </property>
  269 + <property name="sizeHint" stdset="0">
  270 + <size>
  271 + <width>20</width>
  272 + <height>40</height>
  273 + </size>
  274 + </property>
  275 + </spacer>
  276 + </item>
  277 + </layout>
156 278 </widget>
157   - <widget class="QLabel" name="label_2">
  279 + <widget class="paintwidget" name="widget" native="true">
158 280 <property name="geometry">
159 281 <rect>
160   - <x>550</x>
161   - <y>0</y>
162   - <width>25</width>
163   - <height>25</height>
  282 + <x>0</x>
  283 + <y>250</y>
  284 + <width>640</width>
  285 + <height>250</height>
164 286 </rect>
165 287 </property>
166   - <property name="text">
167   - <string>V:</string>
168   - </property>
169 288 </widget>
170 289 </widget>
171 290 <widget class="QMenuBar" name="menuBar">
... ...