Forssim

Merge lp:~par-hellstrom/forssim/touchScreenUI into lp:forssim

  1. touchScreenUI
  2. Merge into development
Proposed by Martin Flodin
Status: Needs review
Proposed branch: lp:~par-hellstrom/forssim/touchScreenUI
Merge into: lp:forssim
Diff against target: 648 lines
2 files modified
FsWisdom/RemoveWisdomToothWindow.ui (+87/-88)
FsWisdom/SelectCaseWindow.ui (+36/-34)
To merge this branch: bzr merge lp:~par-hellstrom/forssim/touchScreenUI
Reviewer Review Type Date Requested Status
Forsslund Systems Pending
Review via email: mp+13277@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Flodin (mflodin) wrote :

The GUI has been adapted for the lower resolution touch screen.

Reply

Unmerged revisions

327. By parhe <parhe@parhe-desktop>

 changed default tab in remove wisdom tooth ui

326. By parhe <parhe@parhe-desktop>

Reduced screensize to 1024x768 and rearange some graphics to accomodate the change. No other changes made.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/RemoveWisdomToothWindow.ui'
2--- FsWisdom/RemoveWisdomToothWindow.ui 2009-09-03 11:53:39 +0000
3+++ FsWisdom/RemoveWisdomToothWindow.ui 2009-10-13 13:00:26 +0000
4@@ -5,8 +5,8 @@
5 <rect>
6 <x>0</x>
7 <y>0</y>
8- <width>1143</width>
9- <height>942</height>
10+ <width>1024</width>
11+ <height>768</height>
12 </rect>
13 </property>
14 <property name="windowTitle" >
15@@ -30,8 +30,8 @@
16 <property name="geometry" >
17 <rect>
18 <x>10</x>
19- <y>610</y>
20- <width>441</width>
21+ <y>380</y>
22+ <width>311</width>
23 <height>171</height>
24 </rect>
25 </property>
26@@ -76,7 +76,7 @@
27 <widget class="QPushButton" name="playstop_2" >
28 <property name="geometry" >
29 <rect>
30- <x>180</x>
31+ <x>110</x>
32 <y>80</y>
33 <width>80</width>
34 <height>28</height>
35@@ -89,7 +89,7 @@
36 <widget class="QPushButton" name="ffw_2" >
37 <property name="geometry" >
38 <rect>
39- <x>330</x>
40+ <x>200</x>
41 <y>80</y>
42 <width>80</width>
43 <height>28</height>
44@@ -142,7 +142,7 @@
45 <rect>
46 <x>20</x>
47 <y>50</y>
48- <width>401</width>
49+ <width>271</width>
50 <height>23</height>
51 </rect>
52 </property>
53@@ -163,8 +163,8 @@
54 <widget class="QLabel" name="stateLabel_2" >
55 <property name="geometry" >
56 <rect>
57- <x>780</x>
58- <y>660</y>
59+ <x>570</x>
60+ <y>430</y>
61 <width>41</width>
62 <height>22</height>
63 </rect>
64@@ -182,8 +182,8 @@
65 <widget class="QLabel" name="state_2" >
66 <property name="geometry" >
67 <rect>
68- <x>830</x>
69- <y>660</y>
70+ <x>620</x>
71+ <y>430</y>
72 <width>186</width>
73 <height>22</height>
74 </rect>
75@@ -195,10 +195,10 @@
76 <widget class="QGroupBox" name="groupBox" >
77 <property name="geometry" >
78 <rect>
79- <x>460</x>
80- <y>500</y>
81- <width>311</width>
82- <height>281</height>
83+ <x>330</x>
84+ <y>420</y>
85+ <width>231</width>
86+ <height>241</height>
87 </rect>
88 </property>
89 <property name="title" >
90@@ -210,8 +210,8 @@
91 </property>
92 <property name="geometry" >
93 <rect>
94- <x>120</x>
95- <y>30</y>
96+ <x>80</x>
97+ <y>20</y>
98 <width>71</width>
99 <height>71</height>
100 </rect>
101@@ -232,8 +232,8 @@
102 </property>
103 <property name="geometry" >
104 <rect>
105- <x>40</x>
106- <y>110</y>
107+ <x>10</x>
108+ <y>90</y>
109 <width>71</width>
110 <height>71</height>
111 </rect>
112@@ -257,8 +257,8 @@
113 </property>
114 <property name="geometry" >
115 <rect>
116- <x>120</x>
117- <y>190</y>
118+ <x>80</x>
119+ <y>160</y>
120 <width>71</width>
121 <height>71</height>
122 </rect>
123@@ -279,8 +279,8 @@
124 </property>
125 <property name="geometry" >
126 <rect>
127- <x>200</x>
128- <y>110</y>
129+ <x>150</x>
130+ <y>90</y>
131 <width>71</width>
132 <height>71</height>
133 </rect>
134@@ -299,10 +299,10 @@
135 <widget class="QGroupBox" name="groupBox_4" >
136 <property name="geometry" >
137 <rect>
138- <x>20</x>
139- <y>40</y>
140- <width>431</width>
141- <height>161</height>
142+ <x>10</x>
143+ <y>10</y>
144+ <width>311</width>
145+ <height>121</height>
146 </rect>
147 </property>
148 <property name="title" >
149@@ -311,8 +311,8 @@
150 <widget class="QToolButton" name="toolButton" >
151 <property name="geometry" >
152 <rect>
153- <x>310</x>
154- <y>40</y>
155+ <x>210</x>
156+ <y>20</y>
157 <width>91</width>
158 <height>91</height>
159 </rect>
160@@ -345,8 +345,8 @@
161 <widget class="QToolButton" name="teethButton" >
162 <property name="geometry" >
163 <rect>
164- <x>170</x>
165- <y>40</y>
166+ <x>110</x>
167+ <y>20</y>
168 <width>91</width>
169 <height>91</height>
170 </rect>
171@@ -379,8 +379,8 @@
172 <widget class="QToolButton" name="headButton" >
173 <property name="geometry" >
174 <rect>
175- <x>30</x>
176- <y>40</y>
177+ <x>10</x>
178+ <y>20</y>
179 <width>91</width>
180 <height>91</height>
181 </rect>
182@@ -414,10 +414,10 @@
183 <widget class="QGroupBox" name="groupBox_5" >
184 <property name="geometry" >
185 <rect>
186- <x>20</x>
187- <y>230</y>
188- <width>431</width>
189- <height>161</height>
190+ <x>10</x>
191+ <y>130</y>
192+ <width>311</width>
193+ <height>121</height>
194 </rect>
195 </property>
196 <property name="title" >
197@@ -429,8 +429,8 @@
198 <widget class="QToolButton" name="highlightForbiddenButton" >
199 <property name="geometry" >
200 <rect>
201- <x>310</x>
202- <y>40</y>
203+ <x>210</x>
204+ <y>20</y>
205 <width>91</width>
206 <height>91</height>
207 </rect>
208@@ -463,8 +463,8 @@
209 <widget class="QToolButton" name="highlightExpertButton" >
210 <property name="geometry" >
211 <rect>
212- <x>170</x>
213- <y>40</y>
214+ <x>110</x>
215+ <y>20</y>
216 <width>91</width>
217 <height>91</height>
218 </rect>
219@@ -497,8 +497,8 @@
220 <widget class="QToolButton" name="highlightUserButton" >
221 <property name="geometry" >
222 <rect>
223- <x>30</x>
224- <y>40</y>
225+ <x>10</x>
226+ <y>20</y>
227 <width>91</width>
228 <height>91</height>
229 </rect>
230@@ -532,8 +532,8 @@
231 <widget class="QPushButton" name="exitPushButton" >
232 <property name="geometry" >
233 <rect>
234- <x>780</x>
235- <y>720</y>
236+ <x>650</x>
237+ <y>600</y>
238 <width>331</width>
239 <height>61</height>
240 </rect>
241@@ -545,10 +545,10 @@
242 <widget class="QTableWidget" name="statisticsTableWidget" >
243 <property name="geometry" >
244 <rect>
245- <x>460</x>
246- <y>240</y>
247- <width>641</width>
248- <height>251</height>
249+ <x>330</x>
250+ <y>160</y>
251+ <width>651</width>
252+ <height>261</height>
253 </rect>
254 </property>
255 <property name="editTriggers" >
256@@ -571,8 +571,8 @@
257 <widget class="QLabel" name="label_4" >
258 <property name="geometry" >
259 <rect>
260- <x>460</x>
261- <y>220</y>
262+ <x>330</x>
263+ <y>140</y>
264 <width>101</width>
265 <height>18</height>
266 </rect>
267@@ -590,9 +590,9 @@
268 <property name="geometry" >
269 <rect>
270 <x>10</x>
271- <y>420</y>
272- <width>441</width>
273- <height>161</height>
274+ <y>250</y>
275+ <width>311</width>
276+ <height>121</height>
277 </rect>
278 </property>
279 <property name="title" >
280@@ -601,8 +601,8 @@
281 <widget class="QToolButton" name="selectDrillButton" >
282 <property name="geometry" >
283 <rect>
284- <x>40</x>
285- <y>40</y>
286+ <x>10</x>
287+ <y>20</y>
288 <width>91</width>
289 <height>91</height>
290 </rect>
291@@ -638,8 +638,8 @@
292 <widget class="QToolButton" name="selectElevatorButton" >
293 <property name="geometry" >
294 <rect>
295- <x>180</x>
296- <y>40</y>
297+ <x>110</x>
298+ <y>20</y>
299 <width>91</width>
300 <height>91</height>
301 </rect>
302@@ -676,8 +676,8 @@
303 <widget class="QLabel" name="stepsLabel" >
304 <property name="geometry" >
305 <rect>
306- <x>460</x>
307- <y>30</y>
308+ <x>330</x>
309+ <y>0</y>
310 <width>101</width>
311 <height>18</height>
312 </rect>
313@@ -694,10 +694,10 @@
314 <widget class="QTableWidget" name="stateTableWidget" >
315 <property name="geometry" >
316 <rect>
317- <x>460</x>
318- <y>50</y>
319+ <x>330</x>
320+ <y>20</y>
321 <width>651</width>
322- <height>151</height>
323+ <height>121</height>
324 </rect>
325 </property>
326 <property name="editTriggers" >
327@@ -724,19 +724,19 @@
328 <widget class="QGroupBox" name="userModeGroupBox" >
329 <property name="geometry" >
330 <rect>
331- <x>600</x>
332- <y>660</y>
333+ <x>10</x>
334+ <y>580</y>
335 <width>411</width>
336- <height>111</height>
337+ <height>61</height>
338 </rect>
339 </property>
340 <widget class="QWidget" name="gridLayoutWidget_8" >
341 <property name="geometry" >
342 <rect>
343 <x>10</x>
344- <y>20</y>
345+ <y>10</y>
346 <width>391</width>
347- <height>71</height>
348+ <height>41</height>
349 </rect>
350 </property>
351 <layout class="QGridLayout" name="gridLayout_8" >
352@@ -760,7 +760,17 @@
353 </property>
354 </widget>
355 </item>
356- <item row="1" column="1" >
357+ <item row="0" column="0" >
358+ <widget class="QPushButton" name="nextStateButton" >
359+ <property name="enabled" >
360+ <bool>true</bool>
361+ </property>
362+ <property name="text" >
363+ <string>Next State</string>
364+ </property>
365+ </widget>
366+ </item>
367+ <item row="0" column="3" >
368 <widget class="QPushButton" name="removeOtherButton" >
369 <property name="enabled" >
370 <bool>true</bool>
371@@ -770,16 +780,6 @@
372 </property>
373 </widget>
374 </item>
375- <item row="0" column="0" >
376- <widget class="QPushButton" name="nextStateButton" >
377- <property name="enabled" >
378- <bool>true</bool>
379- </property>
380- <property name="text" >
381- <string>Next State</string>
382- </property>
383- </widget>
384- </item>
385 </layout>
386 </widget>
387 </widget>
388@@ -1290,7 +1290,7 @@
389 <rect>
390 <x>600</x>
391 <y>510</y>
392- <width>411</width>
393+ <width>391</width>
394 <height>141</height>
395 </rect>
396 </property>
397@@ -1302,7 +1302,7 @@
398 <rect>
399 <x>10</x>
400 <y>20</y>
401- <width>381</width>
402+ <width>341</width>
403 <height>107</height>
404 </rect>
405 </property>
406@@ -1372,7 +1372,7 @@
407 <rect>
408 <x>600</x>
409 <y>250</y>
410- <width>411</width>
411+ <width>391</width>
412 <height>261</height>
413 </rect>
414 </property>
415@@ -1384,7 +1384,7 @@
416 <rect>
417 <x>10</x>
418 <y>20</y>
419- <width>381</width>
420+ <width>371</width>
421 <height>236</height>
422 </rect>
423 </property>
424@@ -1481,7 +1481,7 @@
425 <rect>
426 <x>600</x>
427 <y>0</y>
428- <width>411</width>
429+ <width>391</width>
430 <height>241</height>
431 </rect>
432 </property>
433@@ -1492,9 +1492,9 @@
434 <property name="geometry" >
435 <rect>
436 <x>10</x>
437- <y>20</y>
438- <width>381</width>
439- <height>184</height>
440+ <y>23</y>
441+ <width>371</width>
442+ <height>181</height>
443 </rect>
444 </property>
445 <layout class="QGridLayout" name="gridLayout_4" >
446@@ -1615,7 +1615,6 @@
447 <tabstop>rotationMinusZ_2</tabstop>
448 <tabstop>removeRootButton</tabstop>
449 <tabstop>removeCrownButton</tabstop>
450- <tabstop>removeOtherButton</tabstop>
451 <tabstop>nextStateButton</tabstop>
452 <tabstop>viewRadio</tabstop>
453 <tabstop>headRadio</tabstop>
454
455=== modified file 'FsWisdom/SelectCaseWindow.ui'
456--- FsWisdom/SelectCaseWindow.ui 2009-09-04 13:09:42 +0000
457+++ FsWisdom/SelectCaseWindow.ui 2009-10-13 13:00:26 +0000
458@@ -5,8 +5,8 @@
459 <rect>
460 <x>0</x>
461 <y>0</y>
462- <width>1225</width>
463- <height>831</height>
464+ <width>1024</width>
465+ <height>768</height>
466 </rect>
467 </property>
468 <property name="sizePolicy" >
469@@ -42,19 +42,19 @@
470 <property name="geometry" >
471 <rect>
472 <x>10</x>
473- <y>30</y>
474- <width>301</width>
475- <height>641</height>
476+ <y>360</y>
477+ <width>351</width>
478+ <height>241</height>
479 </rect>
480 </property>
481 </widget>
482 <widget class="QListWidget" name="caseListTimestampsWidget" >
483 <property name="geometry" >
484 <rect>
485- <x>600</x>
486+ <x>380</x>
487 <y>360</y>
488- <width>251</width>
489- <height>311</height>
490+ <width>301</width>
491+ <height>241</height>
492 </rect>
493 </property>
494 <property name="currentRow" >
495@@ -65,7 +65,7 @@
496 <property name="geometry" >
497 <rect>
498 <x>10</x>
499- <y>10</y>
500+ <y>340</y>
501 <width>201</width>
502 <height>18</height>
503 </rect>
504@@ -82,7 +82,7 @@
505 <widget class="QLabel" name="label_8" >
506 <property name="geometry" >
507 <rect>
508- <x>330</x>
509+ <x>10</x>
510 <y>10</y>
511 <width>201</width>
512 <height>18</height>
513@@ -100,7 +100,7 @@
514 <widget class="QLabel" name="label_9" >
515 <property name="geometry" >
516 <rect>
517- <x>600</x>
518+ <x>380</x>
519 <y>10</y>
520 <width>201</width>
521 <height>18</height>
522@@ -118,7 +118,7 @@
523 <widget class="QLabel" name="label_10" >
524 <property name="geometry" >
525 <rect>
526- <x>600</x>
527+ <x>380</x>
528 <y>340</y>
529 <width>241</width>
530 <height>18</height>
531@@ -136,10 +136,10 @@
532 <widget class="QPlainTextEdit" name="anamnesTextWidget" >
533 <property name="geometry" >
534 <rect>
535- <x>330</x>
536+ <x>10</x>
537 <y>30</y>
538- <width>251</width>
539- <height>641</height>
540+ <width>351</width>
541+ <height>301</height>
542 </rect>
543 </property>
544 <property name="undoRedoEnabled" >
545@@ -155,9 +155,9 @@
546 <widget class="QPlainTextEdit" name="objectivesTextWidget" >
547 <property name="geometry" >
548 <rect>
549- <x>600</x>
550+ <x>380</x>
551 <y>30</y>
552- <width>251</width>
553+ <width>301</width>
554 <height>301</height>
555 </rect>
556 </property>
557@@ -174,8 +174,8 @@
558 <widget class="QCheckBox" name="isStereoCheckBox" >
559 <property name="geometry" >
560 <rect>
561- <x>870</x>
562- <y>540</y>
563+ <x>690</x>
564+ <y>520</y>
565 <width>151</width>
566 <height>24</height>
567 </rect>
568@@ -190,8 +190,8 @@
569 <widget class="QCheckBox" name="isMirroredCheckBox" >
570 <property name="geometry" >
571 <rect>
572- <x>870</x>
573- <y>520</y>
574+ <x>690</x>
575+ <y>500</y>
576 <width>171</width>
577 <height>24</height>
578 </rect>
579@@ -207,8 +207,8 @@
580 <property name="geometry" >
581 <rect>
582 <x>10</x>
583- <y>680</y>
584- <width>301</width>
585+ <y>610</y>
586+ <width>211</width>
587 <height>51</height>
588 </rect>
589 </property>
590@@ -222,10 +222,10 @@
591 <widget class="QPushButton" name="launchCaseWithoutPlaybackPushButton" >
592 <property name="geometry" >
593 <rect>
594- <x>860</x>
595- <y>570</y>
596- <width>329</width>
597- <height>101</height>
598+ <x>690</x>
599+ <y>550</y>
600+ <width>211</width>
601+ <height>51</height>
602 </rect>
603 </property>
604 <property name="focusPolicy" >
605@@ -238,9 +238,9 @@
606 <widget class="QPushButton" name="launchCaseWithPlaybackPushButton" >
607 <property name="geometry" >
608 <rect>
609- <x>600</x>
610- <y>680</y>
611- <width>251</width>
612+ <x>470</x>
613+ <y>610</y>
614+ <width>211</width>
615 <height>51</height>
616 </rect>
617 </property>
618@@ -254,9 +254,9 @@
619 <widget class="QPushButton" name="logoutPushButton" >
620 <property name="geometry" >
621 <rect>
622- <x>860</x>
623- <y>680</y>
624- <width>329</width>
625+ <x>690</x>
626+ <y>610</y>
627+ <width>211</width>
628 <height>51</height>
629 </rect>
630 </property>
631@@ -270,7 +270,7 @@
632 <widget class="QLabel" name="selectCasePictureLabel" >
633 <property name="geometry" >
634 <rect>
635- <x>870</x>
636+ <x>690</x>
637 <y>30</y>
638 <width>311</width>
639 <height>471</height>
640@@ -380,6 +380,8 @@
641 </widget>
642 </item>
643 </layout>
644+ <zorder>launchCaseWithoutPlaybackPushButton</zorder>
645+ <zorder>tabWidget_2</zorder>
646 </widget>
647 <widget class="QStatusBar" name="statusbar" />
648 </widget>

Subscribers

People subscribed via source and target branches

to all changes: