Ubuntu One Control Panel

Merge lp:~nataliabidart/ubuntuone-control-panel/able-enable-disable into lp:ubuntuone-control-panel

  1. able-enable-disable
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 219
Merged at revision: 219
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/able-enable-disable
Merge into: lp:ubuntuone-control-panel
Diff against target: 47 lines (+10/-2)
3 files modified
ubuntuone/controlpanel/gui/qt/__init__.py (+7/-2)
ubuntuone/controlpanel/gui/qt/folders.py (+1/-0)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+2/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/able-enable-disable
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+74652@code.launchpad.net

Commit message

- "Explore" button is not enabled for non-subscribed folders (LP: #843835).

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/qt/__init__.py'
2--- ubuntuone/controlpanel/gui/qt/__init__.py 2011-09-07 17:34:54 +0000
3+++ ubuntuone/controlpanel/gui/qt/__init__.py 2011-09-08 17:37:23 +0000
4@@ -26,11 +26,16 @@
5 from PyQt4 import QtGui, QtCore
6 from twisted.internet import defer
7
8+from ubuntuone.controlpanel.gui import FILE_URI_PREFIX
9+
10
11 def uri_hook(uri):
12 """Open an URI using the default browser/file manager."""
13- url = QtCore.QUrl()
14- url.setEncodedUrl(uri)
15+ if uri.startswith(FILE_URI_PREFIX):
16+ url = QtCore.QUrl(uri)
17+ else:
18+ url = QtCore.QUrl()
19+ url.setEncodedUrl(uri)
20 QtGui.QDesktopServices.openUrl(url)
21
22
23
24=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
25--- ubuntuone/controlpanel/gui/qt/folders.py 2011-09-07 16:56:39 +0000
26+++ ubuntuone/controlpanel/gui/qt/folders.py 2011-09-08 17:37:23 +0000
27@@ -173,6 +173,7 @@
28 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
29 QtGui.QSizePolicy.Fixed)
30 button.setSizePolicy(policy)
31+ button.setEnabled(bool(volume[u'subscribed']))
32
33 # Operator not preceded by a space
34 # pylint: disable=C0322
35
36=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
37--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-09-01 21:19:27 +0000
38+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-09-08 17:37:23 +0000
39@@ -173,6 +173,8 @@
40 gui.FOLDER_ICON_NAME)
41 self.assertEqual(button.iconSize().width(), 12)
42 self.assertEqual(button.iconSize().height(), 12)
43+ self.assertEqual(button.isEnabled(),
44+ bool(volume['subscribed']))
45
46 treeiter += 1
47 item = treeiter.value()

Subscribers

People subscribed via source and target branches