Ubuntu One Control Panel

Merge lp:~diegosarmentero/ubuntuone-control-panel/explore-button into lp:ubuntuone-control-panel

  1. explore-button
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 242
Merged at revision: 242
Proposed branch: lp:~diegosarmentero/ubuntuone-control-panel/explore-button
Merge into: lp:ubuntuone-control-panel
Diff against target: 53 lines (+9/-10)
3 files modified
data/qt/ubuntuone.qss (+9/-2)
ubuntuone/controlpanel/gui/qt/folders.py (+0/-4)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+0/-4)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-control-panel/explore-button
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Alejandro J. Cura (community) Approve
Review via email: mp+83202@code.launchpad.net

Commit message

Fixed QT UI folder view explore button (LP: #822698).

Description of the change

Fixed QT UI folder view explore button (LP: #822698).

To post a comment you must log in.
lp:~diegosarmentero/ubuntuone-control-panel/explore-button updated
242. By Diego Sarmentero

Fixed tests.

Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks better than with the little folder.

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good.

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 2011-09-23 15:05:27 +0000
3+++ data/qt/ubuntuone.qss 2011-11-23 17:52:26 +0000
4@@ -126,11 +126,18 @@
5 }
6
7 QPushButton#explore_folder_button {
8- border: none;
9- background: none;
10+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
11+ stop: 0 #fbfbfb, stop: 1.0 #e6e6e6);
12+ height: 15px;
13+ border-radius: 7px;
14+ border-color: #908e8d;
15 color: #595959;
16 padding-left: 10px;
17 padding-right: 10px;
18+ margin-top: 5px;
19+ margin-bottom: 5px;
20+ margin-right: 20px;
21+ margin-left: 20px;
22 }
23
24 QPushButton#twitter_button,
25
26=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
27--- ubuntuone/controlpanel/gui/qt/folders.py 2011-09-12 15:00:24 +0000
28+++ ubuntuone/controlpanel/gui/qt/folders.py 2011-11-23 17:52:26 +0000
29@@ -175,10 +175,6 @@
30 model_index = self.ui.folders.indexFromItem(child, EXPLORE_COL)
31 button = QtGui.QPushButton(parent=self.ui.folders)
32 button.setFlat(True)
33- icon = icon_from_name(FOLDER_ICON_NAME)
34- button.icon_obj = icon # hack!
35- button.setIcon(icon_from_name(FOLDER_ICON_NAME))
36- button.setIconSize(QtCore.QSize(12, 12))
37 button.setText(EXPLORE)
38 button.setObjectName('explore_folder_button')
39 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
40
41=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
42--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-09-12 15:00:24 +0000
43+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-11-23 17:52:26 +0000
44@@ -171,10 +171,6 @@
45 model_index = folders.indexFromItem(item, gui.EXPLORE_COL)
46 button = folders.indexWidget(model_index)
47 self.assertEqual(button.isFlat(), True)
48- self.assertEqual(button.icon_obj.icon_name,
49- gui.FOLDER_ICON_NAME)
50- self.assertEqual(button.iconSize().width(), 12)
51- self.assertEqual(button.iconSize().height(), 12)
52 self.assertEqual(button.isEnabled(),
53 bool(volume['subscribed']))
54

Subscribers

People subscribed via source and target branches