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
=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot 2014-10-06 12:27:18 +0000
+++ po/com.ubuntu.filemanager.pot 2014-10-20 15:58:06 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-29 15:28+0200\n"11"POT-Creation-Date: 2014-10-20 18:48+0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,12 +43,12 @@
43msgid "Change app settings"43msgid "Change app settings"
44msgstr ""44msgstr ""
4545
46#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:43246#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:435
47#: ../src/app/qml/ui/ViewPopover.qml:7047#: ../src/app/qml/ui/ViewPopover.qml:70
48msgid "Icons"48msgid "Icons"
49msgstr ""49msgstr ""
5050
51#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:44951#: ../src/app/qml/filemanager.qml:252 ../src/app/qml/ui/FolderListPage.qml:452
52#: ../src/app/qml/ui/ViewPopover.qml:7152#: ../src/app/qml/ui/ViewPopover.qml:71
53msgid "List"53msgid "List"
54msgstr ""54msgstr ""
@@ -77,7 +77,7 @@
77#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:5777#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
78#: ../src/app/qml/ui/FileActionDialog.qml:4578#: ../src/app/qml/ui/FileActionDialog.qml:45
79#: ../src/app/qml/ui/FileOperationProgressDialog.qml:4479#: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
80#: ../src/app/qml/ui/FolderListPage.qml:38680#: ../src/app/qml/ui/FolderListPage.qml:389
81#: ../src/app/qml/ui/GoToDialog.qml:6681#: ../src/app/qml/ui/GoToDialog.qml:66
82msgid "Cancel"82msgid "Cancel"
83msgstr ""83msgstr ""
@@ -178,7 +178,7 @@
178msgstr ""178msgstr ""
179179
180#: ../src/app/qml/ui/FolderListPage.qml:195180#: ../src/app/qml/ui/FolderListPage.qml:195
181#: ../src/app/qml/ui/FolderListPage.qml:591181#: ../src/app/qml/ui/FolderListPage.qml:594
182msgid "Properties"182msgid "Properties"
183msgstr ""183msgstr ""
184184
@@ -210,97 +210,97 @@
210msgid "View"210msgid "View"
211msgstr ""211msgstr ""
212212
213#: ../src/app/qml/ui/FolderListPage.qml:371213#: ../src/app/qml/ui/FolderListPage.qml:374
214msgid "Select"214msgid "Select"
215msgstr ""215msgstr ""
216216
217#: ../src/app/qml/ui/FolderListPage.qml:394217#: ../src/app/qml/ui/FolderListPage.qml:397
218msgid "Unlock full access"218msgid "Unlock full access"
219msgstr ""219msgstr ""
220220
221#: ../src/app/qml/ui/FolderListPage.qml:408221#: ../src/app/qml/ui/FolderListPage.qml:411
222msgid "Authentication failed"222msgid "Authentication failed"
223msgstr ""223msgstr ""
224224
225#: ../src/app/qml/ui/FolderListPage.qml:464225#: ../src/app/qml/ui/FolderListPage.qml:467
226msgid "No files"226msgid "No files"
227msgstr ""227msgstr ""
228228
229#: ../src/app/qml/ui/FolderListPage.qml:484229#: ../src/app/qml/ui/FolderListPage.qml:487
230#: ../src/app/qml/ui/FolderListPage.qml:565230#: ../src/app/qml/ui/FolderListPage.qml:568
231msgid "Delete"231msgid "Delete"
232msgstr ""232msgstr ""
233233
234#: ../src/app/qml/ui/FolderListPage.qml:485234#: ../src/app/qml/ui/FolderListPage.qml:488
235#, qt-format235#, qt-format
236msgid "Are you sure you want to permanently delete '%1'?"236msgid "Are you sure you want to permanently delete '%1'?"
237msgstr ""237msgstr ""
238238
239#: ../src/app/qml/ui/FolderListPage.qml:508239#: ../src/app/qml/ui/FolderListPage.qml:511
240#: ../src/app/qml/ui/FolderListPage.qml:578240#: ../src/app/qml/ui/FolderListPage.qml:581
241msgid "Rename"241msgid "Rename"
242msgstr ""242msgstr ""
243243
244#: ../src/app/qml/ui/FolderListPage.qml:509244#: ../src/app/qml/ui/FolderListPage.qml:512
245msgid "Enter a new name"245msgid "Enter a new name"
246msgstr ""246msgstr ""
247247
248#: ../src/app/qml/ui/FolderListPage.qml:518248#: ../src/app/qml/ui/FolderListPage.qml:521
249msgid "Could not rename"249msgid "Could not rename"
250msgstr ""250msgstr ""
251251
252#: ../src/app/qml/ui/FolderListPage.qml:519252#: ../src/app/qml/ui/FolderListPage.qml:522
253msgid "Insufficient permissions or name already exists?"253msgid "Insufficient permissions or name already exists?"
254msgstr ""254msgstr ""
255255
256#: ../src/app/qml/ui/FolderListPage.qml:542256#: ../src/app/qml/ui/FolderListPage.qml:545
257msgid "Cut"257msgid "Cut"
258msgstr ""258msgstr ""
259259
260#: ../src/app/qml/ui/FolderListPage.qml:553260#: ../src/app/qml/ui/FolderListPage.qml:556
261msgid "Copy"261msgid "Copy"
262msgstr ""262msgstr ""
263263
264#: ../src/app/qml/ui/FolderListPage.qml:610264#: ../src/app/qml/ui/FolderListPage.qml:613
265#: ../src/app/qml/ui/FolderListPage.qml:733265#: ../src/app/qml/ui/FolderListPage.qml:736
266msgid "File operation error"266msgid "File operation error"
267msgstr ""267msgstr ""
268268
269#: ../src/app/qml/ui/FolderListPage.qml:659269#: ../src/app/qml/ui/FolderListPage.qml:662
270msgid "~/Desktop"270msgid "~/Desktop"
271msgstr ""271msgstr ""
272272
273#: ../src/app/qml/ui/FolderListPage.qml:669273#: ../src/app/qml/ui/FolderListPage.qml:672
274msgid "~/Public"274msgid "~/Public"
275msgstr ""275msgstr ""
276276
277#: ../src/app/qml/ui/FolderListPage.qml:671277#: ../src/app/qml/ui/FolderListPage.qml:674
278msgid "~/Programs"278msgid "~/Programs"
279msgstr ""279msgstr ""
280280
281#: ../src/app/qml/ui/FolderListPage.qml:673281#: ../src/app/qml/ui/FolderListPage.qml:676
282msgid "~/Templates"282msgid "~/Templates"
283msgstr ""283msgstr ""
284284
285#: ../src/app/qml/ui/FolderListPage.qml:686285#: ../src/app/qml/ui/FolderListPage.qml:689
286msgid "Home"286msgid "Home"
287msgstr ""287msgstr ""
288288
289#: ../src/app/qml/ui/FolderListPage.qml:688289#: ../src/app/qml/ui/FolderListPage.qml:691
290msgid "Device"290msgid "Device"
291msgstr ""291msgstr ""
292292
293#: ../src/app/qml/ui/FolderListPage.qml:733293#: ../src/app/qml/ui/FolderListPage.qml:736
294#, qt-format294#, qt-format
295msgid "Unable to open '%1'"295msgid "Unable to open '%1'"
296msgstr ""296msgstr ""
297297
298#: ../src/app/qml/ui/FolderListPage.qml:745298#: ../src/app/qml/ui/FolderListPage.qml:748
299msgid "Folder not accessible"299msgid "Folder not accessible"
300msgstr ""300msgstr ""
301301
302#. TRANSLATORS: this refers to a folder name302#. TRANSLATORS: this refers to a folder name
303#: ../src/app/qml/ui/FolderListPage.qml:747303#: ../src/app/qml/ui/FolderListPage.qml:750
304#, qt-format304#, qt-format
305msgid "Can not access %1"305msgid "Can not access %1"
306msgstr ""306msgstr ""
307307
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml 2014-09-20 10:49:51 +0000
+++ src/app/qml/components/PlacesSidebar.qml 2014-10-20 15:58:06 +0000
@@ -26,7 +26,7 @@
26 id: root26 id: root
2727
28 //color: Qt.rgba(0.5,0.5,0.5,0.3)28 //color: Qt.rgba(0.5,0.5,0.5,0.3)
29 width: collapsed ? units.gu(8) : units.gu(22)29 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
3030
31 property bool collapsed: collapsedSidebar31 property bool collapsed: collapsedSidebar
3232
3333
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml 2014-10-06 12:27:18 +0000
+++ src/app/qml/ui/FolderListPage.qml 2014-10-20 15:58:06 +0000
@@ -360,11 +360,14 @@
360 visible: fileSelectorMode360 visible: fileSelectorMode
361 }361 }
362362
363 Row {363 Flow {
364 id: bottomBarButtons364 id: bottomBarButtons
365 anchors.horizontalCenter: parent.horizontalCenter
366 anchors.bottom: bottomBar.bottom365 anchors.bottom: bottomBar.bottom
367 spacing: units.gu(5)366 anchors.leftMargin: (parent.width - sidebar.width - childrenRect.width) / 2
367 anchors.left: sidebar.right
368 width: parent.width - sidebar.width
369
370 spacing: units.gu(2)
368 visible: fileSelectorMode || pageModel.onlyMTPPaths371 visible: fileSelectorMode || pageModel.onlyMTPPaths
369372
370 Button {373 Button {

Subscribers

People subscribed via source and target branches