Merge lp:~ralsina/ubuntuone-control-panel/fix-983665 into lp:ubuntuone-control-panel

Proposed by Roberto Alsina on 2012-05-15
Status: Merged
Approved by: Roberto Alsina on 2012-05-15
Approved revision: 326
Merged at revision: 323
Proposed branch: lp:~ralsina/ubuntuone-control-panel/fix-983665
Merge into: lp:ubuntuone-control-panel
Diff against target: 90 lines (+39/-1)
4 files modified
data/qt/images.qrc (+4/-0)
data/qt/ubuntuone-rtl.qss (+27/-0)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+4/-1)
ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+4/-0)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-control-panel/fix-983665
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve on 2012-05-15
Diego Sarmentero (community) 2012-05-15 Approve on 2012-05-15
Review via email: mp+105737@code.launchpad.net

Commit Message

- Reverse styling for web buttons in RTL locales (Fixes LP:983665)

Description of the Change

Fix button styling for LTR locales.

To test:

PYTHONPATH=. bin/ubuntuone-control-panel-qt -reversed

Compare to nightlies:

ubuntuone-control-panel-qt -reversed

Will attach before-after in comment

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
Alejandro J. Cura (alecu) wrote :

btw: Great work fixing every RTL detail!

Ubuntu One Auto Pilot (otto-pilot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/external_icon_dark_grey-rtl.png'
2Binary files data/external_icon_dark_grey-rtl.png 1970-01-01 00:00:00 +0000 and data/external_icon_dark_grey-rtl.png 2012-05-15 15:01:18 +0000 differ
3=== added file 'data/external_icon_orange-rtl.png'
4Binary files data/external_icon_orange-rtl.png 1970-01-01 00:00:00 +0000 and data/external_icon_orange-rtl.png 2012-05-15 15:01:18 +0000 differ
5=== added file 'data/external_icon_white-rtl.png'
6Binary files data/external_icon_white-rtl.png 1970-01-01 00:00:00 +0000 and data/external_icon_white-rtl.png 2012-05-15 15:01:18 +0000 differ
7=== modified file 'data/qt/images.qrc'
8--- data/qt/images.qrc 2012-03-22 16:44:35 +0000
9+++ data/qt/images.qrc 2012-05-15 15:01:18 +0000
10@@ -5,6 +5,9 @@
11 <file>../external_icon_dark_grey.png</file>
12 <file>../external_icon_orange.png</file>
13 <file>../external_icon_white.png</file>
14+ <file>../external_icon_dark_grey-rtl.png</file>
15+ <file>../external_icon_orange-rtl.png</file>
16+ <file>../external_icon_white-rtl.png</file>
17 <file>../icon.png</file>
18 <file>../folder.png</file>
19 <file>../logo.png</file>
20@@ -24,6 +27,7 @@
21 <file>../Ubuntu-R.ttf</file>
22 <file>../Ubuntu-B.ttf</file>
23 <file>ubuntuone.qss</file>
24+ <file>ubuntuone-rtl.qss</file>
25 <file>linux.qss</file>
26 <file>windows.qss</file>
27 </qresource>
28
29=== added file 'data/qt/ubuntuone-rtl.qss'
30--- data/qt/ubuntuone-rtl.qss 1970-01-01 00:00:00 +0000
31+++ data/qt/ubuntuone-rtl.qss 2012-05-15 15:01:18 +0000
32@@ -0,0 +1,27 @@
33+GoToWebButton#help_button {
34+ background-image: url(:/external_icon_dark_grey-rtl.png);
35+ background-position: left;
36+}
37+
38+GoToWebButton#share_publish_button {
39+ background-image: url(:/external_icon_orange-rtl.png);
40+ background-position: left;
41+}
42+
43+GoToWebButton#edit_profile_button,
44+GoToWebButton#edit_services_button,
45+GoToWebButton#get_more_space_button {
46+ background-image: url(:/external_icon_white-rtl.png);
47+ background-position: left;
48+}
49+
50+QTabWidget::pane {
51+ border-top-left-radius: 5px;
52+ border-top-right-radius: 0px;
53+}
54+
55+QFrame#frame_status,
56+QFrame#frame_storage {
57+ border-right-width: 1px;
58+ border-left-width: 0px;
59+}
60
61=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
62--- ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-04-24 17:59:49 +0000
63+++ ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-05-15 15:01:18 +0000
64@@ -89,7 +89,10 @@
65 source.main(app)
66
67 data = []
68- for qss_name in (":/ubuntuone.qss", source.PLATFORM_QSS):
69+ qss_files = [":/ubuntuone.qss", source.PLATFORM_QSS]
70+ if app.isRightToLeft():
71+ qss_files.append(":/ubuntuone-rtl.qss")
72+ for qss_name in qss_files:
73 qss = QtCore.QResource(qss_name)
74 data.append(unicode(qss.data()))
75 app.setStyleSheet('\n'.join(data))
76
77=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
78--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py 2012-04-24 17:59:49 +0000
79+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py 2012-05-15 15:01:18 +0000
80@@ -62,6 +62,10 @@
81 def installTranslator(self, translator):
82 """Fake installTranslator."""
83 self.translator = translator
84+
85+ def isRightToLeft(self):
86+ """Fake isRightToLeft."""
87+ return False
88 # pylint: enable=C0103
89
90 def arguments(self):

Subscribers

People subscribed via source and target branches