Commit 4a56cfe0 authored by Philippe Rouquier's avatar Philippe Rouquier

Remove joliet option from the burn option dialog (except for nautilus...

Remove joliet option from the burn option dialog (except for nautilus extension) and ask the user in the data project if he wants joliet or not
parent 586f0ff0
......@@ -211,12 +211,6 @@ write_activate (GtkWindow *toplevel)
track = brasero_track_data_cfg_new ();
brasero_track_data_cfg_add (track, BURN_URI, NULL);
session = brasero_session_cfg_new ();
brasero_burn_session_add_track (BRASERO_BURN_SESSION (session),
BRASERO_TRACK (track));
g_object_unref (track);
/* Add option widget */
box = gtk_vbox_new (FALSE, 6);
gtk_widget_show (box);
......@@ -234,14 +228,15 @@ write_activate (GtkWindow *toplevel)
gtk_box_pack_start (GTK_BOX (box), options, FALSE, TRUE, 0);
/* create the options box */
options = brasero_data_options_new (BRASERO_BURN_SESSION (session));
options = brasero_data_options_new (BRASERO_BURN_SESSION (priv->session));
gtk_widget_show (options);
brasero_burn_options_add_options (self, options);
gtk_box_pack_start (GTK_BOX (box), options, FALSE, TRUE, 0);
/* NOTE: set the disc we're handling */
launch_brasero_on_window_session (session, options, toplevel);
g_object_unref (session);
launch_brasero_on_window_track (BRASERO_TRACK (track),
box,
toplevel);
/* cleanup */
g_object_unref (session);
}
......
......@@ -818,40 +818,59 @@ brasero_data_disc_unknown_uri_cb (BraseroTrackDataCfg *vfs,
g_free (name);
}
static void
brasero_data_disc_use_joliet_response_cb (BraseroDiscMessage *message,
GtkResponseType response,
BraseroDataDisc *self)
{
BraseroDataDiscPrivate *priv;
priv = BRASERO_DATA_DISC_PRIVATE (self);
if (response == GTK_RESPONSE_YES)
brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
BRASERO_IMAGE_FS_JOLIET);
else
brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
BRASERO_IMAGE_FS_JOLIET);
}
static void
brasero_data_disc_joliet_rename_cb (BraseroTrackDataCfg *project,
BraseroDataDisc *self)
{
BraseroDataDiscPrivate *priv;
GtkWidget *dialog;
GtkWidget *message;
gchar *secondary;
gint answer;
priv = BRASERO_DATA_DISC_PRIVATE (self);
dialog = brasero_app_dialog (brasero_app_get_default (),
_("Should files be renamed to be fully Windows-compatible?"),
GTK_BUTTONS_NONE,
GTK_MESSAGE_WARNING);
secondary = g_strdup_printf ("%s\n%s",
_("Some files don't have a suitable name for a fully Windows-compatible CD."),
_("Those names should be changed and truncated to 64 characters."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary);
message = brasero_notify_message_add (BRASERO_NOTIFY (priv->message),
_("Should files be renamed to be fully Windows-compatible?"),
secondary,
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
g_free (secondary);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Rename for Full Windows Compatibility"), GTK_RESPONSE_YES);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Disable Full Windows Compatibility"), GTK_RESPONSE_CANCEL);
brasero_disc_message_set_image (BRASERO_DISC_MESSAGE (message),
GTK_STOCK_DIALOG_WARNING);
gtk_widget_show_all (dialog);
answer = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
BRASERO_DISC_MESSAGE (message),
_("_Rename for Full Windows Compatibility"),
NULL,
GTK_RESPONSE_YES);
brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
BRASERO_DISC_MESSAGE (message),
_("_Disable Full Windows Compatibility"),
NULL,
GTK_RESPONSE_CANCEL);
if (answer == GTK_RESPONSE_YES)
brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
BRASERO_IMAGE_FS_JOLIET);
else
brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
BRASERO_IMAGE_FS_JOLIET);
g_signal_connect (BRASERO_DISC_MESSAGE (message),
"response",
G_CALLBACK (brasero_data_disc_use_joliet_response_cb),
self);
}
static gboolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment