Merge lp:~diegosarmentero/ubuntuone-control-panel/pointing-hand into lp:ubuntuone-control-panel

Proposed by Diego Sarmentero on 2012-10-12
Status: Merged
Approved by: Manuel de la Peña on 2012-10-15
Approved revision: 365
Merged at revision: 367
Proposed branch: lp:~diegosarmentero/ubuntuone-control-panel/pointing-hand
Merge into: lp:ubuntuone-control-panel
Diff against target: 41 lines (+9/-0)
3 files modified
data/qt/ubuntuone.qss (+1/-0)
ubuntuone/controlpanel/gui/qt/share_links.py (+4/-0)
ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+4/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-control-panel/pointing-hand
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2012-10-15
Roberto Alsina (community) 2012-10-12 Approve on 2012-10-12
Review via email: mp+129502@code.launchpad.net

Commit Message

- Setting text decoration to underline and change the cursor type to PointingHandCursor. (LP: #1065192).

Description of the Change

To review this branch, open control panel, go to the Shares tab, go to the detailed view of any published file and you will see the "Back to list" button marked as a link and on hover the cursor will turn into a pointing hand, the same for "Open in Browser"

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/qt/ubuntuone.qss'
2--- data/qt/ubuntuone.qss 2012-08-27 13:16:26 +0000
3+++ data/qt/ubuntuone.qss 2012-10-12 19:43:30 +0000
4@@ -408,6 +408,7 @@
5 color: #dd4814;
6 padding-left: 10px;
7 padding-right: 15px;
8+ text-decoration: underline;
9 }
10
11 QPushButton#enhanced_borderless {
12
13=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
14--- ubuntuone/controlpanel/gui/qt/share_links.py 2012-09-28 20:26:35 +0000
15+++ ubuntuone/controlpanel/gui/qt/share_links.py 2012-10-12 19:43:30 +0000
16@@ -80,6 +80,10 @@
17 EnhancedLineEdit(self.ui.line_copy_link, self._copy_link_from_line,
18 text=COPY_LINK)
19
20+ # Set cursor type
21+ self.ui.back_to_file_list.setCursor(QtCore.Qt.PointingHandCursor)
22+ self.ui.open_in_browser.setCursor(QtCore.Qt.PointingHandCursor)
23+
24 self.ui.line_search.itemSelected.connect(self.share_file)
25 self.ui.back_to_file_list.clicked.connect(self._move_to_main_list)
26 self.ui.open_in_browser.clicked.connect(self._open_in_browser)
27
28=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
29--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py 2012-09-26 20:47:46 +0000
30+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py 2012-10-12 19:43:30 +0000
31@@ -48,6 +48,10 @@
32 self.assertIsInstance(self.ui._enhanced_line, gui.EnhancedLineEdit)
33 self.assertEqual(self.ui._enhanced_line.btn_operation.text(), '')
34 self.assertFalse(self.ui._enhanced_line.btn_operation.isVisible())
35+ self.assertEqual(self.ui.ui.open_in_browser.cursor().shape(),
36+ QtCore.Qt.PointingHandCursor)
37+ self.assertEqual(self.ui.ui.back_to_file_list.cursor().shape(),
38+ QtCore.Qt.PointingHandCursor)
39
40 def test_share_file(self):
41 """Check that the state of the widgets on share_file."""

Subscribers

People subscribed via source and target branches