Merge lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection into lp:ubuntu-filemanager-app

[Arto Jalkanen]

ContentHub file selecting support improved:

 - Buttons for accepting / cancelling selection
 - Can select multiple files

ContentHub file selecting support improved:

 - Buttons for accepting / cancelling selection
 - Can select multiple files

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:179
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/242/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2698
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2698/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/235
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/192
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/40

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:180
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/244/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2726
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/263
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/42

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

review: Approve (continuous-integration)

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

188. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-05-22

Launchpad automatic translations update.

189. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-05-24

Launchpad automatic translations update.

190. By Carlos Jose Mazieri on 2014-05-24

ActionPaths now is used in Actions.

Approved by Arto Jalkanen, Ubuntu Phone Apps Jenkins Bot.

191. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-05-25

Launchpad automatic translations update.

192. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-05-26

Launchpad automatic translations update.

193. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-05-29

Launchpad automatic translations update.

194. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-02

Launchpad automatic translations update.

195. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-03

Launchpad automatic translations update.

196. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-04

Launchpad automatic translations update.

197. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-06

Launchpad automatic translations update.

198. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-07

Launchpad automatic translations update.

199. By Victor Thompson on 2014-06-10

Fix qml errors occuring during application run. Fixes: https://bugs.launchpad.net/bugs/1316677.

Approved by Ubuntu Phone Apps Jenkins Bot.

200. By Leo Arias on 2014-06-10

Cleaned up the places autopilot tests.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

201. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-11

Launchpad automatic translations update.

202. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-12

Launchpad automatic translations update.

203. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-13

Launchpad automatic translations update.

204. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-17

Launchpad automatic translations update.

205. By Victor Thompson on 2014-06-17

* Don't turn off OSK
* Fix various test failures. Fixes: https://bugs.launchpad.net/bugs/1256856, https://bugs.launchpad.net/bugs/1316677, https://bugs.launchpad.net/bugs/1329818.

Approved by Brendan Donegan, Ubuntu Phone Apps Jenkins Bot, Leo Arias.

206. By Carlos Jose Mazieri on 2014-06-17

Code to complete Trash opearations: move into / restore from / restore all / empty trash.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

207. By Carlos Jose Mazieri on 2014-06-17

some tests.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

208. By Carlos Jose Mazieri on 2014-06-17

High level selection methods.

Approved by Arto Jalkanen, Ubuntu Phone Apps Jenkins Bot.

209. By David Planella on 2014-06-18

Add places model plugin.

Approved by Ubuntu Phone Apps Jenkins Bot.

210. By Leo Arias on 2014-06-18

Refactored the first group of context menu tests.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

211. By Nicholas Skaggs on 2014-06-19

Revert accidental merge. Fixes: https://bugs.launchpad.net/bugs/1331948.

Approved by Ubuntu Phone Apps Jenkins Bot.

212. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-25

Launchpad automatic translations update.

213. By David Planella on 2014-06-26

Add places model plugin. Fixes: https://bugs.launchpad.net/bugs/1328332, https://bugs.launchpad.net/bugs/1330841, https://bugs.launchpad.net/bugs/1330843, https://bugs.launchpad.net/bugs/1330852, https://bugs.launchpad.net/bugs/1331702.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Spencer.

214. By Carlos Jose Mazieri on 2014-06-26

fixes the bug #1330223.

Approved by Carlos Jose Mazieri, Ubuntu Phone Apps Jenkins Bot.

215. By Carlos Jose Mazieri on 2014-06-28

removed PLUGIN_URI define directive and put it as hard coded in the plugin.h due to this define was not included in the CMakeLists.txt when changing build from qmake to cmake.

Approved by Carlos Jose Mazieri, Ubuntu Phone Apps Jenkins Bot.

[Carlos Jose Mazieri (carlos-mazieri)]

1. How do I test it?
   In order to see something I just changed the property FolderListPage::fileSelectorMode
   Otherwise it looks like normal filemanager

2. Running as I said above (maybe it is wrong) I could see the select button becomming enabled, but I would expect the item background color be changed.

3. %11 instead of %1
+ 89 + error(i18n.tr("File operation error"), i18n.tr("Unable to open '%11'").arg(filePath))

review: Needs Information

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

216. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-29

Launchpad automatic translations update.

[Arto Jalkanen (ajalkane)]

Hi Carlos,

to test it you will need:

 - Compile and install FileManager as a click package
 - Compile and run this project: https://code.launchpad.net/~ken-vandine/+junk/hub-importer
 - From hub-importer you should be able to select FileManager as import source

Let me know if there's a problem.

[Arto Jalkanen (ajalkane)]

Carlos,

I added more comprehensive instructions for testing on desktop to the branch. After updating please see the file README.contentHubDesktop.

I hope I managed to put everything needed there. If not, let me know - I know I used weeks on this so better to ask if you hit a dead end than to waste time trying to figure it out, because I might have experienced the same problem.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:181
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/271/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/739/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/69/console

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

The content-hub implementation looks fine, I noticed a couple of more general issue you might want to look at though:

 * You'll need to merge from https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/content-hub-preliminary otherwise you'll run in to conflicts due to "Unable to open '%11'" having been fixed in that branch and also changed in a different way in this one.

 * There doesn't appear to be any visual indication that an item has been selected if it has a short name, items with long names that have been truncated get expanded and highlighted when selected, but items with names short enough not to be truncated don't appear to be highlighted.

 * It doesn't appear to be possible to select files from multiple directories, the original selection is lost when changing directory (this could be intentional though?)

review: Needs Fixing

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

217. By Alan Pope 🍺🐧🐱 🦄 on 2014-07-02

bump framework. Fixes: https://bugs.launchpad.net/bugs/1336764.

Approved by Ubuntu Phone Apps Jenkins Bot.

[Arto Jalkanen (ajalkane)]

Thanks for looking into it.

 * Will do the merge

 * There SHOULD be visual indication. For me I see selected items' text in different color. I will try to reproduce this problem. I did only test with the list view, not with the icon view. Perhaps I forgot to make the changes to icon view.

 * This is as intended - That's how Ubuntu's file selection works also, you can't select files from several directories.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:182
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/274/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/835/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/72/console

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

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

Michael,

I have done the merge and added support for highlighting items in item view (it was missing).

Carlos,

the README for building on desktop was incomplete. I have updated it accordingly (see the changes needed in manifest.json when building).

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/275/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/837/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/73/console

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks Arto. Could you look into fixing the merge conflicts in the diff?

review: Needs Fixing

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

218. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-04

Launchpad automatic translations update.

[Arto Jalkanen (ajalkane)]

> Thanks Arto. Could you look into fixing the merge conflicts in the diff?

I will look into it on saturday.

[Arto Jalkanen (ajalkane)]

> Thanks Arto. Could you look into fixing the merge conflicts in the diff?

I did the merge from trunk, and could build the click package. Unfortunately I'm unable to test because on 14.04 desktop at least I get following error when trying to install the click package (did apt-get update and apt-get dist-upgrade before this):

Cannot install ./com.ubuntu.filemanager_0.3.latest_i386.click: Framework "ubuntu-sdk-14.04-dev2" not present on system (use --force-missing-framework option to override)

So I just hope the merge is okay and perhaps Jenkins will complain if there's something more amiss.

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

219. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-06

Launchpad automatic translations update.

[David Planella (dpm)]

On Sat, Jul 5, 2014 at 10:02 PM, Arto Jalkanen <email address hidden> wrote:

> > Thanks Arto. Could you look into fixing the merge conflicts in the diff?
>
> I did the merge from trunk, and could build the click package.
> Unfortunately I'm unable to test because on 14.04 desktop at least I get
> following error when trying to install the click package (did apt-get
> update and apt-get dist-upgrade before this):
>
> Cannot install ./com.ubuntu.filemanager_0.3.latest_i386.click: Framework
> "ubuntu-sdk-14.04-dev2" not present on system (use
> --force-missing-framework option to override)
>
>
Hi Arto,

Thanks for looking into this. You've got two options: either use the
--force-missing-framework as per the message above, or rather, as part of
the branch, fix the manifest to set the framework to ubuntu-sdk-14.*10*
-dev2.

I would recommend the later.

Cheers,
David.

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

220. By Alan Pope 🍺🐧🐱 🦄 on 2014-07-06

Correctly fix framework. Fixes: https://bugs.launchpad.net/bugs/1336764.

Approved by David Planella, Ubuntu Phone Apps Jenkins Bot.

[Arto Jalkanen (ajalkane)]

> On Sat, Jul 5, 2014 at 10:02 PM, Arto Jalkanen <email address hidden> wrote:
> Hi Arto,
>
> Thanks for looking into this. You've got two options: either use the
> --force-missing-framework as per the message above, or rather, as part of
> the branch, fix the manifest to set the framework to ubuntu-sdk-14.*10*
> -dev2.
>
> I would recommend the later.

The trunk got the ubuntu-sdk-14.10 fix into manifest.json. Unfortunately after merging it I still get the problem:

Cannot install ./com.ubuntu.filemanager_0.3.latest_i386.click: Framework "ubuntu-sdk-14.10-dev2" not present on system (use --force-missing-framework option to override)

I did manage to install it with --force-misosing-framework. But after doing "upstart-app-list" does not show FIleManager after that. Furthermore kenvandine's hub-importer failed to start now, not sure what that's related to, probably some dist-upgrade I did.

So I'll just push the changes and I hope they're okay from Jenkin's point of view.

[David Planella (dpm)]

On Sun, Jul 6, 2014 at 10:11 PM, Arto Jalkanen <email address hidden> wrote:

> > On Sat, Jul 5, 2014 at 10:02 PM, Arto Jalkanen <email address hidden>
> wrote:
> > Hi Arto,
> >
> > Thanks for looking into this. You've got two options: either use the
> > --force-missing-framework as per the message above, or rather, as part of
> > the branch, fix the manifest to set the framework to ubuntu-sdk-14.*10*
> > -dev2.
> >
> > I would recommend the later.
>
> The trunk got the ubuntu-sdk-14.10 fix into manifest.json. Unfortunately
> after merging it I still get the problem:
>
> Cannot install ./com.ubuntu.filemanager_0.3.latest_i386.click: Framework
> "ubuntu-sdk-14.10-dev2" not present on system (use
> --force-missing-framework option to override)
>
> I did manage to install it with --force-misosing-framework. But after
> doing "upstart-app-list" does not show FIleManager after that. Furthermore
> kenvandine's hub-importer failed to start now, not sure what that's related
> to, probably some dist-upgrade I did.
>

Hi Arto, a few questions:

- How are you installing the click package?
- Are you using a device, or the emulator? Which Ubuntu image are you using?
- Why are you using upstart-app-list instead of 'click list' to list the
installed packages? And what is the output of 'click list'?
- What is the output of 'click framework list'?

Cheers,
David.

>
> So I'll just push the changes and I hope they're okay from Jenkin's point
> of view.
>
>
> --
>
> https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/content-hub-multiselection/+merge/220135
> You are reviewing the proposed merge of
> lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection into
> lp:ubuntu-filemanager-app.
>

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:185
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/277/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/908/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/908/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/75

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:185
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/278/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/917
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/76

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:186
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/279/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/925
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/925/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/77

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

> On Sun, Jul 6, 2014 at 10:11 PM, Arto Jalkanen <email address hidden> wrote:
>
> Hi Arto, a few questions:
>
> - How are you installing the click package?

Like this:

sudo click install --user=$USER ./com.ubuntu.filemanager_0.3.latest_i386.click

> - Are you using a device, or the emulator? Which Ubuntu image are you using?

I'm using desktop (14.04). This was recommended to me. I spent about two months battling with the emulator, but after a suggestion got it working in desktop. Never managed to get it working in emulator and I don't fancy trying to battle with the emulator anytime soon :P.

> - Why are you using upstart-app-list instead of 'click list' to list the
> installed packages? And what is the output of 'click list'?

This was my mistake. Should have used "click list", and using that the FileManager package is shown.

> - What is the output of 'click framework list'?

click: error: unknown command: framework

[David Planella (dpm)]

On Tue, Jul 8, 2014 at 10:30 PM, Arto Jalkanen <email address hidden> wrote:

> > On Sun, Jul 6, 2014 at 10:11 PM, Arto Jalkanen <email address hidden>
> wrote:
> >
> > Hi Arto, a few questions:
> >
> > - How are you installing the click package?
>
> Like this:
>
> sudo click install --user=$USER
> ./com.ubuntu.filemanager_0.3.latest_i386.click
>
>
Ah, ok. I'm not sure how good the support for click packages on a Unity 7
session is, though.

> > - Are you using a device, or the emulator? Which Ubuntu image are you
> using?
>
> I'm using desktop (14.04). This was recommended to me. I spent about two
> months battling with the emulator, but after a suggestion got it working in
> desktop. Never managed to get it working in emulator and I don't fancy
> trying to battle with the emulator anytime soon :P.
>
>
It's actually not that hard anymore, you can do everything from within Qt
Creator, and the i386 emulator is much, much faster!

You'll find a video with an intro here:
- http://youtu.be/z7v_N2fKuP0

And the slides:
-
http://www.slideshare.net/DavidPlanella/app-development-with-the-ubuntu-emulator

> > - Why are you using upstart-app-list instead of 'click list' to list the
> > installed packages? And what is the output of 'click list'?
>
> This was my mistake. Should have used "click list", and using that the
> FileManager package is shown.
>
> > - What is the output of 'click framework list'?
>
> click: error: unknown command: framework
>

In this case I believe you're using an old version of click. Do you have
the SDK team PPA installed, and is your 14.04 system up-to-date?

[Arto Jalkanen (ajalkane)]

> On Tue, Jul 8, 2014 at 10:30 PM, Arto Jalkanen <email address hidden> wrote:
> > sudo click install --user=$USER
> > ./com.ubuntu.filemanager_0.3.latest_i386.click
> >
> >
> Ah, ok. I'm not sure how good the support for click packages on a Unity 7
> session is, though.
>
> It's actually not that hard anymore, you can do everything from within Qt
> Creator, and the i386 emulator is much, much faster!
>
> You'll find a video with an intro here:
> - http://youtu.be/z7v_N2fKuP0
>
> And the slides:
> -
> http://www.slideshare.net/DavidPlanella/app-development-with-the-ubuntu-
> emulator

Thanks. These seem like good information once I need to venture again into the emulator wonder-land :).

> > > - What is the output of 'click framework list'?
> >
> > click: error: unknown command: framework
>
> In this case I believe you're using an old version of click. Do you have
> the SDK team PPA installed, and is your 14.04 system up-to-date?

This was the problem. My SDK team PPA was disabled, I guess due to some update I had done.

Now it works and lists:

ubuntu-sdk-13.10
ubuntu-sdk-14.04-dev1
ubuntu-sdk-14.04-html-dev1
ubuntu-sdk-14.04-papi-dev1
ubuntu-sdk-14.04-qml-dev1

I tried running File Manager directly with:

upstart-app-launch com.ubuntu.filemanager_filemanager_0.3.latest

But File Manager would not start. The logs were not helpful:

cat ~/.cache/upstart/application-click-com.ubuntu.filemanager_filemanager_0.3.latest.log
pgrep: invalid user name: system

But it doesn't much matter. The merges from FileManager trunk are something that should not impede on content-hub integration changes I've done as such, and I have tested that it works on previous SDKs. Jenkins seems to be ok with the current changes, but of course it would be nice if anyone with working environment can do a quick check that File Manager at least can be started.

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

221. By Jason on 2014-07-11

Change 'caller' of GoToDialog to mainView. Fixes: https://bugs.launchpad.net/bugs/1331333.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

222. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-14

Launchpad automatic translations update.

[Arto Jalkanen (ajalkane)]

Top approving this since all the issues raised have been fixed.

review: Approve

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

223. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-15

Launchpad automatic translations update.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:186
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/281/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1025
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1025/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/79

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

review: Approve (continuous-integration)

[lp:~ajalkane/ubuntu-filemanager-app/content-hub-multiselection]

224. By Arto Jalkanen on 2014-07-15

ContentHub file selecting support improved:

 - Buttons for accepting / cancelling selection
 - Can select multiple files.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

225. By Alan Pope 🍺🐧🐱 🦄 on 2014-07-15

Fix bug in tests. Fixes: https://bugs.launchpad.net/bugs/1342336.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

226. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-16

Launchpad automatic translations update.

227. By Francis Ginther on 2014-07-16

Change version string to include bzr revno.

Approved by Ubuntu Phone Apps Jenkins Bot, Alan Pope ㋛.

228. By Francis Ginther on 2014-07-16

Move manifest.json to manifest.json.in to allow for cmake configure_file(), to correct the presence of @BZR_REVNO@ in the version string.

Approved by Ubuntu Phone Apps Jenkins Bot, Alan Pope ㋛.

229. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-17

Launchpad automatic translations update.

230. By Alan Pope 🍺🐧🐱 🦄 on 2014-07-17

fix 1343505 to remove urls. Fixes: https://bugs.launchpad.net/bugs/1343505.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

231. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-19

Launchpad automatic translations update.

232. By David Planella on 2014-07-22

Fix to get the tests to go to places working again. Going forward, we should probably add the objectName to the model in the plugin instead. Fixes: https://bugs.launchpad.net/bugs/1342336.

Approved by Brendan Donegan, Ubuntu Phone Apps Jenkins Bot.

233. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-23

Launchpad automatic translations update.

234. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-24

Launchpad automatic translations update.

235. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-25

Launchpad automatic translations update.

236. By Paweł Stołowski on 2014-07-25

Added X-Ubuntu-Default-Department-ID key to the desktop file. This is required by click scope to support departments for preinstalled applications.

Approved by Ubuntu Phone Apps Jenkins Bot.

237. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-26

Launchpad automatic translations update.

238. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-07-28

Launchpad automatic translations update.

239. By David Planella on 2014-07-28

Makes the root locations in the path bar human-readable. Fixes: https://bugs.launchpad.net/bugs/1331699.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

240. By David Planella on 2014-07-29

Fixes the missing dependency on the places plugin. Fixes: https://bugs.launchpad.net/bugs/1336464.

Approved by Alan Pope ㋛, Ubuntu Phone Apps Jenkins Bot.

241. By Arto Jalkanen on 2014-08-01

Bug 1347010: UI for only displaying files in MTP directories. For now, "Show all files" is always visible at start and non-MTP directories are not viewable. After clicking "Show all files", all files are shown.

TODO:
 - "Show all files" only when user has set PIN/password, if not all files are automatically shown
 - When "Show all files" clicked query PIN/password from user and if it's valid only then display all files

242. By Arto Jalkanen on 2014-08-01

A stub for PAM Authentication plugin. For now returns always true for authentication required and validation.

243. By Arto Jalkanen on 2014-08-02

Added authentication dialog, and a authentication failed notification.

Unmerged revisions

=== added file 'README.contentHubDesktop'
--- README.contentHubDesktop	1970-01-01 00:00:00 +0000
+++ README.contentHubDesktop	2014-07-08 20:16:44 +0000
@@ -0,0 +1,65 @@
+# Ubuntu File Manager
+
+File manager app for Ubuntu on the desktop and on mobile devices.
+
+## Testing Content-Hub support
+
+### For the desktop
+
+Install the following dependencies to run click applications:
+
+    sudo apt-get install upstart-app-launch-tools
+
+#### Build FileManager and install FileManager as click package
+
+Build FileManager as a click package and install it. At the time of this writing
+this doesn't seem to be working with the SDK (due to cmake), but it can be done 
+from command line:
+
+First you must modify manifest.json and replace "architecture" value of "armhf" with "i386".
+Just remember to change it back to armhf if you commit changes.
+
+After that you can build x86 version of the package and install it:
+
+    QT_SELECT=qt5 cmake . -DCLICK_MODE=1 && make -j2 && make install DESTDIR=install && click build install
+    sudo click install --user=$USER ./com.ubuntu.filemanager_0.3.latest_i386.click 
+
+#### Build and install hub-importer as click package
+
+Get the sources for building:
+
+    bzr branch lp:~ken-vandine/+junk/hub-importer
+
+You should be able to create click package out of it in SDK by opening the project and using Publish and Create package.
+
+Install the created package (example):
+
+    sudo click install --user=$USER com.ubuntu.developer.ken-vandine.hub-importer_0.2_all.click
+
+#### Running test
+
+Run hub-importer (example):
+
+    upstart-app-launch com.ubuntu.developer.ken-vandine.hub-importer_hub-importer_0.2
+
+Click "Select source" button.
+
+You should see File Manager as one of the choices. If you do not see File Manager, look at "Troubleshooting" section.
+Click on File Manager, and File Manager should start. Now you should choose some pictures as that's the only thing
+supported at the moment (even though FileManager allows selecting any type). You can select multiple files in a 
+directory if you so choose. Once you're satisfied with the seelction, click "Select". You should see the pictures 
+then in Hub Importer.
+
+#### Troubleshooting
+
+ - If you don't see File Manager as one of the choises in Hub Importer, then quit Hub Importer and run this script:
+    /usr/lib/i386-linux-gnu/content-hub/content-hub-peer-hook
+   Try running Hub Importer again after that and File Manager should show.
+   If the above script does not exist, you can try locating something similar with:
+    locate hook
+ - If you have trouble running Hub Importer or the above still doesn't work, check the installed click packages with:
+   click list
+   It should show entry for both File Manager and Hub Importer. If it does not, installing the click package has not succeeded
+ - If all else fails, check the logs for both Hub Importer and File Manager for further clues at:
+    $HOME/.cache/upstart/
+

=== modified file 'apparmor.json'
--- apparmor.json	2014-07-02 12:28:30 +0000
+++ apparmor.json	2014-07-08 20:16:44 +0000
@@ -2,4 +2,4 @@
     "policy_version": 1.2,
     "template": "unconfined",
     "policy_groups": []
-}
+}
\ No newline at end of file

=== modified file 'manifest.json'
--- manifest.json	2014-07-08 20:16:44 +0000
+++ manifest.json	2014-07-08 20:16:44 +0000
@@ -1,6 +1,7 @@
 {
     "description": "File Manager application",
     "framework": "ubuntu-sdk-14.10-dev2",
+    "_comment": "put i386 to architecture if you want build for x86, armhf for arm devices",
     "architecture": "armhf",
     "hooks": {
         "filemanager": {

=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
--- src/app/qml/components/FolderIconDelegate.qml	2014-06-22 12:45:32 +0000
+++ src/app/qml/components/FolderIconDelegate.qml	2014-07-08 20:16:44 +0000
@@ -36,7 +36,7 @@
         radius: units.gu(2)
         smooth: true
         antialiasing: true
-        opacity: selected ? 0.5 : 0
+        opacity: model.isSelected ? 0.5 : 0
         color: UbuntuColors.orange
 
         Behavior on opacity {

=== modified file 'src/app/qml/components/FolderListDelegate.qml'
--- src/app/qml/components/FolderListDelegate.qml	2014-06-22 12:45:32 +0000
+++ src/app/qml/components/FolderListDelegate.qml	2014-07-08 20:16:44 +0000
@@ -34,4 +34,6 @@
 
     progression: model.isDir
     iconFrame: false
+
+    selected: model.isSelected
 }

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-07-08 20:16:44 +0000
+++ src/app/qml/filemanager.qml	2014-07-08 20:16:44 +0000
@@ -21,11 +21,8 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Unity.Action 1.0 as UnityActions
 import U1db 1.0 as U1db
-<<<<<<< TREE
+import Ubuntu.Content 0.1
 import com.ubuntu.PlacesModel 0.1
-=======
-import Ubuntu.Content 0.1
->>>>>>> MERGE-SOURCE
 
 import "ui"
 
@@ -65,12 +62,6 @@
     backgroundColor: "#797979"
     footerColor: "#808080"
 
-<<<<<<< TREE
-    PlacesModel {
-       id: userplaces
-    }
-
-=======
     QtObject {
         id: fileSelector
         property var activeTransfer: null
@@ -82,7 +73,10 @@
         ContentItem {}
     }
 
->>>>>>> MERGE-SOURCE
+    PlacesModel {
+       id: userplaces
+    }
+
     // HUD Actions
     Action {
         id: settingsAction
@@ -117,16 +111,18 @@
     function cancelFileSelector() {
         console.log("Cancel file selector")
         pageStack.pop()
-        // fileSelector.fileSelectorCompeonnt = null
-
+        fileSelector.fileSelectorComponent = null
+        fileSelector.activeTransfer.state = ContentTransfer.Aborted
     }
 
-    function acceptFileSelector(fileUrl) {
-        console.log("accept file selector " + fileUrl)
-        var result = fileSelectorResultComponent.createObject(mainView);
-        result.url = fileUrl
+    function acceptFileSelector(fileUrls) {
+        console.log("accept file selector " + fileUrls)
+        var results = fileUrls.map(function(fileUrl) {
+            return fileSelectorResultComponent.createObject(mainView, {"url": fileUrl})
+        })
+
         if (fileSelector.activeTransfer !== null) {
-            fileSelector.activeTransfer.items = [ result ]
+            fileSelector.activeTransfer.items = results
             fileSelector.activeTransfer.state = ContentTransfer.Charged
             console.log("set activeTransfer")
         } else {

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-07-08 20:16:44 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-07-08 20:16:44 +0000
@@ -37,9 +37,11 @@
     property string folder
     property bool loading: pageModel.awaitingResults
 
-    // Set to true if called as file selector
+    // Set to true if called as file selector for ContentHub
     property bool fileSelectorMode: false
 
+    property FolderListSelection selectionManager: pageModel.selectionObject()
+
     onShowHiddenFilesChanged: {
         pageModel.showHiddenFiles = folderListPage.showHiddenFiles
     }
@@ -237,38 +239,6 @@
         }
     }
 
-<<<<<<< TREE
-=======
-    Component {
-        id: selectFileDialog
-        ConfirmDialog {
-            property string filePath
-
-            title: i18n.tr("Confirm selection")
-            text: filePath
-
-            onAccepted: {
-                console.log("Create file accepted", filePath)
-                // IMPROVE: for now single select
-                acceptFileSelector("file:/" + filePath)
-            }
-        }
-    }
-
-
-    function openFile(filePath) {
-        // Just temporarily like this... finally should highlight selection and use buttons
-        if (fileSelectorMode) {
-            PopupUtils.open(selectFileDialog, folderListPage, { filePath: pageModel.path + "/" + filePath })
-        }
-        else {
-            if (!pageModel.openPath(filePath)) {
-                error(i18n.tr("File operation error"), i18n.tr("Unable to open '%1'").arg(filePath))
-            }
-        }
-    }
-
->>>>>>> MERGE-SOURCE
     tools: ToolbarItems {
         id: toolbar
         locked: showToolbar
@@ -378,6 +348,49 @@
         expanded: showSidebar
     }
 
+    Item {
+        id: bottomBar
+        anchors {
+            bottom: parent.bottom
+            left: sidebar.right
+            right: parent.right
+        }
+        height: fileSelectorMode ? bottomBarFileSelectorButtons.height : 0
+        visible: fileSelectorMode
+
+    }
+
+    Row {
+        id: bottomBarFileSelectorButtons
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: bottomBar.bottom
+        spacing: units.gu(5)
+        visible: fileSelectorMode
+
+        Button {
+            text: i18n.tr("Select")
+            enabled: selectionManager.counter > 0
+            onClicked: {
+               var selectedAbsPaths = selectionManager.selectedAbsFilePaths();
+               // For now support only selection in filesystem
+               var selectedAbsUrls = selectedAbsPaths.map(function(item) {
+                   return "file://" + item;
+               });
+               console.log("FileSelector OK clicked, selected items: " + selectedAbsUrls)
+
+               acceptFileSelector(selectedAbsUrls)
+           }
+        }
+        Button {
+           text: i18n.tr("Cancel")
+           onClicked: {
+               console.log("FileSelector cancelled")
+               cancelFileSelector()
+           }
+        }
+    }
+
+
     FolderIconView {
         id: folderIconView
 
@@ -387,6 +400,7 @@
         anchors {
             top: parent.top
             bottom: parent.bottom
+            bottomMargin: bottomBar.height
             left: sidebar.right
             right: parent.right
         }
@@ -403,6 +417,7 @@
         anchors {
             top: parent.top
             bottom: parent.bottom
+            bottomMargin: bottomBar.height
             left: sidebar.right
             right: parent.right
         }
@@ -711,7 +726,13 @@
             }
         } else {
             console.log("Non dir clicked")
-            openFile(model.fileName)
+            if (fileSelectorMode) {
+                selectionManager.select(model.index,
+                                        false,
+                                        true);
+            } else {
+                openFile(model.fileName)
+            }
 //            PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), root,
 //                            {
 //                                fileName: model.fileName,