Ubuntu One Control Panel

Merge lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks into lp://qastaging/ubuntuone-control-panel

tweaks
Merge into trunk

Proposed by Roberto Alsina on 2012-03-13

Status:	Merged
Approved by:	Natalia Bidart on 2012-03-20
Approved revision:	296
Merged at revision:	291
Proposed branch:	lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks
Merge into:	lp://qastaging/ubuntuone-control-panel
Diff against target:	250 lines (+89/-24) 6 files modified data/qt/controlpanel.ui (+9/-0) data/qt/folders.ui (+4/-1) data/qt/ubuntuone.qss (+75/-15) ubuntuone/controlpanel/gui/qt/folders.py (+1/-2) ubuntuone/controlpanel/gui/qt/gotoweb.py (+0/-2) ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+0/-4)
To merge this branch:	bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Natalia Bidart (community)	2012-03-13	Approve on 2012-03-20
dobey (community)		Approve on 2012-03-15
Eric Casteleijn (community)		Approve on 2012-03-15
Review via email: mp+97244@code.qastaging.launchpad.net

Commit message

- Added several tweaks to the UI stylesheet to avoid 'movements' when focusing a button, and to remove the ugly border from the twitter and facebook buttons.

Description of the change

Here are the changes with before/after images

* Remove borders from non-focused twitter/facebook buttons

Before: http://ubuntuone.com/0GlwHiflybykoUHZHZ8Gqw
After: http://ubuntuone.com/26uaOMSFZyxU0eiR4axh7T

* Change in the no-orange-overlay hack from 20px to 100%

No visible change except on rare occasions where 20px made pieces of text hide

* Do the GotoWebButtons arrows using qss and not setIcon
* Make the GotoWebButtons not shift when focused

Before, the text and icon shifted when you focused the button.
Now, they don't. The padding is different, and is not consistent
between buttons so it needs tweaking, if we go this way.

Before/after: http://ubuntuone.com/60XK8tDRjGP6AkZtH3bArf

* Changed background color on folder list activated item

Before, you could not see focus halos on buttons and checkboxes because of color clash:

http://ubuntuone.com/75Btee7WZ52WgQCYWJtdV4

After:

http://ubuntuone.com/4UKzBrcunwQteDz53YVPJp

* Focus halo on QCheckboxes

Before: the checkbox contents shifted when focused
http://ubuntuone.com/4uVKYiXzISNvTNr7WOv0Sk

Now: no shifting

http://ubuntuone.com/0gT5oilxtJi9m5Ca7VoLTx

* Style fix for focused Checkbox in folder list

Before:
http://ubuntuone.com/0quTUFP95oeI0z8O53w487

After: Not terribly happy about it, really.
http://ubuntuone.com/5G1o70sxMv0moaUVjZhFNX

* Focus halo on QSpinBox

Before: http://ubuntuone.com/1GHBE7Les5VpMweDbnjfEi
After: http://ubuntuone.com/6zzB7ohnZpaHihuPVlLT0e

lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks updated on 2012-03-15

292. By Roberto Alsina on 2012-03-15: useless change

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2012-03-15:

===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/controlpanel/review_tweaks/ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py", line 47, in test_layout_direction
    self.assertEqual(self.ui.layoutDirection(), gui.QtCore.Qt.RightToLeft)
  File "/usr/lib/python2.7/dist-packages/twisted/trial/unittest.py", line 270, in assertEqual
    % (msg, pformat(first), pformat(second)))
twisted.trial.unittest.FailTest: not equal:
a = 0
b = 1

ubuntuone.controlpanel.gui.qt.tests.test_gotoweb.GoToWebButtonTestCase.test_layout_direction
-------------------------------------------------------------------------------
Ran 861 tests in 7.354s

FAILED (skips=2, failures=1, successes=858)

review: Needs Fixing

lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks updated on 2012-03-15

293. By Roberto Alsina on 2012-03-15: test is no longer appropiate

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2012-03-15:

Works for me

review: Approve

Revision history for this message

Roberto Alsina (ralsina) wrote on 2012-03-15:

oops, forgot to remove that test. Fixed now.

Revision history for this message

dobey (dobey) on 2012-03-15:

review: Approve

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2012-03-16:

Question:

(09:39:18 AM) nessita: ralsina: having this:
(09:39:18 AM) nessita: /* Compensate for border so text doesn't move */
(09:39:18 AM) nessita: padding-left: 8px;
(09:39:18 AM) nessita: padding-right: 23px;
(09:39:18 AM) nessita: isn't that absolutely dependent of the font size? (ie how many pixels are needed so text do not move)

Need fixing:

* This is a screenshot of trunk, for the devices tab, when tabbing into the devices list you can tell which device is focused: http://ubuntuone.com/4dkwoumzqmtChYd6aZjkGy

* This is the same screenshot from this branch, and I can not tell which device is focused: http://ubuntuone.com/759m76t6EOb5sUYyHrgtrn

review: Needs Fixing

lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks updated on 2012-03-16

294. By Roberto Alsina on 2012-03-16: merged trunk

Revision history for this message

Roberto Alsina (ralsina) wrote on 2012-03-16:

restored the dotted highlight on the focused device list.

lp://qastaging/~ralsina/ubuntuone-control-panel/tweaks updated on 2012-03-16

295. By Roberto Alsina on 2012-03-16: restore dotted box around devices

Revision history for this message

Roberto Alsina (ralsina) wrote on 2012-03-20:

> Question:
>
> (09:39:18 AM) nessita: ralsina: having this:
> (09:39:18 AM) nessita: /* Compensate for border so text doesn't move */
> (09:39:18 AM) nessita: padding-left: 8px;
> (09:39:18 AM) nessita: padding-right: 23px;
> (09:39:18 AM) nessita: isn't that absolutely dependent of the font size? (ie
> how many pixels are needed so text do not move)

No, it's dependent on border size, it only has to be 2px smaller on each direction than the unfocused state.

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2012-03-20:

Could you please fix:
Text conflict in ubuntuone/controlpanel/gui/qt/gotoweb.py
1 conflicts encountered.