Merge lp://staging/~hyuchia/pantheon-files/fix-1124209 into lp://staging/~elementary-apps/pantheon-files/trunk

Some minor code style issues (see inline) comments. Also needs merging with latest trunk to remove irrelevant diff contents.

The code is otherwise OK for this solution, however UX input is needed on the wording and whether this is an acceptable interim solution. The word "Modify" is problematic - it implies you can modify the files inside but you can only create and delete them. I am not sure what single word would convey this and "Create/Delete files" would be too long. Ideally, the buttons need replacing with comboboxes as per Dan's mockup in the bug report. This would allow space for more meaningful descriptions of the permissions on directories. However, that is not strictly within the scope of the bitesize bug. Maybe use tooltips for the buttons?

Ok so using combo boxes instead of buttons, the options required would be:
- Read
- Write
- Execute
- Read and Write
- Read and Execute
- Write and Execute
- Read, Write and Execute

Is that right? Oh and you are right about the code style issues, my bad.

Hi Diego, you would need a "No access" option as well and the exact wording would have to be decided by the design team. For example "Read only" might be preferred. Also you would need a different set for folders. I'll ask someone from the design for comment.

All right, so I managed to replace the grid buttons with the combo boxes and make them actually work, as well as merging with the latest trunk. Now I'll wait for the UX team to take a look since the wording and order of the options is up to them I guess. Codewise I'm not sure if that's the best solution but I think it's ok. Thanks!

A few inline comments.

Another small inline comment but basically waiting for UX team approval of wording now.

When a mixture of files and folders is selected, the wording for permissions is that for files - but I cannot see any better alternative.

It seems like we have a problem where we've made it easier to read which permissions are being applied but we made it much harder to set those permissions. I think this probably needs from more thought from UX team. In the interest of moving to GitHub in a timely manner, I'm going to reject this branch for now. Please re-propose there