1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
diff -ur src/Thunar-1.0.1-orig/thunar/thunar-application.c src/Thunar-1.0.1/thunar/thunar-application.c
--- src/Thunar-1.0.1-orig/thunar/thunar-application.c 2009-01-12 21:38:48.000000000 +0100
+++ src/Thunar-1.0.1/thunar/thunar-application.c 2009-06-21 02:07:38.000000000 +0200
@@ -1328,13 +1328,20 @@
gchar *message;
guint n_path_list = 0;
gint response;
+ gboolean isTrashEnabled;
_thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
+
/* check if we should permanently delete the files (user holds shift) */
permanently = (gtk_get_current_event_state (&state) && (state & GDK_SHIFT_MASK) != 0);
+ g_object_get (G_OBJECT (application->preferences), "misc-enable-trash", &isTrashEnabled, NULL);
+ if (!isTrashEnabled)
+ {
+ permanently = TRUE;
+ }
+
/* determine the paths for the files */
for (lp = g_list_last (file_list); lp != NULL; lp = lp->prev, ++n_path_list)
{
@@ -1354,8 +1361,8 @@
if (G_UNLIKELY (permanently))
{
/* parse the parent pointer */
- screen = thunar_util_parse_parent (parent, &window);
-
+ screen = thunar_util_parse_parent (parent, &window);
+
/* generate the question to confirm the delete operation */
if (G_LIKELY (n_path_list == 1))
{
diff -ur src/Thunar-1.0.1-orig/thunar/thunar-preferences-dialog.c src/Thunar-1.0.1/thunar/thunar-preferences-dialog.c
--- src/Thunar-1.0.1-orig/thunar/thunar-preferences-dialog.c 2009-01-12 21:38:48.000000000 +0100
+++ src/Thunar-1.0.1/thunar/thunar-preferences-dialog.c 2009-06-21 02:19:11.000000000 +0200
@@ -373,7 +373,7 @@
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_widget_show (label);
- table = gtk_table_new (2, 2, FALSE);
+ table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
@@ -418,7 +418,7 @@
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_widget_show (label);
- table = gtk_table_new (2, 2, FALSE);
+ table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
@@ -573,7 +573,7 @@
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_widget_show (label);
- table = gtk_table_new (2, 2, FALSE);
+ table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
@@ -591,6 +591,13 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Ask everytime"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Apply to Folder Only"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Apply to Folder and Contents"));
+
+ button = gtk_check_button_new_with_mnemonic (_("Move items to Trash when on _delete."));
+ exo_mutual_binding_new (G_OBJECT (dialog->preferences), "misc-enable-trash", G_OBJECT (button), "active");
+ thunar_gtk_widget_set_tooltip (button, _( "By default, items are sent to the Trash on delete. By disabling this option, items will be removed on delete and will be lost forever. (DANGEROUS)" ) );
+ gtk_table_attach (GTK_TABLE (table), button, 0,1,2,3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (button);
+
#if !GTK_CHECK_VERSION(2,9,0)
g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
#endif
@@ -608,7 +615,7 @@
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_widget_show (label);
- table = gtk_table_new (2, 2, FALSE);
+ table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
diff -ur src/Thunar-1.0.1-orig/thunar/thunar-preferences.c src/Thunar-1.0.1/thunar/thunar-preferences.c
--- src/Thunar-1.0.1-orig/thunar/thunar-preferences.c 2009-01-12 21:38:48.000000000 +0100
+++ src/Thunar-1.0.1/thunar/thunar-preferences.c 2009-06-21 02:07:38.000000000 +0200
@@ -71,6 +71,7 @@
PROP_MISC_VOLUME_MANAGEMENT,
PROP_MISC_CASE_SENSITIVE,
PROP_MISC_DATE_STYLE,
+ PROP_MISC_ENABLE_TRASH,
PROP_MISC_FOLDERS_FIRST,
PROP_MISC_HORIZONTAL_WHEEL_NAVIGATES,
PROP_MISC_RECURSIVE_PERMISSIONS,
@@ -664,6 +665,19 @@
THUNAR_TYPE_ICON_SIZE,
THUNAR_ICON_SIZE_SMALLEST,
EXO_PARAM_READWRITE));
+
+ /**
+ * ThunarPreferences:misc-enable-trash:
+ *
+ * If trash is disabled, files will be deleted permanently
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_MISC_ENABLE_TRASH,
+ g_param_spec_boolean ("misc-enable-trash",
+ "misc-enable-trash",
+ "misc-enable-trash",
+ TRUE,
+ EXO_PARAM_READWRITE));
}
diff -ur src/Thunar-1.0.1-orig/thunar/thunar-shortcuts-model.c src/Thunar-1.0.1/thunar/thunar-shortcuts-model.c
--- src/Thunar-1.0.1-orig/thunar/thunar-shortcuts-model.c 2009-01-12 21:38:48.000000000 +0100
+++ src/Thunar-1.0.1/thunar/thunar-shortcuts-model.c 2009-06-21 12:25:04.000000000 +0200
@@ -34,6 +34,7 @@
#include <locale.h>
#endif
+#include <thunar/thunar-preferences.h>
#include <thunar/thunar-file.h>
#include <thunar/thunar-shortcuts-model.h>
#include <thunar/thunar-private.h>
@@ -63,7 +64,6 @@
} ThunarShortcutType;
-
static void thunar_shortcuts_model_class_init (ThunarShortcutsModelClass *klass);
static void thunar_shortcuts_model_tree_model_init (GtkTreeModelIface *iface);
static void thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface);
@@ -278,6 +278,8 @@
guint n;
gchar *desktop_path = NULL;
guint desktop_index;
+ gboolean isTrashEnabled;
+
#ifndef NDEBUG
model->stamp = g_random_int ();
@@ -292,6 +294,8 @@
system_path_list[0] = thunar_vfs_path_get_for_home ();
system_path_list[1] = thunar_vfs_path_get_for_trash ();
+ g_object_get (G_OBJECT (thunar_preferences_get ()), "misc-enable-trash", &isTrashEnabled, NULL);
+
#if GLIB_CHECK_VERSION(2,14,0)
desktop_path = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
#else /* GLIB_CHECK_VERSION(2,14,0) */
@@ -323,6 +327,12 @@
thunar_vfs_path_unref (system_path_list[n]);
continue;
}
+ /* we exclude the trash */
+ if (n == 1 && !isTrashEnabled)
+ {
+ thunar_vfs_path_unref (system_path_list[n]);
+ continue;
+ }
#endif
/* determine the file for the path */
|
