[Goodies-commits] r5931 - in xfburn/trunk: . icons/16x16 icons/22x22 icons/24x24 icons/32x32 icons/48x48 icons/scalable xfburn
David Mohr
squisher at xfce.org
Mon Nov 3 07:14:41 CET 2008
Author: squisher
Date: 2008-11-03 06:14:41 +0000 (Mon, 03 Nov 2008)
New Revision: 5931
Modified:
xfburn/trunk/CONTRIBUTORS
xfburn/trunk/NEWS
xfburn/trunk/README
xfburn/trunk/TODO
xfburn/trunk/configure.in.in
xfburn/trunk/icons/16x16/Makefile.am
xfburn/trunk/icons/22x22/Makefile.am
xfburn/trunk/icons/24x24/Makefile.am
xfburn/trunk/icons/32x32/Makefile.am
xfburn/trunk/icons/48x48/Makefile.am
xfburn/trunk/icons/scalable/Makefile.am
xfburn/trunk/xfburn/xfburn-compositions-notebook.c
xfburn/trunk/xfburn/xfburn-main-window.c
xfburn/trunk/xfburn/xfburn-stock.c
xfburn/trunk/xfburn/xfburn-stock.h
xfburn/trunk/xfburn/xfburn-welcome-tab.c
Log:
* Add some icons
* Update README, NEWS
* Bump version number
Modified: xfburn/trunk/CONTRIBUTORS
===================================================================
--- xfburn/trunk/CONTRIBUTORS 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/CONTRIBUTORS 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,2 +1,7 @@
Jérôme Guelfucci (resizable column patch, see bug #2930)
Jari Rahkonen (translatable blanking modes, see bug #4223)
+
+ICONS:
+jean_victor_balin (double_note_two, placed in the public domain:
+ http://openclipart.org/media/files/jean_victor_balin/8666 )
+tango-icon-theme
Modified: xfburn/trunk/NEWS
===================================================================
--- xfburn/trunk/NEWS 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/NEWS 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,7 +1,9 @@
-xfburn 0.3.3 (2008-XX-XX)
+xfburn 0.3.91 (2008-XX-XX)
============-------------
-- Burn audio CDs from uncompressed CD audio .wav files
+- Use gstreamer to decompress any supported audio files to burn an audio CD ("gst" transcoder)
+ NOTE: support for this is new, and not too unlikely to have some bugs ;-)
+- Burn audio CDs from uncompressed CD audio .wav files ("basic" transcoder)
- Allow drags and drop from file managers like Thunar (text/uri-list target)
- Require HAL if compiled with HAL support
- Try to unmount a drive if it is not accessible (requires thunar-vfs)
Modified: xfburn/trunk/README
===================================================================
--- xfburn/trunk/README 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/README 2008-11-03 06:14:41 UTC (rev 5931)
@@ -2,7 +2,7 @@
xfburn
------
-Version 0.3.2, 2008-07-xx
+Version 0.3.91, 2008-07-xx
http://www.xfce.org/projects/xfburn/
@@ -25,21 +25,35 @@
* Burn ISO images
* Blank discs
* Format and deformat DVD-RW discs
+ * Audio CD support
-----------------------
-Experimential Features
-----------------------
+------------------------
+Audio CD support details
+------------------------
- * Audio CD support
-Now included is some very basic audio CD support. Right now only CD-quality,
-uncompressed (PCM) Wave files can be added to an audio compilation. Use i.e.
-your favority audio player with a disc writer output mode / plugin to
-decompress your existing audio files. If .wav files are added to the
-compilation, their headers get checked to make sure they are of the right
-format. Note that this check is not very well tested (in particular it's not
-likely to work on big-endian machines like PowerPC), since it is likely to
-get replaced in the near future.
+Included are two transcoders: basic, which just passes through uncompressed
+wav data, and gst (gstreamer), which can decode any audio file for which a
+gstreamer plugin is present.
+The basic transcoder:
+Only CD-quality, uncompressed (PCM) Wave files can be added to an audio
+compilation. Use i.e. your favority audio player with a disc writer output
+mode / plugin to decompress your existing audio files. If .wav files are added
+to the compilation, their headers get checked to make sure they are of the
+right format. Note that this check is not very well tested (in particular it's
+not likely to work on big-endian machines like PowerPC). It does not require
+any external libraries
+
+The gst transcoder:
+Based on the gstreamer library, it can decode pretty much any audio content,
+as long as you have the appropriate plugins installed. Note that by default
+most distributions do _not_ install these plugins. But a simple search for
+gstreamer plugins in your package manager should quickly allow you to install
+them.
+
+You can at startup switch between the transcoders, see the command line help
+for more information.
+
==============================================================================
Requirements
------------
@@ -52,6 +66,8 @@
also for automatic disc unmounting)
* thunar-vfs (required for some drag and drop code, icons and automatic disc
unmounting)
+ * gstreamer (0.10+, required for burning audio CDs from compressed music
+ files)
The author works with both hal and thunar-vfs enabled, so there might be the
occasional bug that breaks compilation without these components. Xfburn should
@@ -66,7 +82,6 @@
Missing functionality that we plan to add:
* Save and load compositions
* Verification
- * Burn audio CDs
* Copy discs (needs backend support)
* Automatic checksum creation
* Blu-ray support
Modified: xfburn/trunk/TODO
===================================================================
--- xfburn/trunk/TODO 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/TODO 2008-11-03 06:14:41 UTC (rev 5931)
@@ -44,3 +44,4 @@
disc status should get refreshed
- cairo animation for blanking progress
- allow usage of gtk bookmarks
+- check compilation size against free space on inserted media (I thought that was already in place?)
Modified: xfburn/trunk/configure.in.in
===================================================================
--- xfburn/trunk/configure.in.in 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/configure.in.in 2008-11-03 06:14:41 UTC (rev 5931)
@@ -3,7 +3,7 @@
dnl Version information
m4_define([xfburn_version_major], [0])
m4_define([xfburn_version_minor], [3])
-m4_define([xfburn_version_micro], [3])
+m4_define([xfburn_version_micro], [91])
m4_define([xfburn_version_build], [@REVISION@])
m4_define([xfburn_version_tag], [svn])
m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfburn_version_micro()ifelse(xfburn_version_tag(), [svn], [xfburn_version_tag()-xfburn_version_build()], [xfburn_version_tag()])])
Modified: xfburn/trunk/icons/16x16/Makefile.am
===================================================================
--- xfburn/trunk/icons/16x16/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/16x16/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,8 +1,10 @@
iconsdir = $(datadir)/icons/hicolor/16x16/stock/media
icons_DATA = \
stock_xfburn-blank-cdrw.png \
+ stock_xfburn-audio-cd.png \
stock_xfburn-burn-cd.png \
stock_xfburn-data-copy.png \
+ stock_xfburn-new-data-composition.png \
stock_xfburn-import-session.png
EXTRA_DIST = \
Modified: xfburn/trunk/icons/22x22/Makefile.am
===================================================================
--- xfburn/trunk/icons/22x22/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/22x22/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,8 +1,10 @@
iconsdir = $(datadir)/icons/hicolor/22x22/stock/media
icons_DATA = \
stock_xfburn-blank-cdrw.png \
+ stock_xfburn-audio-cd.png \
stock_xfburn-burn-cd.png \
stock_xfburn-data-copy.png \
+ stock_xfburn-new-data-composition.png \
stock_xfburn-import-session.png
EXTRA_DIST = \
Modified: xfburn/trunk/icons/24x24/Makefile.am
===================================================================
--- xfburn/trunk/icons/24x24/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/24x24/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -3,8 +3,10 @@
stock_xfburn-audio-copy.png \
stock_xfburn-blank-cdrw.png \
stock_xfburn-format-dvdrw.png \
+ stock_xfburn-audio-cd.png \
stock_xfburn-burn-cd.png \
stock_xfburn-data-copy.png \
+ stock_xfburn-new-data-composition.png \
stock_xfburn-import-session.png
EXTRA_DIST = \
Modified: xfburn/trunk/icons/32x32/Makefile.am
===================================================================
--- xfburn/trunk/icons/32x32/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/32x32/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,8 +1,10 @@
iconsdir = $(datadir)/icons/hicolor/32x32/stock/media
icons_DATA = \
stock_xfburn-blank-cdrw.png \
+ stock_xfburn-audio-cd.png \
stock_xfburn-burn-cd.png \
stock_xfburn-data-copy.png \
+ stock_xfburn-new-data-composition.png \
stock_xfburn-import-session.png
EXTRA_DIST = \
Modified: xfburn/trunk/icons/48x48/Makefile.am
===================================================================
--- xfburn/trunk/icons/48x48/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/48x48/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,8 +1,10 @@
iconsdir = $(datadir)/icons/hicolor/48x48/stock/media
icons_DATA = \
stock_xfburn-blank-cdrw.png \
+ stock_xfburn-audio-cd.png \
stock_xfburn-burn-cd.png \
stock_xfburn-data-copy.png \
+ stock_xfburn-new-data-composition.png \
stock_xfburn-import-session.png
EXTRA_DIST = \
Modified: xfburn/trunk/icons/scalable/Makefile.am
===================================================================
--- xfburn/trunk/icons/scalable/Makefile.am 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/icons/scalable/Makefile.am 2008-11-03 06:14:41 UTC (rev 5931)
@@ -1,8 +1,10 @@
iconsdir = $(datadir)/icons/hicolor/scalable/stock/media
icons_DATA = \
stock_xfburn-blank-cdrw.svg \
+ stock_xfburn-audio-cd.svg \
stock_xfburn-burn-cd.svg \
stock_xfburn-data-copy.svg \
+ stock_xfburn-new-data-composition.svg \
stock_xfburn-import-session.svg
EXTRA_DIST = \
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-11-03 06:14:41 UTC (rev 5931)
@@ -246,7 +246,9 @@
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
+ if (page_num > 0)
+ /* don't close the welcome page */
+ gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
}
void
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2008-11-03 06:14:41 UTC (rev 5931)
@@ -41,6 +41,7 @@
#include "xfburn-progress-dialog.h"
#include "xfburn-settings.h"
#include "xfburn-main.h"
+#include "xfburn-stock.h"
#define XFBURN_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_MAIN_WINDOW, XfburnMainWindowPrivate))
@@ -102,9 +103,9 @@
/*{"new-composition", GTK_STOCK_NEW, N_("_New composition"), "", N_("Create a new composition"),},*/
/*{"new-composition", GTK_STOCK_NEW, N_("_New composition"), NULL, N_("Create a new composition"),
G_CALLBACK (action_new_data_composition),}, */
- {"new-data-composition", GTK_STOCK_HARDDISK, N_("New data composition"), "<Control><Alt>e", N_("New data composition"),
+ {"new-data-composition", XFBURN_STOCK_NEW_DATA_COMPOSITION, N_("New data composition"), "<Control><Alt>e", N_("New data composition"),
G_CALLBACK (action_new_data_composition),},
- {"new-audio-composition", "audio-x-generic", N_("New audio composition"), "<Control><Alt>A", N_("New audio composition"),
+ {"new-audio-composition", XFBURN_STOCK_AUDIO_CD, N_("New audio composition"), "<Control><Alt>A", N_("New audio composition"),
G_CALLBACK (action_new_audio_composition),},
/*{"load-composition", GTK_STOCK_OPEN, N_("Load composition"), NULL, N_("Load composition"),
G_CALLBACK (action_load),},
@@ -483,7 +484,7 @@
{
//XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
- xfburn_main_window_add_data_composition_with_files (window, 0, NULL);
+ xfburn_main_window_add_audio_composition_with_files (window, 0, NULL);
}
static void
@@ -548,11 +549,11 @@
icon = xfce_themed_icon_load (GTK_STOCK_CDROM, x);
info = xfce_about_info_new ("Xfburn", VERSION, _("Another cd burning GUI"),
- XFCE_COPYRIGHT_TEXT ("2005-2008", "Jean-François Wauthy, Mario Đanić, David Mohr"), XFCE_LICENSE_GPL);
+ XFCE_COPYRIGHT_TEXT ("2005-2008", "Jean-François Wauthy, David Mohr, Mario Đanić"), XFCE_LICENSE_GPL);
xfce_about_info_set_homepage (info, "http://www.xfce.org/projects/xfburn");
+ xfce_about_info_add_credit (info, "David Mohr", "david at mcbf.net", _("Author/Maintainer"));
xfce_about_info_add_credit (info, "Jean-François Wauthy", "pollux at xfce.org", _("Author/Maintainer"));
xfce_about_info_add_credit (info, "Mario Đanić", "mario at libburnia-project.org", _("Author/Maintainer"));
- xfce_about_info_add_credit (info, "David Mohr", "david at mcbf.net", _("Author/Maintainer"));
for (n = 0; n < G_N_ELEMENTS (translators); ++n) {
Modified: xfburn/trunk/xfburn/xfburn-stock.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-stock.c 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/xfburn/xfburn-stock.c 2008-11-03 06:14:41 UTC (rev 5931)
@@ -33,10 +33,12 @@
XFBURN_STOCK_AUDIO_COPY,
XFBURN_STOCK_BLANK_CDRW,
XFBURN_STOCK_FORMAT_DVDRW,
+ XFBURN_STOCK_AUDIO_CD,
XFBURN_STOCK_BURN_CD,
XFBURN_STOCK_CD,
XFBURN_STOCK_DATA_COPY,
XFBURN_STOCK_IMPORT_SESSION,
+ XFBURN_STOCK_NEW_DATA_COMPOSITION,
};
void
Modified: xfburn/trunk/xfburn/xfburn-stock.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-stock.h 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/xfburn/xfburn-stock.h 2008-11-03 06:14:41 UTC (rev 5931)
@@ -22,13 +22,15 @@
G_BEGIN_DECLS;
-#define XFBURN_STOCK_AUDIO_COPY "xfburn-audio-copy"
-#define XFBURN_STOCK_BLANK_CDRW "xfburn-blank-cdrw"
-#define XFBURN_STOCK_FORMAT_DVDRW "xfburn-format-dvdrw"
-#define XFBURN_STOCK_BURN_CD "xfburn-burn-cd"
-#define XFBURN_STOCK_CD "xfburn-cd"
-#define XFBURN_STOCK_DATA_COPY "xfburn-data-copy"
-#define XFBURN_STOCK_IMPORT_SESSION "xfburn-import-session"
+#define XFBURN_STOCK_AUDIO_COPY "xfburn-audio-copy"
+#define XFBURN_STOCK_BLANK_CDRW "xfburn-blank-cdrw"
+#define XFBURN_STOCK_FORMAT_DVDRW "xfburn-format-dvdrw"
+#define XFBURN_STOCK_AUDIO_CD "xfburn-audio-cd"
+#define XFBURN_STOCK_BURN_CD "xfburn-burn-cd"
+#define XFBURN_STOCK_CD "xfburn-cd"
+#define XFBURN_STOCK_DATA_COPY "xfburn-data-copy"
+#define XFBURN_STOCK_IMPORT_SESSION "xfburn-import-session"
+#define XFBURN_STOCK_NEW_DATA_COMPOSITION "xfburn-new-data-composition"
void xfburn_stock_init (void);
Modified: xfburn/trunk/xfburn/xfburn-welcome-tab.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-11-03 00:35:37 UTC (rev 5930)
+++ xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-11-03 06:14:41 UTC (rev 5931)
@@ -143,7 +143,7 @@
gtk_widget_show (priv->button_image);
g_signal_connect (G_OBJECT(priv->button_image), "clicked", G_CALLBACK(burn_image), obj);
- priv->button_data_comp = create_welcome_button (GTK_STOCK_NEW, _("<big>New _Data Composition</big>"), _("Create a new data disc with the files of your choosing"));
+ priv->button_data_comp = create_welcome_button (XFBURN_STOCK_NEW_DATA_COMPOSITION, _("<big>New _Data Composition</big>"), _("Create a new data disc with the files of your choosing"));
gtk_table_attach_defaults (GTK_TABLE (table), priv->button_data_comp, 1, 2, 0, 1);
gtk_widget_show (priv->button_data_comp);
g_signal_connect (G_OBJECT(priv->button_data_comp), "clicked", G_CALLBACK(new_data_composition), obj);
@@ -153,7 +153,7 @@
gtk_widget_show (priv->button_blank);
g_signal_connect (G_OBJECT(priv->button_blank), "clicked", G_CALLBACK(blank_disc), obj);
- priv->button_audio_comp = create_welcome_button (GTK_STOCK_CDROM, _("<big>_Audio CD</big>"), _("Audio CD playable in regular stereos"));
+ priv->button_audio_comp = create_welcome_button (XFBURN_STOCK_AUDIO_CD, _("<big>_Audio CD</big>"), _("Audio CD playable in regular stereos"));
gtk_table_attach_defaults (GTK_TABLE (table), priv->button_audio_comp, 1, 2, 1, 2);
gtk_widget_show (priv->button_audio_comp);
g_signal_connect (G_OBJECT(priv->button_audio_comp), "clicked", G_CALLBACK(new_audio_cd), obj);
More information about the Goodies-commits
mailing list