Merge lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting into lp://qastaging/unity-2d/3.0
Status: | Rejected |
---|---|
Rejected by: | Florian Boucault |
Proposed branch: | lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting |
Merge into: | lp://qastaging/unity-2d/3.0 |
Diff against target: |
72 lines (+30/-2) 2 files modified
libunity-2d-private/src/trash.cpp (+27/-1) libunity-2d-private/src/trash.h (+3/-1) |
To merge this branch: | bzr merge lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Florian Boucault (community) | Needs Fixing | ||
Review via email:
|
Commit message
Emptying the trash from the unity sidebar now respect nautilus setting
Description of the change
Emptying the trash by right-clicking the trash icon in the unity sidebar and selecting the "Empty ..." option requires users to confirm the action, even if they have unchecked the "Ask before emptying ..." option in nautilus > Edit > Preferences > Behaviour. The option is correctly applied to emptying the trash from nautilus itself.
Now this behaviour is respected in Unity-2D too.
Please Note: I've noticed that we're not using a translation for this part (neither the relative Unity code does). We should do it. Even this part of the UI should be correctly translatable.
Unmerged revisions
- 660. By Andrea Grandi
-
Emptying the trash from the unity sidebar now respect nautilus setting
Nice work Andrea. doc.qt. nokia.com/ 4.7-snapshot/ internationaliz ation.html# step-by- step for more information 2d-launcher' )
A few comments:
- the strings need to be made translatable; see http://
- the dialog box should not have a title (right now it's 'unity-
- the dialog box should be the same size as nautilus' (a bit bigger than with this patch)