summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/caja-bookmarks-window.c3
-rw-r--r--src/caja-connect-server-dialog.c3
-rw-r--r--src/caja-file-management-properties.c5
-rw-r--r--src/caja-location-dialog.c3
-rw-r--r--src/caja-places-sidebar.c38
-rw-r--r--src/caja-property-browser.c3
-rw-r--r--src/caja-window-menus.c2
-rw-r--r--src/file-manager/fm-directory-view.c3
-rw-r--r--src/file-manager/fm-properties-window.c3
9 files changed, 32 insertions, 31 deletions
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index aa8b8358..572f6275 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -145,8 +145,7 @@ caja_bookmarks_window_response_callback (GtkDialog *dialog,
GError *error = NULL;
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/goscaja-36",
gtk_get_current_event_time (), &error);
if (error)
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index f1ee942a..921b2597 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -707,8 +707,7 @@ connect_dialog_response_cb (CajaConnectServerDialog *dialog,
case GTK_RESPONSE_HELP :
error = NULL;
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/caja-server-connect",
gtk_get_current_event_time (), &error);
if (error)
{
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 8111d285..24283611 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -256,8 +256,6 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent,
if (response_id == GTK_RESPONSE_HELP)
{
- /* FIXME: show proper page instead of main when m-u-g is complete */
-#if 0
switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (gtk_builder_get_object (builder, "notebook1"))))
{
default:
@@ -280,8 +278,7 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent,
section = "goscaja-61";
break;
}
-#endif
- preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", "files");
+ preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", section);
}
else if (response_id == GTK_RESPONSE_CLOSE)
{
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index 0fc2ef00..b534f210 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -95,8 +95,7 @@ response_callback (CajaLocationDialog *dialog,
case GTK_RESPONSE_HELP :
error = NULL;
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/caja-open-location",
gtk_get_current_event_time (), &error);
if (error)
{
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 55517be2..24ab023e 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -1130,11 +1130,13 @@ compute_drop_position (GtkTreeView *tree_view,
PLACES_SIDEBAR_COLUMN_SECTION_TYPE, &section_type,
-1);
- if (place_type == PLACES_HEADING && section_type != SECTION_BOOKMARKS) {
- /* never drop on headings, but special case the bookmarks heading,
- * so we can drop bookmarks in between it and the first item.
+ if (place_type == PLACES_HEADING &&
+ section_type != SECTION_BOOKMARKS &&
+ section_type != SECTION_NETWORK) {
+ /* never drop on headings, but the bookmarks or network heading
+ * is a special case, so we can create new bookmarks by dragging
+ * at the beginning or end of the bookmark list.
*/
-
gtk_tree_path_free (*path);
*path = NULL;
@@ -1145,17 +1147,19 @@ compute_drop_position (GtkTreeView *tree_view,
sidebar->drag_data_received &&
sidebar->drag_data_info == GTK_TREE_MODEL_ROW) {
/* don't allow dropping bookmarks into non-bookmark areas */
-
- gtk_tree_path_free (*path);
- *path = NULL;
+ gtk_tree_path_free (*path);
+ *path = NULL;
return FALSE;
}
- if (section_type == SECTION_BOOKMARKS) {
+ /* drag to top or bottom of bookmark list to add a bookmark */
+ if (place_type == PLACES_HEADING && section_type == SECTION_BOOKMARKS) {
*pos = GTK_TREE_VIEW_DROP_AFTER;
+ } else if (place_type == PLACES_HEADING && section_type == SECTION_NETWORK) {
+ *pos = GTK_TREE_VIEW_DROP_BEFORE;
} else {
- /* non-bookmark shortcuts can only be dragged into */
+ /* or else you want to drag items INTO the existing bookmarks */
*pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
}
@@ -1266,10 +1270,10 @@ drag_motion_callback (GtkTreeView *tree_view,
}
if (pos == GTK_TREE_VIEW_DROP_BEFORE ||
- pos == GTK_TREE_VIEW_DROP_AFTER )
+ pos == GTK_TREE_VIEW_DROP_AFTER )
{
if (sidebar->drag_data_received &&
- sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
+ sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
{
action = GDK_ACTION_MOVE;
}
@@ -1527,7 +1531,7 @@ drag_data_received_callback (GtkWidget *widget,
success = FALSE;
if (tree_pos == GTK_TREE_VIEW_DROP_BEFORE ||
- tree_pos == GTK_TREE_VIEW_DROP_AFTER)
+ tree_pos == GTK_TREE_VIEW_DROP_AFTER)
{
model = gtk_tree_view_get_model (tree_view);
@@ -1538,14 +1542,20 @@ drag_data_received_callback (GtkWidget *widget,
gtk_tree_model_get (model, &iter,
PLACES_SIDEBAR_COLUMN_SECTION_TYPE, &section_type,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
+ PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
PLACES_SIDEBAR_COLUMN_INDEX, &position,
-1);
- if (section_type != SECTION_BOOKMARKS) {
+ if (section_type != SECTION_BOOKMARKS &&
+ !(section_type == SECTION_NETWORK && place_type == PLACES_HEADING)) {
goto out;
}
+ if (section_type == SECTION_NETWORK && place_type == PLACES_HEADING &&
+ tree_pos == GTK_TREE_VIEW_DROP_BEFORE) {
+ position = caja_bookmark_list_length (sidebar->bookmarks);
+ }
+
if (tree_pos == GTK_TREE_VIEW_DROP_AFTER && place_type != PLACES_HEADING) {
/* heading already has position 0 */
position++;
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index 6a522af0..d1d75f8d 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -1640,8 +1640,7 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser)
GtkWidget *dialog;
gtk_show_uri (gtk_widget_get_screen (property_browser),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/goscaja-50",
gtk_get_current_event_time (), &error);
if (error)
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 3054f48a..4a0d721d 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -581,7 +581,7 @@ action_caja_manual_callback (GtkAction *action,
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
CAJA_IS_DESKTOP_WINDOW (window)
? "help:mate-user-guide"
- : "help:mate-user-guide/files",
+ : "help:mate-user-guide/goscaja-1",
gtk_get_current_event_time (), &error);
if (error)
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 394a2ac2..ebf80eb3 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1170,8 +1170,7 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data)
case GTK_RESPONSE_HELP :
error = NULL;
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/caja-select-pattern",
gtk_get_current_event_time (), &error);
if (error) {
eel_show_error_dialog (_("There was an error displaying help."), error->message,
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 2de1bec1..ba305015 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5521,8 +5521,7 @@ real_response (GtkDialog *dialog,
switch (response) {
case GTK_RESPONSE_HELP:
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
- /* FIXME: show proper page instead of main when m-u-g is complete */
- "help:mate-user-guide/files",
+ "help:mate-user-guide/goscaja-51",
gtk_get_current_event_time (),
&error);
if (error != NULL) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 21:29:29 +0000