Ubuntu File Manager App

Merge lp:~ajalkane/ubuntu-filemanager-app/overflowing-content-picker-buttons into lp:ubuntu-filemanager-app

  1. overflowing-content-picker-buttons
  2. Merge into trunk
Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 304
Merged at revision: 305
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/overflowing-content-picker-buttons
Merge into: lp:ubuntu-filemanager-app
Diff against target: 203 lines (+37/-34)
3 files modified
po/com.ubuntu.filemanager.pot (+30/-30)
src/app/qml/components/PlacesSidebar.qml (+1/-1)
src/app/qml/ui/FolderListPage.qml (+6/-3)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/overflowing-content-picker-buttons
Reviewer Review Type Date Requested Status
Arto Jalkanen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+238915@code.launchpad.net

Commit message

#1378709: When using FileManager as content picker, the buttons to
confirm selection were partly offscreen.

This commit uses Flow component based positioning, so that if the Row
is too big to fit, the button will be positioned on another row.

Description of the change

Bug #1378709: When using FileManager as content picker, the buttons to
confirm selection were partly offscreen.

This commit uses Flow component based positioning, so that if the Row
is too big to fit, the button will be positioned on another row.

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

PASSED: Continuous integration, rev:304
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/358/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1063
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/156

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/358/rebuild

review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Important bug fix, self-approving to get it in.

Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.filemanager.pot'
2--- po/com.ubuntu.filemanager.pot 2014-10-06 12:27:18 +0000
3+++ po/com.ubuntu.filemanager.pot 2014-10-20 15:58:06 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-09-29 15:28+0200\n"
9+"POT-Creation-Date: 2014-10-20 18:48+0300\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -43,12 +43,12 @@
14 msgid "Change app settings"
15 msgstr ""
16
17-#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:432
18+#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:435
19 #: ../src/app/qml/ui/ViewPopover.qml:70
20 msgid "Icons"
21 msgstr ""
22
23-#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:449
24+#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:452
25 #: ../src/app/qml/ui/ViewPopover.qml:71
26 msgid "List"
27 msgstr ""
28@@ -77,7 +77,7 @@
29 #: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
30 #: ../src/app/qml/ui/FileActionDialog.qml:45
31 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
32-#: ../src/app/qml/ui/FolderListPage.qml:386
33+#: ../src/app/qml/ui/FolderListPage.qml:389
34 #: ../src/app/qml/ui/GoToDialog.qml:66
35 msgid "Cancel"
36 msgstr ""
37@@ -178,7 +178,7 @@
38 msgstr ""
39
40 #: ../src/app/qml/ui/FolderListPage.qml:195
41-#: ../src/app/qml/ui/FolderListPage.qml:591
42+#: ../src/app/qml/ui/FolderListPage.qml:594
43 msgid "Properties"
44 msgstr ""
45
46@@ -210,97 +210,97 @@
47 msgid "View"
48 msgstr ""
49
50-#: ../src/app/qml/ui/FolderListPage.qml:371
51+#: ../src/app/qml/ui/FolderListPage.qml:374
52 msgid "Select"
53 msgstr ""
54
55-#: ../src/app/qml/ui/FolderListPage.qml:394
56+#: ../src/app/qml/ui/FolderListPage.qml:397
57 msgid "Unlock full access"
58 msgstr ""
59
60-#: ../src/app/qml/ui/FolderListPage.qml:408
61+#: ../src/app/qml/ui/FolderListPage.qml:411
62 msgid "Authentication failed"
63 msgstr ""
64
65-#: ../src/app/qml/ui/FolderListPage.qml:464
66+#: ../src/app/qml/ui/FolderListPage.qml:467
67 msgid "No files"
68 msgstr ""
69
70-#: ../src/app/qml/ui/FolderListPage.qml:484
71-#: ../src/app/qml/ui/FolderListPage.qml:565
72+#: ../src/app/qml/ui/FolderListPage.qml:487
73+#: ../src/app/qml/ui/FolderListPage.qml:568
74 msgid "Delete"
75 msgstr ""
76
77-#: ../src/app/qml/ui/FolderListPage.qml:485
78+#: ../src/app/qml/ui/FolderListPage.qml:488
79 #, qt-format
80 msgid "Are you sure you want to permanently delete '%1'?"
81 msgstr ""
82
83-#: ../src/app/qml/ui/FolderListPage.qml:508
84-#: ../src/app/qml/ui/FolderListPage.qml:578
85+#: ../src/app/qml/ui/FolderListPage.qml:511
86+#: ../src/app/qml/ui/FolderListPage.qml:581
87 msgid "Rename"
88 msgstr ""
89
90-#: ../src/app/qml/ui/FolderListPage.qml:509
91+#: ../src/app/qml/ui/FolderListPage.qml:512
92 msgid "Enter a new name"
93 msgstr ""
94
95-#: ../src/app/qml/ui/FolderListPage.qml:518
96+#: ../src/app/qml/ui/FolderListPage.qml:521
97 msgid "Could not rename"
98 msgstr ""
99
100-#: ../src/app/qml/ui/FolderListPage.qml:519
101+#: ../src/app/qml/ui/FolderListPage.qml:522
102 msgid "Insufficient permissions or name already exists?"
103 msgstr ""
104
105-#: ../src/app/qml/ui/FolderListPage.qml:542
106+#: ../src/app/qml/ui/FolderListPage.qml:545
107 msgid "Cut"
108 msgstr ""
109
110-#: ../src/app/qml/ui/FolderListPage.qml:553
111+#: ../src/app/qml/ui/FolderListPage.qml:556
112 msgid "Copy"
113 msgstr ""
114
115-#: ../src/app/qml/ui/FolderListPage.qml:610
116-#: ../src/app/qml/ui/FolderListPage.qml:733
117+#: ../src/app/qml/ui/FolderListPage.qml:613
118+#: ../src/app/qml/ui/FolderListPage.qml:736
119 msgid "File operation error"
120 msgstr ""
121
122-#: ../src/app/qml/ui/FolderListPage.qml:659
123+#: ../src/app/qml/ui/FolderListPage.qml:662
124 msgid "~/Desktop"
125 msgstr ""
126
127-#: ../src/app/qml/ui/FolderListPage.qml:669
128+#: ../src/app/qml/ui/FolderListPage.qml:672
129 msgid "~/Public"
130 msgstr ""
131
132-#: ../src/app/qml/ui/FolderListPage.qml:671
133+#: ../src/app/qml/ui/FolderListPage.qml:674
134 msgid "~/Programs"
135 msgstr ""
136
137-#: ../src/app/qml/ui/FolderListPage.qml:673
138+#: ../src/app/qml/ui/FolderListPage.qml:676
139 msgid "~/Templates"
140 msgstr ""
141
142-#: ../src/app/qml/ui/FolderListPage.qml:686
143+#: ../src/app/qml/ui/FolderListPage.qml:689
144 msgid "Home"
145 msgstr ""
146
147-#: ../src/app/qml/ui/FolderListPage.qml:688
148+#: ../src/app/qml/ui/FolderListPage.qml:691
149 msgid "Device"
150 msgstr ""
151
152-#: ../src/app/qml/ui/FolderListPage.qml:733
153+#: ../src/app/qml/ui/FolderListPage.qml:736
154 #, qt-format
155 msgid "Unable to open '%1'"
156 msgstr ""
157
158-#: ../src/app/qml/ui/FolderListPage.qml:745
159+#: ../src/app/qml/ui/FolderListPage.qml:748
160 msgid "Folder not accessible"
161 msgstr ""
162
163 #. TRANSLATORS: this refers to a folder name
164-#: ../src/app/qml/ui/FolderListPage.qml:747
165+#: ../src/app/qml/ui/FolderListPage.qml:750
166 #, qt-format
167 msgid "Can not access %1"
168 msgstr ""
169
170=== modified file 'src/app/qml/components/PlacesSidebar.qml'
171--- src/app/qml/components/PlacesSidebar.qml 2014-09-20 10:49:51 +0000
172+++ src/app/qml/components/PlacesSidebar.qml 2014-10-20 15:58:06 +0000
173@@ -26,7 +26,7 @@
174 id: root
175
176 //color: Qt.rgba(0.5,0.5,0.5,0.3)
177- width: collapsed ? units.gu(8) : units.gu(22)
178+ width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
179
180 property bool collapsed: collapsedSidebar
181
182
183=== modified file 'src/app/qml/ui/FolderListPage.qml'
184--- src/app/qml/ui/FolderListPage.qml 2014-10-06 12:27:18 +0000
185+++ src/app/qml/ui/FolderListPage.qml 2014-10-20 15:58:06 +0000
186@@ -360,11 +360,14 @@
187 visible: fileSelectorMode
188 }
189
190- Row {
191+ Flow {
192 id: bottomBarButtons
193- anchors.horizontalCenter: parent.horizontalCenter
194 anchors.bottom: bottomBar.bottom
195- spacing: units.gu(5)
196+ anchors.leftMargin: (parent.width - sidebar.width - childrenRect.width) / 2
197+ anchors.left: sidebar.right
198+ width: parent.width - sidebar.width
199+
200+ spacing: units.gu(2)
201 visible: fileSelectorMode || pageModel.onlyMTPPaths
202
203 Button {

Subscribers

People subscribed via source and target branches