marlin r1288 - trunk/marlin

[iain svn gnome org]

Author: iain
Date: Thu Oct  2 00:07:48 2008
New Revision: 1288
URL: http://svn.gnome.org/viewvc/marlin?rev=1288&view=rev

Log:
Remove old dialog code


Modified:
   trunk/marlin/ChangeLog
   trunk/marlin/marlin-marker-view.c

Modified: trunk/marlin/marlin-marker-view.c
==============================================================================
--- trunk/marlin/marlin-marker-view.c	(original)
+++ trunk/marlin/marlin-marker-view.c	Thu Oct  2 00:07:48 2008
@@ -64,13 +64,6 @@
 };
 
 enum {
-	POPUP_ADD,
-	POPUP_REMOVE,
-	POPUP_GOTO,
-	POPUP_EDIT
-};
-
-enum {
 	MOVE_CURSOR,
 	ENTER_MARKER,
 	LEAVE_MARKER,
@@ -2136,157 +2129,6 @@
 					      0);
 }
 
-#if 0
-static void
-add_marker_response (GtkDialog *dialog,
-		     guint response_id,
-		     MarlinMarkerView *view)
-{
-	const char *name;
-	char *real_name;
-	guint64 pos;
-	GtkAdjustment *adj;
-	MarlinUndoContext *ctxt;
-
-	switch (response_id) {
-	case GTK_RESPONSE_OK:
-		name = gtk_entry_get_text (GTK_ENTRY (view->priv->add_data->entry));
-		g_object_get (G_OBJECT (view->priv->add_data->position),
-			      "adjustment", &adj,
-			      NULL);
-
-		pos = (guint64) adj->value;
-
-		if (name == NULL) {
-			real_name = g_strdup_printf (_("Marker %llu"), pos);
-		} else {
-			real_name = g_strdup (name);
-		}
-
-		ctxt = marlin_undo_manager_context_begin (view->priv->undo,
-							  _("Add Marker"));
-		marlin_marker_model_add_marker (view->priv->model, pos, real_name, ctxt);
-		marlin_undo_manager_context_end (view->priv->undo, ctxt);
-
-		g_free (real_name);
-		break;
-
-	case GTK_RESPONSE_HELP:
-		marlin_display_help ("marlin-add-marker-dialog");
-		return;
-
-	case GTK_RESPONSE_CANCEL:
-	default:
-		break;
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-	g_free (view->priv->add_data);
-	view->priv->add_data = NULL;
-}
-
-static void
-marker_add (GtkWidget *item,
-	    MarlinMarkerView *view)
-{
-	char *name, *title;
-	GtkWidget *vbox, *toplevel, *table, *label;
-	struct _dialog_data *ad;
-	guint rate;
-	guint64 max_frames;
-
-	if (view->priv->add_data != NULL) {
-		gtk_window_present (GTK_WINDOW (view->priv->add_data->dialog));
-		return;
-	}
-
-	g_object_get (G_OBJECT (view->priv->sample),
-		      "name", &name,
-		      NULL);
-
-	title = g_strdup_printf ("Add Marker: %s", name);
-	g_free (name);
-
-	ad = view->priv->add_data = g_new (struct _dialog_data, 1);
-	ad->dialog = gtk_dialog_new ();
-	gtk_window_set_title (GTK_WINDOW (ad->dialog), title);
-	g_free (title);
-
-	gtk_dialog_set_has_separator (GTK_DIALOG (ad->dialog), FALSE);
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	gtk_window_set_transient_for (GTK_WINDOW (ad->dialog), GTK_WINDOW (toplevel));
-	gtk_window_set_resizable (GTK_WINDOW (ad->dialog), FALSE);
-
-	vbox = gtk_vbox_new (FALSE, 12);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (ad->dialog)->vbox), vbox);
-
-	table = marlin_make_table (2, 3, FALSE);
-	gtk_widget_show (table);
-	gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-
-	label = marlin_make_title_label (_("_Name:"));
-	gtk_widget_show (label);
-	PACK (table, label, 0, 0, GTK_FILL);
-
-	ad->entry = gtk_entry_new ();
-	gtk_widget_show (ad->entry);
-	gtk_table_attach (GTK_TABLE (table), ad->entry,
-			  1, 3, 0, 1,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), ad->entry);
-	marlin_add_paired_relations (ad->entry, ATK_RELATION_LABELLED_BY,
-				     label, ATK_RELATION_LABEL_FOR);
-
-	label = marlin_make_title_label (_("_Position:"));
-	gtk_widget_show (label);
-	PACK (table, label, 0, 1, GTK_FILL);
-
-	ad->position = marlin_position_spinner_new ();
-
-	g_object_get (G_OBJECT (view->priv->sample),
-		      "sample_rate", &rate,
-		      "total_frames", &max_frames,
-		      NULL);
-	g_object_set (G_OBJECT (ad->position),
-		      "rate", rate,
-		      "max_frames", max_frames,
-		      NULL);
-
-	gtk_widget_show (ad->position);
-	PACK (table, ad->position, 1, 1, GTK_FILL | GTK_EXPAND);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), ad->position);
-	marlin_add_paired_relations (ad->position, ATK_RELATION_LABELLED_BY,
-				     label, ATK_RELATION_LABEL_FOR);
-
-	label = marlin_position_spinner_label (MARLIN_POSITION_SPINNER (ad->position));
-	gtk_widget_show (label);
-	PACK (table, label, 2, 1, GTK_FILL);
-
-	gtk_dialog_add_button (GTK_DIALOG (ad->dialog),
-			       GTK_STOCK_CANCEL,
-			       GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (ad->dialog),
-			       _("Add Marker"),
-			       GTK_RESPONSE_OK);
-	gtk_dialog_add_button (GTK_DIALOG (ad->dialog),
-			       GTK_STOCK_HELP,
-			       GTK_RESPONSE_HELP);
-	gtk_dialog_set_default_response (GTK_DIALOG (ad->dialog),
-					 GTK_RESPONSE_OK);
-
-	g_signal_connect (ad->dialog, "response",
-			  G_CALLBACK (add_marker_response), view);
-
-	gtk_widget_show (ad->dialog);
-}
-#endif
-
 static void
 init (MarlinMarkerView *view)
 {