Merge lp:~ibelieve/ubuntu-filemanager-app/disable-multitabs into lp:ubuntu-filemanager-app

Proposed by Michael Spencer
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 143
Merged at revision: 141
Proposed branch: lp:~ibelieve/ubuntu-filemanager-app/disable-multitabs
Merge into: lp:ubuntu-filemanager-app
Diff against target: 129 lines (+39/-26)
4 files modified
components/PlacesSidebar.qml (+1/-1)
components/SuruSheetStyle.qml (+2/-1)
ubuntu-filemanager-app.qml (+19/-9)
ui/FolderListPage.qml (+17/-15)
To merge this branch: bzr merge lp:~ibelieve/ubuntu-filemanager-app/disable-multitabs
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+212000@code.launchpad.net

Commit message

Temporarily disabled support for multiple tabs since the Tabs implementation broke it

Description of the change

Temporarily disabled support for multiple tabs since the Tabs implementation broke it.

Also updated the Suru sheet style since buttons are now smaller.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

LGTM, fixes the issues on the desktop.

Because of the pending cmake issues, it's difficult to confirm this is working properly on the device. Let's address those in https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/fix-armhf-build/+merge/211621

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/PlacesSidebar.qml'
2--- components/PlacesSidebar.qml 2014-02-19 00:00:15 +0000
3+++ components/PlacesSidebar.qml 2014-03-20 17:11:10 +0000
4@@ -103,7 +103,7 @@
5 height: units.gu(1.1)
6 width: height
7
8- source: getIcon("arrow")
9+ source: Qt.resolvedUrl("../icons/arrow.png")
10 opacity: selected && collapsed ? 1 : 0
11
12 Behavior on opacity {
13
14=== modified file 'components/SuruSheetStyle.qml'
15--- components/SuruSheetStyle.qml 2014-02-19 00:00:15 +0000
16+++ components/SuruSheetStyle.qml 2014-03-20 17:11:10 +0000
17@@ -23,7 +23,7 @@
18 // styling properties
19 property color backgroundColor: Qt.rgba(0.2,0.2,0.2,0.97)
20 property color headerColor: Qt.rgba(0,0,0,0.2)
21- property real headerHeight: units.gu(8)
22+ property real headerHeight: units.gu(6)
23 property real buttonContainerWidth: units.gu(14)
24
25 implicitWidth: MathUtils.clamp(styledItem.contentsWidth, styledItem.minWidth, styledItem.maxWidth)
26@@ -98,6 +98,7 @@
27 horizontalAlignment: Text.AlignHCenter
28 text: styledItem.title
29 fontSize: "large"
30+ color: "#F3F3E7"
31 }
32
33 Item {
34
35=== modified file 'ubuntu-filemanager-app.qml'
36--- ubuntu-filemanager-app.qml 2014-02-19 00:00:15 +0000
37+++ ubuntu-filemanager-app.qml 2014-03-20 17:11:10 +0000
38@@ -95,22 +95,32 @@
39 Tabs {
40 id: tabs
41
42- Repeater {
43- model: folderTabs
44- delegate: Tab {
45- title: page.title
46- page: FolderListPage {
47- objectName: "folderPage"
48+ Tab {
49+ title: page.title
50+ page: FolderListPage {
51+ objectName: "folderPage"
52
53- folder: modelData
54- }
55+ folder: "~"//modelData
56 }
57 }
58+
59+ // TODO: Temporarily disabled tabs support since this is broken in the SDK (lp:1295242)
60+// Repeater {
61+// model: folderTabs
62+// delegate: Tab {
63+// title: page.title
64+// page: FolderListPage {
65+// objectName: "folderPage"
66+
67+// folder: modelData
68+// }
69+// }
70+// }
71 }
72
73 Component.onCompleted: {
74 pageStack.push(tabs)
75- pageStack.push(settingsPage)
76+ pageStack.push(Qt.resolvedUrl("ui/FolderListPage.qml"))
77 pageStack.pop()
78 loaded = true
79 }
80
81=== modified file 'ui/FolderListPage.qml'
82--- ui/FolderListPage.qml 2014-02-19 00:00:15 +0000
83+++ ui/FolderListPage.qml 2014-03-20 17:11:10 +0000
84@@ -374,7 +374,8 @@
85
86 Item {
87 id: pathItem
88- width: folderListPage.width - units.gu(37)
89+ // TODO: Uncomment after re-enabling tab support (caused by lp:1295242)
90+ width: folderListPage.width - units.gu(31)//folderListPage.width - units.gu(37)
91 height: units.gu(5)
92 anchors.verticalCenter: parent.verticalCenter
93 PathBar {
94@@ -426,20 +427,21 @@
95 }
96 }
97
98- ToolbarButton {
99- id: tabsButton
100- objectName: "tabs"
101- text: i18n.tr("Tabs")
102- iconSource: getIcon("browser-tabs")
103-
104- onTriggered: {
105- print(text)
106-
107- PopupUtils.open(tabsPopover, tabsButton, {
108- tab: folderListPage.parent
109- })
110- }
111- }
112+ // TODO: Uncomment after re-enabling tab support (caused by lp:1295242)
113+// ToolbarButton {
114+// id: tabsButton
115+// objectName: "tabs"
116+// text: i18n.tr("Tabs")
117+// iconSource: getIcon("browser-tabs")
118+
119+// onTriggered: {
120+// print(text)
121+
122+// PopupUtils.open(tabsPopover, tabsButton, {
123+// tab: folderListPage.parent
124+// })
125+// }
126+// }
127
128 ToolbarButton {
129 id: settingsButton

Subscribers

People subscribed via source and target branches