brasero r936 - in branches/video: . help help/es help/fr help/it m4 po src src/plugins/cdrtools src/plugins/gstreamer
- From: philippr svn gnome org
- To: svn-commits-list gnome org
- Subject: brasero r936 - in branches/video: . help help/es help/fr help/it m4 po src src/plugins/cdrtools src/plugins/gstreamer
- Date: Sun, 29 Jun 2008 18:39:37 +0000 (UTC)
Author: philippr
Date: Sun Jun 29 18:39:36 2008
New Revision: 936
URL: http://svn.gnome.org/viewvc/brasero?rev=936&view=rev
Log:
Update with changes and fixes from trunk
Added:
branches/video/help/ChangeLog
- copied unchanged from r935, /trunk/help/ChangeLog
branches/video/help/fr/
- copied from r935, /trunk/help/fr/
branches/video/help/it/
- copied from r935, /trunk/help/it/
branches/video/m4/
- copied from r935, /trunk/m4/
Modified:
branches/video/Makefile.am
branches/video/configure.in
branches/video/help/Makefile.am
branches/video/help/es/es.po
branches/video/po/de.po
branches/video/po/es.po
branches/video/po/fr.po
branches/video/po/it.po
branches/video/po/pt_BR.po
branches/video/po/ru.po
branches/video/po/sv.po
branches/video/src/brasero-audio-disc.c
branches/video/src/brasero-blank-dialog.c
branches/video/src/brasero-burn-dialog.c
branches/video/src/brasero-data-disc.c
branches/video/src/brasero-data-disc.h
branches/video/src/brasero-data-project.c
branches/video/src/brasero-data-project.h
branches/video/src/brasero-data-session.c
branches/video/src/brasero-data-session.h
branches/video/src/brasero-data-tree-model.c
branches/video/src/brasero-data-tree-model.h
branches/video/src/brasero-data-vfs.c
branches/video/src/brasero-data-vfs.h
branches/video/src/brasero-dest-selection.c
branches/video/src/brasero-dest-selection.h
branches/video/src/brasero-disc-copy-dialog.c
branches/video/src/brasero-disc-message.c
branches/video/src/brasero-disc-message.h
branches/video/src/brasero-disc-option-dialog.c
branches/video/src/brasero-drive-info.c
branches/video/src/brasero-drive-info.h
branches/video/src/brasero-drive-properties.c
branches/video/src/brasero-drive-properties.h
branches/video/src/brasero-drive-selection.c
branches/video/src/brasero-drive-selection.h
branches/video/src/brasero-file-monitor.c
branches/video/src/brasero-file-monitor.h
branches/video/src/brasero-filter-option.c
branches/video/src/brasero-filter-option.h
branches/video/src/brasero-image-option-dialog.c
branches/video/src/brasero-image-properties.c
branches/video/src/brasero-image-properties.h
branches/video/src/brasero-io.h
branches/video/src/brasero-jacket-background.c
branches/video/src/brasero-jacket-edit.c
branches/video/src/brasero-layout.c
branches/video/src/brasero-multi-song-props.c
branches/video/src/brasero-playlist.c
branches/video/src/brasero-plugin-manager-ui.c
branches/video/src/brasero-plugin-option.c
branches/video/src/brasero-plugin-option.h
branches/video/src/brasero-pref.c
branches/video/src/brasero-pref.h
branches/video/src/brasero-preview.c
branches/video/src/brasero-preview.h
branches/video/src/brasero-project-manager.c
branches/video/src/brasero-project.c
branches/video/src/brasero-search-beagle.c
branches/video/src/brasero-search-entry.c
branches/video/src/brasero-song-properties.c
branches/video/src/brasero-split-dialog.c
branches/video/src/brasero-split-dialog.h
branches/video/src/brasero-src-selection.c
branches/video/src/brasero-src-selection.h
branches/video/src/brasero-sum-dialog.c
branches/video/src/brasero-time-button.c
branches/video/src/brasero-time-button.h
branches/video/src/brasero-tool-dialog.c
branches/video/src/brasero-utils.c
branches/video/src/burn-caps.c
branches/video/src/burn-dbus.c
branches/video/src/burn-dbus.h
branches/video/src/burn-drive.c
branches/video/src/burn-drive.h
branches/video/src/burn-job.c
branches/video/src/burn-medium-monitor.c
branches/video/src/burn-medium.h
branches/video/src/burn-plugin-manager.c
branches/video/src/burn-plugin-manager.h
branches/video/src/burn-plugin.c
branches/video/src/burn-plugin.h
branches/video/src/burn-task-ctx.c
branches/video/src/burn-task-ctx.h
branches/video/src/burn-task-item.c
branches/video/src/burn-task-item.h
branches/video/src/burn.c
branches/video/src/main.c
branches/video/src/plugins/cdrtools/burn-cdrecord.c
branches/video/src/plugins/gstreamer/burn-transcode.c
Modified: branches/video/Makefile.am
==============================================================================
--- branches/video/Makefile.am (original)
+++ branches/video/Makefile.am Sun Jun 29 18:39:36 2008
@@ -6,11 +6,9 @@
EXTRA_DIST = \
AUTHORS \
- HACKING \
MAINTAINERS \
NEWS \
README \
- acinclude.m4 \
gnome-doc-utils.make \
m4
Modified: branches/video/configure.in
==============================================================================
--- branches/video/configure.in (original)
+++ branches/video/configure.in Sun Jun 29 18:39:36 2008
@@ -4,7 +4,7 @@
BRASERO_MAJOR_VERSION=0
BRASERO_MINOR_VERSION=7
-BRASERO_SUB=90
+BRASERO_SUB=91
BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB
AC_SUBST(BRASERO_MAJOR_VERSION)
@@ -251,7 +251,7 @@
AM_CONDITIONAL(BUILD_SEARCH, test x"$build_search" = "xyes")
dnl ****************check for playlist (optional)**************
-TOTEM_REQUIRED=2.20.0
+TOTEM_REQUIRED=2.22.0
AC_ARG_ENABLE(playlist,
[ --enable-playlist build playlist pane (if totem is available)[[default = yes]]],,
Modified: branches/video/help/Makefile.am
==============================================================================
--- branches/video/help/Makefile.am (original)
+++ branches/video/help/Makefile.am Sun Jun 29 18:39:36 2008
@@ -14,4 +14,4 @@
DOC_FIGURES = figures/brasero_main.png
# List of translations
-DOC_LINGUAS = es
+DOC_LINGUAS = es fr it
Modified: branches/video/src/brasero-audio-disc.c
==============================================================================
--- branches/video/src/brasero-audio-disc.c (original)
+++ branches/video/src/brasero-audio-disc.c Sun Jun 29 18:39:36 2008
@@ -1144,7 +1144,7 @@
GTK_BUTTONS_CLOSE,
_("The track will be padded at its end:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Track length"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Track Length"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("the track is shorter than 6 seconds."));
@@ -1332,7 +1332,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Unhandled song"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Unhandled Song"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("Make sure the appropriate codec is installed."));
@@ -1365,7 +1365,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Video file"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Video File"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("This file is a video and therefore only the audio part can be written to the disc."));
@@ -1500,12 +1500,12 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
- _("Do you want to search for audio discs inside the directory?"));
+ _("Do you want to search for audio files inside the directory?"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Directory search"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Directory Search"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("Directories can't be added to an audio disc:"));
+ _("Directories can't be added to an audio disc."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -1582,7 +1582,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Unreadable file"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Unreadable File"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
error->message);
@@ -3649,7 +3649,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("File deletion noticed"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("File Deletion"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("it will be removed from the project."));
Modified: branches/video/src/brasero-blank-dialog.c
==============================================================================
--- branches/video/src/brasero-blank-dialog.c (original)
+++ branches/video/src/brasero-blank-dialog.c Sun Jun 29 18:39:36 2008
@@ -216,7 +216,7 @@
GTK_BUTTONS_CLOSE,
_("Error Blanking:"));
- gtk_window_set_title (GTK_WINDOW (self), _("Blanking finished"));
+ gtk_window_set_title (GTK_WINDOW (self), _("Blanking Finished"));
button = brasero_utils_make_button (_("Blank _Again"),
NULL,
@@ -257,7 +257,7 @@
GTK_BUTTONS_NONE,
_("The disc was successfully blanked:"));
- gtk_window_set_title (GTK_WINDOW (self), _("Blanking finished"));
+ gtk_window_set_title (GTK_WINDOW (self), _("Blanking Finished"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("the disc is ready for use."));
@@ -411,7 +411,7 @@
BraseroBlankDialog *obj;
obj = BRASERO_BLANK_DIALOG (g_object_new (BRASERO_TYPE_BLANK_DIALOG,
- "title", _("Disc blanking"),
+ "title", _("Disc Blanking"),
NULL));
return GTK_WIDGET (obj);
}
Modified: branches/video/src/brasero-burn-dialog.c
==============================================================================
--- branches/video/src/brasero-burn-dialog.c (original)
+++ branches/video/src/brasero-burn-dialog.c Sun Jun 29 18:39:36 2008
@@ -157,12 +157,12 @@
GTK_ICON_SIZE_DIALOG);
header = g_strdup (_("<big><b>Creating image</b></big>"));
- title = g_strdup (_("Brasero - Creating image"));
+ title = g_strdup (_("Brasero - Creating Image"));
}
else if (media & (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_DVD_DL)) {
if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning DVD (simulation)"));
+ title = g_strdup (_("Brasero - Burning DVD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of data DVD burning</b></big>"));
}
else {
@@ -176,7 +176,7 @@
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Burning DVD (simulation)"));
+ title = g_strdup (_("Burning DVD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of image to DVD burning</b></big>"));
}
else {
@@ -190,7 +190,7 @@
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Copying DVD (simulation)"));
+ title = g_strdup (_("Brasero - Copying DVD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of data DVD copying</b></big>"));
}
else {
@@ -206,7 +206,7 @@
else if (media & BRASERO_MEDIUM_CD) {
if (input == BRASERO_TRACK_TYPE_AUDIO) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of audio CD burning</b></big>"));
}
else {
@@ -220,7 +220,7 @@
}
else if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of data CD burning</b></big>"));
}
else {
@@ -234,7 +234,7 @@
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Copying CD (simulation)"));
+ title = g_strdup (_("Brasero - Copying CD (Simulation)"));
header = g_strdup(_("<big><b>Simulation of CD copying</b></big>"));
}
else {
@@ -248,7 +248,7 @@
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of image to CD burning</b></big>"));
}
else {
@@ -263,7 +263,7 @@
}
else if (input == BRASERO_TRACK_TYPE_AUDIO) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
header = g_strdup (_("<big><b>Simulation of audio CD burning</b></big>"));
}
else {
@@ -277,11 +277,11 @@
}
else if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning disc (simulation)"));
+ title = g_strdup (_("Brasero - Burning Disc (Simulation)"));
header = g_strdup (_("<big><b>Simulation of data disc burning</b></big>"));
}
else {
- title = g_strdup (_("Brasero - Burning disc"));
+ title = g_strdup (_("Brasero - Burning Disc"));
header = g_strdup (_("<big><b>Burning data disc</b></big>"));
}
@@ -291,11 +291,11 @@
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Copying disc (simulation)"));
+ title = g_strdup (_("Brasero - Copying Disc (Simulation)"));
header = g_strdup(_("<big><b>Simulation of disc copying</b></big>"));
}
else {
- title = g_strdup (_("Brasero - Copying disc"));
+ title = g_strdup (_("Brasero - Copying Disc"));
header = g_strdup(_("<big><b>Copying disc</b></big>"));
}
gtk_image_set_from_icon_name (GTK_IMAGE (dialog->priv->image),
@@ -304,11 +304,11 @@
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY) {
- title = g_strdup (_("Brasero - Burning disc (simulation)"));
+ title = g_strdup (_("Brasero - Burning Disc (Simulation)"));
header = g_strdup (_("<big><b>Simulation of image to disc burning</b></big>"));
}
else {
- title = g_strdup (_("Brasero - Burning disc"));
+ title = g_strdup (_("Brasero - Burning Disc"));
header = g_strdup (_("<big><b>Burning image to disc</b></big>"));
}
@@ -547,9 +547,9 @@
g_free (main_message);
if (error == BRASERO_BURN_ERROR_MEDIA_NONE)
- gtk_window_set_title (GTK_WINDOW (message), _("Waiting for disc insertion"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Disc Insertion"));
else
- gtk_window_set_title (GTK_WINDOW (message), _("Waiting for disc replacement"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Disc Replacement"));
/* connect to signals to be warned when media is inserted */
added_id = g_signal_connect_after (drive,
@@ -661,7 +661,7 @@
GtkDialog *dialog)
{
return brasero_burn_dialog_loss_warnings_cb (dialog,
- _("Possible loss of data"),
+ _("Possible Data Loss"),
_("Do you really want to erase the current disc?"),
_("The disc in the drive holds data."),
_("Erase disc"),
@@ -673,7 +673,7 @@
GtkDialog *dialog)
{
return brasero_burn_dialog_loss_warnings_cb (dialog,
- _("Multisession disc"),
+ _("Multisession Disc"),
_("Appending new files to a multisession disc is not advised:"),
_("already burnt files will be invisible (though still readable).\nDo you want to continue anyway?"),
_("Continue"),
@@ -685,7 +685,7 @@
GtkDialog *dialog)
{
return brasero_burn_dialog_loss_warnings_cb (dialog,
- _("Multisession disc"),
+ _("Multisession Disc"),
_("Appending audio tracks to a CD is not advised:"),
_("you might not be able to listen to them with stereos and CD-TEXT won't be written.\nDo you want to continue anyway?"),
_("Continue"),
@@ -697,7 +697,7 @@
GtkDialog *dialog)
{
return brasero_burn_dialog_loss_warnings_cb (dialog,
- _("Rewritable disc"),
+ _("Rewritable Disc"),
_("Recording audio tracks on a rewritable disc is not advised:"),
_("you might not be able to listen to it with stereos.\nDo you want to continue anyway?"),
_("Continue"),
@@ -730,7 +730,7 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Some files don't have a suitable name for a Windows-compatible CD:"));
- gtk_window_set_title (GTK_WINDOW (message), _("Windows compatibility"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Windows Compatibility"));
gtk_dialog_add_buttons (GTK_DIALOG (message),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
@@ -770,76 +770,76 @@
/* This is used only when actually writing to a disc */
if (media == BRASERO_MEDIUM_FILE)
- title = g_strdup_printf (_("Brasero - Creating image (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Creating Image (%i%% Done)"), percent);
else if (media & BRASERO_MEDIUM_DVD) {
if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning DVD (simulation)"));
+ title = g_strdup (_("Brasero - Burning DVD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning DVD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning DVD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning DVD (simulation)"));
+ title = g_strdup (_("Brasero - Burning DVD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning DVD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning DVD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Copying DVD (simulation)"));
+ title = g_strdup (_("Brasero - Copying DVD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Copying DVD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Copying DVD (%i%% Done)"), percent);
}
}
else if (media & BRASERO_MEDIUM_CD) {
if (input == BRASERO_TRACK_TYPE_AUDIO) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning CD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning CD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning CD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning CD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Copying CD (simulation)"));
+ title = g_strdup (_("Brasero - Copying CD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Copying CD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Copying CD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
title = g_strdup (_("Brasero - Burning CD (simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning CD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning CD (%i%% Done)"), percent);
}
}
else if (input == BRASERO_TRACK_TYPE_AUDIO) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning CD (simulation)"));
+ title = g_strdup (_("Brasero - Burning CD (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning CD (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning CD (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_DATA) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning disc (simulation)"));
+ title = g_strdup (_("Brasero - Burning Disc (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning disc (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning Disc (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_DISC) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Copying disc (simulation)"));
+ title = g_strdup (_("Brasero - Copying Disc (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Copying disc (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Copying Disc (%i%% Done)"), percent);
}
else if (input == BRASERO_TRACK_TYPE_IMAGE) {
if (flags & BRASERO_BURN_FLAG_DUMMY)
- title = g_strdup (_("Brasero - Burning disc (simulation)"));
+ title = g_strdup (_("Brasero - Burning Disc (Simulation)"));
else
- title = g_strdup_printf (_("Brasero - Burning disc (%i%% done)"), percent);
+ title = g_strdup_printf (_("Brasero - Burning Disc (%i%% Done)"), percent);
}
else
return;
@@ -999,7 +999,7 @@
GTK_BUTTONS_CANCEL,
_("The simulation was successful."));
- gtk_window_set_title (GTK_WINDOW (message), _("Successful simulation"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Successful Simulation"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Real disc burning will take place in 10 seconds."));
@@ -1288,7 +1288,7 @@
GtkWidget *chooser;
GtkResponseType answer;
- chooser = gtk_file_chooser_dialog_new (_("Save current session"),
+ chooser = gtk_file_chooser_dialog_new (_("Save Current Session"),
GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -1300,6 +1300,7 @@
g_get_home_dir ());
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser),
"brasero-session.log");
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (chooser), TRUE);
gtk_widget_show (chooser);
answer = gtk_dialog_run (GTK_DIALOG (chooser));
@@ -1367,7 +1368,7 @@
GtkTextTag *object_tag;
GtkTextTag *domain_tag;
- message = gtk_dialog_new_with_buttons (_("Session log"),
+ message = gtk_dialog_new_with_buttons (_("Session Log"),
GTK_WINDOW (dialog),
GTK_DIALOG_DESTROY_WITH_PARENT |
GTK_DIALOG_MODAL,
@@ -1397,7 +1398,7 @@
logfile = brasero_burn_session_get_log_path (dialog->priv->session);
if (g_stat (logfile, &stats) == -1) {
brasero_burn_dialog_message (dialog,
- _("Session log error"),
+ _("Session Log Error"),
_("The session log cannot be displayed:"),
_("the log file could not be found."),
GTK_MESSAGE_ERROR);
@@ -1420,7 +1421,7 @@
file = g_fopen (logfile, "r");
if (!file) {
brasero_burn_dialog_message (dialog,
- _("Session log error"),
+ _("Session Log Error"),
_("The session log cannot be displayed:"),
strerror (errno),
GTK_MESSAGE_ERROR);
@@ -1430,7 +1431,7 @@
if (fread (contents, 1, sizeof (contents), file) != sizeof (contents)) {
brasero_burn_dialog_message (dialog,
- _("Session log error"),
+ _("Session Log Error"),
_("The session log cannot be displayed:"),
strerror (errno),
GTK_MESSAGE_ERROR);
@@ -1512,7 +1513,7 @@
GTK_BUTTONS_NONE,
_("Error while burning:"));
- gtk_window_set_title (GTK_WINDOW (message), _("Burning error"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Burning Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
"%s.",
secondary);
Modified: branches/video/src/brasero-data-disc.c
==============================================================================
--- branches/video/src/brasero-data-disc.c (original)
+++ branches/video/src/brasero-data-disc.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -216,7 +216,7 @@
GTK_BUTTONS_CLOSE,
_("The session couldn't be imported:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Import session error"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Session Import Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
error?error->message:_("unknown error"));
@@ -742,7 +742,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Unreadable file"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Unreadable File"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s.",
error->message);
@@ -785,7 +785,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Recursive symlink"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Recursive Symlink"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("it is a recursive symlink."));
@@ -828,7 +828,7 @@
name);
g_free (name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("File not found"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("File Not Found"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("it doesn't exist at the specified location."));
@@ -909,7 +909,7 @@
_("Do you really want to add \"%s\" to the selection and use ISO9660 level 3 standard to support it?"),
name);
- gtk_window_set_title (GTK_WINDOW (dialog), _("File over 2 Gio"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("File Over 2 Gio"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("The size of the file is over 2 Gio. This isn't supported by ISO9660 standard in his first and second versions (the most widespread ones)."
@@ -1621,7 +1621,7 @@
GtkWidget *rename;
GtkResponseType answer;
- dialog = gtk_dialog_new_with_buttons (_("File renaming"),
+ dialog = gtk_dialog_new_with_buttons (_("File Renaming"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (disc))),
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
_("_Don't rename"), GTK_RESPONSE_CANCEL,
Modified: branches/video/src/brasero-data-disc.h
==============================================================================
--- branches/video/src/brasero-data-disc.h (original)
+++ branches/video/src/brasero-data-disc.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-data-project.c
==============================================================================
--- branches/video/src/brasero-data-project.c (original)
+++ branches/video/src/brasero-data-project.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -10,13 +10,13 @@
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-project.h
==============================================================================
--- branches/video/src/brasero-data-project.h (original)
+++ branches/video/src/brasero-data-project.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-session.c
==============================================================================
--- branches/video/src/brasero-data-session.c (original)
+++ branches/video/src/brasero-data-session.c Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-session.h
==============================================================================
--- branches/video/src/brasero-data-session.h (original)
+++ branches/video/src/brasero-data-session.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-tree-model.c
==============================================================================
--- branches/video/src/brasero-data-tree-model.c (original)
+++ branches/video/src/brasero-data-tree-model.c Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-tree-model.h
==============================================================================
--- branches/video/src/brasero-data-tree-model.h (original)
+++ branches/video/src/brasero-data-tree-model.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-data-vfs.c
==============================================================================
--- branches/video/src/brasero-data-vfs.c (original)
+++ branches/video/src/brasero-data-vfs.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -1172,7 +1172,7 @@
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- brasero_marshal_VOID__INT_STRING,
+ brasero_marshal_VOID__POINTER_STRING,
G_TYPE_NONE,
2,
G_TYPE_POINTER,
Modified: branches/video/src/brasero-data-vfs.h
==============================================================================
--- branches/video/src/brasero-data-vfs.h (original)
+++ branches/video/src/brasero-data-vfs.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-dest-selection.c
==============================================================================
--- branches/video/src/brasero-dest-selection.c (original)
+++ branches/video/src/brasero-dest-selection.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -494,7 +494,7 @@
output.type = BRASERO_TRACK_TYPE_IMAGE;
for (; format > BRASERO_IMAGE_FORMAT_NONE; format >>= 1) {
- gboolean result;
+ BraseroBurnResult result;
output.subtype.img_format = format;
result = brasero_burn_caps_is_output_supported (priv->caps,
@@ -823,14 +823,15 @@
brasero_dest_selection_set_drive_properties (BraseroDestSelection *self)
{
BraseroDestSelectionPrivate *priv;
+ BraseroBurnResult is_valid;
BraseroTrackType source;
BraseroBurnFlag flags;
BraseroMedium *medium;
BraseroDrive *drive;
GConfClient *client;
GConfValue *value;
- gchar *path;
guint64 rate;
+ gchar *path;
gchar *key;
priv = BRASERO_DEST_SELECTION_PRIVATE (self);
@@ -842,6 +843,7 @@
0,
FALSE);
gtk_widget_set_sensitive (priv->button, FALSE);
+ gtk_widget_set_sensitive (priv->copies_box, FALSE);
return;
}
@@ -914,47 +916,22 @@
value = gconf_client_get_without_default (client, key, NULL);
g_free (key);
- if (!value) {
- BraseroBurnResult result;
- BraseroBurnFlag supported = BRASERO_BURN_FLAG_NONE;
- BraseroBurnFlag compulsory = BRASERO_BURN_FLAG_NONE;
-
- flags = BRASERO_BURN_FLAG_EJECT|
- BRASERO_BURN_FLAG_BURNPROOF;
-
- if (source.type == BRASERO_TRACK_TYPE_DATA
- || source.type == BRASERO_TRACK_TYPE_DISC
- || source.type == BRASERO_TRACK_TYPE_IMAGE)
- flags |= BRASERO_BURN_FLAG_NO_TMP_FILES;
-
- brasero_dest_selection_add_drive_properties_flags (self,
- flags,
- &supported,
- &compulsory);
-
- /* Now that we updated the session flags see if everything works */
- result = brasero_burn_caps_is_session_supported (priv->caps, priv->session);
- g_signal_emit (self,
- brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
- 0,
- (result == BRASERO_BURN_OK));
-
- gtk_widget_set_sensitive (priv->button, (result == BRASERO_BURN_OK));
- gtk_widget_set_sensitive (priv->copies_box, (result == BRASERO_BURN_OK));
- }
- else if (brasero_dest_selection_check_same_src_dest (self)) {
- /* Special case: better not check if session is supported. */
+ if (brasero_dest_selection_check_same_src_dest (self)) {
+ /* Special case */
/* wipe out previous flags */
brasero_burn_session_remove_flag (priv->session,
- BRASERO_DRIVE_PROPERTIES_FLAGS|
- BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|
- BRASERO_BURN_FLAG_FAST_BLANK|
- BRASERO_BURN_FLAG_DAO);
+ BRASERO_DRIVE_PROPERTIES_FLAGS);
/* set new ones */
- flags = gconf_value_get_int (value) & BRASERO_DEST_SAVED_FLAGS;
- gconf_value_free (value);
+ if (value) {
+ flags = gconf_value_get_int (value) & BRASERO_DEST_SAVED_FLAGS;
+ gconf_value_free (value);
+ }
+ else
+ flags = BRASERO_BURN_FLAG_EJECT|
+ BRASERO_BURN_FLAG_BURNPROOF;
+
brasero_burn_session_add_flag (priv->session, flags);
/* NOTE: of course NO_TMP is not possible; DAO and BLANK_BEFORE
@@ -966,16 +943,25 @@
BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|
BRASERO_BURN_FLAG_FAST_BLANK|
BRASERO_BURN_FLAG_DAO);
+ }
+ else if (!value) {
+ BraseroBurnFlag supported = BRASERO_BURN_FLAG_NONE;
+ BraseroBurnFlag compulsory = BRASERO_BURN_FLAG_NONE;
- g_signal_emit (self,
- brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
- 0,
- TRUE);
- gtk_widget_set_sensitive (priv->button, TRUE);
- gtk_widget_set_sensitive (priv->copies_box, TRUE);
+ flags = BRASERO_BURN_FLAG_EJECT|
+ BRASERO_BURN_FLAG_BURNPROOF;
+
+ if (source.type == BRASERO_TRACK_TYPE_DATA
+ || source.type == BRASERO_TRACK_TYPE_DISC
+ || source.type == BRASERO_TRACK_TYPE_IMAGE)
+ flags |= BRASERO_BURN_FLAG_NO_TMP_FILES;
+
+ brasero_dest_selection_add_drive_properties_flags (self,
+ flags,
+ &supported,
+ &compulsory);
}
else {
- BraseroBurnResult result;
BraseroBurnFlag supported = BRASERO_BURN_FLAG_NONE;
BraseroBurnFlag compulsory = BRASERO_BURN_FLAG_NONE;
@@ -987,18 +973,17 @@
flags,
&supported,
&compulsory);
+ }
- /* Now that we updated the session flags see if everything works
- * if not, unset all flags and retry. */
- result = brasero_burn_caps_is_session_supported (priv->caps, priv->session);
- g_signal_emit (self,
- brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
- 0,
- (result == BRASERO_BURN_OK));
+ /* Now that we updated the session flags see if everything works */
+ is_valid = brasero_burn_caps_is_session_supported (priv->caps, priv->session);
+ g_signal_emit (self,
+ brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
+ 0,
+ (is_valid == BRASERO_BURN_OK));
- gtk_widget_set_sensitive (priv->copies_box, (result == BRASERO_BURN_OK));
- gtk_widget_set_sensitive (priv->button, (result == BRASERO_BURN_OK));
- }
+ gtk_widget_set_sensitive (priv->copies_box, (is_valid == BRASERO_BURN_OK));
+ gtk_widget_set_sensitive (priv->button, (is_valid == BRASERO_BURN_OK));
key = g_strdup_printf ("%s/tmpdir", BRASERO_DRIVE_PROPERTIES_KEY);
path = gconf_client_get_string (client, key, NULL);
@@ -1026,6 +1011,7 @@
if (output.type == BRASERO_TRACK_TYPE_NONE
|| output.subtype.img_format == BRASERO_IMAGE_FORMAT_NONE) {
/* That means that we've got a problem */
+ /* FIXME: we need to display a message nevertheless */
brasero_burn_session_set_image_output (priv->session,
BRASERO_IMAGE_FORMAT_NONE,
NULL);
@@ -1033,6 +1019,7 @@
brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
0,
FALSE);
+
gtk_widget_set_sensitive (priv->button, FALSE);
return;
}
@@ -1066,12 +1053,15 @@
priv = BRASERO_DEST_SELECTION_PRIVATE (self);
if (brasero_burn_session_get_output (priv->session, NULL, NULL, NULL) == BRASERO_BURN_OK) {
+ gchar *path;
BraseroTrackType output;
BraseroImageFormat format;
+ /* we already have an output check its validity */
output.type = BRASERO_TRACK_TYPE_IMAGE;
if (!priv->default_format) {
+ /* The user set a format */
output.subtype.img_format = brasero_burn_session_get_output_format (priv->session);
/* check that the format is still supported. If not then find a good default */
@@ -1087,35 +1077,17 @@
brasero_dest_selection_get_default_output_format (self, &output);
format = output.subtype.img_format;
-
- if (format != BRASERO_IMAGE_FORMAT_NONE) {
- gchar *path;
-
- if (!priv->default_path) {
- /* check that the extension is ok */
- path = brasero_dest_selection_get_output_path (self);
- if (priv->default_ext
- && brasero_dest_selection_image_check_extension (self, format, path))
- path = brasero_dest_selection_fix_image_extension (format, TRUE, path);
- }
- else
- path = brasero_dest_selection_get_default_output_path (self, format);
-
- brasero_burn_session_set_image_output (priv->session, format, path);
- brasero_drive_selection_set_image_path (BRASERO_DRIVE_SELECTION (self), path);
- g_free (path);
- }
-
g_signal_emit (self,
brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
0,
(format != BRASERO_IMAGE_FORMAT_NONE));
- gtk_widget_set_sensitive (priv->button, (format != BRASERO_IMAGE_FORMAT_NONE));
- if (format == BRASERO_IMAGE_FORMAT_NONE) {
- if (priv->button)
- gtk_widget_set_sensitive (priv->button, FALSE);
+ if (priv->button)
+ gtk_widget_set_sensitive (priv->button, (format != BRASERO_IMAGE_FORMAT_NONE));
+ if (format == BRASERO_IMAGE_FORMAT_NONE) {
+ /* FIXME: we've got a problem and it's not possible,
+ * display a message to say so */
if (priv->drive_prop) {
gtk_widget_destroy (priv->drive_prop);
priv->drive_prop = NULL;
@@ -1124,8 +1096,19 @@
return;
}
- if (priv->button)
- gtk_widget_set_sensitive (priv->button, TRUE);
+ if (!priv->default_path) {
+ /* check that the extension is ok if not update it */
+ path = brasero_dest_selection_get_output_path (self);
+ if (priv->default_ext
+ && brasero_dest_selection_image_check_extension (self, format, path))
+ path = brasero_dest_selection_fix_image_extension (format, TRUE, path);
+ }
+ else
+ path = brasero_dest_selection_get_default_output_path (self, format);
+
+ brasero_burn_session_set_image_output (priv->session, format, path);
+ brasero_drive_selection_set_image_path (BRASERO_DRIVE_SELECTION (self), path);
+ g_free (path);
}
else
brasero_dest_selection_set_image_properties (self);
@@ -1145,8 +1128,7 @@
}
static void
-brasero_dest_selection_check_drive_settings (BraseroDestSelection *self,
- BraseroDrive *drive)
+brasero_dest_selection_check_drive_settings (BraseroDestSelection *self)
{
BraseroBurnFlag compulsory = BRASERO_BURN_FLAG_NONE;
BraseroBurnFlag supported = BRASERO_BURN_FLAG_NONE;
@@ -1156,35 +1138,30 @@
priv = BRASERO_DEST_SELECTION_PRIVATE (self);
- /* check for a special case */
+ /* Update the flags and save them */
if (brasero_dest_selection_check_same_src_dest (self)) {
- gtk_widget_set_sensitive (priv->button, TRUE);
- g_signal_emit (self,
- brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
- 0,
- TRUE);
- gtk_widget_set_sensitive (priv->button, TRUE);
-
- /* These are always set in any case */
+ /* These are always set in any case and there is no way to check
+ * the current flags */
brasero_burn_session_add_flag (priv->session,
BRASERO_BURN_FLAG_DAO|
BRASERO_BURN_FLAG_FAST_BLANK|
BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE);
- return;
}
+ else {
+ /* Try to properly update the flags for the current drive */
+ flags = brasero_burn_session_get_flags (priv->session);
- /* Try to properly update the flags for the current drive */
- flags = brasero_burn_session_get_flags (priv->session);
-
- /* check each flag before re-adding it */
- brasero_dest_selection_add_drive_properties_flags (self,
- flags,
- &supported,
- &compulsory);
+ /* check each flag before re-adding it */
+ brasero_dest_selection_add_drive_properties_flags (self,
+ flags,
+ &supported,
+ &compulsory);
+ }
/* NOTE: we save even if result != BRASERO_BURN_OK. That way if a flag
* is no longer supported after the removal of a plugin then the
* properties are reset and the user can access them again */
+
/* save potential changes for the new profile */
brasero_dest_selection_save_drive_properties (self);
@@ -1203,6 +1180,7 @@
brasero_dest_selection_signals [VALID_MEDIA_SIGNAL],
0,
(result == BRASERO_BURN_OK));
+
if (priv->button)
gtk_widget_set_sensitive (priv->button, (result == BRASERO_BURN_OK));
@@ -1228,7 +1206,7 @@
/* NOTE: that can't happen if we are going to write to an image since
* that would mean we are changing the image format (something we don't
- * do. So it has to be when we write to a drive */
+ * do). So it has to be when we write to a drive */
brasero_dest_selection_set_drive_properties (self);
}
@@ -1236,7 +1214,6 @@
brasero_dest_selection_caps_changed (BraseroPluginManager *manager,
BraseroDestSelection *self)
{
- BraseroDrive *drive;
BraseroDestSelectionPrivate *priv;
/* In this case we are still in the same context (same src, dest) so we
@@ -1247,14 +1224,10 @@
/* The caps of the library / the source have changed so we must check:
* if it's an image that the output type is still possible
* if it's a drive that all flags are still supported and that the media is too */
- drive = brasero_burn_session_get_burner (priv->session);
- if (!drive)
- return;
-
- if (!brasero_drive_is_fake (drive))
- brasero_dest_selection_check_drive_settings (self, drive);
- else
+ if (brasero_burn_session_is_dest_file (priv->session))
brasero_dest_selection_check_image_settings (self);
+ else
+ brasero_dest_selection_check_drive_settings (self);
}
static void
@@ -1267,18 +1240,18 @@
priv = BRASERO_DEST_SELECTION_PRIVATE (self);
- burner = brasero_burn_session_get_burner (priv->session);
- if (priv->drive_prop) {
- /* cancel the drive properties dialog as it's not the same drive */
- gtk_dialog_response (GTK_DIALOG (priv->drive_prop),
- GTK_RESPONSE_CANCEL);
- }
-
/* make sure the current displayed drive reflects that */
+ burner = brasero_burn_session_get_burner (priv->session);
drive = brasero_drive_selection_get_drive (BRASERO_DRIVE_SELECTION (self));
- if (drive && burner && burner != drive)
+ if (burner != drive) {
brasero_drive_selection_set_drive (BRASERO_DRIVE_SELECTION (self), drive);
+ if (priv->drive_prop) {
+ /* cancel the drive properties dialog as it's not the same drive */
+ gtk_dialog_response (GTK_DIALOG (priv->drive_prop), GTK_RESPONSE_CANCEL);
+ }
+ }
+
if (drive)
g_object_unref (drive);
@@ -1292,10 +1265,9 @@
brasero_dest_selection_set_drive_properties (self);
- gtk_widget_show (priv->copies_box);
-
numcopies = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->copies_spin));
brasero_burn_session_set_num_copies (priv->session, numcopies);
+ gtk_widget_show (priv->copies_box);
}
else {
gtk_widget_hide (priv->copies_box);
Modified: branches/video/src/brasero-dest-selection.h
==============================================================================
--- branches/video/src/brasero-dest-selection.h (original)
+++ branches/video/src/brasero-dest-selection.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-disc-copy-dialog.c
==============================================================================
--- branches/video/src/brasero-disc-copy-dialog.c (original)
+++ branches/video/src/brasero-disc-copy-dialog.c Sun Jun 29 18:39:36 2008
@@ -106,7 +106,7 @@
priv = BRASERO_DISC_COPY_DIALOG_PRIVATE (obj);
gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE);
- gtk_window_set_title (GTK_WINDOW (obj), _("CD/DVD copy options"));
+ gtk_window_set_title (GTK_WINDOW (obj), _("CD/DVD Copy Options"));
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_widget_show (button);
@@ -175,15 +175,24 @@
src_drive = brasero_drive_selection_get_drive (BRASERO_DRIVE_SELECTION (priv->source));
if (brasero_burn_session_same_src_dest_drive (priv->session)) {
- BraseroMedia media;
+ BraseroTrackType source;
- media = brasero_medium_get_status (brasero_burn_session_get_src_medium (priv->session));
+ memset (&source, 0, sizeof (BraseroTrackType));
+ brasero_burn_session_get_input_type (priv->session, &source);
- if (media == BRASERO_MEDIUM_NONE
- || (media & (BRASERO_MEDIUM_HAS_AUDIO|BRASERO_MEDIUM_HAS_DATA)) == 0)
+ if (source.subtype.media == BRASERO_MEDIUM_NONE
+ || (source.subtype.media & (BRASERO_MEDIUM_HAS_AUDIO|BRASERO_MEDIUM_HAS_DATA)) == 0)
valid = FALSE;
- else
- valid = TRUE;
+ else {
+ BraseroBurnResult result;
+ BraseroBurnCaps *caps;
+
+ caps = brasero_burn_caps_get_default ();
+ result = brasero_burn_caps_is_session_supported (caps, priv->session);
+ g_object_unref (caps);
+
+ valid = (result == BRASERO_BURN_OK);
+ }
}
else {
BraseroBurnCaps *caps;
Modified: branches/video/src/brasero-disc-message.c
==============================================================================
--- branches/video/src/brasero-disc-message.c (original)
+++ branches/video/src/brasero-disc-message.c Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-disc-message.h
==============================================================================
--- branches/video/src/brasero-disc-message.h (original)
+++ branches/video/src/brasero-disc-message.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-disc-option-dialog.c
==============================================================================
--- branches/video/src/brasero-disc-option-dialog.c (original)
+++ branches/video/src/brasero-disc-option-dialog.c Sun Jun 29 18:39:36 2008
@@ -558,7 +558,7 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Some files don't have a suitable name for a Windows-compatible CD. Those names will be changed and truncated to 64 characters."));
- gtk_window_set_title (GTK_WINDOW (message), _("Windows compatibility"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Windows Compatibility"));
gtk_dialog_add_button (GTK_DIALOG (message),
_("_Don't rename"),
@@ -1417,7 +1417,7 @@
BraseroDiscOptionDialog *obj;
obj = BRASERO_DISC_OPTION_DIALOG (g_object_new (BRASERO_TYPE_DISC_OPTION_DIALOG,
- "title", _("Disc burning setup"),
+ "title", _("Disc Burning Setup"),
NULL));
return GTK_WIDGET (obj);
Modified: branches/video/src/brasero-drive-info.c
==============================================================================
--- branches/video/src/brasero-drive-info.c (original)
+++ branches/video/src/brasero-drive-info.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-drive-info.h
==============================================================================
--- branches/video/src/brasero-drive-info.h (original)
+++ branches/video/src/brasero-drive-info.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8-*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) PhiPhilippe Rouquier 2007-2008nfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-drive-properties.c
==============================================================================
--- branches/video/src/brasero-drive-properties.c (original)
+++ branches/video/src/brasero-drive-properties.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -307,7 +307,7 @@
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
PROP_TEXT, text,
- PROP_RATE, brasero_medium_get_max_write_speed (medium),
+ PROP_RATE, rates [i],
-1);
g_free (text);
}
Modified: branches/video/src/brasero-drive-properties.h
==============================================================================
--- branches/video/src/brasero-drive-properties.h (original)
+++ branches/video/src/brasero-drive-properties.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-drive-selection.c
==============================================================================
--- branches/video/src/brasero-drive-selection.c (original)
+++ branches/video/src/brasero-drive-selection.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-drive-selection.h
==============================================================================
--- branches/video/src/brasero-drive-selection.h (original)
+++ branches/video/src/brasero-drive-selection.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8-*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-file-monitor.c
==============================================================================
--- branches/video/src/brasero-file-monitor.c (original)
+++ branches/video/src/brasero-file-monitor.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-file-monitor.h
==============================================================================
--- branches/video/src/brasero-file-monitor.h (original)
+++ branches/video/src/brasero-file-monitor.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-filter-option.c
==============================================================================
--- branches/video/src/brasero-filter-option.c (original)
+++ branches/video/src/brasero-filter-option.c Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-filter-option.h
==============================================================================
--- branches/video/src/brasero-filter-option.h (original)
+++ branches/video/src/brasero-filter-option.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-image-option-dialog.c
==============================================================================
--- branches/video/src/brasero-image-option-dialog.c (original)
+++ branches/video/src/brasero-image-option-dialog.c Sun Jun 29 18:39:36 2008
@@ -347,7 +347,7 @@
GTK_BUTTONS_CLOSE,
_("This image can't be burnt:"));
- gtk_window_set_title (GTK_WINDOW (message), _("Invalid image"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Invalid Image"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("it doesn't appear to be a valid image or a valid cue file."));
@@ -370,7 +370,7 @@
GTK_BUTTONS_CLOSE,
_("There is no specified image:"));
- gtk_window_set_title (GTK_WINDOW (message), _("No image"));
+ gtk_window_set_title (GTK_WINDOW (message), _("No Image"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Please, choose an image and retry."));
@@ -733,7 +733,7 @@
BraseroImageOptionDialog *obj;
obj = BRASERO_IMAGE_OPTION_DIALOG (g_object_new (BRASERO_TYPE_IMAGE_OPTION_DIALOG,
- "title", _("Image burning setup"),
+ "title", _("Image Burning Setup"),
NULL));
return GTK_WIDGET (obj);
Modified: branches/video/src/brasero-image-properties.c
==============================================================================
--- branches/video/src/brasero-image-properties.c (original)
+++ branches/video/src/brasero-image-properties.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -229,7 +229,7 @@
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (object);
- gtk_window_set_title (GTK_WINDOW (object), _("Disc image file properties"));
+ gtk_window_set_title (GTK_WINDOW (object), _("Image File Properties"));
gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
gtk_dialog_add_buttons (GTK_DIALOG (object),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Modified: branches/video/src/brasero-image-properties.h
==============================================================================
--- branches/video/src/brasero-image-properties.h (original)
+++ branches/video/src/brasero-image-properties.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-io.h
==============================================================================
--- branches/video/src/brasero-io.h (original)
+++ branches/video/src/brasero-io.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -77,6 +77,8 @@
#define BRASERO_IO_XFER_DESTINATION "xfer::destination"
#define BRASERO_IO_PLAYLIST_TITLE "playlist::title"
+#define BRASERO_IO_IS_PLAYLIST "playlist::is_playlist"
+#define BRASERO_IO_PLAYLIST_ENTRIES_NUM "playlist::entries_num"
#define BRASERO_IO_COUNT_NUM "count::num"
#define BRASERO_IO_COUNT_SIZE "count::size"
Modified: branches/video/src/brasero-jacket-background.c
==============================================================================
--- branches/video/src/brasero-jacket-background.c (original)
+++ branches/video/src/brasero-jacket-background.c Sun Jun 29 18:39:36 2008
@@ -299,7 +299,7 @@
brasero_jacket_background_new (void)
{
return g_object_new (BRASERO_TYPE_JACKET_BACKGROUND,
- "title", _("Background properties"),
+ "title", _("Background Properties"),
NULL);
}
Modified: branches/video/src/brasero-jacket-edit.c
==============================================================================
--- branches/video/src/brasero-jacket-edit.c (original)
+++ branches/video/src/brasero-jacket-edit.c Sun Jun 29 18:39:36 2008
@@ -824,7 +824,7 @@
GtkWidget *window;
GtkWidget *contents;
- window = gtk_dialog_new_with_buttons (_("Cover editor"),
+ window = gtk_dialog_new_with_buttons (_("Cover Editor"),
GTK_WINDOW (toplevel),
GTK_DIALOG_MODAL|
GTK_DIALOG_DESTROY_WITH_PARENT|
Modified: branches/video/src/brasero-layout.c
==============================================================================
--- branches/video/src/brasero-layout.c (original)
+++ branches/video/src/brasero-layout.c Sun Jun 29 18:39:36 2008
@@ -744,12 +744,13 @@
source = brasero_layout_item_get_object (item);
if (!BRASERO_IS_URI_CONTAINER (source)) {
BRASERO_BURN_LOG ("Item is not an URI container");
- brasero_project_set_source (BRASERO_PROJECT (layout->priv->project),
- NULL);
+ brasero_project_set_source (BRASERO_PROJECT (layout->priv->project), NULL);
}
- else
+ else {
+ brasero_uri_container_uri_selected (BRASERO_URI_CONTAINER (source));
brasero_project_set_source (BRASERO_PROJECT (layout->priv->project),
BRASERO_URI_CONTAINER (source));
+ }
brasero_layout_save (layout, item->id);
}
Modified: branches/video/src/brasero-multi-song-props.c
==============================================================================
--- branches/video/src/brasero-multi-song-props.c (original)
+++ branches/video/src/brasero-multi-song-props.c Sun Jun 29 18:39:36 2008
@@ -1,14 +1,14 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software: you can redistribute it and/or modify it
+ * brasero is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * trunk is distributed in the hope that it will be useful, but
+ * brasero is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
@@ -312,7 +312,7 @@
GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT,
NULL);
- gtk_window_set_title (GTK_WINDOW (object), _("Song information"));
+ gtk_window_set_title (GTK_WINDOW (object), _("Song Information"));
}
static void
Modified: branches/video/src/brasero-playlist.c
==============================================================================
--- branches/video/src/brasero-playlist.c (original)
+++ branches/video/src/brasero-playlist.c Sun Jun 29 18:39:36 2008
@@ -492,6 +492,9 @@
playlist->priv->client = beagle_client_new (NULL);
if(playlist->priv->client) {
GError *error = NULL;
+ BeagleQueryPartOr *or_part;
+ BeagleQueryPartHuman *type;
+ BeagleQueryPartProperty *filetype;
playlist->priv->query = beagle_query_new ();
@@ -505,12 +508,37 @@
G_CALLBACK (brasero_playlist_beagle_finished_cb),
playlist);
- beagle_query_add_text (playlist->priv->query, "Files");
-
- beagle_query_add_text (playlist->priv->query, "audio/x-scpls");
- beagle_query_add_text (playlist->priv->query, "audio/x-ms-asx");
- beagle_query_add_text (playlist->priv->query, "audio/x-mp3-playlist");
- beagle_query_add_text (playlist->priv->query, "audio/x-mpegurl");
+ type = beagle_query_part_human_new ();
+ beagle_query_part_human_set_string (type, "type:File");
+ beagle_query_add_part (playlist->priv->query, BEAGLE_QUERY_PART (type));
+
+ or_part = beagle_query_part_or_new ();
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:MimeType");
+ beagle_query_part_property_set_value (filetype, "audio/x-ms-asx");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:MimeType");
+ beagle_query_part_property_set_value (filetype, "audio/x-mpegurl");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:MimeType");
+ beagle_query_part_property_set_value (filetype, "audio/x-scpls");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:FileType");
+ beagle_query_part_property_set_value (filetype, "audio/x-mp3-playlist");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
+
+ beagle_query_add_part (playlist->priv->query, BEAGLE_QUERY_PART (or_part));
brasero_playlist_increase_activity_counter (playlist);
beagle_client_send_request_async (playlist->priv->client,
@@ -622,7 +650,7 @@
if (!GTK_WIDGET_TOPLEVEL (toplevel))
return;
- dialog = gtk_file_chooser_dialog_new (_("Select a playlist"),
+ dialog = gtk_file_chooser_dialog_new (_("Select Playlist"),
GTK_WINDOW (toplevel),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -806,7 +834,7 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("an unknown error occured."));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Playlist loading error"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Playlist Loading Error"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -834,13 +862,11 @@
gpointer callback_data)
{
gint num;
- gboolean has_audio;
gint64 total_length;
GtkTreeModel *model;
GtkTreePath *treepath;
GtkTreeIter parent, row;
gchar *len_string, *num_string;
- const gchar *playlist_title = NULL;
BraseroPlaylistParseData *data = callback_data;
BraseroPlaylist *playlist = BRASERO_PLAYLIST (object);
@@ -849,8 +875,9 @@
gtk_tree_model_get_iter (model, &parent, treepath);
gtk_tree_path_free (treepath);
- playlist_title = g_file_info_get_attribute_string (info, BRASERO_IO_PLAYLIST_TITLE);
- if (playlist_title) {
+ if (info && g_file_info_get_attribute_boolean (info, BRASERO_IO_IS_PLAYLIST)) {
+ const gchar *playlist_title = NULL;
+
/* The first entry returned is always the playlist as a whole:
* if it was successfully parsed uri is the title if any. If not
* it's simply the URI */
@@ -861,10 +888,14 @@
brasero_playlist_dialog_error (playlist, uri);
gtk_list_store_remove (GTK_LIST_STORE (model), &parent);
+ data->title = 1;
+ return;
}
- else if (uri)
+
+ playlist_title = g_file_info_get_attribute_string (info, BRASERO_IO_PLAYLIST_TITLE);
+ if (playlist_title)
gtk_tree_store_set (GTK_TREE_STORE (model), &parent,
- BRASERO_PLAYLIST_DISPLAY_COL, uri,
+ BRASERO_PLAYLIST_DISPLAY_COL, playlist_title,
-1);
data->title = 1;
@@ -872,8 +903,7 @@
}
/* See if the song can be added */
- has_audio = g_file_info_get_attribute_boolean (info, BRASERO_IO_HAS_AUDIO);
- if (!error && has_audio) {
+ if (!error && info && g_file_info_get_attribute_boolean (info, BRASERO_IO_HAS_AUDIO)) {
gchar *name;
guint64 len;
const gchar *title;
@@ -978,7 +1008,8 @@
uri,
playlist->priv->parse_type,
BRASERO_IO_INFO_PERM|
- BRASERO_IO_INFO_MIME,
+ BRASERO_IO_INFO_MIME|
+ BRASERO_IO_INFO_METADATA,
data);
brasero_playlist_increase_activity_counter (playlist);
}
Modified: branches/video/src/brasero-plugin-manager-ui.c
==============================================================================
--- branches/video/src/brasero-plugin-manager-ui.c (original)
+++ branches/video/src/brasero-plugin-manager-ui.c Sun Jun 29 18:39:36 2008
@@ -369,6 +369,7 @@
}
g_object_unref (caps);
+ plugin = NULL;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
{
GtkTreeSelection *selection;
@@ -568,6 +569,9 @@
plugin = plugin_manager_ui_get_selected_plugin (pm);
+ if (!plugin)
+ return NULL;
+
menu = gtk_menu_new ();
item = gtk_image_menu_item_new_with_mnemonic (_("_About"));
@@ -714,6 +718,8 @@
gtk_widget_destroy (priv->popup_menu);
priv->popup_menu = create_tree_popup_menu (pm);
+ if (!priv->popup_menu)
+ return;
gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu),
GTK_WIDGET (pm),
@@ -983,11 +989,8 @@
gtk_widget_set_sensitive (priv->about_button, FALSE);
gtk_widget_set_sensitive (priv->configure_button, FALSE);
}
- else {
+ else
plugin_manager_ui_populate_lists (pm);
- gtk_widget_set_sensitive (priv->about_button, TRUE);
- gtk_widget_set_sensitive (priv->configure_button, TRUE);
- }
}
static void
Modified: branches/video/src/brasero-plugin-option.c
==============================================================================
--- branches/video/src/brasero-plugin-option.c (original)
+++ branches/video/src/brasero-plugin-option.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-plugin-option.h
==============================================================================
--- branches/video/src/brasero-plugin-option.h (original)
+++ branches/video/src/brasero-plugin-option.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-pref.c
==============================================================================
--- branches/video/src/brasero-pref.c (original)
+++ branches/video/src/brasero-pref.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-pref.h
==============================================================================
--- branches/video/src/brasero-pref.h (original)
+++ branches/video/src/brasero-pref.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-preview.c
==============================================================================
--- branches/video/src/brasero-preview.c (original)
+++ branches/video/src/brasero-preview.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-preview.h
==============================================================================
--- branches/video/src/brasero-preview.h (original)
+++ branches/video/src/brasero-preview.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-project-manager.c
==============================================================================
--- branches/video/src/brasero-project-manager.c (original)
+++ branches/video/src/brasero-project-manager.c Sun Jun 29 18:39:36 2008
@@ -350,7 +350,7 @@
manager->priv->size_preview);
uris = brasero_uri_container_get_selected_uris (container);
- if (!uris) {
+ if (!uris) {
gtk_statusbar_pop (GTK_STATUSBAR (manager->priv->status),
manager->priv->status_ctx);
gtk_statusbar_push (GTK_STATUSBAR (manager->priv->status),
@@ -556,7 +556,7 @@
}
if (toplevel)
- gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New audio disc project"));
+ gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Audio Disc Project"));
}
else if (type == BRASERO_PROJECT_TYPE_DATA) {
brasero_layout_load (BRASERO_LAYOUT (manager->priv->layout), BRASERO_LAYOUT_DATA);
@@ -570,7 +570,7 @@
}
if (toplevel)
- gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New data disc project"));
+ gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Data Disc Project"));
}
else if (type == BRASERO_PROJECT_TYPE_VIDEO) {
brasero_layout_load (BRASERO_LAYOUT (manager->priv->layout), BRASERO_LAYOUT_VIDEO);
@@ -594,7 +594,7 @@
gtk_action_set_sensitive (action, FALSE);
if (toplevel)
- gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New image file"));
+ gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Image File"));
brasero_project_manager_burn_iso_dialog (manager, uri);
}
else if (type == BRASERO_PROJECT_TYPE_COPY) {
@@ -605,7 +605,7 @@
gtk_action_set_sensitive (action, FALSE);
if (toplevel)
- gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - Copy a disc"));
+ gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - Disc Copy"));
brasero_project_manager_burn_disc (manager);
}
@@ -838,7 +838,7 @@
BraseroProjectType type;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (manager));
- chooser = gtk_file_chooser_dialog_new (_("Open a project"),
+ chooser = gtk_file_chooser_dialog_new (_("Open Project"),
GTK_WINDOW (toplevel),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Modified: branches/video/src/brasero-project.c
==============================================================================
--- branches/video/src/brasero-project.c (original)
+++ branches/video/src/brasero-project.c Sun Jun 29 18:39:36 2008
@@ -566,7 +566,7 @@
GTK_BUTTONS_NONE,
_("Would you like to activate overburn?"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Project size"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Project Size"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("The size of the project is too large for the disc and you must delete files otherwise."
@@ -791,12 +791,12 @@
GTK_BUTTONS_CLOSE,
_("Please wait:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Please wait"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Please Wait"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("some tasks are not completed yet."));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Waiting for ongoing tasks"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Ongoing Tasks"));
progress = gtk_progress_bar_new ();
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), " ");
@@ -1504,7 +1504,7 @@
GTK_WINDOW (toplevel),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ GTK_STOCK_ADD, GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (project->priv->chooser), TRUE);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (project->priv->chooser), TRUE);
@@ -1741,9 +1741,9 @@
/* update the name of the main window */
BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
if (type == BRASERO_PROJECT_TYPE_DATA)
- title = g_strdup_printf (_("Brasero - %s (data disc)"), name);
+ title = g_strdup_printf (_("Brasero - %s (Data Disc)"), name);
else if (type == BRASERO_PROJECT_TYPE_AUDIO)
- title = g_strdup_printf (_("Brasero - %s (audio disc)"), name);
+ title = g_strdup_printf (_("Brasero - %s (Audio Disc)"), name);
else if (type == BRASERO_PROJECT_TYPE_AUDIO)
title = g_strdup_printf (_("Brasero - %s (Video Disc)"), name);
g_free (name);
@@ -1773,7 +1773,7 @@
GTK_BUTTONS_CLOSE,
_("Error while loading the project:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Project loading error"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Project Loading Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
reason);
@@ -2863,7 +2863,7 @@
gint answer;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (project));
- chooser = gtk_file_chooser_dialog_new (_("Save current project"),
+ chooser = gtk_file_chooser_dialog_new (_("Save Current Project"),
GTK_WINDOW (toplevel),
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Modified: branches/video/src/brasero-search-beagle.c
==============================================================================
--- branches/video/src/brasero-search-beagle.c (original)
+++ branches/video/src/brasero-search-beagle.c Sun Jun 29 18:39:36 2008
@@ -1051,7 +1051,7 @@
GTK_BUTTONS_CLOSE,
_("Error querying beagle:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Search error"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Search Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
error->message);
Modified: branches/video/src/brasero-search-entry.c
==============================================================================
--- branches/video/src/brasero-search-entry.c (original)
+++ branches/video/src/brasero-search-entry.c Sun Jun 29 18:39:36 2008
@@ -47,13 +47,16 @@
#include <gtk/gtkcombobox.h>
#include <gtk/gtkcomboboxentry.h>
#include <gtk/gtkentry.h>
-#include <gconf/gconf-client.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkcelllayout.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkdialog.h>
+#include <beagle/beagle.h>
+
+#include <gconf/gconf-client.h>
+
#include "brasero-search-entry.h"
#include "brasero-layout.h"
@@ -79,134 +82,6 @@
};
-/* cut and pasted from nautilus */
-struct _MimeTypeGroup{
- gchar *name;
- gchar *mimetypes[30];
-};
-typedef struct _MimeTypeGroup MimeTypeGroup;
-const static MimeTypeGroup mime_type_groups [] = {
- { N_("Find all available music"),
- { "application/ogg",
- "audio/ac3",
- "audio/basic",
- "audio/midi",
- "audio/x-flac",
- "audio/mp4",
- "audio/mpeg",
- "audio/x-vorbis+ogg", /* beagle stores ogg-vorbis files under this mime type */
- "audio/x-mpeg",
- "audio/x-ms-asx",
- "audio/x-pn-realaudio",
- NULL
- }
- },
- { N_("Find all available videos"),
- { "video/mp4",
- "video/3gpp",
- "video/mpeg",
- "video/quicktime",
- "video/vivo",
- "video/x-avi",
- "video/x-mng",
- "video/x-ms-asf",
- "video/x-ms-wmv",
- "video/x-msvideo",
- "video/x-nsv",
- "video/x-real-video",
- NULL
- }
- },
- { N_("Find all available pictures"),
- { "application/vnd.oasis.opendocument.image",
- "application/x-krita",
- "image/bmp",
- "image/cgm",
- "image/gif",
- "image/jpeg",
- "image/jpeg2000",
- "image/png",
- "image/svg+xml",
- "image/tiff",
- "image/x-compressed-xcf",
- "image/x-pcx",
- "image/x-photo-cd",
- "image/x-psd",
- "image/x-tga",
- "image/x-xcf",
- "application/illustrator",
- "application/vnd.corel-draw",
- "application/vnd.stardivision.draw",
- "application/vnd.oasis.opendocument.graphics",
- "application/x-dia-diagram",
- "application/x-karbon",
- "application/x-killustrator",
- "application/x-kivio",
- "application/x-kontour",
- "application/x-wpg",
- NULL
- }
- },
- { N_("Find all available documents"),
- { "application/rtf",
- "application/msword",
- "application/vnd.sun.xml.writer",
- "application/vnd.sun.xml.writer.global",
- "application/vnd.sun.xml.writer.template",
- "application/vnd.oasis.opendocument.text",
- "application/vnd.oasis.opendocument.text-template",
- "application/x-abiword",
- "application/x-applix-word",
- "application/x-mswrite",
- "application/docbook+xml",
- "application/x-kword",
- "application/x-kword-crypt",
- "application/x-lyx",
- NULL
- }
- },
- { N_("Find all available spreadsheets"),
- { "application/vnd.lotus-1-2-3",
- "application/vnd.ms-excel",
- "application/vnd.stardivision.calc",
- "application/vnd.sun.xml.calc",
- "application/vnd.oasis.opendocument.spreadsheet",
- "application/x-applix-spreadsheet",
- "application/x-gnumeric",
- "application/x-kspread",
- "application/x-kspread-crypt",
- "application/x-quattropro",
- "application/x-sc",
- "application/x-siag",
- NULL
- }
- },
- { N_("Find all available presentations"),
- { "application/vnd.ms-powerpoint",
- "application/vnd.sun.xml.impress",
- "application/vnd.oasis.opendocument.presentation",
- "application/x-magicpoint",
- "application/x-kpresenter",
- NULL
- }
- },
- { N_("Find all available Pdf / Postscripts"),
- { "application/pdf",
- "application/postscript",
- "application/x-dvi",
- "image/x-eps",
- NULL
- }
- },
- {NULL},
- { N_("Text File"),
- { "text/plain",
- NULL
- }
- },
- { NULL }
-};
-
enum {
BRASERO_SEARCH_ENTRY_DISPLAY_COL,
BRASERO_SEARCH_ENTRY_BACKGRD_COL,
@@ -806,41 +681,74 @@
brasero_search_entry_set_history (entry);
}
-static void
-_add_mime_types_to_query (BeagleQuery *query, const MimeTypeGroup *group)
-{
- gchar **mime;
-
- mime = (gchar **) group->mimetypes;
- while (*mime) {
- beagle_hit_get_mime_type (query);
- mime ++;
- }
-}
-
BeagleQuery *
brasero_search_entry_get_query (BraseroSearchEntry *entry)
{
BeagleQuery *query;
+ BeagleQueryPartOr *or_part;
+ BeagleQueryPartHuman *text;
+ /* Not sure about all this */
query = beagle_query_new ();
- beagle_query_add_text (query, "Files");
+ if (strcmp (entry->priv->keywords, _("All files"))) {
+ BeagleQueryPartHuman *text;
+
+ text = beagle_query_part_human_new ();
+ beagle_query_part_human_set_string (text, entry->priv->keywords);
+ beagle_query_part_set_logic (BEAGLE_QUERY_PART (text),
+ BEAGLE_QUERY_PART_LOGIC_REQUIRED);
+
+ beagle_query_add_part (query, BEAGLE_QUERY_PART (text));
+ }
+
+ text = beagle_query_part_human_new ();
+ beagle_query_part_human_set_string (text, "type:File");
+ beagle_query_add_part (query, BEAGLE_QUERY_PART (text));
+
+ or_part = beagle_query_part_or_new ();
+
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->documents))) {
- _add_mime_types_to_query (query, mime_type_groups + 3);
+ BeagleQueryPartProperty *filetype;
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:FileType");
+ beagle_query_part_property_set_value (filetype, "document");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
}
+
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->pictures))) {
- _add_mime_types_to_query (query, mime_type_groups + 2);
+ BeagleQueryPartProperty *filetype;
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:FileType");
+ beagle_query_part_property_set_value (filetype, "image");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
}
+
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->music))) {
- _add_mime_types_to_query (query, mime_type_groups);
+ BeagleQueryPartProperty *filetype;
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:FileType");
+ beagle_query_part_property_set_value (filetype, "audio");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
}
+
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->video))) {
- _add_mime_types_to_query (query, mime_type_groups + 1);
+ BeagleQueryPartProperty *filetype;
+
+ filetype = beagle_query_part_property_new ();
+ beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
+ beagle_query_part_property_set_key (filetype, "beagle:FileType");
+ beagle_query_part_property_set_value (filetype, "video");
+ beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
}
- if (strcmp (entry->priv->keywords, _("All files")))
- beagle_query_add_text (query, entry->priv->keywords);
+ beagle_query_add_part (query, BEAGLE_QUERY_PART (or_part));
return query;
}
Modified: branches/video/src/brasero-song-properties.c
==============================================================================
--- branches/video/src/brasero-song-properties.c (original)
+++ branches/video/src/brasero-song-properties.c Sun Jun 29 18:39:36 2008
@@ -239,7 +239,7 @@
GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT,
NULL);
- gtk_window_set_title (GTK_WINDOW (obj), _("Song information"));
+ gtk_window_set_title (GTK_WINDOW (obj), _("Song Information"));
}
void
Modified: branches/video/src/brasero-split-dialog.c
==============================================================================
--- branches/video/src/brasero-split-dialog.c (original)
+++ branches/video/src/brasero-split-dialog.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
@@ -174,7 +174,7 @@
GTK_BUTTONS_NONE,
_("Do you really want to split the track?"));
- gtk_window_set_title (GTK_WINDOW (message), _("size error"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Size Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("If you split the track, the size of the new track will be shorter than 6 seconds and will be padded."));
@@ -576,7 +576,7 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("no silence could be retrieved."));
- gtk_window_set_title (GTK_WINDOW (message), _("no silence"));
+ gtk_window_set_title (GTK_WINDOW (message), _("No Silence"));
gtk_dialog_run (GTK_DIALOG (message));
gtk_widget_destroy (message);
}
@@ -682,7 +682,7 @@
GTK_BUTTONS_NONE,
_("Do you really want to carry on with automatic splitting?"));
- gtk_window_set_title (GTK_WINDOW (message), _("automatic split"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Automatic Split"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("This will remove all previous results."));
Modified: branches/video/src/brasero-split-dialog.h
==============================================================================
--- branches/video/src/brasero-split-dialog.h (original)
+++ branches/video/src/brasero-split-dialog.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-src-selection.c
==============================================================================
--- branches/video/src/brasero-src-selection.c (original)
+++ branches/video/src/brasero-src-selection.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-src-selection.h
==============================================================================
--- branches/video/src/brasero-src-selection.h (original)
+++ branches/video/src/brasero-src-selection.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-sum-dialog.c
==============================================================================
--- branches/video/src/brasero-sum-dialog.c (original)
+++ branches/video/src/brasero-sum-dialog.c Sun Jun 29 18:39:36 2008
@@ -149,7 +149,7 @@
NULL);
return brasero_sum_dialog_message (self,
- _("File integrity check error"),
+ _("File Integrity Check Error"),
_("The file integrity check cannot be performed:"),
error ? error->message:_("unknown error"),
GTK_MESSAGE_ERROR);
@@ -163,7 +163,7 @@
NULL);
return brasero_sum_dialog_message (self,
- _("File integrity check success"),
+ _("File Integrity Check Success"),
_("The file integrity was performed successfully:"),
_("there seems to be no corrupted file on the disc."),
GTK_MESSAGE_INFO);
@@ -195,7 +195,7 @@
GTK_BUTTONS_NONE,
_("<b><big>The following files appear to be corrupted:</big></b>"));
- gtk_window_set_title (GTK_WINDOW (message), _("File integrity check error"));
+ gtk_window_set_title (GTK_WINDOW (message), _("File Integrity Check Error"));
gtk_window_set_resizable (GTK_WINDOW (message), TRUE);
gtk_widget_set_size_request (GTK_WIDGET (message), 440, 300);
@@ -470,7 +470,7 @@
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (self->priv->md5_chooser));
if (!uri) {
retval = brasero_sum_dialog_message (self,
- _("File integrity check error"),
+ _("File Integrity Check Error"),
_("The file integrity check cannot be performed:"),
error ? error->message:_("no md5 file was given."),
GTK_MESSAGE_ERROR);
@@ -765,7 +765,7 @@
BraseroSumDialog *obj;
obj = BRASERO_SUM_DIALOG (g_object_new (BRASERO_TYPE_SUM_DIALOG, NULL));
- gtk_window_set_title (GTK_WINDOW (obj), "Disc checking");
+ gtk_window_set_title (GTK_WINDOW (obj), "Disc Checking");
return GTK_WIDGET (obj);
}
Modified: branches/video/src/brasero-time-button.c
==============================================================================
--- branches/video/src/brasero-time-button.c (original)
+++ branches/video/src/brasero-time-button.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/brasero-time-button.h
==============================================================================
--- branches/video/src/brasero-time-button.h (original)
+++ branches/video/src/brasero-time-button.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * brasero
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/brasero-tool-dialog.c
==============================================================================
--- branches/video/src/brasero-tool-dialog.c (original)
+++ branches/video/src/brasero-tool-dialog.c Sun Jun 29 18:39:36 2008
@@ -96,7 +96,7 @@
brasero_tool_dialog_media_error (BraseroToolDialog *self)
{
brasero_tool_dialog_message (self,
- _("Media busy"),
+ _("Media Busy"),
_("The operation cannot be performed:"),
_("the inserted media is busy."),
GTK_MESSAGE_ERROR);
@@ -106,7 +106,7 @@
brasero_tool_dialog_media_busy (BraseroToolDialog *self)
{
brasero_tool_dialog_message (self,
- _("Media error"),
+ _("Media Error"),
_("The operation cannot be performed:"),
_("the inserted media is not supported."),
GTK_MESSAGE_ERROR);
@@ -116,7 +116,7 @@
brasero_tool_dialog_no_media (BraseroToolDialog *self)
{
brasero_tool_dialog_message (self,
- _("Media error"),
+ _("Media Error"),
_("The operation cannot be performed:"),
_("the drive is empty."),
GTK_MESSAGE_ERROR);
Modified: branches/video/src/brasero-utils.c
==============================================================================
--- branches/video/src/brasero-utils.c (original)
+++ branches/video/src/brasero-utils.c Sun Jun 29 18:39:36 2008
@@ -546,7 +546,7 @@
GTK_BUTTONS_CLOSE,
_("This file can't be opened:"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("File error"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("File Error"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
error->message);
Modified: branches/video/src/burn-caps.c
==============================================================================
--- branches/video/src/burn-caps.c (original)
+++ branches/video/src/burn-caps.c Sun Jun 29 18:39:36 2008
@@ -1906,6 +1906,83 @@
return BRASERO_BURN_OK;
}
+static BraseroBurnResult
+brasero_burn_caps_is_session_supported_same_src_dest (BraseroBurnCaps *self,
+ BraseroBurnSession *session)
+{
+ GSList *iter;
+ BraseroTrackType input;
+ BraseroTrackType output;
+ BraseroImageFormat format;
+ BraseroBurnFlag session_flags;
+
+ BRASERO_BURN_LOG ("Checking disc copy support with same source and destination");
+
+ /* To determine if a CD/DVD can be copied using the same source/dest,
+ * we first determine if can be imaged and then if this image can be
+ * burnt to whatever medium type. */
+ memset (&input, 0, sizeof (BraseroTrackType));
+ brasero_burn_session_get_input_type (session, &input);
+ BRASERO_BURN_LOG_TYPE (&input, "input");
+
+ /* NOTE: BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE is a problem here since it
+ * is only used if needed. Likewise DAO can be a problem. So just in
+ * case remove them. They are not really useful in this context. What we
+ * want here is to know whether a medium can be used given the input;
+ * only 1 flag is important here (MERGE) and can have consequences. */
+ session_flags = brasero_burn_session_get_flags (session);
+ session_flags &= ~(BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|BRASERO_BURN_FLAG_DAO);
+
+ BRASERO_BURN_LOG_FLAGS (session_flags, "flags");
+
+ /* Find one available output format */
+ format = BRASERO_IMAGE_FORMAT_CDRDAO;
+ output.type = BRASERO_TRACK_TYPE_IMAGE;
+
+ for (; format > BRASERO_IMAGE_FORMAT_NONE; format >>= 1) {
+ BraseroBurnResult result;
+
+ output.subtype.img_format = format;
+
+ BRASERO_BURN_LOG_TYPE (&output, "Testing temporary image format");
+ result = brasero_caps_try_output_with_blanking (self,
+ session,
+ &output,
+ &input,
+ BRASERO_PLUGIN_IO_ACCEPT_FILE);
+ if (result != BRASERO_BURN_OK)
+ continue;
+
+ /* This format can be used to create an image. Check if can be
+ * burnt now. Just find at least one medium. */
+ for (iter = self->priv->caps_list; iter; iter = iter->next) {
+ BraseroCaps *caps;
+ gboolean result;
+
+ caps = iter->data;
+
+ if (caps->type.type != BRASERO_TRACK_TYPE_DISC)
+ continue;
+
+ /* Put BRASERO_MEDIUM_NONE so we can always succeed */
+ result = brasero_caps_find_link (caps,
+ session_flags,
+ BRASERO_MEDIUM_NONE,
+ &input,
+ BRASERO_PLUGIN_IO_ACCEPT_FILE);
+
+ BRASERO_BURN_LOG_DISC_TYPE (caps->type.subtype.media,
+ "Tested medium (%s)",
+ result ? "working":"not working");
+
+ if (result)
+ return BRASERO_BURN_OK;
+ }
+ }
+
+ return BRASERO_BURN_NOT_SUPPORTED;
+}
+
BraseroBurnResult
brasero_burn_caps_is_session_supported (BraseroBurnCaps *self,
BraseroBurnSession *session)
@@ -1915,6 +1992,10 @@
BraseroTrackType output;
BraseroPluginIOFlag io_flags;
+ /* Special case */
+ if (brasero_burn_session_same_src_dest_drive (session))
+ return brasero_burn_caps_is_session_supported_same_src_dest (self, session);
+
/* Here flags don't matter as we don't record anything.
* Even the IOFlags since that can be checked later with
* brasero_burn_caps_get_flags. */
@@ -1980,8 +2061,7 @@
* want here is to know which media can be used given the input; only 1
* flag is important here (MERGE) and can have consequences. */
session_flags = brasero_burn_session_get_flags (session);
- session_flags &= ~(BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|
- BRASERO_BURN_FLAG_DAO);
+ session_flags &= ~(BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|BRASERO_BURN_FLAG_DAO);
BRASERO_BURN_LOG_FLAGS (session_flags, "and flags");
Modified: branches/video/src/burn-dbus.c
==============================================================================
--- branches/video/src/burn-dbus.c (original)
+++ branches/video/src/burn-dbus.c Sun Jun 29 18:39:36 2008
@@ -1,3 +1,22 @@
+/* Copyright 2008 Luis Medinas <lmedinas gmail com>
+ * Copyright 2008 Philippe Rouquier <brasero-app wanadoo fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Modified: branches/video/src/burn-dbus.h
==============================================================================
--- branches/video/src/burn-dbus.h (original)
+++ branches/video/src/burn-dbus.h Sun Jun 29 18:39:36 2008
@@ -1,3 +1,20 @@
+/* Copyright 2008 Luis Medinas <lmedinas gmail com>
+ * Copyright 2008 Philippe Rouquier <brasero-app wanadoo fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
#ifdef HAVE_CONFIG_H
# include <config.h>
Modified: branches/video/src/burn-drive.c
==============================================================================
--- branches/video/src/burn-drive.c (original)
+++ branches/video/src/burn-drive.c Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/burn-drive.h
==============================================================================
--- branches/video/src/burn-drive.h (original)
+++ branches/video/src/burn-drive.h Sun Jun 29 18:39:36 2008
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * trunk
+ * brasero
* Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * trunk is free software.
+ * brasero is free software.
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
- * trunk is distributed in the hope that it will be useful,
+ * brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with trunk. If not, write to:
+ * along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: branches/video/src/burn-job.c
==============================================================================
--- branches/video/src/burn-job.c (original)
+++ branches/video/src/burn-job.c Sun Jun 29 18:39:36 2008
@@ -82,10 +82,16 @@
BraseroJob *linked;
};
-#define BRASERO_JOB_DEBUG(job_MACRO) brasero_job_log_message (job_MACRO, G_STRLOC, \
- "%s called %s", \
- G_OBJECT_TYPE_NAME (job_MACRO), \
- G_STRFUNC);
+#define BRASERO_JOB_DEBUG(job_MACRO) \
+{ \
+ const gchar *class_name_MACRO = NULL; \
+ if (BRASERO_IS_JOB (job_MACRO)) \
+ class_name_MACRO = G_OBJECT_TYPE_NAME (job_MACRO); \
+ brasero_job_log_message (job_MACRO, G_STRLOC, \
+ "%s called %s", \
+ class_name_MACRO, \
+ G_STRFUNC); \
+}
#define BRASERO_JOB_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_JOB, BraseroJobPrivate))
@@ -1821,6 +1827,9 @@
va_start (arg_list, format);
brasero_burn_session_logv (session, format, arg_list);
+ va_end (arg_list);
+
+ va_start (arg_list, format);
brasero_burn_debug_messagev (location, format, arg_list);
va_end (arg_list);
}
Modified: branches/video/src/burn-medium-monitor.c
==============================================================================
--- branches/video/src/burn-medium-monitor.c (original)
+++ branches/video/src/burn-medium-monitor.c Sun Jun 29 18:39:36 2008
@@ -21,6 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Modified: branches/video/src/burn-medium.h
==============================================================================
--- branches/video/src/burn-medium.h (original)
+++ branches/video/src/burn-medium.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-plugin-manager.c
==============================================================================
--- branches/video/src/burn-plugin-manager.c (original)
+++ branches/video/src/burn-plugin-manager.c Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-plugin-manager.h
==============================================================================
--- branches/video/src/burn-plugin-manager.h (original)
+++ branches/video/src/burn-plugin-manager.h Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-plugin.c
==============================================================================
--- branches/video/src/burn-plugin.c (original)
+++ branches/video/src/burn-plugin.c Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-plugin.h
==============================================================================
--- branches/video/src/burn-plugin.h (original)
+++ branches/video/src/burn-plugin.h Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-task-ctx.c
==============================================================================
--- branches/video/src/burn-task-ctx.c (original)
+++ branches/video/src/burn-task-ctx.c Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-task-ctx.h
==============================================================================
--- branches/video/src/burn-task-ctx.h (original)
+++ branches/video/src/burn-task-ctx.h Sun Jun 29 18:39:36 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-task-item.c
==============================================================================
--- branches/video/src/burn-task-item.c (original)
+++ branches/video/src/burn-task-item.c Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn-task-item.h
==============================================================================
--- branches/video/src/burn-task-item.h (original)
+++ branches/video/src/burn-task-item.h Sun Jun 29 18:39:36 2008
@@ -1,6 +1,6 @@
/*
* brasero
- * Copyright (C) Philippe Rouquier 2007 <bonfire-app wanadoo fr>
+ * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
*
* brasero is free software.
*
Modified: branches/video/src/burn.c
==============================================================================
--- branches/video/src/burn.c (original)
+++ branches/video/src/burn.c Sun Jun 29 18:39:36 2008
@@ -162,9 +162,7 @@
va_list arg_list;
va_start (arg_list, format);
-
brasero_burn_session_logv (priv->session, format, arg_list);
-
va_end (arg_list);
}
Modified: branches/video/src/main.c
==============================================================================
--- branches/video/src/main.c (original)
+++ branches/video/src/main.c Sun Jun 29 18:39:36 2008
@@ -679,7 +679,7 @@
GTK_BUTTONS_CLOSE,
_("Incompatible command line options used:"));
- gtk_window_set_title (GTK_WINDOW (message), _("Incompatible options"));
+ gtk_window_set_title (GTK_WINDOW (message), _("Incompatible Options"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("only one option can be given at a time."));
Modified: branches/video/src/plugins/cdrtools/burn-cdrecord.c
==============================================================================
--- branches/video/src/plugins/cdrtools/burn-cdrecord.c (original)
+++ branches/video/src/plugins/cdrtools/burn-cdrecord.c Sun Jun 29 18:39:36 2008
@@ -825,8 +825,10 @@
if (!rawpath)
BRASERO_JOB_NOT_READY (cdrecord);
- if (flags & BRASERO_BURN_FLAG_DAO)
- return BRASERO_BURN_ERR;
+ /* NOTE: we ignore DAO flag on purpose since it isn't
+ * implemented yet. Don't error out since there is no
+ * way for us to tell that we don't support this flag
+ * for this specific input. */
g_ptr_array_add (argv, g_strdup ("fs=16m"));
g_ptr_array_add (argv, g_strdup ("-raw96r"));
Modified: branches/video/src/plugins/gstreamer/burn-transcode.c
==============================================================================
--- branches/video/src/plugins/gstreamer/burn-transcode.c (original)
+++ branches/video/src/plugins/gstreamer/burn-transcode.c Sun Jun 29 18:39:36 2008
@@ -1017,7 +1017,7 @@
output = NULL;
brasero_job_get_audio_output (BRASERO_JOB (transcode), &output);
- fd = open (output, O_WRONLY | O_CREAT | O_APPEND);
+ fd = open (output, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU | S_IRGRP | S_IROTH);
g_free (output);
if (fd == -1) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
