summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2017-01-26 17:20:47 +0100
committermonsta <[email protected]>2017-02-07 17:51:36 +0400
commit2a294282863634721b46a0a386aa10414de78bab (patch)
treee81384088a3b1b912c7c15d67a3bebbadb8260e1 /src
parentd575ecad1297e3200df6370efd5d9ae6db12b96a (diff)
downloadcaja-2a294282863634721b46a0a386aa10414de78bab.tar.bz2
caja-2a294282863634721b46a0a386aa10414de78bab.tar.xz
Add an option for asking confirmation before moving files to the trash
Add an option to show a confirmation dialog when moving files to the trash, like there is for deleting files directly or emptying the trash. Closes #632.
Diffstat (limited to 'src')
-rw-r--r--src/caja-file-management-properties.c4
-rw-r--r--src/caja-file-management-properties.ui17
2 files changed, 20 insertions, 1 deletions
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 94ce7443..5dc2251d 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -63,6 +63,7 @@
#define CAJA_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
#define CAJA_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY_WIDGET "always_use_location_entry_checkbutton"
#define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton"
+#define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_TRASH_WIDGET "trash_confirm_trash_checkbutton"
#define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton"
#define CAJA_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET "hidden_files_checkbutton"
#define CAJA_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
@@ -1100,6 +1101,9 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi
bind_builder_bool (builder, caja_preferences,
CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET,
CAJA_PREFERENCES_CONFIRM_TRASH);
+ bind_builder_bool (builder, caja_preferences,
+ CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_TRASH_WIDGET,
+ CAJA_PREFERENCES_CONFIRM_MOVE_TO_TRASH);
bind_builder_bool (builder, caja_preferences,
CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET,
diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
index 526a80d4..f0e55b5a 100644
--- a/src/caja-file-management-properties.ui
+++ b/src/caja-file-management-properties.ui
@@ -1119,6 +1119,21 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="trash_confirm_trash_checkbutton">
+ <property name="label" translatable="yes">Ask before moving files to the _Trash</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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>
+ <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>
@@ -1130,7 +1145,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>