[brasero] Remove some dead code and make sure the help widget is shown when emptying a data project

From: Philippe Rouquier <philippr src gnome org>
To: svn-commits-list gnome org
Subject: [brasero] Remove some dead code and make sure the help widget is shown when emptying a data project
Date: Mon, 22 Jun 2009 12:39:33 -0400 (EDT)
commit caa5ae87c3f7fff994016f8c0a944cbaa6d1e54f
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon Jun 22 18:37:19 2009 +0200

    Remove some dead code and make sure the help widget is shown when emptying a data project

 libbrasero-burn/brasero-session-cfg.c    |    1 +
 libbrasero-burn/brasero-track-data-cfg.c |    2 +
 src/brasero-data-disc.c                  |   14 -
 src/brasero-disc.c                       |  456 ------------------------------
 src/brasero-disc.h                       |   20 --
 5 files changed, 3 insertions(+), 490 deletions(-)
---
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index 0517e6d..0a37718 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -877,6 +877,7 @@ brasero_session_cfg_update (BraseroSessionCfg *self,
 			       0);
 		return;
 	}
+	/* it can be empty with an empty track */
 
 	if (brasero_track_type_get_has_medium (source)
 	&&  brasero_track_type_get_medium_type (source) == BRASERO_MEDIUM_NONE) {
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index c9d5b12..9db4135 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -1922,6 +1922,8 @@ brasero_track_data_cfg_reset (BraseroTrackDataCfg *track)
 	priv->G2_files = FALSE;
 	priv->deep_directory = FALSE;
 	priv->joliet_rename = FALSE;
+
+	brasero_track_changed (BRASERO_TRACK (track));
 	return TRUE;
 }
 
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 9f06380..1007c60 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -863,8 +863,6 @@ brasero_data_disc_size_changed (gpointer user_data)
 	brasero_track_get_size (BRASERO_TRACK (priv->project),
 				&sectors,
 				NULL);
-	brasero_disc_size_changed (BRASERO_DISC (self), sectors);
-
 	priv->size_changed_id = 0;
 	return FALSE;
 }
@@ -1096,12 +1094,6 @@ brasero_data_disc_session_loaded_cb (BraseroTrackDataCfg *session,
 	g_signal_handlers_block_by_func (action, brasero_data_disc_import_session_cb, self);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), loaded);
 	g_signal_handlers_unblock_by_func (action, brasero_data_disc_import_session_cb, self);
-
-	/* Update buttons states */
-	if (loaded)
-		brasero_disc_flags_changed (BRASERO_DISC (self), BRASERO_BURN_FLAG_MERGE);
-	else
-		brasero_disc_flags_changed (BRASERO_DISC (self), BRASERO_BURN_FLAG_NONE);
 }
 
 /**
@@ -1136,9 +1128,6 @@ brasero_data_disc_clear (BraseroDisc *disc)
 	brasero_notify_message_remove (BRASERO_NOTIFY (priv->message), BRASERO_NOTIFY_CONTEXT_MULTISESSION);
 
 	brasero_track_data_cfg_reset (priv->project);
-	brasero_disc_size_changed (disc, 0);
-
-	gdk_window_set_cursor (GTK_WIDGET (disc)->window, NULL);
 }
 
 static void
@@ -1405,9 +1394,6 @@ brasero_data_disc_unset_track (BraseroDataDisc *disc)
 		priv->size_changed_id = 0;
 	}
 
-	if (GTK_WIDGET (disc)->window)
-		gdk_window_set_cursor (GTK_WIDGET (disc)->window, NULL);
-
 	/* Hide all toggle actions for session importing */
 	if (gtk_action_group_get_visible (priv->import_group))
 		gtk_action_group_set_visible (priv->import_group, FALSE);
diff --git a/src/brasero-disc.c b/src/brasero-disc.c
index 7c044e5..5f9e84e 100644
--- a/src/brasero-disc.c
+++ b/src/brasero-disc.c
@@ -42,9 +42,6 @@ static void brasero_disc_base_init (gpointer g_class);
 
 typedef enum {
 	SELECTION_CHANGED_SIGNAL,
-	CONTENTS_CHANGED_SIGNAL,
-	SIZE_CHANGED_SIGNAL,
-	FLAGS_CHANGED_SIGNAL,
 	LAST_SIGNAL
 } BraseroDiscSignalType;
 
@@ -87,17 +84,6 @@ brasero_disc_base_init (gpointer g_class)
 	if (initialized)
 		return;
 
-	brasero_disc_signals [CONTENTS_CHANGED_SIGNAL] =
-	    g_signal_new ("contents_changed",
-			  BRASERO_TYPE_DISC,
-			  G_SIGNAL_RUN_LAST|G_SIGNAL_ACTION|G_SIGNAL_NO_RECURSE,
-			  G_STRUCT_OFFSET (BraseroDiscIface, contents_changed),
-			  NULL,
-			  NULL,
-			  g_cclosure_marshal_VOID__INT,
-			  G_TYPE_NONE,
-			  1,
-			  G_TYPE_INT);
 	brasero_disc_signals [SELECTION_CHANGED_SIGNAL] =
 	    g_signal_new ("selection_changed",
 			  BRASERO_TYPE_DISC,
@@ -108,28 +94,6 @@ brasero_disc_base_init (gpointer g_class)
 			  g_cclosure_marshal_VOID__VOID,
 			  G_TYPE_NONE,
 			  0);
-	brasero_disc_signals [SIZE_CHANGED_SIGNAL] =
-	    g_signal_new ("size_changed",
-			  BRASERO_TYPE_DISC,
-			  G_SIGNAL_RUN_LAST|G_SIGNAL_ACTION|G_SIGNAL_NO_RECURSE,
-			  G_STRUCT_OFFSET (BraseroDiscIface, size_changed),
-			  NULL,
-			  NULL,
-			  brasero_marshal_VOID__INT64,
-			  G_TYPE_NONE,
-			  1,
-			  G_TYPE_INT64);
-	brasero_disc_signals [FLAGS_CHANGED_SIGNAL] =
-	    g_signal_new ("flags_changed",
-			  BRASERO_TYPE_DISC,
-			  G_SIGNAL_RUN_LAST|G_SIGNAL_ACTION|G_SIGNAL_NO_RECURSE,
-			  G_STRUCT_OFFSET (BraseroDiscIface, flags_changed),
-			  NULL,
-			  NULL,
-			  g_cclosure_marshal_VOID__INT,
-			  G_TYPE_NONE,
-			  1,
-			  G_TYPE_INT);
 	initialized = TRUE;
 }
 
@@ -176,36 +140,6 @@ brasero_disc_clear (BraseroDisc *disc)
 	return TRUE;
 }
 
-void
-brasero_disc_reset (BraseroDisc *disc)
-{
-	BraseroDiscIface *iface;
-
-	g_return_if_fail (BRASERO_IS_DISC (disc));
-	
-	iface = BRASERO_DISC_GET_IFACE (disc);
-	if (iface->reset)
-		(* iface->reset) (disc);
-}
-
-BraseroDiscResult
-brasero_disc_get_status (BraseroDisc *disc,
-			 gint *remaining,
-			 gchar **current_task)
-{
-	BraseroDiscIface *iface;
-
-	g_return_val_if_fail (BRASERO_IS_DISC (disc), BRASERO_DISC_ERROR_UNKNOWN);
-	
-	iface = BRASERO_DISC_GET_IFACE (disc);
-	if (iface->get_status)
-		return (* iface->get_status) (disc,
-					      remaining,
-					      current_task);
-
-	return BRASERO_DISC_ERROR_UNKNOWN;
-}
-
 BraseroDiscResult
 brasero_disc_set_session_contents (BraseroDisc *disc,
 				   BraseroBurnSession *session)
@@ -277,393 +211,3 @@ brasero_disc_selection_changed (BraseroDisc *disc)
 		       brasero_disc_signals [SELECTION_CHANGED_SIGNAL],
 		       0);
 }
-
-void
-brasero_disc_contents_changed (BraseroDisc *disc, int nb_files)
-{
-	g_return_if_fail (BRASERO_IS_DISC (disc));
-	g_signal_emit (disc,
-		       brasero_disc_signals [CONTENTS_CHANGED_SIGNAL],
-		       0,
-		       nb_files);
-}
-
-void
-brasero_disc_size_changed (BraseroDisc *disc,
-			   gint64 size)
-{
-	g_return_if_fail (BRASERO_IS_DISC (disc));
-	g_signal_emit (disc,
-		       brasero_disc_signals [SIZE_CHANGED_SIGNAL],
-		       0,
-		       size);
-}
-
-void
-brasero_disc_flags_changed (BraseroDisc *disc,
-			    BraseroBurnFlag flags)
-{
-	g_return_if_fail (BRASERO_IS_DISC (disc));
-	g_signal_emit (disc,
-		       brasero_disc_signals [FLAGS_CHANGED_SIGNAL],
-		       0,
-		       flags);
-}
-
-/**
- * Used to show the how to
- */
-enum {
-	TREE_MODEL_ROW = 150,
-	FILE_NODES_ROW,
-	TARGET_URIS_LIST,
-};
-
-static GtkTargetEntry ntables_cd[] = {
-	{"GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, TREE_MODEL_ROW},
-	{"GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, FILE_NODES_ROW},
-	{"text/uri-list", 0, TARGET_URIS_LIST}
-};
-static guint nb_targets_cd = sizeof (ntables_cd) / sizeof (ntables_cd [0]);
-
-static GtkWidget *
-brasero_utils_disc_find_tree_view_in_container (GtkContainer *container)
-{
-	GList *children;
-	GList *iter;
-
-	children = gtk_container_get_children (container);
-	for (iter = children; iter; iter = iter->next) {
-		GtkWidget *widget;
-
-		widget = iter->data;
-		if (GTK_IS_TREE_VIEW (widget)) {
-			g_list_free (children);
-			return widget;
-		}
-
-		if (GTK_IS_CONTAINER (widget)) {
-			widget = brasero_utils_disc_find_tree_view_in_container (GTK_CONTAINER (widget));
-			if (widget) {
-				g_list_free (children);
-				return widget;
-			}
-		}
-	}
-	g_list_free (children);
-
-	return NULL;
-}
-
-static GtkWidget *
-brasero_utils_disc_find_tree_view (GtkNotebook *notebook)
-{
-	GtkWidget *other_widget;
-
-	other_widget = gtk_notebook_get_nth_page (notebook, 1);
-	return brasero_utils_disc_find_tree_view_in_container (GTK_CONTAINER (other_widget));
-}
-
-static void
-brasero_utils_disc_hide_use_info_leave_cb (GtkWidget *widget,
-					   GdkDragContext *drag_context,
-					   guint time,
-					   GtkNotebook *notebook)
-{
-	GtkWidget *other_widget;
-
-	other_widget = brasero_utils_disc_find_tree_view (notebook);
-	if (!other_widget)
-		return;
-
-	g_signal_emit_by_name (other_widget,
-			       "drag-leave",
-			       drag_context,
-			       time);
-}
-
-static gboolean
-brasero_utils_disc_hide_use_info_drop_cb (GtkWidget *widget,
-					  GdkDragContext *drag_context,
-					  gint x,
-					  gint y,
-					  guint time,
-					  GtkNotebook *notebook)
-{
-	GdkAtom target = GDK_NONE;
-	GtkWidget *other_widget;
-
-	/* here the treeview is not realized so we'll have a warning message
-	 * if we ever try to forward the event */
-	other_widget = brasero_utils_disc_find_tree_view (notebook);
-	if (!other_widget)
-		return FALSE;
-
-	target = gtk_drag_dest_find_target (other_widget,
-					    drag_context,
-					    gtk_drag_dest_get_target_list (GTK_WIDGET (other_widget)));
-
-	if (target != GDK_NONE) {
-		gboolean return_value = FALSE;
-
-		/* The widget must be realized to receive such events. */
-		g_signal_emit_by_name (other_widget,
-				       "drag-drop",
-				       drag_context,
-				       x,
-				       y,
-				       time,
-				       &return_value);
-		return return_value;
-	}
-
-	return FALSE;
-}
-
-static void
-brasero_utils_disc_hide_use_info_data_received_cb (GtkWidget *widget,
-						   GdkDragContext *drag_context,
-						   gint x,
-						   gint y,
-						   GtkSelectionData *data,
-						   guint info,
-						   guint time,
-						   GtkNotebook *notebook)
-{
-	GtkWidget *other_widget;
-
-	other_widget = brasero_utils_disc_find_tree_view (notebook);
-	if (!other_widget)
-		return;
-
-	g_signal_emit_by_name (other_widget,
-			       "drag-data-received",
-			       drag_context,
-			       x,
-			       y,
-			       data,
-			       info,
-			       time);
-}
-
-static gboolean
-brasero_utils_disc_hide_use_info_motion_cb (GtkWidget *widget,
-					    GdkDragContext *drag_context,
-					    gint x,
-					    gint y,
-					    guint time,
-					    GtkNotebook *notebook)
-{
-	return TRUE;
-}
-
-static gboolean
-brasero_utils_disc_hide_use_info_button_cb (GtkWidget *widget,
-					    GdkEventButton *event,
-					    GtkNotebook *notebook)
-{
-	GtkWidget *other_widget;
-	gboolean result;
-
-	if (event->button != 3)
-		return TRUE;
-
-	other_widget = brasero_utils_disc_find_tree_view (notebook);
-	if (!other_widget)
-		return TRUE;
-
-	g_signal_emit_by_name (other_widget,
-			       "button-press-event",
-			       event,
-			       &result);
-
-	return result;
-}
-
-static void
-brasero_utils_disc_style_changed_cb (GtkWidget *widget,
-				     GtkStyle *previous,
-				     GtkWidget *event_box)
-{
-	/* The widget (a treeview here) needs to be realized to get proper style */
-	gtk_widget_realize (widget);
-	gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]);
-}
-
-static void
-brasero_utils_disc_realized_cb (GtkWidget *event_box,
-				GtkNotebook *notebook)
-{
-	GtkWidget *widget;
-
-	widget = brasero_utils_disc_find_tree_view (notebook);
-
-	if (!widget || !GTK_IS_TREE_VIEW (widget))
-		return;
-
-	/* The widget (a treeview here) needs to be realized to get proper style */
-	gtk_widget_realize (widget);
-	gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]);
-
-	g_signal_handlers_disconnect_by_func (widget,
-					      brasero_utils_disc_style_changed_cb,
-					      event_box);
-	g_signal_connect (widget,
-			  "style-set",
-			  G_CALLBACK (brasero_utils_disc_style_changed_cb),
-			  event_box);
-}
-
-static gboolean
-brasero_disc_draw_focus_around_help_text (GtkWidget *label,
-					  GdkEventExpose *event,
-					  gpointer NULL_data)
-{
-	if (!gtk_widget_is_focus (label))
-		return FALSE;
-
-	gtk_paint_focus (label->style,
-			 label->window,
-			 GTK_STATE_NORMAL,
-			 &event->area,
-			 label,
-			 NULL,
-			 label->style->xthickness, label->style->ythickness,
-			 label->allocation.width - label->style->xthickness * 2,
-			 label->allocation.height - label->style->ythickness * 2);
-	return FALSE;
-}
-
-GtkWidget *
-brasero_disc_get_use_info_notebook ()
-{
-	GList	  *chain;
-	GtkWidget *frame;
-	GtkWidget *notebook;
-	GtkWidget *event_box;
-	GtkWidget *first_use;
-	gchar     *message_add, *message_add_header;
-	gchar     *message_remove, *message_remove_header;
-	gchar	  *first_use_message;
-
-	notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-				  frame,
-				  NULL);
-
-	/* Now this event box must be 'transparent' to have the same background 
-	 * color as a treeview */
-	event_box = gtk_event_box_new ();
-	gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), TRUE);
-	gtk_drag_dest_set (event_box, 
-			   GTK_DEST_DEFAULT_MOTION,
-			   ntables_cd,
-			   nb_targets_cd,
-			   GDK_ACTION_COPY|
-			   GDK_ACTION_MOVE);
-
-	/* the following signals need to be forwarded to the widget underneath */
-	g_signal_connect (event_box,
-			  "drag-motion",
-			  G_CALLBACK (brasero_utils_disc_hide_use_info_motion_cb),
-			  notebook);
-	g_signal_connect (event_box,
-			  "drag-leave",
-			  G_CALLBACK (brasero_utils_disc_hide_use_info_leave_cb),
-			  notebook);
-	g_signal_connect (event_box,
-			  "drag-drop",
-			  G_CALLBACK (brasero_utils_disc_hide_use_info_drop_cb),
-			  notebook);
-	g_signal_connect (event_box,
-			  "button-press-event",
-			  G_CALLBACK (brasero_utils_disc_hide_use_info_button_cb),
-			  notebook);
-	g_signal_connect (event_box,
-			  "drag-data-received",
-			  G_CALLBACK (brasero_utils_disc_hide_use_info_data_received_cb),
-			  notebook);
-
-	gtk_container_add (GTK_CONTAINER (frame), event_box);
-
-	/* Translators: this messages will appear as a list of possible
-	 * actions, like:
-	 *   To add/remove files you can:
-         *      * perform action one
-         *      * perform action two
-	 * The full message will be showed in the main area of an empty
-	 * project, suggesting users how to add and remove items to project.
-	 * You simply have to translate messages in the best form
-         * for a list of actions. */
-	message_add_header = g_strconcat ("<big>", _("To add files to this project you can:"), "\n</big>", NULL);
-	message_add = g_strconcat ("\t* ", _("click the \"Add\" button to show a selection dialog"), "\n",
-				   "\t* ", _("select files in the selection pane and click the \"Add\" button"), "\n",
-				   "\t* ", _("drag files in this area from the selection pane or from the file manager"), "\n",
-				   "\t* ", _("double click on files in the selection pane"), "\n",
-				   "\t* ", _("copy files (from file manager for example) and paste in this area"), "\n",
-				   NULL);
-
-	message_remove_header = g_strconcat ("<big>", _("To remove files from this project you can:"), "\n</big>", NULL);
-	message_remove = g_strconcat ("\t* ", _("click on the \"Remove\" button to remove selected items in this area"), "\n",
-				      "\t* ", _("drag and release items out from this area"), "\n",
-				      "\t* ", _("select items in this area, and choose \"Remove\" from context menu"), "\n",
-				      "\t* ", _("select items in this area, and press \"Delete\" key"), "\n",
-				      NULL);
-	
-
-	first_use_message = g_strconcat ("<span foreground='grey50'>",
-					 message_add_header, message_add,
-					 "\n\n\n",
-					 message_remove_header, message_remove,
-					 "</span>", NULL);
-	first_use = gtk_label_new (first_use_message);
-	gtk_misc_set_alignment (GTK_MISC (first_use), 0.50, 0.30);
-	gtk_label_set_selectable (GTK_LABEL (first_use), TRUE);
-	gtk_label_set_ellipsize (GTK_LABEL (first_use), PANGO_ELLIPSIZE_END);
-	g_free (first_use_message);
-
-	gtk_misc_set_padding (GTK_MISC (first_use), 24, 0);
-	gtk_label_set_justify (GTK_LABEL (first_use), GTK_JUSTIFY_LEFT);
-	gtk_label_set_use_markup (GTK_LABEL (first_use), TRUE);
-	gtk_container_add (GTK_CONTAINER (event_box), first_use);
-
-	/* This is meant for accessibility so that screen readers can read it */
-	g_object_set (first_use,
-		      "can-focus", TRUE,
-		      NULL);
-
-	g_signal_connect_after (first_use,
-				"expose-event",
-				G_CALLBACK (brasero_disc_draw_focus_around_help_text),
-				NULL);
-	/* We don't want to have the whole text selected */
-	g_object_set (gtk_widget_get_settings (first_use),
-		      "gtk-label-select-on-focus", FALSE,
-		      NULL);
-
-	chain = g_list_prepend (NULL, first_use);
-	gtk_container_set_focus_chain (GTK_CONTAINER (frame), chain);
-	g_list_free (chain);
-
-	/* This gets all events and forward them to treeview */
-	gtk_event_box_set_above_child (GTK_EVENT_BOX (event_box), TRUE);
-
-	g_free (message_add_header);
-	g_free (message_add);
-	g_free (message_remove_header);
-	g_free (message_remove);
-
-	g_signal_connect (event_box,
-			  "realize",
-			  G_CALLBACK (brasero_utils_disc_realized_cb),
-			  notebook);
-
-	gtk_widget_show_all (notebook);
-	return notebook;
-}
-
diff --git a/src/brasero-disc.h b/src/brasero-disc.h
index 4686622..60516b6 100644
--- a/src/brasero-disc.h
+++ b/src/brasero-disc.h
@@ -72,18 +72,8 @@ struct _BraseroDiscIface {
 
 	/* signals */
 	void	(*selection_changed)			(BraseroDisc *disc);
-	void	(*contents_changed)			(BraseroDisc *disc,
-							 gint nb_files);
-	void	(*size_changed)				(BraseroDisc *disc,
-							 gint64 size);
-	void	(*flags_changed)			(BraseroDisc *disc,
-							 BraseroBurnFlag flags);
 
 	/* virtual functions */
-	BraseroDiscResult	(*get_status)		(BraseroDisc *disc,
-							 gint *remaining,
-							 gchar **current_task);
-
 	BraseroDiscResult	(*set_session_contents)	(BraseroDisc *disc,
 							 BraseroBurnSession *session);
 
@@ -98,7 +88,6 @@ struct _BraseroDiscIface {
 
 	void			(*delete_selected)	(BraseroDisc *disc);
 	void			(*clear)		(BraseroDisc *disc);
-	void			(*reset)		(BraseroDisc *disc);
 
 	guint			(*add_ui)		(BraseroDisc *disc,
 							 GtkUIManager *manager,
@@ -139,15 +128,6 @@ brasero_disc_set_session_contents (BraseroDisc *disc,
 				   BraseroBurnSession *session);
 
 void
-brasero_disc_size_changed (BraseroDisc *disc,
-			   gint64 size);
-void
-brasero_disc_flags_changed (BraseroDisc *disc,
-			    BraseroBurnFlag flags);
-void
-brasero_disc_contents_changed (BraseroDisc *disc,
-			       gint nb_files);
-void
 brasero_disc_selection_changed (BraseroDisc *disc);
 
 #endif /* DISC_H */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]