diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-file-management-properties.c | 4 | ||||
| -rw-r--r-- | src/nautilus-file-management-properties.ui | 16 | ||||
| -rw-r--r-- | src/nautilus-view-context-menus.xml | 5 | ||||
| -rw-r--r-- | src/nautilus-view.c | 8 |
4 files changed, 1 insertions, 32 deletions
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c index 80ac0d937..2b8a1581b 100644 --- a/src/nautilus-file-management-properties.c +++ b/src/nautilus-file-management-properties.c @@ -51,7 +51,6 @@ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET "sort_folders_first_checkbutton" #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_USE_TREE_WIDGET "use_tree_view_checkbutton" #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton" -#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton" #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET "hidden_files_checkbutton" /* int enums */ @@ -611,9 +610,6 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow bind_builder_bool (builder, nautilus_preferences, NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET, NAUTILUS_PREFERENCES_CONFIRM_TRASH); - bind_builder_bool (builder, nautilus_preferences, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET, - NAUTILUS_PREFERENCES_ENABLE_DELETE); bind_builder_bool (builder, gtk_filechooser_preferences, NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui index 31fb39ee8..a4f68ebe9 100644 --- a/src/nautilus-file-management-properties.ui +++ b/src/nautilus-file-management-properties.ui @@ -652,22 +652,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="trash_delete_checkbutton"> - <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> </object> </child> </object> diff --git a/src/nautilus-view-context-menus.xml b/src/nautilus-view-context-menus.xml index 45a521d38..a219d2c23 100644 --- a/src/nautilus-view-context-menus.xml +++ b/src/nautilus-view-context-menus.xml @@ -166,11 +166,6 @@ <attribute name="hidden-when">action-disabled</attribute> </item> <item> - <attribute name="label" translatable="yes">D_elete Permanently</attribute> - <attribute name="action">view.delete-permanently</attribute> - <attribute name="hidden-when">action-disabled</attribute> - </item> - <item> <attribute name="label" translatable="yes">Empty Trash</attribute> <attribute name="action">view.empty-trash</attribute> <attribute name="hidden-when">action-disabled</attribute> diff --git a/src/nautilus-view.c b/src/nautilus-view.c index 70c99d86b..1faba7446 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -6014,11 +6014,8 @@ real_update_actions_state (NautilusView *view) action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), "delete-permanently"); - /* Only show it in trash folder or if the setting to include a delete - * menu item is enabled */ - show_separate_delete_command = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ENABLE_DELETE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_delete_files && show_separate_delete_command); + can_delete_files); action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), "cut"); @@ -7530,9 +7527,6 @@ nautilus_view_init (NautilusView *view) gtk_widget_show (GTK_WIDGET (view)); g_signal_connect_swapped (nautilus_preferences, - "changed::" NAUTILUS_PREFERENCES_ENABLE_DELETE, - G_CALLBACK (schedule_update_context_menus), view); - g_signal_connect_swapped (nautilus_preferences, "changed::" NAUTILUS_PREFERENCES_CLICK_POLICY, G_CALLBACK (click_policy_changed_callback), view); |