Merge lp:~lains/pantheon-files/fix-1197628 into lp:~elementary-apps/pantheon-files/trunk

[Lains]

[David Gomes (davidgomes)]

http://i.imgur.com/N6ftGuT.png

It doesn't properly fix the bug as visible in the image.

review: Needs Fixing

[lp:~lains/pantheon-files/fix-1197628]

1276. By Lains on 2013-07-24

Removed the label correctly now.

1277. By Lains on 2013-07-24

 fixed the shortcut now.

[Julien Spautz (julien-spautz)]

Still doesn't work for me, try reverting your changes in "src/fm-directory-view-ui.xml", then it should work.

[lp:~lains/pantheon-files/fix-1197628]

1278. By Lains on 2013-07-25

Restored Delete item in fm-directory-view-ui.xml

[Cody Garver (codygarver)]

Revision 1277 worked fine for me, 1278 leaves a blank menu space where it used to be.

[Lains (lains)]

Use revision 1277 then.

[David Gomes (davidgomes)]

1. No mixed tabs and spaces indentation.
2. No adding trailing whitespace.
3. Since we use a bot to merge branches, you will have to revert to the 'good' revision.

review: Needs Fixing

[lp:~lains/pantheon-files/fix-1197628]

1279. By Lains on 2013-07-26

Reverted to commit 1277 and removed code cosmetic errors

[Lains (lains)]

A-OK for merging.

[Lains (lains)]

If I remove the delete option everywhere, it doesn't show, but at the cost of removing the key bind too.

[lp:~lains/pantheon-files/fix-1197628]

1280. By Lains on 2013-07-26

Made the Delete option back to the fm-directory-view-ui.xml

1281. By Lains on 2013-07-26

Removed all stances of Delete Everywhere option, at the cost of removing the keybind.

[David Gomes (davidgomes)]

Daniel, up to you now I guess.

[Julián Unrrein (junrrein)]

This removes the keyboard shortcut, which is something we cannot accept.

Oddly enough, Paulo was very close to fixing this properly, but as it seems he closed his account, I uploaded a proper fix -> https://code.launchpad.net/~junrrein/pantheon-files/fix-1197628/+merge/178860

review: Disapprove

Unmerged revisions

1281. By Lains on 2013-07-26

Removed all stances of Delete Everywhere option, at the cost of removing the keybind.

1280. By Lains on 2013-07-26

Made the Delete option back to the fm-directory-view-ui.xml

1279. By Lains on 2013-07-26

Reverted to commit 1277 and removed code cosmetic errors

1278. By Lains on 2013-07-25

Restored Delete item in fm-directory-view-ui.xml

1277. By Lains on 2013-07-24

 fixed the shortcut now.

1276. By Lains on 2013-07-24

Removed the label correctly now.

1275. By Lains on 2013-07-24

Remove Delete Permanently from the menu but retain it's keybind

1274. By Lains on 2013-07-23

Making default icon size 64px.

1273. By Lains on 2013-07-23

Fixing some errors of the last commit.

1272. By Lains on 2013-07-23

Removed menu option Delete Permanently.

=== modified file 'src/fm-directory-view-ui.xml'
--- src/fm-directory-view-ui.xml	2012-08-04 15:59:35 +0000
+++ src/fm-directory-view-ui.xml	2013-07-26 17:36:24 +0000
@@ -54,7 +54,6 @@
 		</placeholder>
 	    <placeholder name="Dangerous File Actions">
 		    <menuitem name="Trash" action="Trash"/>
-    		<menuitem name="Delete" action="Delete"/>
 	    	<menuitem name="Restore From Trash" action="Restore From Trash"/>
     	</placeholder>
 	</menu>
@@ -158,7 +157,6 @@
 	<separator name="Dangerous separator"/>
 	<placeholder name="Dangerous File Actions">
 		<menuitem name="Trash" action="Trash"/>
-		<menuitem name="Delete" action="Delete"/>
 		<menuitem name="Restore From Trash" action="Restore From Trash"/>
 	</placeholder>
 	<!--<separator name="Appearance separator"/>

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-06-30 09:33:01 +0000
+++ src/fm-directory-view.c	2013-07-26 17:36:24 +0000
@@ -3531,10 +3531,6 @@
         /* label, accelerator */       N_("Mo_ve to Trash"), NULL,
         /* tooltip */                  N_("Move each selected item to the Trash"),
         G_CALLBACK (action_trash_callback) },
-    /* name, stock id */         { "Delete", NULL,
-        /* label, accelerator */       N_("_Delete Permanently"), "<shift>Delete",
-        /* tooltip */                  N_("Delete each selected item, without moving to the Trash"),
-        G_CALLBACK (action_delete_callback) },
     /* name, stock id */         { "Restore From Trash", NULL,
         /* label, accelerator */       N_("_Restore"), NULL, 
         NULL,