Checkbox

Merge lp:~kokoto-java/checkbox/new-QT-home-screen into lp:checkbox

  1. new-QT-home-screen
  2. Merge into trunk
Proposed by George Karavasilev
Status: Merged
Merged at revision: 1546
Proposed branch: lp:~kokoto-java/checkbox/new-QT-home-screen
Merge into: lp:checkbox
Diff against target: 381 lines (+223/-30) (has conflicts)
2 files modified
qt/checkbox-qt-head-orig.svg (+163/-0)
qt/frontend/qtfront.ui (+60/-30)
Contents conflict in qt/frontend/images/checkbox-qt-head.png
Text conflict in qt/frontend/qtfront.ui
To merge this branch: bzr merge lp:~kokoto-java/checkbox/new-QT-home-screen
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+114021@code.launchpad.net

Description of the change

Redesigned the homescreen of the QT UI.
From:
http://i.imgur.com/vx2eW.png
To:
http://i.imgur.com/yJlPJ.png

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Thanks for your suggested changes but it's not clear how this redesign is better than the previous Qt UI. Please describe the motivation for your changes and perhaps their source of inspiration. You might also like to document the guidelines the previous Qt UI was not respecting and how your changes fix some of them.

Also, please note that this change doesn't look quite right:

8 - <string>Don't show me this message in the future</string>
9 + <string>Don't show me this message in the ABBA!</string>

Indeed, we don't want to show messages in the ABBA but we preferably don't want to show them in the future.

review: Needs Information
Revision history for this message
George Karavasilev (kokoto-java) wrote :

Ok, that line doesn't count :)
The file that is used is "qt/frontend/qtfront.ui" and not "qt/checkbox-qt.ui", I just made silly chnages to both files to see which was the used one and forgot to undo that in the unused file. So that line doesn't count at all :P
P.S. As far as the redesign goes - it looks more tidy than before (there is NO giant "OK" button and no out of place checkbox), the line (separator) between the TextBox and the checbox+button makes the window look a bit more professional and last, but not least the new banner fits Ambiance (the default theme) so much better :)

lp:~kokoto-java/checkbox/new-QT-home-screen updated
1485. By George Karavasilev

Fixed the silly ABBA string bug -_-

1486. By George Karavasilev

Changed the banner. The credits for the new one go to Marin Treselj on Google+ :)

Revision history for this message
Marc Tardif (cr3) wrote :

I have shared your redesign with other people and they like what they see! The only nit to pick is that "System Testing" is part of the image whereas the string should be translatable. If you are able to make the string translatable, that would be very much appreciated. Otherwise, if you could just make an extra version of the image available without the string, we could then fix that problem later without butchering your image. Make sense?

review: Needs Fixing
Revision history for this message
Marc Tardif (cr3) wrote :

@George, any updates on this? This is a very exciting merge request and we just need to push it the last mile. Please let me know if anything is blocking you. Thanks!

Revision history for this message
George Karavasilev (kokoto-java) wrote :

@Marc, I *seriously* need to talk to you on IRC about this MR :)

Revision history for this message
George Karavasilev (kokoto-java) wrote :

A bit of feedback about the MR:
 - "Confirm" as a button label is just wrong. "Continue" sounds much better name for that button. That's a 1 second fix.
 - The checkbox "Don't show me this message again" shouldn't start with "Don't", however changing the label to "Show me this message again" would change the behaviour of the home screen, because if the use doesn't check that checkboc he won't be able to see the homescreen again. This is a seperate bug and somebody must change the behaviour of the checkbox and the UI. This is most likely not to be implemented in this MR.
 - The banner outline should be killed off (And I'm not sure that's even possible, but then again after my after this MR is merged someone can try playing w/ it and fix it. BTW: that outline is here even know, it is just the current banned is light and the light outline is not that visible)
 - Mking the "System Testing" string translatable will be next to impossible with the current banner design (it would require either a banner redesign and it won't be that pretty after it or some incredibly ugly hack in the UI code that will be ... well, incredibly ugly) and to be fair I'm not sure it is that needed, because the titlebar does say "System Testing")

Revision history for this message
Marc Tardif (cr3) wrote :

These additional changes could be done independently of this merge request, but I would like to see each point you raise as a bug report. To save some time, you might like to fix the first point since it a 1 second fix.

I would still like to get the original banner produced in Inkscape which should be added to this merge request. If you can't get it, just let me know, I'll review anyways knowing we did a best effort. Either way, also let me know the name of the person who did the banner so that we can give due credit.

Thanks!

lp:~kokoto-java/checkbox/new-QT-home-screen updated
1487. By George Karavasilev

Fixed the button label, now it says "Continue" rather then "Confirm". Made the "System Testing" string translatable. Added the orginal banner from Marin Treselj on Google+ in the MR, it is located in "qt/checkbox-qt-head-orig.svg" :)

Revision history for this message
George Karavasilev (kokoto-java) wrote :

@Mark, just updated the MR. Here are the changes:
Fixed the button label, now it says "Continue" rather then "Confirm"
Made the "System Testing" string translatable and redesigned the banner so it fits with the translatable string
Added the orginal banner from Marin Treselj on Google+ in the MR, it is located in "qt/checkbox-qt-head-orig.svg"
Here is how it looks now:
http://i.imgur.com/yJlPJ.png
NOTE: After you merge this I will fill a bug report about the things I've marked as To-Do and hopefully some nice fellah (could be me for all I know :D) will fix them :P

Revision history for this message
Marc Tardif (cr3) wrote :

Looks good, thanks so much! I made a few modifications while committing:

1. Changed the pointsize of the "System\nTesting" label to 18 so that other languages have a chance to fit.
2. Added a property to aligh that label right and center which seems to look nicer.
3. Removed the execute bit from qt/checkbox-qt-head-orig.svg
4. Renamed it to qt/checkbox-qt-head.svg
5. Removed qt/checkbox.svg

review: Approve
Revision history for this message
George Karavasilev (kokoto-java) wrote :

Thank you so much for merging this! :)
Next up - main QT UI :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'qt/checkbox-qt-head-orig.svg'
2--- qt/checkbox-qt-head-orig.svg 1970-01-01 00:00:00 +0000
3+++ qt/checkbox-qt-head-orig.svg 2012-08-02 16:09:19 +0000
4@@ -0,0 +1,163 @@
5+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6+<!-- Created with Inkscape (http://www.inkscape.org/) -->
7+
8+<svg
9+ xmlns:dc="http://purl.org/dc/elements/1.1/"
10+ xmlns:cc="http://creativecommons.org/ns#"
11+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
12+ xmlns:svg="http://www.w3.org/2000/svg"
13+ xmlns="http://www.w3.org/2000/svg"
14+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
15+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16+ width="744.09448819"
17+ height="1052.3622047"
18+ id="svg2"
19+ version="1.1"
20+ inkscape:version="0.48.3.1 r9886"
21+ sodipodi:docname="variant2.svg"
22+ inkscape:export-filename="/home/marin/Documents/variant3light.png"
23+ inkscape:export-xdpi="90"
24+ inkscape:export-ydpi="90">
25+ <defs
26+ id="defs4">
27+ <linearGradient
28+ id="linearGradient3852">
29+ <stop
30+ style="stop-color:#3c3b37;stop-opacity:1;"
31+ offset="0"
32+ id="stop3854" />
33+ <stop
34+ style="stop-color:#f7f6f6;stop-opacity:1;"
35+ offset="1"
36+ id="stop3856" />
37+ </linearGradient>
38+ <clipPath
39+ clipPathUnits="userSpaceOnUse"
40+ id="clipPath3923">
41+ <rect
42+ y="447.64792"
43+ x="28.571428"
44+ height="119"
45+ width="640"
46+ id="rect3925"
47+ style="fill:#f7f6f5;fill-opacity:1;stroke:none" />
48+ </clipPath>
49+ <clipPath
50+ clipPathUnits="userSpaceOnUse"
51+ id="clipPath3929">
52+ <rect
53+ y="447.64792"
54+ x="28.571428"
55+ height="119"
56+ width="640"
57+ id="rect3931"
58+ style="fill:#f7f6f5;fill-opacity:1;stroke:none" />
59+ </clipPath>
60+ <clipPath
61+ clipPathUnits="userSpaceOnUse"
62+ id="clipPath3935">
63+ <rect
64+ y="447.64792"
65+ x="28.571428"
66+ height="119"
67+ width="640"
68+ id="rect3937"
69+ style="fill:#f7f6f5;fill-opacity:1;stroke:none" />
70+ </clipPath>
71+ </defs>
72+ <sodipodi:namedview
73+ id="base"
74+ pagecolor="#ffffff"
75+ bordercolor="#666666"
76+ borderopacity="1.0"
77+ inkscape:pageopacity="0.0"
78+ inkscape:pageshadow="2"
79+ inkscape:zoom="0.98994949"
80+ inkscape:cx="307.87344"
81+ inkscape:cy="582.95611"
82+ inkscape:document-units="px"
83+ inkscape:current-layer="layer1"
84+ showgrid="false"
85+ inkscape:window-width="1301"
86+ inkscape:window-height="744"
87+ inkscape:window-x="65"
88+ inkscape:window-y="24"
89+ inkscape:window-maximized="1" />
90+ <metadata
91+ id="metadata7">
92+ <rdf:RDF>
93+ <cc:Work
94+ rdf:about="">
95+ <dc:format>image/svg+xml</dc:format>
96+ <dc:type
97+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
98+ <dc:title />
99+ </cc:Work>
100+ </rdf:RDF>
101+ </metadata>
102+ <g
103+ inkscape:label="Layer 1"
104+ inkscape:groupmode="layer"
105+ id="layer1">
106+ <rect
107+ style="fill:#3c3b3f;fill-opacity:1;stroke:none"
108+ id="rect2985"
109+ width="640"
110+ height="119"
111+ x="0"
112+ y="433.36218" />
113+ <path
114+ style="fill:#f7f6f5;fill-opacity:1"
115+ inkscape:connector-curvature="0"
116+ d="m 315.72539,438.47013 c 2.80334,-2.80333 6.35486,-4.39146 10.01342,-4.78202 -3.07979,-12.0333 -9.44993,-22.75374 -18.0764,-31.17317 -2.16573,2.94333 -5.29964,5.20435 -9.10055,6.22428 -8.89587,2.38337 -18.03642,-2.89392 -20.41626,-11.78743 -1.01757,-3.79856 -0.63172,-7.63712 0.83054,-10.98042 -5.68785,-1.58107 -11.66862,-2.44454 -17.8529,-2.44454 -6.27604,0 -12.34974,0.88935 -18.11053,2.51747 1.4352,3.32684 1.81047,7.13716 0.79995,10.90749 -2.38219,8.89234 -11.52274,14.1708 -20.41508,11.78743 -3.73621,-1.00228 -6.82188,-3.20331 -8.98174,-6.06899 -8.55235,8.40531 -14.86369,19.08458 -17.91877,31.05787 3.55505,0.4388 7.0007,2.0081 9.7311,4.7385 6.51014,6.51132 6.51367,17.06825 0.004,23.5831 -2.72687,2.72687 -6.16429,4.29382 -9.71816,4.73614 3.06567,11.95683 9.38171,22.62081 17.9376,31.012 2.1575,-2.84216 5.22552,-5.02554 8.94174,-6.01959 8.89468,-2.38572 18.03876,2.89392 20.42096,11.78743 1.00463,3.74445 0.6376,7.52772 -0.77642,10.83456 5.75607,1.62459 11.81684,2.51159 18.08464,2.51159 6.17488,0 12.14741,-0.85759 17.82467,-2.43513 -1.43637,-3.32683 -1.81282,-7.13833 -0.80465,-10.90866 2.37983,-8.89234 11.52509,-14.17433 20.42095,-11.79096 3.78563,1.01287 6.90424,3.25977 9.06645,6.18075 8.62764,-8.40648 15.00131,-19.11399 18.09051,-31.13081 -3.6515,-0.39527 -7.19714,-1.9834 -9.9946,-4.77967 -6.51132,-6.51368 -6.51132,-17.06707 0,-23.57722 z m -42.81825,23.5431 c -6.51014,6.50897 -17.06589,6.50426 -23.57839,-0.005 -6.50897,-6.51014 -6.50897,-17.06706 0,-23.57721 6.51603,-6.51014 17.06825,-6.51485 23.57839,-0.002 6.51014,6.51014 6.51014,17.0706 0,23.58427 z"
117+ id="path3"
118+ clip-path="url(#clipPath3923)"
119+ transform="translate(163.42857,-14.285736)" />
120+ <flowRoot
121+ xml:space="preserve"
122+ id="flowRoot3844"
123+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#f7f6f5;fill-opacity:1;stroke:none;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono"
124+ transform="matrix(1.2693189,0,0,1.2693189,-123.01436,-166.44339)"><flowRegion
125+ id="flowRegion3846"><rect
126+ id="rect3848"
127+ width="417.85715"
128+ height="48.57143"
129+ x="216.42857"
130+ y="518.79077"
131+ style="fill:#f7f6f5;fill-opacity:1;stroke:none" /></flowRegion><flowPara
132+ id="flowPara3850"
133+ style="font-size:37.81555557000000078px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#f7f6f5;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">System Testing</flowPara></flowRoot> <path
134+ style="fill:#f7f6f5;fill-opacity:1"
135+ inkscape:connector-curvature="0"
136+ d="m 51.870664,544.12866 v 18.77076 c -7.380035,-8.34005 -11.42131,-18.9478 -11.42131,-30.18 0,-12.18579 4.7454,-23.6417 13.362281,-32.25858 8.616881,-8.61688 20.073599,-13.36309 32.259388,-13.36309 11.78987,0 22.887687,4.45329 31.400757,12.5455 v 38.7824 c 0,2.66521 -1.03728,5.17029 -2.92273,7.05573 -1.88463,1.88464 -4.39132,2.92273 -7.05814,2.92273 -5.50103,0 -9.977654,-4.47663 -9.979263,-9.97927 v -25.66073 c 0.0016,-4.18934 -1.629547,-8.12842 -4.5917,-11.09057 -2.962154,-2.96215 -6.900426,-4.59331 -11.089768,-4.59331 -8.645046,0 -15.679859,7.03481 -15.682273,15.68308 v 14.49612 c -8.100254,1.3479 -14.277242,8.38513 -14.277242,16.86923 z m 79.822826,-11.40924 c 0,-9.65818 -2.99193,-18.85285 -8.5187,-26.54431 v 32.24812 c 0.002,4.18854 -1.62874,8.12681 -4.5917,11.08897 -2.96216,2.96215 -6.90042,4.59331 -11.09057,4.59331 -8.644243,0 -15.679056,-7.03482 -15.68147,-15.68067 V 512.7617 c 8.05e-4,-2.66602 -1.037276,-5.1727 -2.921917,-7.05735 -1.885446,-1.88464 -4.391326,-2.92272 -7.05815,-2.92272 -5.501027,0 -9.977653,4.47743 -9.979262,9.98087 v 14.50257 c 8.080136,1.36721 14.235396,8.39397 14.235396,16.86359 v 34.21243 c 12.180156,-0.004 23.631243,-4.74862 32.243293,-13.36148 8.61688,-8.61768 13.36308,-20.0744 13.36308,-32.26019 z m -62.718623,19.89897 c 6.288843,0 11.405216,-5.11637 11.405216,-11.40521 h -5.70301 c 0,3.14402 -2.558187,5.7022 -5.702206,5.7022 -3.144019,0 -5.702205,-2.55818 -5.702205,-5.7022 h -5.702206 c -8.05e-4,6.28884 5.115569,11.40521 11.404411,11.40521 l 0,0 z"
137+ id="path3-4"
138+ clip-path="url(#clipPath3935)"
139+ transform="translate(-28.571428,-14.285736)" />
140+ <path
141+ style="fill:#f7f6f5;fill-opacity:1"
142+ inkscape:connector-curvature="0"
143+ d="m 668.28563,496.24917 c -13.27381,-13.27132 -30.92264,-20.57998 -49.69436,-20.57998 -18.77172,0 -36.42304,7.30866 -49.69807,20.58121 -13.27507,13.27135 -20.58619,30.91647 -20.58619,49.68323 0,18.76675 7.31112,36.41186 20.58619,49.68321 13.27629,13.27132 30.92512,20.58121 49.6993,20.58121 18.77174,0 36.41932,-7.30864 49.69313,-20.57998 27.40033,-27.39413 27.40033,-71.97354 0,-99.3689 z m -106.80272,54.28256 c -2.42548,0 -4.39239,-1.96691 -4.39239,-4.39113 0,-2.42548 1.96815,-4.39362 4.39239,-4.39362 2.42548,0 4.39361,1.96814 4.39361,4.39362 0,2.42422 -1.96813,4.39113 -4.39361,4.39113 z m 57.05383,-65.82248 c 2.42548,-10e-4 4.39238,1.96443 4.39238,4.3899 0,2.42674 -1.9669,4.39239 -4.39238,4.39239 -2.42671,0 -4.39362,-1.96565 -4.39362,-4.39361 0,-2.42425 1.96691,-4.3899 4.39362,-4.38868 z m -43.4491,17.99091 c 1.7153,-1.71653 4.49401,-1.71407 6.2118,0 1.71282,1.71531 1.71531,4.49525 0,6.21058 -1.71779,1.7153 -4.49898,1.7153 -6.21429,0 -1.71407,-1.71284 -1.71407,-4.49527 0.002,-6.21058 z m 6.2118,86.87716 c -1.71533,1.71779 -4.4965,1.71779 -6.2118,0.002 -1.71531,-1.71405 -1.71531,-4.49647 0,-6.21303 1.7153,-1.71407 4.49647,-1.71159 6.2118,10e-4 1.71531,1.7153 1.71531,4.49524 0,6.20931 z m 37.2373,17.99586 c -2.42425,0 -4.39362,-1.96691 -4.39362,-4.39238 0,-2.42423 1.96937,-4.39113 4.39362,-4.39113 2.42548,0 4.39238,1.96442 4.39238,4.38863 0,2.42797 -1.9669,4.39488 -4.39238,4.39488 z m 15.61502,-45.84484 c -4.14699,4.14573 -9.66226,6.42992 -15.52949,6.42992 -5.86601,0 -11.38253,-2.28542 -15.52827,-6.43241 -4.14821,-4.1445 -6.4324,-9.65851 -6.4324,-15.52451 0,-2.81465 0.54038,-5.54627 1.54676,-8.08701 l -10.74175,-10.7405 c -3.43187,-3.43061 -3.43187,-8.99174 0,-12.42111 3.43061,-3.42938 8.99423,-3.43061 12.42234,0 l 10.78885,10.78513 c 2.50232,-0.97044 5.18186,-1.49469 7.94447,-1.49469 5.86601,0 11.3825,2.28293 15.52949,6.42868 4.15068,4.14822 6.43486,9.66349 6.43486,15.52824 0,5.86726 -2.28542,11.38127 -6.43486,15.52826 z m 27.83285,27.84898 c -1.71531,1.7153 -4.49649,1.71779 -6.2118,0 -1.7153,-1.71159 -1.71282,-4.49527 0,-6.21057 1.71779,-1.71407 4.49649,-1.71407 6.2118,0 1.7153,1.7153 1.71779,4.4965 0,6.21057 z m 0,-80.66658 c -1.71531,1.7153 -4.49401,1.71653 -6.2118,0.001 -1.7153,-1.71407 -1.7153,-4.49524 0,-6.2118 1.71531,-1.71408 4.49649,-1.71408 6.2118,10e-4 1.71779,1.71408 1.7153,4.4965 0,6.20934 z m 13.60596,41.62099 c -2.42548,0 -4.39487,-1.96691 -4.39487,-4.39113 0,-2.42548 1.96939,-4.39362 4.39487,-4.39362 2.42548,0 4.39239,1.96814 4.39239,4.39362 0,2.42422 -1.96691,4.39113 -4.39239,4.39113 z"
144+ id="path3-8"
145+ clip-path="url(#clipPath3929)"
146+ transform="translate(-28.571428,-14.285736)" />
147+ <path
148+ inkscape:connector-curvature="0"
149+ id="text"
150+ d="m 280.82632,463.58384 0,15.2864 c -1e-5,3.89217 1.88541,6.06426 5.65622,6.06426 1.0095,0 2.00417,-0.0446 2.984,-0.1337 0.97979,-0.0891 1.81116,-0.22282 2.49409,-0.4011 l 0,-20.81586 4.45372,0 0,23.579 c -1.33615,0.47538 -2.88009,0.81707 -4.63187,1.02504 -1.75182,0.23769 -3.51846,0.35653 -5.29994,0.35653 -3.32545,0 -5.84922,-1.05792 -7.57131,-2.72175 -1.72212,-1.66383 -2.58316,-4.18927 -2.58316,-7.57636 l 0,-14.66246 4.49825,0 m -68.99733,0 0,15.2864 c -1e-5,3.89217 1.88541,6.06426 5.65622,6.06426 1.00949,0 2.00417,-0.0446 2.984,-0.1337 0.97979,-0.0891 1.81116,-0.22282 2.49408,-0.4011 l 0,-20.81586 4.45373,0 0,23.579 c -1.33615,0.47538 -2.88009,0.81707 -4.63187,1.02504 -1.75182,0.23769 -3.51846,0.35653 -5.29994,0.35653 -3.32545,0 -5.84922,-1.05792 -7.57132,-2.72175 -1.72211,-1.66383 -2.58316,-4.18927 -2.58316,-7.57636 l 0,-14.66246 4.49826,0 m 50.73348,-7.88736 -4.01586,0.72819 -0.009,24.30894 c 3e-5,4.66462 2.52439,7.72239 8.07664,7.7224 1.36582,-10e-6 4.01444,-0.3709 5.58807,-0.63828 l -0.53006,-3.14651 c -0.031,0.12377 -3.5433,0.48007 -5.41737,0.37759 -1.87407,-0.10251 -3.56499,-1.6308 -3.72837,-3.20044 l 0.009,-14.69864 9.25355,0 0,-3.56903 -9.25355,0 0.0269,-7.88422 z m -77.08296,-4.22529 -4.50099,0.72818 0,34.96347 c 2.64253,0.92105 5.44888,1.38446 8.41802,1.38446 0.50827,0 1.00034,-0.0176 1.47339,-0.0539 l 0,-0.009 c 8.77925,0.0423 13.32285,-6.9187 12.14771,-14.9967 -0.92359,-5.69766 -5.65246,-10.5093 -11.18641,-10.5093 -2.19714,0 -3.94922,0.59443 -5.25565,1.06981 -0.39826,0.15055 -0.75863,0.30567 -1.09605,0.46748 l 0,-13.04448 0,-2e-5 -2e-5,0 z m 6.30679,15.12116 c 4.93934,0.24347 6.91825,4.59037 7.07172,8.86413 0.20979,5.84274 -3.86831,9.96373 -9.37163,9.47684 -1.27065,-0.11241 -2.61138,-0.15863 -4.00688,-0.48545 l 0,-16.08449 c 0.58781,-0.50149 1.25073,-0.90158 1.98548,-1.19567 1.03921,-0.38625 2.48352,-0.66595 4.32131,-0.57536 z m 46.18608,21.32495 -4.49826,0 0,-23.35299 c 1.3658,-0.47536 2.88006,-0.81704 4.54279,-1.02505 1.6924,-0.23766 3.42935,-0.35651 5.21086,-0.35653 6.65086,2e-5 9.9763,3.31281 9.97633,9.93839 l 0,14.79618 -4.45372,0 0,-15.42012 c -2e-5,-3.803 -1.84089,-5.70452 -5.52261,-5.70454 -0.97985,2e-5 -1.92997,0.0446 -2.85038,0.1337 -0.92045,0.0891 -1.72213,0.20801 -2.40501,0.35654 l 0,20.63442 m -78.46637,-24.33346 0,15.2864 c -1e-5,3.89217 1.88541,6.06426 5.65622,6.06426 1.00949,0 2.00417,-0.0446 2.98399,-0.1337 0.9798,-0.0891 1.81117,-0.22282 2.49409,-0.4011 l 0,-20.81586 4.45373,0 0,23.579 c -1.33615,0.47538 -2.8801,0.81707 -4.63188,1.02504 -1.75181,0.23769 -3.51845,0.35653 -5.29993,0.35653 -3.32545,0 -5.84922,-1.05792 -7.57132,-2.72175 -1.72211,-1.66383 -2.58316,-4.18927 -2.58316,-7.57636 l 0,-14.66246 4.49826,0"
151+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;text-anchor:start;fill:#f7f6f5;fill-opacity:1;stroke:none;font-family:Xenu" />
152+ <g
153+ id="logo"
154+ transform="matrix(0.21076862,0,0,0.21076862,300.24646,452.71675)">
155+ <path
156+ inkscape:connector-curvature="0"
157+ id="roundel"
158+ d="M 95.00015,50.000432 C 95.00015,74.852315 74.852463,95 49.999138,95 25.146388,95 4.9998625,74.852315 4.9998625,50.000432 c 0,-24.853612 20.1465255,-45.0004322 44.9992755,-45.0004322 24.853325,0 45.001012,20.1468202 45.001012,45.0004322"
159+ style="fill:#f47421;fill-opacity:1;fill-rule:nonzero;stroke:none" />
160+ <path
161+ inkscape:connector-curvature="0"
162+ id="circle-of-friends"
163+ d="m 62.295912,28.701087 c 2.873376,1.659372 6.546563,0.675122 8.204788,-2.197388 1.659075,-2.873664 0.675688,-6.546562 -2.197975,-8.205644 -2.873087,-1.658504 -6.545987,-0.674543 -8.205062,2.199121 -1.6585,2.872509 -0.67455,6.545408 2.19825,8.203911 z M 50,67.549813 c -2.641888,0 -5.145512,-0.587374 -7.392837,-1.632816 l -4.174551,7.480879 C 41.919625,75.124499 45.845375,76.10009 50,76.10009 c 2.416175,0 4.7524,-0.334819 6.9726,-0.949614 0.392825,-2.413 1.825625,-4.636944 4.109888,-5.956013 2.280224,-1.316469 4.919225,-1.446933 7.203499,-0.583622 4.4424,-4.368222 7.333101,-10.311246 7.753925,-16.929679 l -8.5624,-0.124687 C 66.689537,60.521517 59.168538,67.549813 50,67.549813 z m 0,-35.099916 c 9.168538,0 16.689537,7.029739 17.477512,15.993631 l 8.5624,-0.124975 C 75.6185,41.700699 72.727812,35.757675 68.284837,31.389741 66.00085,32.252475 63.362137,32.121722 61.081625,30.804963 58.797637,29.486472 57.365137,27.262817 56.972312,24.849528 54.7524,24.235311 52.416175,23.900204 50,23.900204 c -4.154625,0 -8.080075,0.975302 -11.566813,2.702502 l 4.174263,7.480012 C 44.854487,33.037277 47.358112,32.449902 50,32.449902 z M 32.450338,49.999856 c 0,-5.93754 2.950725,-11.181774 7.4624,-14.357351 l -4.392175,-7.357919 c -5.257513,3.512993 -9.168825,8.882784 -10.793275,15.172749 1.897787,1.546802 3.11035,3.902363 3.11035,6.543097 0,2.640447 -1.21285,4.996008 -3.110638,6.542522 1.624163,6.290252 5.535475,11.660045 10.793275,15.173037 l 4.392463,-7.358207 c -4.511675,-3.175289 -7.4624,-8.419523 -7.4624,-14.357928 z m 29.84645,21.298479 c -2.873675,1.659081 -3.857625,5.331691 -2.198838,8.2042 1.659088,2.873663 5.331688,3.858202 8.20535,2.199121 2.8728,-1.658794 3.85705,-5.331691 2.197975,-8.205066 -1.658512,-2.872221 -5.3317,-3.85676 -8.204487,-2.198255 z M 19.400513,43.992755 c -3.31875,0 -6.007975,2.688936 -6.007975,6.007677 0,3.317876 2.689225,6.007102 6.007975,6.007102 3.317587,0 6.0071,-2.689226 6.0071,-6.007102 0,-3.318741 -2.689513,-6.007677 -6.0071,-6.007677"
164+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
165+ </g>
166+ </g>
167+</svg>
168
169=== renamed file 'qt/frontend/images/checkbox-qt-head.png' => 'qt/frontend/images/checkbox-qt-head.png.OTHER'
170Binary files qt/frontend/images/checkbox-qt-head.png 2012-07-31 13:31:17 +0000 and qt/frontend/images/checkbox-qt-head.png.OTHER 2012-08-02 16:09:19 +0000 differ
171=== modified file 'qt/frontend/qtfront.ui'
172--- qt/frontend/qtfront.ui 2012-07-31 16:50:46 +0000
173+++ qt/frontend/qtfront.ui 2012-08-02 16:09:19 +0000
174@@ -7,7 +7,7 @@
175 <x>0</x>
176 <y>0</y>
177 <width>640</width>
178- <height>480</height>
179+ <height>470</height>
180 </rect>
181 </property>
182 <property name="sizePolicy">
183@@ -18,14 +18,14 @@
184 </property>
185 <property name="minimumSize">
186 <size>
187- <width>640</width>
188- <height>480</height>
189+ <width>600</width>
190+ <height>400</height>
191 </size>
192 </property>
193 <property name="maximumSize">
194 <size>
195 <width>640</width>
196- <height>480</height>
197+ <height>470</height>
198 </size>
199 </property>
200 <property name="windowTitle">
201@@ -50,13 +50,13 @@
202 <string notr="true">QTabBar::tab {min-height: 0ex;}</string>
203 </property>
204 <property name="currentIndex">
205- <number>1</number>
206+ <number>0</number>
207 </property>
208 <widget class="QWidget" name="tabWelcome">
209 <attribute name="title">
210 <string>Tab 1</string>
211 </attribute>
212- <layout class="QHBoxLayout" name="horizontalLayout_5">
213+ <layout class="QHBoxLayout" name="horizontalLayout_2">
214 <property name="spacing">
215 <number>0</number>
216 </property>
217@@ -64,7 +64,7 @@
218 <number>0</number>
219 </property>
220 <item>
221- <layout class="QVBoxLayout" name="verticalLayout_5">
222+ <layout class="QVBoxLayout" name="verticalLayout_2">
223 <property name="spacing">
224 <number>0</number>
225 </property>
226@@ -104,8 +104,8 @@
227 </property>
228 <property name="minimumSize">
229 <size>
230- <width>195</width>
231- <height>0</height>
232+ <width>500</width>
233+ <height>119</height>
234 </size>
235 </property>
236 <property name="styleSheet">
237@@ -114,27 +114,35 @@
238 </widget>
239 </item>
240 <item>
241- <widget class="QWidget" name="welcomeTopText" native="true">
242+ <widget class="QWidget" name="welcomeTopText" native="true">
243 <property name="styleSheet">
244+<<<<<<< TREE
245 <string notr="true">background: transparent;</string>
246+=======
247+ <string notr="true">background-color: #3c3b3f</string>
248+>>>>>>> MERGE-SOURCE
249 </property>
250 <widget class="QLabel" name="welcomeLabel">
251 <property name="geometry">
252 <rect>
253- <x>30</x>
254- <y>20</y>
255- <width>330</width>
256- <height>51</height>
257+ <x>0</x>
258+ <y>10</y>
259+ <width>350</width>
260+ <height>100</height>
261 </rect>
262 </property>
263 <property name="font">
264 <font>
265 <family>Ubuntu</family>
266- <pointsize>21</pointsize>
267+ <pointsize>30</pointsize>
268 </font>
269 </property>
270+ <property name="styleSheet">
271+ <string notr="true">color: #f0ebe2</string>
272+ </property>
273 <property name="text">
274- <string>System Testing</string>
275+ <string>System
276+Testing</string>
277 </property>
278 </widget>
279 </widget>
280@@ -161,17 +169,20 @@
281 <widget class="QTextEdit" name="welcomeTextBox">
282 <property name="geometry">
283 <rect>
284- <x>30</x>
285- <y>10</y>
286- <width>571</width>
287- <height>261</height>
288+ <x>15</x>
289+ <y>12</y>
290+ <width>610</width>
291+ <height>260</height>
292 </rect>
293 </property>
294 <property name="frameShape">
295- <enum>QFrame::Box</enum>
296+ <enum>QFrame::StyledPanel</enum>
297 </property>
298 <property name="frameShadow">
299- <enum>QFrame::Plain</enum>
300+ <enum>QFrame::Raised</enum>
301+ </property>
302+ <property name="lineWidth">
303+ <number>20</number>
304 </property>
305 <property name="readOnly">
306 <bool>true</bool>
307@@ -180,26 +191,26 @@
308 <widget class="QPushButton" name="friendlyTestsButton">
309 <property name="geometry">
310 <rect>
311- <x>30</x>
312- <y>280</y>
313- <width>571</width>
314+ <x>430</x>
315+ <y>305</y>
316+ <width>191</width>
317 <height>31</height>
318 </rect>
319 </property>
320 <property name="font">
321 <font>
322- <pointsize>9</pointsize>
323+ <pointsize>11</pointsize>
324 </font>
325 </property>
326 <property name="text">
327- <string>OK</string>
328+ <string>Continue</string>
329 </property>
330 </widget>
331 <widget class="QCheckBox" name="checkBox">
332 <property name="geometry">
333 <rect>
334- <x>310</x>
335- <y>320</y>
336+ <x>10</x>
337+ <y>310</y>
338 <width>321</width>
339 <height>20</height>
340 </rect>
341@@ -210,7 +221,20 @@
342 </font>
343 </property>
344 <property name="text">
345- <string>Don't show me this message in the future</string>
346+ <string>Don't show this message on startup</string>
347+ </property>
348+ </widget>
349+ <widget class="Line" name="line_3">
350+ <property name="geometry">
351+ <rect>
352+ <x>15</x>
353+ <y>280</y>
354+ <width>608</width>
355+ <height>20</height>
356+ </rect>
357+ </property>
358+ <property name="orientation">
359+ <enum>Qt::Horizontal</enum>
360 </property>
361 </widget>
362 </widget>
363@@ -865,8 +889,13 @@
364 <rect>
365 <x>0</x>
366 <y>0</y>
367+<<<<<<< TREE
368 <width>500</width>
369 <height>189</height>
370+=======
371+ <width>62</width>
372+ <height>16</height>
373+>>>>>>> MERGE-SOURCE
374 </rect>
375 </property>
376 <layout class="QVBoxLayout" name="verticalLayout_4">
377@@ -1209,3 +1238,4 @@
378 <resources/>
379 <connections/>
380 </ui>
381+

Subscribers

People subscribed via source and target branches