[gtk+/wip/csoriano/bookmarks: 1/3] gtkplacesidebar: use GtkListBox
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/csoriano/bookmarks: 1/3] gtkplacesidebar: use GtkListBox
- Date: Tue, 26 May 2015 16:46:44 +0000 (UTC)
commit b446b8cc3ff2fd80ddffcc10bdadd66ad2b2ac96
Author: Carlos Soriano <csoriano gnome org>
Date: Wed May 6 23:07:17 2015 +0200
gtkplacesidebar: use GtkListBox
We were using GTkTreeView in a simple list. Also, as we know,
GtkCellRenderers are not the best way to theme and manipulate
widgets.
So instead use a GtkListBox to modernize the GtkPlacesSidebar,
and in the way clean up some parts of the code (like headings)
which were not used anymore.
Also we don't use a model anymore, since the data is simple
enough to manage it in a subclass of the row itself.
gtk/Makefile.am | 3 +-
gtk/gtkplacessidebar.c | 2641 ++++++++++++++++++++++++++----------------------
gtk/ui/sidebarrow.ui | 61 ++
3 files changed, 1493 insertions(+), 1212 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7fd739b..c24094d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1086,7 +1086,8 @@ templates = \
ui/gtksearchbar.ui \
ui/gtkscalebutton.ui \
ui/gtkstatusbar.ui \
- ui/gtkvolumebutton.ui
+ ui/gtkvolumebutton.ui \
+ ui/sidebarrow.ui
#
# rules to generate built sources
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 8828381..3814b5a 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -44,6 +44,7 @@
#include "config.h"
#include <gio/gio.h>
+#include <gtk/gtk.h>
#include "gdk/gdkkeysyms.h"
#include "gtkbookmarksmanager.h"
@@ -70,6 +71,7 @@
#include "gtkgrid.h"
#include "gtklabel.h"
#include "gtkbutton.h"
+#include "gtklistbox.h"
/**
* SECTION:gtkplacessidebar
@@ -126,9 +128,19 @@ typedef enum {
DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT,
} DropState;
+typedef enum {
+ DROP_POSITION_INVALID,
+ DROP_POSITION_INTO,
+ DROP_POSITION_BEFORE,
+ DROP_POSITION_AFTER,
+} DropPosition;
+
struct _GtkPlacesSidebar {
GtkScrolledWindow parent;
+ GtkWidget *list_box;
+ GtkWidget *new_bookmark_row;
+
GtkTreeView *tree_view;
GtkCellRenderer *eject_icon_cell_renderer;
GtkCellRenderer *text_cell_renderer;
@@ -154,6 +166,17 @@ struct _GtkPlacesSidebar {
GList *drag_list; /* list of GFile */
gint drag_data_info;
gboolean dragging_over;
+ GtkTargetList *source_targets;
+ GtkWidget *drag_row;
+ gint drag_row_x;
+ gint drag_row_y;
+ gint drag_root_x;
+ gint drag_root_y;
+ gint drag_row_height;
+ GtkWidget *row_placeholder;
+ guint row_placeholder_index;
+ guint row_destination_index;
+ gint row_source_row_offset;
/* volume mounting - delayed open process */
GtkPlacesOpenFlags go_to_after_mount_open_flags;
@@ -230,6 +253,7 @@ enum {
};
typedef enum {
+ PLACES_0,
PLACES_BUILT_IN,
PLACES_XDG_DIR,
PLACES_MOUNTED_VOLUME,
@@ -237,14 +261,18 @@ typedef enum {
PLACES_HEADING,
PLACES_CONNECT_TO_SERVER,
PLACES_ENTER_LOCATION,
- PLACES_DROP_FEEDBACK
+ PLACES_DROP_FEEDBACK,
+ N_PLACES
} PlaceType;
+/* Keep order, since it's used for the sort functions */
typedef enum {
+ SECTION_0,
+ SECTION_COMPUTER,
SECTION_DEVICES,
+ SECTION_NETWORK,
SECTION_BOOKMARKS,
- SECTION_COMPUTER,
- SECTION_NETWORK
+ N_SECTIONS
} SectionType;
enum {
@@ -269,6 +297,8 @@ enum {
NUM_PROPERTIES
};
+#define ROW_OUTSIDE_LISTBOX -1
+
/* Names for themed icons */
#define ICON_NAME_HOME "user-home-symbolic"
#define ICON_NAME_DESKTOP "user-desktop-symbolic"
@@ -292,34 +322,21 @@ enum {
static guint places_sidebar_signals [LAST_SIGNAL] = { 0 };
static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-static void open_selected_bookmark (GtkPlacesSidebar *sidebar,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkPlacesOpenFlags open_flags);
-static gboolean eject_or_unmount_bookmark (GtkPlacesSidebar *sidebar,
- GtkTreePath *path);
-static gboolean eject_or_unmount_selection (GtkPlacesSidebar *sidebar);
-static void check_unmount_and_eject (GMount *mount,
- GVolume *volume,
- GDrive *drive,
- gboolean *show_unmount,
- gboolean *show_eject);
-static int bookmarks_get_first_index (GtkPlacesSidebar *sidebar);
/* Identifiers for target types */
enum {
- GTK_TREE_MODEL_ROW,
- TEXT_URI_LIST
+ DND_SIDEBAR_ROW,
+ DND_TEXT_URI_LIST
};
/* Target types for dragging from the shortcuts list */
static const GtkTargetEntry dnd_source_targets[] = {
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
+ { "DND_SIDEBAR_ROW", GTK_TARGET_SAME_WIDGET, DND_SIDEBAR_ROW }
};
/* Target types for dropping into the shortcuts list */
static const GtkTargetEntry dnd_drop_targets [] = {
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
+ { "DND_SIDEBAR_ROW", GTK_TARGET_SAME_WIDGET, DND_SIDEBAR_ROW }
};
/* Drag and drop interface declarations */
@@ -347,6 +364,478 @@ static GtkListStore *shortcuts_model_new (GtkPlacesSidebar *sidebar);
G_DEFINE_TYPE (GtkPlacesSidebar, gtk_places_sidebar, GTK_TYPE_SCROLLED_WINDOW);
+#define SIDEBAR_TYPE_ROW (sidebar_row_get_type ())
+G_DECLARE_FINAL_TYPE (SidebarRow, sidebar_row, SIDEBAR, ROW, GtkListBoxRow)
+
+struct _SidebarRow
+{
+ GtkListBoxRow parent_instance;
+ GIcon *icon;
+ GtkWidget *icon_widget;
+ gchar *label;
+ GtkWidget *label_widget;
+ gboolean ejectable;
+ GtkWidget *eject_button;
+ gint order_index;
+ gint section_type;
+ gint place_type;
+ gchar *uri;
+ GDrive *drive;
+ GVolume *volume;
+ GMount *mount;
+ GtkPlacesSidebar *sidebar;
+ GtkWidget *event_box;
+ GtkWidget *revealer;
+};
+
+G_DEFINE_TYPE (SidebarRow, sidebar_row, GTK_TYPE_LIST_BOX_ROW)
+
+static gboolean eject_or_unmount_bookmark (GtkPlacesSidebar *sidebar,
+ SidebarRow *row);
+static gboolean eject_or_unmount_selection (GtkPlacesSidebar *sidebar);
+static void check_unmount_and_eject (GMount *mount,
+ GVolume *volume,
+ GDrive *drive,
+ gboolean *show_unmount,
+ gboolean *show_eject);
+static int bookmarks_get_first_index (GtkPlacesSidebar *sidebar);
+static gboolean on_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ SidebarRow *sidebar);
+static gboolean on_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ SidebarRow *sidebar);
+static void stop_drop_feedback (GtkPlacesSidebar *sidebar);
+
+
+enum
+{
+ PROP_0,
+ PROP_ICON,
+ PROP_LABEL,
+ PROP_EJECTABLE,
+ PROP_SIDEBAR,
+ PROP_ORDER_INDEX,
+ PROP_SECTION_TYPE,
+ PROP_PLACE_TYPE,
+ PROP_URI,
+ PROP_DRIVE,
+ PROP_VOLUME,
+ PROP_MOUNT,
+ LAST_PROP
+};
+
+static GParamSpec *gParamSpecs [LAST_PROP];
+
+static void
+sidebar_row_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ SidebarRow *self = SIDEBAR_ROW (object);
+
+ switch (prop_id)
+ {
+ case PROP_SIDEBAR:
+ {
+ g_value_set_object (value, self->sidebar);
+ break;
+ }
+
+ case PROP_ICON:
+ {
+ g_value_set_object (value, self->icon);
+ break;
+ }
+
+ case PROP_LABEL:
+ {
+ g_value_set_string (value, self->label);
+ break;
+ }
+
+ case PROP_EJECTABLE:
+ {
+ g_value_set_boolean (value, self->ejectable);
+ break;
+ }
+
+ case PROP_ORDER_INDEX:
+ {
+ g_value_set_int (value, self->order_index);
+ break;
+ }
+
+ case PROP_SECTION_TYPE:
+ {
+ g_value_set_int (value, self->section_type);
+ break;
+ }
+
+ case PROP_PLACE_TYPE:
+ {
+ g_value_set_int (value, self->place_type);
+ break;
+ }
+
+ case PROP_URI:
+ {
+ g_value_set_string (value, self->uri);
+ break;
+ }
+
+ case PROP_DRIVE:
+ {
+ g_value_set_object (value, self->drive);
+ break;
+ }
+
+ case PROP_VOLUME:
+ {
+ g_value_set_object (value, self->volume);
+ break;
+ }
+
+ case PROP_MOUNT:
+ {
+ g_value_set_object (value, self->mount);
+ break;
+ }
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+sidebar_row_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ SidebarRow *self = SIDEBAR_ROW (object);
+
+ switch (prop_id)
+ {
+ case PROP_SIDEBAR:
+ {
+ self->sidebar = g_value_get_object (value);
+ break;
+ }
+
+ case PROP_ICON:
+ {
+ g_clear_object (&self->icon);
+ if (value != NULL)
+ {
+ self->icon = g_object_ref (g_value_get_object (value));
+ gtk_image_set_from_gicon (GTK_IMAGE (self->icon_widget), self->icon, GTK_ICON_SIZE_MENU);
+ }
+ else
+ {
+ self->icon = NULL;
+ gtk_image_clear (GTK_IMAGE (self->icon_widget));
+ }
+ break;
+ }
+
+ case PROP_LABEL:
+ {
+ g_free (self->label);
+ self->label = g_strdup (g_value_get_string (value));
+ gtk_label_set_text (GTK_LABEL (self->label_widget), self->label);
+ break;
+ }
+
+ case PROP_EJECTABLE:
+ {
+ self->ejectable = g_value_get_boolean (value);
+ if (self->ejectable)
+ {
+ gtk_widget_set_sensitive (self->eject_button, TRUE);
+ gtk_widget_set_opacity (self->eject_button, 1);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (self->eject_button, FALSE);
+ gtk_widget_set_opacity (self->eject_button, 0);
+ }
+ break;
+ }
+
+ case PROP_ORDER_INDEX:
+ {
+ self->order_index = g_value_get_int (value);
+ break;
+ }
+
+ case PROP_SECTION_TYPE:
+ {
+ self->section_type = g_value_get_int (value);
+ if (self->section_type != SECTION_COMPUTER)
+ gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_MIDDLE);
+ else
+ gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_NONE);
+ break;
+ }
+
+ case PROP_PLACE_TYPE:
+ {
+ self->place_type = g_value_get_int (value);
+ break;
+ }
+
+ case PROP_URI:
+ {
+ g_free (self->uri);
+ self->uri = g_strdup (g_value_get_string (value));
+ break;
+ }
+
+ case PROP_DRIVE:
+ {
+ gpointer *object;
+
+ g_clear_object (&self->drive);
+ object = g_value_get_object (value);
+ if (object != NULL)
+ self->drive = g_object_ref (object);
+ break;
+ }
+
+ case PROP_VOLUME:
+ {
+ gpointer *object;
+
+ g_clear_object (&self->volume);
+ object = g_value_get_object (value);
+ if (object != NULL)
+ self->volume = g_object_ref (object);
+ break;
+ }
+
+ case PROP_MOUNT:
+ {
+ gpointer *object;
+
+ g_clear_object (&self->mount);
+ object = g_value_get_object (value);
+ if (object != NULL)
+ self->mount = g_object_ref (object);
+ break;
+ }
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+sidebar_row_reveal (SidebarRow *self)
+{
+ gtk_widget_show (GTK_WIDGET (self));
+ gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), TRUE);
+}
+
+static void
+sidebar_row_hide (SidebarRow *self,
+ gboolean inmediate)
+{
+ guint transition_duration;
+
+ transition_duration = gtk_revealer_get_transition_duration (GTK_REVEALER (self->revealer));
+ if (inmediate)
+ gtk_revealer_set_transition_duration (GTK_REVEALER (self->revealer), 0);
+
+ gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), FALSE);
+
+ gtk_revealer_set_transition_duration (GTK_REVEALER (self->revealer), transition_duration);
+}
+
+static void
+on_eject_button_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ SidebarRow *self = SIDEBAR_ROW (user_data);
+
+ eject_or_unmount_bookmark (self->sidebar, self);
+}
+
+static void
+sidebar_row_constructed (GObject *object)
+{
+ SidebarRow *self = SIDEBAR_ROW (object);
+
+ G_OBJECT_CLASS (sidebar_row_parent_class)->constructed (object);
+ g_signal_connect (self->event_box, "button-press-event",
+ G_CALLBACK (on_button_press_event), self);
+ g_signal_connect (self->event_box, "button-release-event",
+ G_CALLBACK (on_button_release_event), self);
+}
+
+static void
+sidebar_row_init (SidebarRow *self)
+{
+ gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+static void
+sidebar_row_class_init (SidebarRowClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->get_property = sidebar_row_get_property;
+ object_class->set_property = sidebar_row_set_property;
+ object_class->constructed = sidebar_row_constructed;
+
+ gParamSpecs [PROP_SIDEBAR] =
+ g_param_spec_object ("sidebar",
+ "Sidebar",
+ "Sidebar",
+ GTK_TYPE_PLACES_SIDEBAR,
+ (G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_SIDEBAR,
+ gParamSpecs [PROP_SIDEBAR]);
+ gParamSpecs [PROP_ICON] =
+ g_param_spec_object ("icon",
+ "icon",
+ "The place icon.",
+ G_TYPE_ICON,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_ICON,
+ gParamSpecs [PROP_ICON]);
+
+ gParamSpecs [PROP_LABEL] =
+ g_param_spec_string ("label",
+ "label",
+ "The label text.",
+ NULL,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_LABEL,
+ gParamSpecs [PROP_LABEL]);
+
+ gParamSpecs [PROP_EJECTABLE] =
+ g_param_spec_boolean ("ejectable",
+ "Ejectable",
+ "Ejectable",
+ FALSE,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_EJECTABLE,
+ gParamSpecs [PROP_EJECTABLE]);
+
+ gParamSpecs [PROP_ORDER_INDEX] =
+ g_param_spec_int ("order-index",
+ "OrderIndex",
+ "Order Index",
+ 0, G_MAXINT, 0,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_ORDER_INDEX,
+ gParamSpecs [PROP_ORDER_INDEX]);
+
+ gParamSpecs [PROP_SECTION_TYPE] =
+ g_param_spec_int ("section-type",
+ "section type",
+ "The section type.",
+ SECTION_0, N_SECTIONS, SECTION_0,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class, PROP_SECTION_TYPE,
+ gParamSpecs [PROP_SECTION_TYPE]);
+
+ gParamSpecs [PROP_PLACE_TYPE] =
+ g_param_spec_int ("place-type",
+ "place type",
+ "The place type.",
+ PLACES_0, N_PLACES, PLACES_0,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class, PROP_PLACE_TYPE,
+ gParamSpecs [PROP_PLACE_TYPE]);
+
+ gParamSpecs [PROP_URI] =
+ g_param_spec_string ("uri",
+ "Uri",
+ "Uri",
+ NULL,
+ (G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_URI,
+ gParamSpecs [PROP_URI]);
+ gParamSpecs [PROP_DRIVE] =
+ g_param_spec_object ("drive",
+ "Drive",
+ "Drive",
+ G_TYPE_DRIVE,
+ (G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_DRIVE,
+ gParamSpecs [PROP_DRIVE]);
+
+ gParamSpecs [PROP_VOLUME] =
+ g_param_spec_object ("volume",
+ "Volume",
+ "Volume",
+ G_TYPE_VOLUME,
+ (G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_VOLUME,
+ gParamSpecs [PROP_VOLUME]);
+
+ gParamSpecs [PROP_MOUNT] =
+ g_param_spec_object ("mount",
+ "Mount",
+ "Mount",
+ G_TYPE_MOUNT,
+ (G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_MOUNT,
+ gParamSpecs [PROP_MOUNT]);
+
+ gtk_widget_class_set_template_from_resource (widget_class,
+ "/org/gtk/libgtk/ui/sidebarrow.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, SidebarRow, icon_widget);
+ gtk_widget_class_bind_template_child (widget_class, SidebarRow, label_widget);
+ gtk_widget_class_bind_template_child (widget_class, SidebarRow, eject_button);
+ gtk_widget_class_bind_template_child (widget_class, SidebarRow, event_box);
+ gtk_widget_class_bind_template_child (widget_class, SidebarRow, revealer);
+
+ gtk_widget_class_bind_template_callback (widget_class, on_eject_button_clicked);
+}
+
+
+static SidebarRow*
+sidebar_row_clone (SidebarRow *self)
+{
+ return g_object_new (SIDEBAR_TYPE_ROW,
+ "sidebar", self->sidebar,
+ "icon", self->icon,
+ "label", self->label,
+ "ejectable", self->ejectable,
+ "order-index", self->order_index,
+ "section-type", self->section_type,
+ "place-type", self->place_type,
+ "uri", self->uri,
+ "drive", self->drive,
+ "volume", self->volume,
+ "mount", self->mount,
+ NULL);
+}
+
static void
emit_open_location (GtkPlacesSidebar *sidebar,
GFile *location,
@@ -426,17 +915,6 @@ emit_drag_perform_drop (GtkPlacesSidebar *sidebar,
dest_file, source_file_list, action);
}
-static gint
-get_icon_size (GtkPlacesSidebar *sidebar)
-{
- gint width, height;
-
- if (gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height))
- return MAX (width, height);
- else
- return 16;
-}
-
static GtkTreeIter
add_heading (GtkPlacesSidebar *sidebar,
SectionType section_type,
@@ -457,33 +935,37 @@ add_heading (GtkPlacesSidebar *sidebar,
}
static void
-check_heading_for_section (GtkPlacesSidebar *sidebar,
- SectionType section_type)
+add_separator (GtkListBoxRow *row,
+ GtkListBoxRow *before,
+ gpointer user_data)
{
- switch (section_type)
- {
- case SECTION_DEVICES:
- if (!sidebar->devices_header_added)
- {
- add_heading (sidebar, SECTION_DEVICES, _("Devices"));
- sidebar->devices_header_added = TRUE;
- }
- break;
+ SectionType row_section_type;
+ SectionType before_section_type;
+ GtkWidget *separator;
- case SECTION_BOOKMARKS:
- if (!sidebar->bookmarks_header_added)
- {
- add_heading (sidebar, SECTION_BOOKMARKS, _("Bookmarks"));
- sidebar->bookmarks_header_added = TRUE;
- }
- break;
+ gtk_list_box_row_set_header (row, NULL);
- default:
- break;
- }
+ g_object_get (row, "section-type", &row_section_type, NULL);
+ if (before)
+ {
+ g_object_get (before, "section-type", &before_section_type, NULL);
+ }
+ else
+ {
+ before_section_type = SECTION_0;
+ gtk_widget_set_margin_top (GTK_WIDGET (row), 4);
+ }
+
+ if (before && before_section_type != row_section_type)
+ {
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_margin_top (separator, 4);
+ gtk_widget_set_margin_bottom (separator, 4);
+ gtk_list_box_row_set_header (row, separator);
+ }
}
-static void
+static GtkWidget*
add_place (GtkPlacesSidebar *sidebar,
PlaceType place_type,
SectionType section_type,
@@ -496,11 +978,9 @@ add_place (GtkPlacesSidebar *sidebar,
const gint index,
const gchar *tooltip)
{
- GtkTreeIter iter;
gboolean show_eject, show_unmount;
gboolean show_eject_button;
-
- check_heading_for_section (sidebar, section_type);
+ GtkWidget *row;
check_unmount_and_eject (mount, volume, drive,
&show_unmount, &show_eject);
@@ -513,23 +993,24 @@ add_place (GtkPlacesSidebar *sidebar,
else
show_eject_button = (show_unmount || show_eject);
- gtk_list_store_append (sidebar->store, &iter);
- gtk_list_store_set (sidebar->store, &iter,
- PLACES_SIDEBAR_COLUMN_GICON, icon,
- PLACES_SIDEBAR_COLUMN_NAME, name,
- PLACES_SIDEBAR_COLUMN_URI, uri,
- PLACES_SIDEBAR_COLUMN_DRIVE, drive,
- PLACES_SIDEBAR_COLUMN_VOLUME, volume,
- PLACES_SIDEBAR_COLUMN_MOUNT, mount,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, place_type,
- PLACES_SIDEBAR_COLUMN_INDEX, index,
- PLACES_SIDEBAR_COLUMN_EJECT, show_eject_button,
- PLACES_SIDEBAR_COLUMN_NO_EJECT, !show_eject_button,
- PLACES_SIDEBAR_COLUMN_BOOKMARK, place_type != PLACES_BOOKMARK,
- PLACES_SIDEBAR_COLUMN_TOOLTIP, tooltip,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type,
- PLACES_SIDEBAR_COLUMN_SENSITIVE, TRUE,
- -1);
+ row = g_object_new (SIDEBAR_TYPE_ROW,
+ "sidebar", sidebar,
+ "icon", icon,
+ "label", name,
+ "ejectable", show_eject_button,
+ "order-index", index,
+ "section-type", section_type,
+ "place-type", place_type,
+ "uri", uri,
+ "drive", drive,
+ "volume", volume,
+ "mount", mount,
+ NULL);
+
+ gtk_container_add (GTK_CONTAINER (sidebar->list_box), GTK_WIDGET (row));
+ gtk_widget_show_all (row);
+
+ return row;
}
static GIcon *
@@ -666,7 +1147,6 @@ add_special_dirs (GtkPlacesSidebar *sidebar)
path_is_home_dir (path) ||
g_list_find_custom (dirs, path, (GCompareFunc) g_strcmp0) != NULL)
continue;
-
root = g_file_new_for_path (path);
@@ -746,32 +1226,30 @@ static gboolean
file_is_shown (GtkPlacesSidebar *sidebar,
GFile *file)
{
- GtkTreeIter iter;
gchar *uri;
+ GList *rows;
+ GList *l;
+ gboolean found = FALSE;
- if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sidebar->store), &iter))
- return FALSE;
-
- do
+ rows = gtk_container_get_children (GTK_CONTAINER (sidebar->list_box));
+ l = rows;
+ while (l != NULL && !found)
{
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
+ g_object_get (SIDEBAR_ROW (l->data), "uri", &uri, NULL);
if (uri)
{
GFile *other;
- gboolean found;
other = g_file_new_for_uri (uri);
- g_free (uri);
found = g_file_equal (file, other);
g_object_unref (other);
- if (found)
- return TRUE;
}
+
+ l = l->next;
}
- while (gtk_tree_model_iter_next (GTK_TREE_MODEL (sidebar->store), &iter));
- return FALSE;
+ g_list_free (rows);
+
+ return found;
}
static void
@@ -922,8 +1400,6 @@ out:
static void
update_places (GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
- GVolumeMonitor *volume_monitor;
GList *mounts, *l, *ll;
GMount *mount;
GList *drives;
@@ -933,17 +1409,19 @@ update_places (GtkPlacesSidebar *sidebar)
GSList *bookmarks, *sl;
gint index;
gchar *original_uri, *mount_uri, *name, *identifier;
+ GtkListBoxRow *selected;
gchar *home_uri;
GIcon *icon;
GFile *root;
gchar *tooltip;
GList *network_mounts, *network_volumes;
+ GIcon *new_bookmark_icon;
+ g_print ("update places \n");
/* save original selection */
- if (get_selected_iter (sidebar, &iter))
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),
- &iter,
- PLACES_SIDEBAR_COLUMN_URI, &original_uri, -1);
+ selected = gtk_list_box_get_selected_row (GTK_LIST_BOX (sidebar->list_box));
+ if (selected)
+ g_object_get (SIDEBAR_ROW (selected), "uri", &original_uri, NULL);
else
original_uri = NULL;
@@ -952,16 +1430,19 @@ update_places (GtkPlacesSidebar *sidebar)
g_object_unref (sidebar->cancellable);
sidebar->cancellable = g_cancellable_new ();
- gtk_list_store_clear (sidebar->store);
+ /* Reset drag state, just in case we update the places while dragging or
+ * ending a drag */
+ stop_drop_feedback (sidebar);
+ gtk_container_foreach (GTK_CONTAINER (sidebar->list_box),
+ (GtkCallback) gtk_widget_destroy,
+ NULL);
sidebar->devices_header_added = FALSE;
sidebar->bookmarks_header_added = FALSE;
network_mounts = network_volumes = NULL;
- volume_monitor = sidebar->volume_monitor;
-
- /* add built-in bookmarks */
+ /* add built-in places */
if (should_show_recent (sidebar))
{
mount_uri = "recent:///";
@@ -1033,7 +1514,7 @@ update_places (GtkPlacesSidebar *sidebar)
add_application_shortcuts (sidebar);
/* go through all connected drives */
- drives = g_volume_monitor_get_connected_drives (volume_monitor);
+ drives = g_volume_monitor_get_connected_drives (sidebar->volume_monitor);
for (l = drives; l != NULL; l = l->next)
{
@@ -1132,7 +1613,7 @@ update_places (GtkPlacesSidebar *sidebar)
g_list_free (drives);
/* add all volumes that is not associated with a drive */
- volumes = g_volume_monitor_get_volumes (volume_monitor);
+ volumes = g_volume_monitor_get_volumes (sidebar->volume_monitor);
for (l = volumes; l != NULL; l = l->next)
{
volume = l->data;
@@ -1184,13 +1665,12 @@ update_places (GtkPlacesSidebar *sidebar)
NULL, volume, NULL, 0, name);
g_object_unref (icon);
g_free (name);
- }
+ }
g_object_unref (volume);
}
g_list_free (volumes);
/* file system root */
-
mount_uri = "file:///"; /* No need to strdup */
icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_FILESYSTEM);
add_place (sidebar, PLACES_BUILT_IN,
@@ -1201,7 +1681,7 @@ update_places (GtkPlacesSidebar *sidebar)
g_object_unref (icon);
/* add mounts that has no volume (/etc/mtab mounts, ftp, sftp,...) */
- mounts = g_volume_monitor_get_mounts (volume_monitor);
+ mounts = g_volume_monitor_get_mounts (sidebar->volume_monitor);
for (l = mounts; l != NULL; l = l->next)
{
@@ -1245,7 +1725,6 @@ update_places (GtkPlacesSidebar *sidebar)
g_list_free (mounts);
/* add bookmarks */
-
bookmarks = _gtk_bookmarks_manager_list_bookmarks (sidebar->bookmarks_manager);
for (sl = bookmarks, index = 0; sl; sl = sl->next, index++)
@@ -1284,10 +1763,21 @@ update_places (GtkPlacesSidebar *sidebar)
g_slist_foreach (bookmarks, (GFunc) g_object_unref, NULL);
g_slist_free (bookmarks);
+ /* Add new bookmark row */
+ new_bookmark_icon = g_themed_icon_new ("bookmark-new-symbolic");
+ sidebar->new_bookmark_row = add_place (sidebar, PLACES_DROP_FEEDBACK,
+ SECTION_BOOKMARKS,
+ _("New bookmark"), new_bookmark_icon, NULL,
+ NULL, NULL, NULL, 0,
+ _("Add a new bookmark"));
+ sidebar_row_hide (SIDEBAR_ROW (sidebar->new_bookmark_row), TRUE);
+ g_object_unref (new_bookmark_icon);
+
/* network */
if (!sidebar->local_only)
{
add_heading (sidebar, SECTION_NETWORK, _("Network"));
+ /* Keep order, since it's used for the sort functions */
mount_uri = "network:///";
icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_NETWORK);
@@ -1360,6 +1850,8 @@ update_places (GtkPlacesSidebar *sidebar)
g_list_free_full (network_volumes, g_object_unref);
g_list_free_full (network_mounts, g_object_unref);
+ gtk_widget_show_all (GTK_WIDGET (sidebar));
+
/* restore original selection */
if (original_uri)
{
@@ -1373,89 +1865,11 @@ update_places (GtkPlacesSidebar *sidebar)
}
}
-static gboolean
-over_eject_button (GtkPlacesSidebar *sidebar,
- gint x,
- gint y,
- GtkTreePath **path)
-{
- GtkTreeViewColumn *column;
- gint width, x_offset, hseparator;
- gint eject_button_size;
- gboolean show_eject;
- GtkTreeIter iter;
- GtkTreeModel *model;
-
- *path = NULL;
- model = gtk_tree_view_get_model (sidebar->tree_view);
-
- if (gtk_tree_view_get_path_at_pos (sidebar->tree_view,
- x, y, path, &column, NULL, NULL))
- {
- gtk_tree_model_get_iter (model, &iter, *path);
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_EJECT, &show_eject,
- -1);
-
- if (!show_eject)
- goto out;
-
- gtk_widget_style_get (GTK_WIDGET (sidebar->tree_view),
- "horizontal-separator", &hseparator,
- NULL);
-
- /* Reload cell attributes for this particular row */
- gtk_tree_view_column_cell_set_cell_data (column,
- model, &iter, FALSE, FALSE);
-
- gtk_tree_view_column_cell_get_position (column,
- sidebar->eject_icon_cell_renderer,
- &x_offset, &width);
-
- eject_button_size = get_icon_size (sidebar);
-
- /* This is kinda weird, but we have to do it to workaround expanding
- * the eject cell renderer (even thought we told it not to) and we
- * then had to set it right-aligned
- */
- x_offset += width - hseparator - EJECT_BUTTON_XPAD - eject_button_size;
-
- if (x - x_offset >= 0 && x - x_offset <= eject_button_size)
- return TRUE;
- }
-
- out:
- g_clear_pointer (path, gtk_tree_path_free);
-
- return FALSE;
-}
-
-static gboolean
-clicked_eject_button (GtkPlacesSidebar *sidebar,
- GtkTreePath **path)
-{
- GdkEvent *event;
-
- event = gtk_get_current_event ();
-
- if (event &&
- (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) &&
- over_eject_button (sidebar, ((GdkEventButton *)event)->x, ((GdkEventButton *)event)->y, path))
- return TRUE;
-
- return FALSE;
-}
-
-static gboolean
-pos_is_into_or_before (GtkTreeViewDropPosition pos)
-{
- return (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-}
-
static void
update_possible_drop_targets (GtkPlacesSidebar *sidebar,
gboolean dragging)
{
+#if 0
GtkTreeIter iter;
PlaceType place_type;
gchar *uri;
@@ -1494,97 +1908,52 @@ update_possible_drop_targets (GtkPlacesSidebar *sidebar,
g_free (uri);
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (sidebar->store), &iter));
+#endif
}
/* Computes the appropriate row and position for dropping */
-static gboolean
-compute_drop_position (GtkTreeView *tree_view,
- gint x,
- gint y,
- GtkTreePath **path,
- GtkTreeViewDropPosition *pos,
- GtkPlacesSidebar *sidebar)
+static gint
+compute_drop_position (GtkPlacesSidebar *sidebar,
+ gint y)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
+ GtkListBoxRow *row;
PlaceType place_type;
SectionType section_type;
- gboolean drop_possible;
+ gint drop_position;
- if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, path, pos))
+ row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (sidebar->list_box), y);
+ if (row == NULL)
return FALSE;
- model = gtk_tree_view_get_model (tree_view);
-
- gtk_tree_model_get_iter (model, &iter, *path);
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
- -1);
-
- drop_possible = TRUE;
+ g_object_get (row,
+ "place-type", &place_type,
+ "section_type", §ion_type,
+ NULL);
/* Normalize drops on the feedback row */
if (place_type == PLACES_DROP_FEEDBACK)
{
- *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+ drop_position = DROP_POSITION_INTO;
goto out;
}
- /* Never drop on headings, but special case the bookmarks heading,
- * so we can drop bookmarks in between it and the first bookmark.
- */
- if (place_type == PLACES_HEADING && section_type != SECTION_BOOKMARKS)
- drop_possible = FALSE;
-
/* Dragging a bookmark? */
if (sidebar->drag_data_received &&
- sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
+ sidebar->drag_data_info == DND_SIDEBAR_ROW)
{
/* Don't allow reordering bookmarks into non-bookmark areas */
if (section_type != SECTION_BOOKMARKS)
- drop_possible = FALSE;
+ drop_position = DROP_POSITION_INVALID;
/* Bookmarks can only be reordered. Disallow dropping directly
* into them; only allow dropping between them.
*/
- if (place_type == PLACES_HEADING)
- {
- if (pos_is_into_or_before (*pos))
- drop_possible = FALSE;
- else
- *pos = GTK_TREE_VIEW_DROP_AFTER;
- }
- else
- {
- if (pos_is_into_or_before (*pos))
- *pos = GTK_TREE_VIEW_DROP_BEFORE;
- else
- *pos = GTK_TREE_VIEW_DROP_AFTER;
- }
+ // TODO
}
else
- {
+ {
/* Dragging a file */
-
- /* Outside the bookmarks section, URIs can only be dropped
- * directly into places items. Inside the bookmarks section,
- * they can be dropped between items (to create new bookmarks)
- * or in items themselves (to request a move/copy file
- * operation).
- */
- if (section_type != SECTION_BOOKMARKS)
- *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
- else
- {
- if (place_type == PLACES_HEADING)
- {
- if (pos_is_into_or_before (*pos))
- drop_possible = FALSE;
- else
- *pos = GTK_TREE_VIEW_DROP_AFTER;
- }
- }
+ drop_position = DROP_POSITION_INTO;
}
/* Disallow drops on recent:/// */
@@ -1592,44 +1961,29 @@ compute_drop_position (GtkTreeView *tree_view,
{
gchar *uri;
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
+ g_object_get (row, "uri", &uri, NULL);
if (g_strcmp0 (uri, "recent:///") == 0)
- drop_possible = FALSE;
-
- g_free (uri);
+ drop_position = DROP_POSITION_INVALID;
}
out:
-
- if (!drop_possible)
- {
- gtk_tree_path_free (*path);
- *path = NULL;
- return FALSE;
- }
-
- return TRUE;
+ return drop_position;
}
static gboolean
-get_drag_data (GtkTreeView *tree_view,
+get_drag_data (GtkWidget *list_box,
GdkDragContext *context,
guint time)
{
GdkAtom target;
- target = gtk_drag_dest_find_target (GTK_WIDGET (tree_view),
- context,
- NULL);
+ target = gtk_drag_dest_find_target (list_box, context, NULL);
if (target == GDK_NONE)
return FALSE;
- gtk_drag_get_data (GTK_WIDGET (tree_view),
- context, target, time);
+ gtk_drag_get_data (list_box, context, target, time);
return TRUE;
}
@@ -1655,8 +2009,6 @@ free_drag_data (GtkPlacesSidebar *sidebar)
sidebar->drag_list = NULL;
}
- remove_switch_location_timer (sidebar);
-
g_free (sidebar->drop_target_uri);
sidebar->drop_target_uri = NULL;
}
@@ -1697,161 +2049,238 @@ check_switch_location_timer (GtkPlacesSidebar *sidebar,
}
static void
-remove_drop_bookmark_feedback_row (GtkPlacesSidebar *sidebar)
+start_drop_feedback (GtkPlacesSidebar *sidebar,
+ SidebarRow *row)
{
- if (sidebar->drop_state != DROP_STATE_NORMAL)
+ if (sidebar->drag_data_info != DND_SIDEBAR_ROW)
{
- gboolean success;
- GtkTreeIter iter;
- int bookmarks_index;
-
- bookmarks_index = bookmarks_get_first_index (sidebar);
+ sidebar_row_reveal (SIDEBAR_ROW (sidebar->new_bookmark_row));
+ /* If the state is permanent, don't change it. Is the application that
+ * controls this */
+ if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT)
+ sidebar->drop_state = DROP_STATE_NEW_BOOKMARK_ARMED;
+ }
- success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (sidebar->store), &iter, NULL,
bookmarks_index);
- g_assert (success);
- gtk_list_store_remove (sidebar->store, &iter);
+ if (row != NULL)
+ gtk_list_box_drag_highlight_row (GTK_LIST_BOX (sidebar->list_box), GTK_LIST_BOX_ROW (row));
- sidebar->drop_state = DROP_STATE_NORMAL;
- }
+ update_possible_drop_targets (sidebar, TRUE);
}
static void
-show_new_bookmark_row (GtkPlacesSidebar *sidebar,
- GtkTreePath *path)
+stop_drop_feedback (GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
- int bookmarks_index;
- gint drop_target_index;
- GtkTreePath *new_bookmark_path;
- GIcon *new_bookmark_icon;
+ update_possible_drop_targets (sidebar, FALSE);
- bookmarks_index = bookmarks_get_first_index (sidebar);
+ free_drag_data (sidebar);
+
+ if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT &&
+ sidebar->new_bookmark_row != NULL)
+ sidebar_row_hide (SIDEBAR_ROW (sidebar->new_bookmark_row), FALSE);
- /* Add the row if it doesn't exists yet */
- if (sidebar->drop_state == DROP_STATE_NORMAL)
+ if (sidebar->drag_row != NULL)
{
- new_bookmark_icon = g_themed_icon_new ("bookmark-new-symbolic");
- gtk_list_store_insert_with_values (sidebar->store, &iter, bookmarks_index,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, PLACES_DROP_FEEDBACK,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, SECTION_BOOKMARKS,
- PLACES_SIDEBAR_COLUMN_GICON, new_bookmark_icon,
- PLACES_SIDEBAR_COLUMN_NAME, _("New bookmark"),
- PLACES_SIDEBAR_COLUMN_INDEX, bookmarks_index,
- PLACES_SIDEBAR_COLUMN_NO_EJECT, TRUE,
- -1);
- g_object_unref (new_bookmark_icon);
+ gtk_widget_show (sidebar->drag_row);
+ sidebar->drag_row = NULL;
}
- /* If the state is permanent, don't change it. Is the application that
- * controls this */
- if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT)
- sidebar->drop_state = DROP_STATE_NEW_BOOKMARK_ARMED;
-
- /* Highlight the new bookmark row */
- if (path != NULL)
+ if (sidebar->row_placeholder != NULL)
{
- drop_target_index = gtk_tree_path_get_indices (path)[0];
- if (drop_target_index == bookmarks_index)
- {
- new_bookmark_path = gtk_tree_path_new_from_indices (bookmarks_index, -1);
- gtk_tree_view_set_drag_dest_row (sidebar->tree_view, new_bookmark_path,
GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
- gtk_tree_path_free (new_bookmark_path);
- }
+ gtk_widget_destroy (sidebar->row_placeholder);
+ sidebar->row_placeholder = NULL;
}
+
+ sidebar->drop_state = DROP_STATE_NORMAL;
+ sidebar->dragging_over = FALSE;
}
-static void
-start_drop_feedback (GtkPlacesSidebar *sidebar,
- GtkTreePath *path,
- GtkTreeViewDropPosition pos,
- gboolean drop_as_bookmarks)
+static gboolean
+on_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer user_data)
{
- if (drop_as_bookmarks)
- show_new_bookmark_row (sidebar, path);
- else
- gtk_tree_view_set_drag_dest_row (sidebar->tree_view, path, pos);
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
- update_possible_drop_targets (sidebar, TRUE);
+ if (sidebar->drag_row == NULL || sidebar->dragging_over)
+
+ {
+ return FALSE;
+ }
+
+ if (!(event->state & GDK_BUTTON1_MASK))
+ {
+ g_print ("######################diferent\n");
+ sidebar->drag_row = NULL;
+
+ return FALSE;
+ }
+
+ if (gtk_drag_check_threshold (widget,
+ sidebar->drag_root_x, sidebar->drag_root_y,
+ event->x_root, event->y_root))
+ {
+ sidebar->dragging_over = TRUE;
+
+ gtk_drag_begin_with_coordinates (widget, sidebar->source_targets, GDK_ACTION_MOVE,
+ GDK_BUTTON_PRIMARY, (GdkEvent*)event,
+ -1, -1);
+ }
+
+ return FALSE;
}
static void
-stop_drop_feedback (GtkPlacesSidebar *sidebar)
+drag_begin_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ gpointer user_data)
{
- gtk_tree_view_set_drag_dest_row (sidebar->tree_view, NULL, 0);
- update_possible_drop_targets (sidebar, FALSE);
+
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
+ GtkAllocation allocation;
+ GtkWidget *drag_widget;
+ GtkWidget *window;
+ GtkStyleContext *style_context;
+
+ gtk_widget_get_allocation (sidebar->drag_row, &allocation);
+ gtk_widget_hide (sidebar->drag_row);
+
+ sidebar->drag_row_height = allocation.height;
+
+ drag_widget = GTK_WIDGET (sidebar_row_clone (SIDEBAR_ROW (sidebar->drag_row)));
+ window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_set_size_request (window, allocation.width, allocation.height);
+ style_context = gtk_widget_get_style_context (window);
+ gtk_style_context_add_class (style_context, "sidebar-drag-row");
+
+ gtk_container_add (GTK_CONTAINER (window), drag_widget);
+ gtk_widget_show_all (window);
+ gtk_widget_set_opacity (window, 0.8);
+
+ gtk_drag_set_icon_widget (context,
+ window,
+ sidebar->drag_row_x,
+ sidebar->drag_row_y);
+}
+
+static GtkWidget *
+create_placeholder_row (GtkPlacesSidebar *sidebar)
+{
+ GtkStyleContext *context;
+
+ GtkWidget *placeholder_row = g_object_new (SIDEBAR_TYPE_ROW,
+ "section-type", SECTION_BOOKMARKS,
+ "place-type", PLACES_DROP_FEEDBACK,
+ "ejectable", FALSE,
+ NULL);
+
+ context = gtk_widget_get_style_context (placeholder_row);
+ gtk_style_context_add_class (context, "sidebar-placeholder-row");
+
+ gtk_widget_set_size_request (placeholder_row, -1, sidebar->drag_row_height);
+
+ return placeholder_row;
}
static gboolean
-drag_motion_callback (GtkTreeView *tree_view,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- GtkPlacesSidebar *sidebar)
+drag_motion_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
{
- GtkTreePath *path;
- GtkTreeViewDropPosition pos;
gint action;
- GtkTreeIter iter;
- gboolean res;
- gboolean drop_as_bookmarks;
+ gint drop_position;
+ GtkListBoxRow *row;
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
+ PlaceType place_type;
gchar *drop_target_uri = NULL;
+ gint row_index;
+ gint row_placeholder_index;
sidebar->dragging_over = TRUE;
-
action = 0;
- drop_as_bookmarks = FALSE;
- path = NULL;
+ row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (sidebar->list_box), y);
if (!sidebar->drag_data_received)
{
- if (!get_drag_data (tree_view, context, time))
- goto out;
+ if (!get_drag_data (sidebar->list_box, context, time))
+ {
+ g_print ("no get drag data\n");
+ goto out;
+ }
}
- res = compute_drop_position (tree_view, x, y, &path, &pos, sidebar);
- if (!res)
- goto out;
+ drop_position = compute_drop_position (sidebar, y);
+ if (drop_position == DROP_POSITION_INVALID)
+ {
+ g_print ("drop position invalid\n");
+ goto out;
+ }
if (sidebar->drag_data_received &&
- sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
+ sidebar->drag_data_info == DND_SIDEBAR_ROW)
{
/* Dragging bookmarks always moves them to another position in the bookmarks list */
action = GDK_ACTION_MOVE;
+ if (sidebar->row_placeholder == NULL)
+ {
+ sidebar->row_placeholder = create_placeholder_row (sidebar);
+ gtk_widget_show (sidebar->row_placeholder);
+ g_object_ref_sink (sidebar->row_placeholder);
+ }
+ else if (GTK_WIDGET (row) == sidebar->row_placeholder)
+ {
+ goto out;
+ }
+
+ if (gtk_widget_get_parent (sidebar->row_placeholder) != NULL)
+ {
+ gtk_container_remove (GTK_CONTAINER (sidebar->list_box),
+ sidebar->row_placeholder);
+ }
+
+ if (row != NULL)
+ {
+ g_object_get (row, "order-index", &row_index, NULL);
+ g_object_get (sidebar->row_placeholder, "order-index", &row_placeholder_index, NULL);
+ if (row_index >= row_placeholder_index)
+ row_placeholder_index = row_index + 1;
+ else
+ row_placeholder_index = row_index;
+ }
+ else
+ {
+ row_placeholder_index = G_MAXINT32;
+ }
+
+ g_print ("relative order %d\n", row_placeholder_index);
+ g_object_set (sidebar->row_placeholder, "order-index", row_placeholder_index, NULL);
+
+ gtk_list_box_prepend (GTK_LIST_BOX (sidebar->list_box),
+ sidebar->row_placeholder);
}
else
{
+ gtk_list_box_drag_highlight_row (GTK_LIST_BOX (sidebar->list_box), row);
+
+ g_object_get (SIDEBAR_ROW (row),
+ "place-type", &place_type,
+ "uri", &drop_target_uri,
+ NULL);
/* URIs are being dragged. See if the caller wants to handle a
* file move/copy operation itself, or if we should only try to
* create bookmarks out of the dragged URIs.
*/
if (sidebar->drag_list != NULL)
{
- SectionType section_type;
- PlaceType place_type;
-
- gtk_tree_model_get_iter (GTK_TREE_MODEL (sidebar->store), &iter, path);
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),
- &iter,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- -1);
-
- if (place_type == PLACES_DROP_FEEDBACK ||
- (section_type == SECTION_BOOKMARKS &&
- (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER)))
+ if (place_type == PLACES_DROP_FEEDBACK)
{
action = GDK_ACTION_COPY;
- drop_as_bookmarks = TRUE;
}
-
- if (!drop_as_bookmarks)
+ else
{
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),
- &iter,
- PLACES_SIDEBAR_COLUMN_URI, &drop_target_uri,
- -1);
-
+ /* uri may be NULL for unmounted volumes, for example, so we don't allow drops there */
if (drop_target_uri != NULL)
{
GFile *dest_file = g_file_new_for_uri (drop_target_uri);
@@ -1859,90 +2288,23 @@ drag_motion_callback (GtkTreeView *tree_view,
action = emit_drag_action_requested (sidebar, context, dest_file, sidebar->drag_list);
g_object_unref (dest_file);
- } /* uri may be NULL for unmounted volumes, for example, so we don't allow drops there */
+ }
}
}
}
out:
- if (action != 0)
- {
- check_switch_location_timer (sidebar, drop_target_uri);
- start_drop_feedback (sidebar, path, pos, drop_as_bookmarks);
- }
- else
- {
- remove_switch_location_timer (sidebar);
- stop_drop_feedback (sidebar);
- }
+ start_drop_feedback (sidebar, SIDEBAR_ROW (row));
g_free (drop_target_uri);
- if (path != NULL)
- gtk_tree_path_free (path);
-
- g_signal_stop_emission_by_name (tree_view, "drag-motion");
+ g_signal_stop_emission_by_name (sidebar->list_box, "drag-motion");
gdk_drag_status (context, action, time);
return TRUE;
}
-static void
-on_drag_end (GtkPlacesSidebar *sidebar)
-{
- g_return_if_fail (GTK_IS_PLACES_SIDEBAR (sidebar));
-
- free_drag_data (sidebar);
- /* we could call finalize when disposing the widget */
- if (sidebar->tree_view != NULL)
- stop_drop_feedback (sidebar);
- remove_drop_bookmark_feedback_row (sidebar);
-
- if (sidebar->drag_leave_timeout_id)
- g_source_remove (sidebar->drag_leave_timeout_id);
-
- sidebar->drag_leave_timeout_id = 0;
- sidebar->drop_state = DROP_STATE_NORMAL;
- sidebar->dragging_over = FALSE;
-}
-
-static gboolean
-drag_leave_timeout_cb (gpointer data)
-{
- GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (data);
-
- if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT)
- {
- on_drag_end (sidebar);
- return FALSE;
- }
- else
- {
- sidebar->dragging_over = FALSE;
- return TRUE;
- }
-}
-
-static void
-drag_leave_callback (GtkTreeView *tree_view,
- GdkDragContext *context,
- guint time,
- GtkPlacesSidebar *sidebar)
-{
- sidebar->dragging_over = FALSE;
-
- if (sidebar->drag_leave_timeout_id)
- g_source_remove (sidebar->drag_leave_timeout_id);
-
- sidebar->drag_leave_timeout_id = gdk_threads_add_timeout (500, drag_leave_timeout_cb, sidebar);
- g_source_set_name_by_id (sidebar->drag_leave_timeout_id, "[gtk+] drag_leave_timeout_cb");
-
- remove_switch_location_timer (sidebar);
-
- g_signal_stop_emission_by_name (tree_view, "drag-leave");
-}
-
/* Takes an array of URIs and turns it into a list of GFile */
static GList *
build_file_list_from_uris (const gchar **uris)
@@ -1962,27 +2324,21 @@ build_file_list_from_uris (const gchar **uris)
return g_list_reverse (result);
}
-/* Reorders the selected bookmark to the specified position */
+/* Reorders the bookmark to the specified position */
static void
reorder_bookmarks (GtkPlacesSidebar *sidebar,
+ SidebarRow *row,
gint new_position)
{
- GtkTreeIter iter;
gchar *uri;
GFile *file;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
-
+ g_object_get (row, "uri", &uri, NULL);
file = g_file_new_for_uri (uri);
+
_gtk_bookmarks_manager_reorder_bookmark (sidebar->bookmarks_manager, file, new_position, NULL); /*
NULL-GError */
g_object_unref (file);
- g_free (uri);
}
/* Creates bookmarks for the specified files at the given position in the bookmarks list */
@@ -2013,32 +2369,65 @@ drop_files_as_bookmarks (GtkPlacesSidebar *sidebar,
}
static void
-drag_data_received_callback (GtkWidget *widget,
+drag_data_get_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data)
+{
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
+ GdkAtom target = gtk_selection_data_get_target (data);
+ GdkAtom result;
+ gchar *name;
+
+ if (target == gdk_atom_intern_static_string ("DND_SIDEBAR_ROW"))
+ {
+ gtk_selection_data_set (data,
+ target,
+ 8,
+ (void*)&sidebar->drag_row,
+ sizeof (gpointer));
+ return;
+ }
+
+ result = gtk_drag_dest_find_target (widget, context, sidebar->source_targets);
+ name = gdk_atom_name (target);
+ if (result != GDK_NONE)
+ {
+ g_print ("##########diff %s\n", name);
+ }
+
+}
+
+static void
+drag_data_received_callback (GtkWidget *list_box,
GdkDragContext *context,
int x,
int y,
GtkSelectionData *selection_data,
guint info,
guint time,
- GtkPlacesSidebar *sidebar)
+ gpointer user_data)
{
- GtkTreeView *tree_view;
- GtkTreePath *tree_path;
- GtkTreeViewDropPosition tree_pos;
- GtkTreeIter iter;
- gint position;
- GtkTreeModel *model;
- PlaceType place_type;
- SectionType section_type;
+ gint target_order_index;
+ PlaceType target_place_type;
+ SectionType target_section_type;
+ gchar *target_uri;
gboolean success;
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
+ DropPosition drop_position;
+ GtkListBoxRow *target_row;
- tree_view = GTK_TREE_VIEW (widget);
+ g_print ("drag data received\n");
if (!sidebar->drag_data_received)
{
+ g_print ("draggin uris?\n");
if (gtk_selection_data_get_target (selection_data) != GDK_NONE &&
- info == TEXT_URI_LIST)
+ info == DND_TEXT_URI_LIST)
{
+ g_print ("uris\n");
gchar **uris;
uris = gtk_selection_data_get_uris (selection_data);
@@ -2047,58 +2436,69 @@ drag_data_received_callback (GtkWidget *widget,
}
else
{
+ g_print ("no uris\n");
sidebar->drag_list = NULL;
}
sidebar->drag_data_received = TRUE;
sidebar->drag_data_info = info;
}
- g_signal_stop_emission_by_name (widget, "drag-data-received");
+ g_signal_stop_emission_by_name (list_box, "drag-data-received");
if (!sidebar->drop_occured)
+ {
+ g_print ("no drop\n");
return;
+ }
- /* Compute position */
- success = compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar);
- if (!success)
- goto out;
-
- success = FALSE;
+ target_row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (sidebar->list_box), y);
- if (sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
+ if (target_row == NULL)
{
- /* A bookmark got reordered */
-
- model = gtk_tree_view_get_model (tree_view);
+ g_print ("target row null\n");
+ return;
+ }
- if (!gtk_tree_model_get_iter (model, &iter, tree_path))
- goto out;
+ g_object_get (SIDEBAR_ROW (target_row),
+ "place-type", &target_place_type,
+ "section-type", &target_section_type,
+ "order-index", &target_order_index,
+ "uri", &target_uri,
+ NULL);
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- PLACES_SIDEBAR_COLUMN_INDEX, &position,
- -1);
+ success = FALSE;
+ /* Compute position */
+ drop_position = compute_drop_position (sidebar, y);
+ if (drop_position == DROP_POSITION_INVALID)
+ {
+ g_print ("drop invalid\n");
+ goto out;
+ }
- if (section_type != SECTION_BOOKMARKS)
- goto out;
+ if (sidebar->drag_data_info == DND_SIDEBAR_ROW)
+ {
+ /* A bookmark got reordered */
+ if (target_section_type != SECTION_BOOKMARKS)
+ {
+ g_print ("no section bookmarks\n");
+ goto out;
+ }
- if (place_type == PLACES_HEADING)
- position = 0;
- else if (tree_pos == GTK_TREE_VIEW_DROP_AFTER)
- position++;
+ GtkWidget **source_row = (void*) gtk_selection_data_get_data (selection_data);
+ g_print ("reordering\n");
- reorder_bookmarks (sidebar, position);
+ reorder_bookmarks (sidebar, SIDEBAR_ROW (*source_row), target_order_index);
success = TRUE;
}
else
{
/* Dropping URIs! */
-
GdkDragAction real_action;
gchar **uris;
GList *source_file_list;
+ g_print ("dropping uris\n");
+
/* file transfer requested */
real_action = gdk_drag_context_get_selected_action (context);
@@ -2107,62 +2507,25 @@ drag_data_received_callback (GtkWidget *widget,
if (real_action > 0)
{
- gchar *uri;
GFile *dest_file;
- gboolean drop_as_bookmarks;
-
- model = gtk_tree_view_get_model (tree_view);
-
- gtk_tree_model_get_iter (model, &iter, tree_path);
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- PLACES_SIDEBAR_COLUMN_INDEX, &position,
- -1);
-
- drop_as_bookmarks = FALSE;
uris = gtk_selection_data_get_uris (selection_data);
source_file_list = build_file_list_from_uris ((const gchar **) uris);
- if (section_type == SECTION_BOOKMARKS)
+ if (target_place_type == PLACES_DROP_FEEDBACK)
{
- if (place_type == PLACES_HEADING)
- {
- position = 0;
- tree_pos = GTK_TREE_VIEW_DROP_BEFORE;
- }
-
- if (tree_pos == GTK_TREE_VIEW_DROP_AFTER)
- position++;
-
- if (tree_pos == GTK_TREE_VIEW_DROP_BEFORE ||
- tree_pos == GTK_TREE_VIEW_DROP_AFTER ||
- place_type == PLACES_DROP_FEEDBACK)
- {
- remove_drop_bookmark_feedback_row (sidebar);
- drop_files_as_bookmarks (sidebar, source_file_list, position);
- success = TRUE;
- drop_as_bookmarks = TRUE;
- }
+ drop_files_as_bookmarks (sidebar, source_file_list, target_order_index);
}
-
- if (!drop_as_bookmarks)
+ else
{
- gtk_tree_model_get_iter (model, &iter, tree_path);
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
-
- dest_file = g_file_new_for_uri (uri);
+ dest_file = g_file_new_for_uri (target_uri);
emit_drag_perform_drop (sidebar, dest_file, source_file_list, real_action);
- success = TRUE;
g_object_unref (dest_file);
- g_free (uri);
}
+ success = TRUE;
g_list_free_full (source_file_list, g_object_unref);
g_strfreev (uris);
}
@@ -2171,24 +2534,71 @@ drag_data_received_callback (GtkWidget *widget,
out:
sidebar->drop_occured = FALSE;
gtk_drag_finish (context, success, FALSE, time);
- on_drag_end (sidebar);
+ stop_drop_feedback (sidebar);
+}
+
+static void
+drag_end_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ gpointer user_data)
+{
+ g_print ("drag end\n");
+ stop_drop_feedback (GTK_PLACES_SIDEBAR (user_data));
+}
+
+static void
+drag_leave_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time,
+ gpointer user_data)
+{
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
+
+ g_print ("drag leave\n");
+ update_possible_drop_targets (sidebar, FALSE);
+ if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT)
+ {
+ sidebar_row_hide (SIDEBAR_ROW (sidebar->new_bookmark_row), FALSE);
+ sidebar->drop_state = DROP_STATE_NORMAL;
+ }
+
+ sidebar->drag_data_received = FALSE;
+ sidebar->dragging_over = FALSE;
+}
- gtk_tree_path_free (tree_path);
+static void
+drag_failed_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkDragResult result,
+ gpointer user_data)
+{
+ g_print ("failed callback\n");
+}
+
+static void
+drag_data_delete_callback (GtkWidget *widget,
+ GdkDragContext *context,
+ gpointer user_data)
+{
+ g_print ("drag delete\n");
}
static gboolean
-drag_drop_callback (GtkTreeView *tree_view,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- GtkPlacesSidebar *sidebar)
+drag_drop_callback (GtkWidget *list_box,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
{
gboolean retval = FALSE;
+ GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
sidebar->drop_occured = TRUE;
- retval = get_drag_data (tree_view, context, time);
- g_signal_stop_emission_by_name (tree_view, "drag-drop");
+ retval = get_drag_data (sidebar->list_box, context, time);
+ g_signal_stop_emission_by_name (sidebar->list_box, "drag-drop");
+ g_print ("drag drop %d\n", retval);
+
return retval;
}
@@ -2263,45 +2673,6 @@ check_visibility (GMount *mount,
}
typedef struct {
- PlaceType type;
- GDrive *drive;
- GVolume *volume;
- GMount *mount;
- gchar *uri;
-} SelectionInfo;
-
-static void
-get_selection_info (GtkPlacesSidebar *sidebar,
- SelectionInfo *info)
-{
- GtkTreeIter iter;
-
- info->type = PLACES_BUILT_IN;
- info->drive = NULL;
- info->volume = NULL;
- info->mount = NULL;
- info->uri = NULL;
-
- if (get_selected_iter (sidebar, &iter))
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &info->type,
- PLACES_SIDEBAR_COLUMN_DRIVE, &info->drive,
- PLACES_SIDEBAR_COLUMN_VOLUME, &info->volume,
- PLACES_SIDEBAR_COLUMN_MOUNT, &info->mount,
- PLACES_SIDEBAR_COLUMN_URI, &info->uri,
- -1);
-}
-
-static void
-free_selection_info (SelectionInfo *info)
-{
- g_clear_object (&info->drive);
- g_clear_object (&info->volume);
- g_clear_object (&info->mount);
- g_clear_pointer (&info->uri, g_free);
-}
-
-typedef struct {
GtkWidget *add_shortcut_item;
GtkWidget *remove_item;
GtkWidget *rename_item;
@@ -2315,9 +2686,8 @@ typedef struct {
} PopupMenuData;
static void
-check_popup_sensitivity (GtkPlacesSidebar *sidebar,
- PopupMenuData *data,
- SelectionInfo *info)
+check_popup_sensitivity (SidebarRow *row,
+ PopupMenuData *data)
{
gboolean show_mount;
gboolean show_unmount;
@@ -2325,13 +2695,25 @@ check_popup_sensitivity (GtkPlacesSidebar *sidebar,
gboolean show_rescan;
gboolean show_start;
gboolean show_stop;
+ PlaceType type;
+ GDrive *drive;
+ GVolume *volume;
+ GMount *mount;
- gtk_widget_set_visible (data->add_shortcut_item, (info->type == PLACES_MOUNTED_VOLUME));
+ g_object_get (row,
+ "place-type", &type,
+ "drive", &drive,
+ "volume", &volume,
+ "mount", &mount,
+ NULL);
+
+ gtk_widget_set_visible (data->add_shortcut_item, (type == PLACES_MOUNTED_VOLUME));
- gtk_widget_set_sensitive (data->remove_item, (info->type == PLACES_BOOKMARK));
- gtk_widget_set_sensitive (data->rename_item, (info->type == PLACES_BOOKMARK || info->type ==
PLACES_XDG_DIR));
+ gtk_widget_set_sensitive (data->remove_item, (type == PLACES_BOOKMARK));
+ gtk_widget_set_sensitive (data->rename_item, (type == PLACES_BOOKMARK ||
+ type == PLACES_XDG_DIR));
- check_visibility (info->mount, info->volume, info->drive,
+ check_visibility (mount, volume, drive,
&show_mount, &show_unmount, &show_eject, &show_rescan, &show_start, &show_stop);
gtk_widget_set_visible (data->separator_item, show_mount || show_unmount || show_eject);
@@ -2345,9 +2727,9 @@ check_popup_sensitivity (GtkPlacesSidebar *sidebar,
/* Adjust start/stop items to reflect the type of the drive */
gtk_menu_item_set_label (GTK_MENU_ITEM (data->start_item), _("_Start"));
gtk_menu_item_set_label (GTK_MENU_ITEM (data->stop_item), _("_Stop"));
- if ((show_start || show_stop) && info->drive != NULL)
+ if ((show_start || show_stop) && drive != NULL)
{
- switch (g_drive_get_start_stop_type (info->drive))
+ switch (g_drive_get_start_stop_type (drive))
{
case G_DRIVE_START_STOP_TYPE_SHUTDOWN:
/* start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used */
@@ -2466,27 +2848,12 @@ mount_volume (GtkPlacesSidebar *sidebar,
}
static void
-open_selected_volume (GtkPlacesSidebar *sidebar,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkPlacesOpenFlags open_flags)
+open_drive (GtkPlacesSidebar *sidebar,
+ GDrive *drive,
+ GtkPlacesOpenFlags open_flags)
{
- GDrive *drive;
- GVolume *volume;
-
- gtk_tree_model_get (model, iter,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- PLACES_SIDEBAR_COLUMN_VOLUME, &volume,
- -1);
-
- if (volume != NULL && !sidebar->mounting)
- {
- sidebar->mounting = TRUE;
- sidebar->go_to_after_mount_open_flags = open_flags;
- mount_volume (sidebar, volume);
- }
- else if (volume == NULL && drive != NULL &&
- (g_drive_can_start (drive) || g_drive_can_start_degraded (drive)))
+ if (drive != NULL &&
+ (g_drive_can_start (drive) || g_drive_can_start_degraded (drive)))
{
GMountOperation *mount_op;
@@ -2494,18 +2861,25 @@ open_selected_volume (GtkPlacesSidebar *sidebar,
g_drive_start (drive, G_DRIVE_START_NONE, mount_op, NULL, drive_start_from_bookmark_cb, NULL);
g_object_unref (mount_op);
}
+}
- if (drive != NULL)
- g_object_unref (drive);
-
- if (volume != NULL)
- g_object_unref (volume);
+static void
+open_volume (GtkPlacesSidebar *sidebar,
+ GVolume *volume,
+ GtkPlacesOpenFlags open_flags)
+{
+ if (volume != NULL && !sidebar->mounting)
+ {
+ sidebar->mounting = TRUE;
+ sidebar->go_to_after_mount_open_flags = open_flags;
+ mount_volume (sidebar, volume);
+ }
}
static void
-open_selected_uri (GtkPlacesSidebar *sidebar,
- const gchar *uri,
- GtkPlacesOpenFlags open_flags)
+open_uri (GtkPlacesSidebar *sidebar,
+ const gchar *uri,
+ GtkPlacesOpenFlags open_flags)
{
GFile *location;
@@ -2515,25 +2889,26 @@ open_selected_uri (GtkPlacesSidebar *sidebar,
}
static void
-open_selected_bookmark (GtkPlacesSidebar *sidebar,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkPlacesOpenFlags open_flags)
+open_row (SidebarRow *row,
+ GtkPlacesOpenFlags open_flags)
{
gchar *uri;
+ GDrive *drive;
+ GVolume *volume;
PlaceType place_type;
+ GtkPlacesSidebar *sidebar;
- if (!iter)
- return;
-
- gtk_tree_model_get (model, iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- -1);
+ g_object_get (row,
+ "sidebar", &sidebar,
+ "uri", &uri,
+ "place-type", &place_type,
+ "drive", &drive,
+ "volume", &volume,
+ NULL);
if (uri != NULL)
{
- open_selected_uri (sidebar, uri, open_flags);
+ open_uri (sidebar, uri, open_flags);
g_free (uri);
}
else if (place_type == PLACES_CONNECT_TO_SERVER)
@@ -2544,96 +2919,77 @@ open_selected_bookmark (GtkPlacesSidebar *sidebar,
{
emit_show_enter_location (sidebar);
}
- else
+ else if (volume != NULL)
{
- open_selected_volume (sidebar, model, iter, open_flags);
+ open_volume (sidebar, volume, open_flags);
+ }
+ else if (drive != NULL)
+ {
+ open_drive (sidebar, drive, open_flags);
}
-}
-
-static void
-open_shortcut_from_menu (GtkPlacesSidebar *sidebar,
- GtkPlacesOpenFlags open_flags)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreePath *path = NULL;
-
- model = gtk_tree_view_get_model (sidebar->tree_view);
- gtk_tree_view_get_cursor (sidebar->tree_view, &path, NULL);
- if (path != NULL && gtk_tree_model_get_iter (model, &iter, path))
- open_selected_bookmark (sidebar, model, &iter, open_flags);
+ g_clear_object (&volume);
+ g_clear_object (&drive);
- gtk_tree_path_free (path);
}
/* Callback used for the "Open" menu item in the context menu */
static void
-open_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+open_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- open_shortcut_from_menu (sidebar, GTK_PLACES_OPEN_NORMAL);
+ open_row (row, GTK_PLACES_OPEN_NORMAL);
}
/* Callback used for the "Open in new tab" menu item in the context menu */
static void
-open_shortcut_in_new_tab_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+open_shortcut_in_new_tab_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- open_shortcut_from_menu (sidebar, GTK_PLACES_OPEN_NEW_TAB);
+ open_row (row, GTK_PLACES_OPEN_NEW_TAB);
}
/* Callback used for the "Open in new window" menu item in the context menu */
static void
-open_shortcut_in_new_window_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+open_shortcut_in_new_window_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- open_shortcut_from_menu (sidebar, GTK_PLACES_OPEN_NEW_WINDOW);
+ open_row (row, GTK_PLACES_OPEN_NEW_WINDOW);
}
/* Add bookmark for the selected item - just used from mount points */
static void
-add_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+add_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
gchar *uri;
gchar *name;
GFile *location;
+ GtkPlacesSidebar *sidebar;
- model = gtk_tree_view_get_model (sidebar->tree_view);
-
- if (get_selected_iter (sidebar, &iter))
- {
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- PLACES_SIDEBAR_COLUMN_NAME, &name,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "uri", &uri, "label", &name, NULL);
- if (uri == NULL)
- return;
+ if (uri == NULL)
+ return;
- location = g_file_new_for_uri (uri);
- if (_gtk_bookmarks_manager_insert_bookmark (sidebar->bookmarks_manager, location, -1, NULL))
- _gtk_bookmarks_manager_set_bookmark_label (sidebar->bookmarks_manager, location, name, NULL);
+ location = g_file_new_for_uri (uri);
+ if (_gtk_bookmarks_manager_insert_bookmark (sidebar->bookmarks_manager, location, -1, NULL))
+ _gtk_bookmarks_manager_set_bookmark_label (sidebar->bookmarks_manager, location, name, NULL);
- g_object_unref (location);
- g_free (uri);
- g_free (name);
- }
+ g_object_unref (location);
}
static void
rename_entry_changed (GtkEntry *entry,
GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
PlaceType type;
gchar *name;
gchar *uri;
const gchar *new_name;
gboolean found = FALSE;
+ GList *rows;
+ GList *l;
new_name = gtk_entry_get_text (GTK_ENTRY (sidebar->rename_entry));
@@ -2643,23 +2999,18 @@ rename_entry_changed (GtkEntry *entry,
gtk_label_set_label (GTK_LABEL (sidebar->rename_error), "");
return;
}
+ rows = gtk_container_get_children (GTK_CONTAINER (sidebar->list_box));
+ l = rows;
+ while (l != NULL && !found)
+ {
+ g_object_get (SIDEBAR_ROW (l->data), "place-type", &type, "uri", &uri, "label", &name, NULL);
+ if ((type == PLACES_XDG_DIR || type == PLACES_BOOKMARK) &&
+ strcmp (uri, sidebar->rename_uri) != 0 &&
+ strcmp (new_name, name) == 0)
+ found = TRUE;
- gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sidebar->store), &iter);
- do {
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- PLACES_SIDEBAR_COLUMN_NAME, &name,
- -1);
-
- if ((type == PLACES_XDG_DIR || type == PLACES_BOOKMARK) &&
- strcmp (uri, sidebar->rename_uri) != 0 &&
- strcmp (new_name, name) == 0)
- found = TRUE;
-
- g_free (name);
- g_free (uri);
- } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (sidebar->store), &iter) && !found);
+ l = l->next;
+ }
gtk_widget_set_sensitive (sidebar->rename_button, !found);
gtk_label_set_label (GTK_LABEL (sidebar->rename_error),
@@ -2740,88 +3091,61 @@ create_rename_popover (GtkPlacesSidebar *sidebar)
}
static void
-show_rename_popover (GtkPlacesSidebar *sidebar,
- GtkTreeIter *iter)
+show_rename_popover (SidebarRow *row)
{
- GtkTreeViewColumn *column;
- GdkRectangle rect;
gchar *name;
gchar *uri;
- GtkTreePath *path;
+ GtkPlacesSidebar *sidebar;
- create_rename_popover (sidebar);
+ g_object_get (row, "sidebar", &sidebar, "label", &name, "uri", &uri, NULL);
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), iter,
- PLACES_SIDEBAR_COLUMN_NAME, &name,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
+ create_rename_popover (sidebar);
if (sidebar->rename_uri)
g_free (sidebar->rename_uri);
sidebar->rename_uri = uri;
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (sidebar->store), iter);
- column = gtk_tree_view_get_column (GTK_TREE_VIEW (sidebar->tree_view), 0);
- gtk_tree_view_get_background_area (GTK_TREE_VIEW (sidebar->tree_view), path, column, &rect);
- gtk_tree_path_free (path);
-
gtk_entry_set_text (GTK_ENTRY (sidebar->rename_entry), name);
- gtk_popover_set_pointing_to (GTK_POPOVER (sidebar->rename_popover), &rect);
+ gtk_popover_set_relative_to (GTK_POPOVER (sidebar->rename_popover), GTK_WIDGET (row));
gtk_widget_show (sidebar->rename_popover);
gtk_widget_grab_focus (sidebar->rename_entry);
}
-/* Rename the selected bookmark */
static void
-rename_selected_bookmark (GtkPlacesSidebar *sidebar)
+rename_bookmark (SidebarRow *row)
{
- GtkTreeIter iter;
PlaceType type;
+ GtkPlacesSidebar *sidebar;
- if (get_selected_iter (sidebar, &iter))
- {
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "place-type", &type, NULL);
- if (type != PLACES_BOOKMARK && type != PLACES_XDG_DIR)
- return;
+ if (type != PLACES_BOOKMARK && type != PLACES_XDG_DIR)
+ return;
- show_rename_popover (sidebar, &iter);
- }
+ show_rename_popover (row);
}
static void
-rename_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+rename_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- rename_selected_bookmark (sidebar);
+ rename_bookmark (row);
}
-/* Removes the selected bookmarks */
static void
-remove_selected_bookmarks (GtkPlacesSidebar *sidebar)
+remove_bookmark (SidebarRow *row)
{
- GtkTreeIter iter;
PlaceType type;
gchar *uri;
GFile *file;
+ GtkPlacesSidebar *sidebar;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "place-type", &type, "uri", &uri, NULL);
if (type != PLACES_BOOKMARK)
return;
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
-
file = g_file_new_for_uri (uri);
_gtk_bookmarks_manager_remove_bookmark (sidebar->bookmarks_manager, file, NULL);
@@ -2830,31 +3154,22 @@ remove_selected_bookmarks (GtkPlacesSidebar *sidebar)
}
static void
-remove_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+remove_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- remove_selected_bookmarks (sidebar);
+ remove_bookmark (row);
}
static void
-mount_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+mount_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
GVolume *volume;
+ GtkPlacesSidebar *sidebar;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_VOLUME, &volume,
- -1);
-
+ g_object_get (row, "sidebar", &sidebar, "volume", &volume, NULL);
if (volume != NULL)
- {
- mount_volume (sidebar, volume);
- g_object_unref (volume);
- }
+ mount_volume (sidebar, volume);
}
/* Callback used from g_mount_unmount_with_operation() */
@@ -3095,30 +3410,14 @@ do_unmount (GMount *mount,
}
static void
-do_unmount_selection (GtkPlacesSidebar *sidebar)
+unmount_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
+ GtkPlacesSidebar *sidebar;
GMount *mount;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_MOUNT, &mount,
- -1);
-
- if (mount != NULL)
- {
- do_unmount (mount, sidebar);
- g_object_unref (mount);
- }
-}
-
-static void
-unmount_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
-{
- do_unmount_selection (sidebar);
+ g_object_get (row, "sidebar", &sidebar, "mount", &mount, NULL);
+ do_unmount (mount, sidebar);
}
static void
@@ -3277,52 +3576,39 @@ do_eject (GMount *mount,
}
static void
-eject_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+eject_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
GMount *mount;
GVolume *volume;
GDrive *drive;
+ GtkPlacesSidebar *sidebar;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_MOUNT, &mount,
- PLACES_SIDEBAR_COLUMN_VOLUME, &volume,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- -1);
+ g_object_get (row,
+ "sidebar", &sidebar,
+ "mount", &mount,
+ "volume", &volume,
+ "drive", &drive,
+ NULL);
do_eject (mount, volume, drive, sidebar);
}
static gboolean
eject_or_unmount_bookmark (GtkPlacesSidebar *sidebar,
- GtkTreePath *path)
+ SidebarRow *row)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
gboolean can_unmount, can_eject;
GMount *mount;
GVolume *volume;
GDrive *drive;
gboolean ret;
- model = GTK_TREE_MODEL (sidebar->store);
-
- if (!path)
- return FALSE;
-
- if (!gtk_tree_model_get_iter (model, &iter, path))
- return FALSE;
-
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_MOUNT, &mount,
- PLACES_SIDEBAR_COLUMN_VOLUME, &volume,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- -1);
-
+ g_object_get (row,
+ "mount", &mount,
+ "volume", &volume,
+ "drive", &drive,
+ NULL);
ret = FALSE;
check_unmount_and_eject (mount, volume, drive, &can_unmount, &can_eject);
@@ -3338,30 +3624,17 @@ eject_or_unmount_bookmark (GtkPlacesSidebar *sidebar,
ret = TRUE;
}
- g_clear_object (&mount);
- g_clear_object (&volume);
- g_clear_object (&drive);
-
return ret;
}
static gboolean
eject_or_unmount_selection (GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
- GtkTreePath *path;
gboolean ret;
+ GtkListBoxRow *row;
- if (!get_selected_iter (sidebar, &iter))
- return FALSE;
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (sidebar->store), &iter);
- if (path == NULL)
- return FALSE;
-
- ret = eject_or_unmount_bookmark (sidebar, path);
-
- gtk_tree_path_free (path);
+ row = gtk_list_box_get_selected_row (GTK_LIST_BOX (sidebar->list_box));
+ ret = eject_or_unmount_bookmark (sidebar, SIDEBAR_ROW (row));
return ret;
}
@@ -3396,18 +3669,13 @@ drive_poll_for_media_cb (GObject *source_object,
}
static void
-rescan_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+rescan_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
+ GtkPlacesSidebar *sidebar;
GDrive *drive;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "drive", &drive, NULL);
if (drive != NULL)
{
@@ -3446,18 +3714,13 @@ drive_start_cb (GObject *source_object,
}
static void
-start_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+start_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
+ GtkPlacesSidebar *sidebar;
GDrive *drive;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "drive", &drive, NULL);
if (drive != NULL)
{
@@ -3473,18 +3736,13 @@ start_shortcut_cb (GtkMenuItem *item,
}
static void
-stop_shortcut_cb (GtkMenuItem *item,
- GtkPlacesSidebar *sidebar)
+stop_shortcut_cb (GtkMenuItem *item,
+ SidebarRow *row)
{
- GtkTreeIter iter;
+ GtkPlacesSidebar *sidebar;
GDrive *drive;
- if (!get_selected_iter (sidebar, &iter))
- return;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_DRIVE, &drive,
- -1);
+ g_object_get (row, "sidebar", &sidebar, "drive", &drive, NULL);
if (drive != NULL)
{
@@ -3500,146 +3758,86 @@ stop_shortcut_cb (GtkMenuItem *item,
}
static gboolean
-find_prev_or_next_row (GtkPlacesSidebar *sidebar,
- GtkTreeIter *iter,
- gboolean go_up)
+on_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ GtkPlacesSidebar *sidebar)
{
- GtkTreeModel *model = GTK_TREE_MODEL (sidebar->store);
- gboolean res;
- gint place_type;
-
- if (go_up)
- res = gtk_tree_model_iter_previous (model, iter);
- else
- res = gtk_tree_model_iter_next (model, iter);
+ guint modifiers;
+ GtkListBoxRow *row;
+ gchar *label;
- if (res)
+ if (event)
{
- gtk_tree_model_get (model, iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- -1);
- if (place_type == PLACES_HEADING)
+ row = gtk_list_box_get_selected_row (GTK_LIST_BOX (sidebar->list_box));
+ if (row)
{
- if (go_up)
- res = gtk_tree_model_iter_previous (model, iter);
- else
- res = gtk_tree_model_iter_next (model, iter);
- }
- }
+ g_object_get (row, "label", &label, NULL);
+ modifiers = gtk_accelerator_get_default_mod_mask ();
- return res;
-}
-
-static gboolean
-find_prev_row (GtkPlacesSidebar *sidebar,
- GtkTreeIter *iter)
-{
- return find_prev_or_next_row (sidebar, iter, TRUE);
-}
-
-static gboolean
-find_next_row (GtkPlacesSidebar *sidebar,
- GtkTreeIter *iter)
-{
- return find_prev_or_next_row (sidebar, iter, FALSE);
-}
-
-static gboolean
-gtk_places_sidebar_focus (GtkWidget *widget,
- GtkDirectionType direction)
-{
- GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (widget);
- GtkTreePath *path;
- GtkTreeIter iter;
- gboolean res;
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_space)
+ {
+ GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;
- if (!get_selected_iter (sidebar, &iter))
- {
- gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sidebar->store), &iter);
- res = find_next_row (sidebar, &iter);
- if (res)
- {
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (sidebar->store), &iter);
- gtk_tree_view_set_cursor (sidebar->tree_view, path, NULL, FALSE);
- gtk_tree_path_free (path);
- }
- }
+ if ((event->state & modifiers) == GDK_SHIFT_MASK)
+ open_flags = GTK_PLACES_OPEN_NEW_TAB;
+ else if ((event->state & modifiers) == GDK_CONTROL_MASK)
+ open_flags = GTK_PLACES_OPEN_NEW_WINDOW;
- return GTK_WIDGET_CLASS (gtk_places_sidebar_parent_class)->focus (widget, direction);
-}
+ open_row (SIDEBAR_ROW (row), open_flags);
-/* Handler for GtkWidget::key-press-event on the shortcuts list */
-static gboolean
-bookmarks_key_press_event_cb (GtkWidget *widget,
- GdkEventKey *event,
- GtkPlacesSidebar *sidebar)
-{
- guint modifiers;
- GtkTreeIter selected_iter;
- GtkTreePath *path;
+ return TRUE;
+ }
- if (!get_selected_iter (sidebar, &selected_iter))
- return FALSE;
+ if (event->keyval == GDK_KEY_Down &&
+ (event->state & modifiers) == GDK_MOD1_MASK)
+ return eject_or_unmount_selection (sidebar);
- modifiers = gtk_accelerator_get_default_mod_mask ();
+ if (event->keyval == GDK_KEY_Up)
+ {
+ gint index;
+ GtkListBoxRow *previous_row;
- if (event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_KP_Enter ||
- event->keyval == GDK_KEY_ISO_Enter ||
- event->keyval == GDK_KEY_space)
- {
- GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;
+ index = gtk_list_box_row_get_index (row);
+ previous_row = gtk_list_box_get_row_at_index (GTK_LIST_BOX (sidebar->list_box),
+ index - 1);
+ if (previous_row != NULL)
+ gtk_list_box_select_row (GTK_LIST_BOX (sidebar->list_box), previous_row);
- if ((event->state & modifiers) == GDK_SHIFT_MASK)
- open_flags = GTK_PLACES_OPEN_NEW_TAB;
- else if ((event->state & modifiers) == GDK_CONTROL_MASK)
- open_flags = GTK_PLACES_OPEN_NEW_WINDOW;
+ return TRUE;
+ }
- open_selected_bookmark (sidebar, GTK_TREE_MODEL (sidebar->store),
- &selected_iter, open_flags);
+ if (event->keyval == GDK_KEY_Down)
+ {
+ gint index;
+ GtkListBoxRow *previous_row;
- return TRUE;
- }
+ index = gtk_list_box_row_get_index (row);
+ previous_row = gtk_list_box_get_row_at_index (GTK_LIST_BOX (sidebar->list_box),
+ index + 1);
+ if (previous_row != NULL)
+ gtk_list_box_select_row (GTK_LIST_BOX (sidebar->list_box), previous_row);
- if (event->keyval == GDK_KEY_Down &&
- (event->state & modifiers) == GDK_MOD1_MASK)
- return eject_or_unmount_selection (sidebar);
+ return TRUE;
+ }
- if (event->keyval == GDK_KEY_Up)
- {
- if (find_prev_row (sidebar, &selected_iter))
- {
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (sidebar->store), &selected_iter);
- gtk_tree_view_set_cursor (sidebar->tree_view, path, NULL, FALSE);
- gtk_tree_path_free (path);
- }
- return TRUE;
- }
+ if ((event->keyval == GDK_KEY_Delete ||
+ event->keyval == GDK_KEY_KP_Delete) &&
+ (event->state & modifiers) == 0)
+ {
+ remove_bookmark (SIDEBAR_ROW (row));
+ return TRUE;
+ }
- if (event->keyval == GDK_KEY_Down)
- {
- if (find_next_row (sidebar, &selected_iter))
- {
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (sidebar->store), &selected_iter);
- gtk_tree_view_set_cursor (sidebar->tree_view, path, NULL, FALSE);
- gtk_tree_path_free (path);
+ if ((event->keyval == GDK_KEY_F2) &&
+ (event->state & modifiers) == 0)
+ {
+ rename_bookmark (SIDEBAR_ROW (row));
+ return TRUE;
+ }
}
- return TRUE;
- }
-
- if ((event->keyval == GDK_KEY_Delete ||
- event->keyval == GDK_KEY_KP_Delete) &&
- (event->state & modifiers) == 0)
- {
- remove_selected_bookmarks (sidebar);
- return TRUE;
- }
-
- if ((event->keyval == GDK_KEY_F2) &&
- (event->state & modifiers) == 0)
- {
- rename_selected_bookmark (sidebar);
- return TRUE;
}
return FALSE;
@@ -3659,13 +3857,18 @@ append_menu_separator (GtkMenu *menu)
/* Constructs the popup menu for the file list if needed */
static void
-bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
+bookmarks_build_popup_menu (SidebarRow *row)
{
PopupMenuData menu_data;
GtkWidget *item;
- SelectionInfo sel_info;
GFile *file;
+ const gchar *uri;
+ GVolume *volume;
+ GtkPlacesSidebar *sidebar;
+
+ g_object_get (row, "sidebar", &sidebar, "uri", &uri, "volume", &volume, NULL);
+ g_print ("uri %s\n", uri);
sidebar->popup_menu = gtk_menu_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (sidebar->popup_menu),
GTK_STYLE_CLASS_CONTEXT_MENU);
@@ -3676,7 +3879,7 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
item = gtk_menu_item_new_with_mnemonic (_("_Open"));
g_signal_connect (item, "activate",
- G_CALLBACK (open_shortcut_cb), sidebar);
+ G_CALLBACK (open_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
@@ -3684,7 +3887,7 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
{
item = gtk_menu_item_new_with_mnemonic (_("Open in New _Tab"));
g_signal_connect (item, "activate",
- G_CALLBACK (open_shortcut_in_new_tab_cb), sidebar);
+ G_CALLBACK (open_shortcut_in_new_tab_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
}
@@ -3693,7 +3896,7 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
{
item = gtk_menu_item_new_with_mnemonic (_("Open in New _Window"));
g_signal_connect (item, "activate",
- G_CALLBACK (open_shortcut_in_new_window_cb), sidebar);
+ G_CALLBACK (open_shortcut_in_new_window_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
}
@@ -3703,20 +3906,20 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
item = gtk_menu_item_new_with_mnemonic (_("_Add Bookmark"));
menu_data.add_shortcut_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (add_shortcut_cb), sidebar);
+ G_CALLBACK (add_shortcut_cb), row);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_label (_("Remove"));
menu_data.remove_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (remove_shortcut_cb), sidebar);
+ G_CALLBACK (remove_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_label (_("Rename…"));
menu_data.rename_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (rename_shortcut_cb), sidebar);
+ G_CALLBACK (rename_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
@@ -3727,76 +3930,75 @@ bookmarks_build_popup_menu (GtkPlacesSidebar *sidebar)
item = gtk_menu_item_new_with_mnemonic (_("_Mount"));
menu_data.mount_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (mount_shortcut_cb), sidebar);
+ G_CALLBACK (mount_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_mnemonic (_("_Unmount"));
menu_data.unmount_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (unmount_shortcut_cb), sidebar);
+ G_CALLBACK (unmount_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_mnemonic (_("_Eject"));
menu_data.eject_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (eject_shortcut_cb), sidebar);
+ G_CALLBACK (eject_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_mnemonic (_("_Detect Media"));
menu_data.rescan_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (rescan_shortcut_cb), sidebar);
+ G_CALLBACK (rescan_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_mnemonic (_("_Start"));
menu_data.start_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (start_shortcut_cb), sidebar);
+ G_CALLBACK (start_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
item = gtk_menu_item_new_with_mnemonic (_("_Stop"));
menu_data.stop_item = item;
g_signal_connect (item, "activate",
- G_CALLBACK (stop_shortcut_cb), sidebar);
+ G_CALLBACK (stop_shortcut_cb), row);
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
/* Update everything! */
- get_selection_info (sidebar, &sel_info);
-
- check_popup_sensitivity (sidebar, &menu_data, &sel_info);
+ check_popup_sensitivity (row, &menu_data);
/* And let the caller spice things up */
- if (sel_info.uri)
- file = g_file_new_for_uri (sel_info.uri);
+ if (uri)
+ file = g_file_new_for_uri (uri);
else
file = NULL;
- emit_populate_popup (sidebar, GTK_MENU (sidebar->popup_menu), file, sel_info.volume);
+ emit_populate_popup (sidebar, GTK_MENU (sidebar->popup_menu), file, volume);
if (file)
g_object_unref (file);
-
- free_selection_info (&sel_info);
}
static void
-bookmarks_popup_menu (GtkPlacesSidebar *sidebar,
- GdkEventButton *event)
+bookmarks_popup_menu (SidebarRow *row,
+ GdkEventButton *event)
{
gint button;
+ GtkPlacesSidebar *sidebar;
+
+ g_object_get (row, "sidebar", &sidebar, NULL);
if (sidebar->popup_menu)
gtk_widget_destroy (sidebar->popup_menu);
- bookmarks_build_popup_menu (sidebar);
+ bookmarks_build_popup_menu (row);
/* The event button needs to be 0 if we're popping up this menu from
* a button release, else a 2nd click outside the menu with any button
@@ -3824,107 +4026,82 @@ bookmarks_popup_menu (GtkPlacesSidebar *sidebar,
event ? event->time : gtk_get_current_event_time ());
}
-/* Callback used for the GtkWidget::popup-menu signal of the shortcuts list */
-static gboolean
-bookmarks_popup_menu_cb (GtkWidget *widget,
- GtkPlacesSidebar *sidebar)
-{
- bookmarks_popup_menu (sidebar, NULL);
- return TRUE;
-}
-
static void
-bookmarks_row_activated_cb (GtkWidget *widget,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkPlacesSidebar *sidebar)
+on_row_activated (GtkListBox *list_box,
+ GtkListBoxRow *row,
+ gpointer user_data)
{
- GtkTreeIter iter;
- GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
- GtkTreePath *dummy;
-
- if (!gtk_tree_model_get_iter (model, &iter, path))
- return;
+ SidebarRow *selected_row;
- dummy = NULL;
- if (!clicked_eject_button (sidebar, &dummy))
- {
- open_selected_bookmark (sidebar, model, &iter, 0);
- gtk_tree_path_free (dummy);
- }
+ selected_row = SIDEBAR_ROW (gtk_list_box_get_selected_row (list_box));
+ open_row (selected_row, 0);
}
static gboolean
-bookmarks_button_release_event_cb (GtkWidget *widget,
- GdkEventButton *event,
- GtkPlacesSidebar *sidebar)
+on_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ SidebarRow *row)
{
- GtkTreePath *path;
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeView *tree_view;
- gboolean ret = FALSE;
- gboolean res;
-
- path = NULL;
-
- if (event->type != GDK_BUTTON_RELEASE)
- return TRUE;
+ GtkPlacesSidebar *sidebar;
+ SectionType section_type;
- if (clicked_eject_button (sidebar, &path))
- {
- eject_or_unmount_bookmark (sidebar, path);
- gtk_tree_path_free (path);
- return TRUE;
- }
+ g_object_get (row, "sidebar", &sidebar, "section_type", §ion_type, NULL);
- if (event->button == 1)
+ if (section_type != SECTION_BOOKMARKS)
return FALSE;
- tree_view = GTK_TREE_VIEW (widget);
- model = gtk_tree_view_get_model (tree_view);
+ g_print ("button press\n");
+ sidebar->drag_row = GTK_WIDGET (row);
+ sidebar->drag_row_x = (gint)event->x;
+ sidebar->drag_row_y = (gint)event->y;
- if (event->window != gtk_tree_view_get_bin_window (tree_view))
- return FALSE;
+ sidebar->drag_root_x = event->x_root;
+ sidebar->drag_root_y = event->y_root;
- res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y,
- &path, NULL, NULL, NULL);
+ return FALSE;
+}
- if (!res || path == NULL)
- return FALSE;
+static gboolean
+on_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ SidebarRow *row)
+{
+ gboolean ret = FALSE;
+ gchar *label;
- res = gtk_tree_model_get_iter (model, &iter, path);
- if (!res)
+ g_print ("type %s\n", G_OBJECT_TYPE_NAME (widget));
+ if (event)
{
- gtk_tree_path_free (path);
- return FALSE;
- }
+ g_print ("event y %d\n", (gint)event->y);
+ if (row)
+ {
+ g_object_get (row, "label", &label, NULL);
+ if (event->button == 1)
+ return FALSE;
- if (event->button == 2)
- {
- GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;
+ if (event->button == 2)
+ {
+ GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;
- open_flags = (event->state & GDK_CONTROL_MASK) ?
- GTK_PLACES_OPEN_NEW_WINDOW :
- GTK_PLACES_OPEN_NEW_TAB;
+ open_flags = (event->state & GDK_CONTROL_MASK) ?
+ GTK_PLACES_OPEN_NEW_WINDOW :
+ GTK_PLACES_OPEN_NEW_TAB;
- open_selected_bookmark (sidebar, model, &iter, open_flags);
- ret = TRUE;
- }
- else if (event->button == 3)
- {
- PlaceType row_type;
+ open_row (SIDEBAR_ROW (row), open_flags);
+ ret = TRUE;
+ }
+ else if (event->button == 3)
+ {
+ PlaceType row_type;
- gtk_tree_model_get (model, &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &row_type,
- -1);
+ g_object_get (row, "place-type", &row_type, NULL);
- if (row_type != PLACES_HEADING && row_type != PLACES_CONNECT_TO_SERVER)
- bookmarks_popup_menu (sidebar, event);
+ if (row_type != PLACES_CONNECT_TO_SERVER)
+ bookmarks_popup_menu (SIDEBAR_ROW (row), event);
+ }
+ }
}
- gtk_tree_path_free (path);
-
return ret;
}
@@ -3952,34 +4129,42 @@ tree_selection_func (GtkTreeSelection *selection,
static int
bookmarks_get_first_index (GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
+ GList *children;
+ GList *l;
+ SectionType section_type;
+ PlaceType place_type;
+ int bookmarks_heading_index = 0;
g_return_val_if_fail (GTK_IS_PLACES_SIDEBAR (sidebar), -1);
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sidebar->store), &iter))
- {
- int bookmarks_heading_index = 0;
+ children = gtk_container_get_children (GTK_CONTAINER (sidebar->list_box));
+ l = children;
- do
+ while (l != NULL)
+ {
+ g_object_get (SIDEBAR_ROW (l->data),
+ "section-type", §ion_type,
+ "place-type", &place_type,
+ NULL);
+ if (section_type == SECTION_BOOKMARKS)
{
- PlaceType place_type;
- SectionType section_type;
-
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
- -1);
- if (place_type == PLACES_HEADING && section_type == SECTION_BOOKMARKS)
- return ++bookmarks_heading_index;
-
- bookmarks_heading_index++;
+ break;
}
- while (gtk_tree_model_iter_next (GTK_TREE_MODEL (sidebar->store), &iter));
+ else if (section_type == SECTION_NETWORK)
+ {
+ if (place_type == PLACES_CONNECT_TO_SERVER)
+ {
+ break;
+ }
+ }
+
+ bookmarks_heading_index++;
+ l = l->next;
}
- g_warning ("Index of bookmarks not calculable. No bookmarks heading");
+ g_list_free (children);
- return -1;
+ return bookmarks_heading_index;
}
static void
@@ -3999,68 +4184,84 @@ icon_cell_renderer_func (GtkTreeViewColumn *column,
}
static gint
-places_sidebar_sort_func (GtkTreeModel *model,
- GtkTreeIter *iter_a,
- GtkTreeIter *iter_b,
- gpointer user_data)
-{
- SectionType section_type_a, section_type_b;
- PlaceType place_type_a, place_type_b;
+list_box_sort_func (GtkListBoxRow *row1,
+ GtkListBoxRow *row2,
+ gpointer user_data)
+{
+ SectionType section_type_1, section_type_2;
+ PlaceType place_type_1, place_type_2;
+ const gchar *label_1, *label_2;
+ gint index_1, index_2;
gint retval = 0;
- gtk_tree_model_get (model, iter_a,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type_a,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type_a,
- -1);
- gtk_tree_model_get (model, iter_b,
- PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type_b,
- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type_b,
- -1);
-
- /* fall back to the default order if we're not in the
- * XDG part of the computer section.
- */
- if ((section_type_a == section_type_b) &&
- (section_type_a == SECTION_COMPUTER) &&
- (place_type_a == place_type_b) &&
- (place_type_a == PLACES_XDG_DIR))
- {
- gchar *name_a, *name_b;
-
- gtk_tree_model_get (model, iter_a,
- PLACES_SIDEBAR_COLUMN_NAME, &name_a,
- -1);
- gtk_tree_model_get (model, iter_b,
- PLACES_SIDEBAR_COLUMN_NAME, &name_b,
- -1);
-
- retval = g_utf8_collate (name_a, name_b);
-
- g_free (name_a);
- g_free (name_b);
- }
- else if ((place_type_a == place_type_b) &&
- (place_type_a == PLACES_BOOKMARK))
- {
- gint pos_a, pos_b;
-
- gtk_tree_model_get (model, iter_a,
- PLACES_SIDEBAR_COLUMN_INDEX, &pos_a,
- -1);
- gtk_tree_model_get (model, iter_b,
- PLACES_SIDEBAR_COLUMN_INDEX, &pos_b,
- -1);
-
- retval = pos_a - pos_b;
- }
- else if (place_type_a == PLACES_CONNECT_TO_SERVER)
+ g_object_get (SIDEBAR_ROW (row1),
+ "label", &label_1,
+ "place-type", &place_type_1,
+ "section-type", §ion_type_1,
+ "order-index", &index_1,
+ NULL);
+ g_object_get (SIDEBAR_ROW (row2),
+ "label", &label_2,
+ "place-type", &place_type_2,
+ "section-type", §ion_type_2,
+ "order-index", &index_2,
+ NULL);
+ if (place_type_1 == PLACES_CONNECT_TO_SERVER)
{
retval = 1;
}
- else if (place_type_b == PLACES_CONNECT_TO_SERVER)
+ else if (place_type_2 == PLACES_CONNECT_TO_SERVER)
{
retval = -1;
}
+ else
+ {
+ if (section_type_1 == section_type_2)
+ {
+ if ((section_type_1 == section_type_2) &&
+ (section_type_1 == SECTION_COMPUTER) &&
+ (place_type_1 == place_type_2) &&
+ (place_type_1 == PLACES_XDG_DIR))
+ {
+ retval = g_utf8_collate (label_1, label_2);
+ }
+ else if (place_type_1 == PLACES_BOOKMARK && place_type_2 == PLACES_BOOKMARK)
+ {
+ retval = index_1 - index_2;
+ }
+ /* We order the bookmarks sections based on the bookmark index that we
+ * set on the row as a order-index property, but we have to deal with
+ * the placeholder row wanted to be between two consecutive bookmarks,
+ * that is the usual case.
+ * For that, in the list box sort func we give priority to the placeholder row,
+ * that means that if the index-order is the same as another bookmark
+ * the placeholder row goes before. However that is a problem when the
+ * user is dragging again over the row with the same index-order,
+ * for that, increase the index in the dragging motion handler so it
+ * goes after that row, and if the user goes again to this row
+ * (that now is before the placeholder) it will just set the index-order
+ * of that row, and go again to be before.
+ */
+ else if (place_type_1 == PLACES_DROP_FEEDBACK && place_type_2 == PLACES_BOOKMARK)
+ {
+ if (index_1 == index_2)
+ retval = index_1 - index_2 - 1;
+ else
+ retval = index_1 - index_2;
+ }
+ else if (place_type_1 == PLACES_BOOKMARK && place_type_2 == PLACES_DROP_FEEDBACK)
+ {
+ if (index_1 == index_2)
+ retval = index_1 - index_2 + 1;
+ else
+ retval = index_1 - index_2;
+ }
+ }
+ else
+ {
+ retval = section_type_1 - section_type_2;
+ }
+ }
return retval;
}
@@ -4229,6 +4430,69 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
gtk_style_context_set_junction_sides (gtk_widget_get_style_context (GTK_WIDGET (sidebar)),
GTK_JUNCTION_RIGHT | GTK_JUNCTION_LEFT);
+ /* list box */
+ sidebar->list_box = gtk_list_box_new ();
+ gtk_list_box_set_header_func (GTK_LIST_BOX (sidebar->list_box),
+ add_separator, sidebar, NULL);
+ gtk_list_box_set_sort_func (GTK_LIST_BOX (sidebar->list_box),
+ list_box_sort_func, NULL, NULL);
+ gtk_list_box_set_selection_mode (GTK_LIST_BOX (sidebar->list_box),
+ GTK_SELECTION_BROWSE);
+ gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (sidebar->list_box),
+ TRUE);
+ g_signal_connect (sidebar->list_box,
+ "row-activated",
+ (GCallback) on_row_activated,
+ sidebar);
+ g_signal_connect (sidebar->list_box,
+ "key-press-event",
+ G_CALLBACK (on_key_press_event),
+ sidebar);
+
+ /* DND support */
+ gtk_drag_dest_set (sidebar->list_box,
+ 0,
+ NULL, 0,
+ GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);
+ target_list = gtk_target_list_new (dnd_drop_targets, G_N_ELEMENTS (dnd_drop_targets));
+ gtk_target_list_add_uri_targets (target_list, DND_TEXT_URI_LIST);
+ gtk_drag_dest_set_target_list (sidebar->list_box, target_list);
+ gtk_target_list_unref (target_list);
+ sidebar->source_targets = gtk_target_list_new (dnd_source_targets, G_N_ELEMENTS (dnd_source_targets));
+ gtk_target_list_add_text_targets (sidebar->source_targets, 0);
+
+ gtk_drag_dest_set_track_motion (GTK_WIDGET (sidebar->list_box), TRUE);
+
+ g_signal_connect (sidebar->list_box, "motion-notify-event",
+ G_CALLBACK (on_motion_notify_event), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-begin",
+ G_CALLBACK (drag_begin_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-motion",
+ G_CALLBACK (drag_motion_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-data-get",
+ G_CALLBACK (drag_data_get_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-data-received",
+ G_CALLBACK (drag_data_received_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-drop",
+ G_CALLBACK (drag_drop_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-end",
+ G_CALLBACK (drag_end_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-leave",
+ G_CALLBACK (drag_leave_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-failed",
+ G_CALLBACK (drag_failed_callback), sidebar);
+ g_signal_connect (sidebar->list_box, "drag-data-delete",
+ G_CALLBACK (drag_data_delete_callback), sidebar);
+ sidebar->drag_row = NULL;
+ sidebar->row_placeholder = NULL;
+ sidebar->row_placeholder_index = ROW_OUTSIDE_LISTBOX;
+ sidebar->row_destination_index = ROW_OUTSIDE_LISTBOX;
+ sidebar->row_source_row_offset = 0;
+ sidebar->dragging_over = FALSE;
+
+ gtk_container_add (GTK_CONTAINER (sidebar), sidebar->list_box);
+ gtk_widget_show (GTK_WIDGET (sidebar));
+
/* tree view */
tree_view = GTK_TREE_VIEW (gtk_tree_view_new ());
gtk_tree_view_set_headers_visible (tree_view, FALSE);
@@ -4312,13 +4576,8 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sidebar->store),
PLACES_SIDEBAR_COLUMN_NAME,
GTK_SORT_ASCENDING);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sidebar->store),
- PLACES_SIDEBAR_COLUMN_NAME,
- places_sidebar_sort_func,
- sidebar, NULL);
gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (sidebar->store));
- gtk_container_add (GTK_CONTAINER (sidebar), GTK_WIDGET (tree_view));
gtk_widget_show (GTK_WIDGET (tree_view));
gtk_tree_view_set_enable_search (tree_view, FALSE);
@@ -4338,33 +4597,6 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
GDK_BUTTON1_MASK,
dnd_source_targets, G_N_ELEMENTS (dnd_source_targets),
GDK_ACTION_MOVE);
- gtk_drag_dest_set (GTK_WIDGET (tree_view),
- 0,
- NULL, 0,
- GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);
- target_list = gtk_target_list_new (dnd_drop_targets, G_N_ELEMENTS (dnd_drop_targets));
- gtk_target_list_add_uri_targets (target_list, TEXT_URI_LIST);
- gtk_drag_dest_set_target_list (GTK_WIDGET (tree_view), target_list);
- gtk_target_list_unref (target_list);
-
- g_signal_connect (tree_view, "key-press-event",
- G_CALLBACK (bookmarks_key_press_event_cb), sidebar);
-
- g_signal_connect (tree_view, "drag-motion",
- G_CALLBACK (drag_motion_callback), sidebar);
- g_signal_connect (tree_view, "drag-leave",
- G_CALLBACK (drag_leave_callback), sidebar);
- g_signal_connect (tree_view, "drag-data-received",
- G_CALLBACK (drag_data_received_callback), sidebar);
- g_signal_connect (tree_view, "drag-drop",
- G_CALLBACK (drag_drop_callback), sidebar);
-
- g_signal_connect (tree_view, "popup-menu",
- G_CALLBACK (bookmarks_popup_menu_cb), sidebar);
- g_signal_connect (tree_view, "button-release-event",
- G_CALLBACK (bookmarks_button_release_event_cb), sidebar);
- g_signal_connect (tree_view, "row-activated",
- G_CALLBACK (bookmarks_row_activated_cb), sidebar);
gtk_tree_view_set_activate_on_single_click (sidebar->tree_view, TRUE);
@@ -4487,7 +4719,7 @@ gtk_places_sidebar_dispose (GObject *object)
sidebar->cancellable = NULL;
}
- on_drag_end (sidebar);
+ stop_drop_feedback (sidebar);
sidebar->tree_view = NULL;
@@ -4555,8 +4787,6 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
gobject_class->set_property = gtk_places_sidebar_set_property;
gobject_class->get_property = gtk_places_sidebar_get_property;
- GTK_WIDGET_CLASS (class)->focus = gtk_places_sidebar_focus;
-
/**
* GtkPlacesSidebar::open-location:
* @sidebar: the object which received the signal.
@@ -4833,7 +5063,7 @@ gtk_places_sidebar_new (void)
return GTK_WIDGET (g_object_new (gtk_places_sidebar_get_type (), NULL));
}
-
+
/* Drag and drop interfaces */
@@ -4911,7 +5141,7 @@ shortcuts_model_new (GtkPlacesSidebar *sidebar)
return GTK_LIST_STORE (model);
}
-
+
/* Public methods for GtkPlacesSidebar */
@@ -4986,16 +5216,14 @@ void
gtk_places_sidebar_set_location (GtkPlacesSidebar *sidebar,
GFile *location)
{
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- gboolean valid;
- gchar *iter_uri;
- gchar *uri;
+ GList *children;
+ GList *child;
+ gchar *row_uri;
+ gchar *uri;
g_return_if_fail (GTK_IS_PLACES_SIDEBAR (sidebar));
- selection = gtk_tree_view_get_selection (sidebar->tree_view);
- gtk_tree_selection_unselect_all (selection);
+ gtk_list_box_unselect_all (GTK_LIST_BOX (sidebar->list_box));
if (sidebar->current_location != NULL)
g_object_unref (sidebar->current_location);
@@ -5008,23 +5236,16 @@ gtk_places_sidebar_set_location (GtkPlacesSidebar *sidebar,
uri = g_file_get_uri (location);
- valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sidebar->store), &iter);
- while (valid)
+ children = gtk_container_get_children (GTK_CONTAINER (sidebar->list_box));
+ for (child = children; child != NULL; child = child->next)
{
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_URI, &iter_uri,
- -1);
- if (iter_uri != NULL)
+ g_object_get (SIDEBAR_ROW (child->data), "uri", &row_uri, NULL);
+ if (row_uri != NULL && g_strcmp0 (row_uri, uri) == 0)
{
- if (strcmp (iter_uri, uri) == 0)
- {
- g_free (iter_uri);
- gtk_tree_selection_select_iter (selection, &iter);
- break;
- }
- g_free (iter_uri);
+ gtk_list_box_select_row (GTK_LIST_BOX (sidebar->list_box),
+ GTK_LIST_BOX_ROW (child->data));
+ break;
}
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (sidebar->store), &iter);
}
g_free (uri);
@@ -5055,22 +5276,21 @@ gtk_places_sidebar_set_location (GtkPlacesSidebar *sidebar,
GFile *
gtk_places_sidebar_get_location (GtkPlacesSidebar *sidebar)
{
- GtkTreeIter iter;
+ GtkListBoxRow *selected;
GFile *file;
g_return_val_if_fail (sidebar != NULL, NULL);
file = NULL;
+ selected = gtk_list_box_get_selected_row (GTK_LIST_BOX (sidebar->list_box));
- if (get_selected_iter (sidebar, &iter))
+ if (selected)
{
gchar *uri;
- gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
- PLACES_SIDEBAR_COLUMN_URI, &uri,
- -1);
-
+ g_object_get (SIDEBAR_ROW (selected), "uri", &uri, NULL);
file = g_file_new_for_uri (uri);
+
g_free (uri);
}
@@ -5114,7 +5334,7 @@ gtk_places_sidebar_set_show_desktop (GtkPlacesSidebar *sidebar,
* gtk_places_sidebar_get_show_desktop:
* @sidebar: a places sidebar
*
- * Returns the value previously set with gtk_places_sidebar_set_show_desktop()
+ * Returns the value previously set with gtk_places_sidebar_show_desktop()
*
* Returns: %TRUE if the sidebar will display a builtin shortcut to the desktop folder.
*
@@ -5158,7 +5378,7 @@ gtk_places_sidebar_set_show_connect_to_server (GtkPlacesSidebar *sidebar,
* gtk_places_sidebar_get_show_connect_to_server:
* @sidebar: a places sidebar
*
- * Returns the value previously set with gtk_places_sidebar_set_show_connect_to_server()
+ * Returns the value previously set with gtk_places_sidebar_show_connect_to_server()
*
* Returns: %TRUE if the sidebar will display a “Connect to Server” item.
*
@@ -5445,9 +5665,8 @@ gtk_places_sidebar_set_drop_targets_visible (GtkPlacesSidebar *sidebar,
{
if (visible)
{
- show_new_bookmark_row (sidebar, NULL);
- update_possible_drop_targets (sidebar, TRUE);
sidebar->drop_state = DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT;
+ start_drop_feedback (sidebar, NULL);
}
else
{
@@ -5456,7 +5675,7 @@ gtk_places_sidebar_set_drop_targets_visible (GtkPlacesSidebar *sidebar,
{
if (!sidebar->dragging_over)
{
- on_drag_end (sidebar);
+ stop_drop_feedback (sidebar);
}
else
{
diff --git a/gtk/ui/sidebarrow.ui b/gtk/ui/sidebarrow.ui
new file mode 100644
index 0000000..1b55d41
--- /dev/null
+++ b/gtk/ui/sidebarrow.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <template class="SidebarRow" parent="GtkListBoxRow">
+ <property name="visible">True</property>
+ <property name="margin-top">1</property>
+ <property name="margin-bottom">1</property>
+ <child>
+ <object class="GtkRevealer" id="revealer">
+ <property name="visible">True</property>
+ <property name="reveal-child">True</property>
+ <child>
+ <object class="GtkEventBox" id="event_box">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkBox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="icon_widget">
+ <property name="visible">True</property>
+ <style>
+ <class name="sidebar-icon"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_widget">
+ <property name="visible">True</property>
+ <style>
+ <class name="sidebar-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="eject_button">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <signal name="clicked" handler="on_eject_button_clicked" swapped="no" />
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon_name">media-eject-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ <class name="sidebar-button"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
