Re: [Rhythmbox-devel] burner fixes



Hi,

Updated patch. Added a few other GTK+ 2.5 things: use GtkAboutDialog, new GTK_STOCK_MEDIA_* icons.

Look ok?

Jon
* looking for rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-148 to compare with
* comparing to rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-148
D  data/art/.arch-ids/rhythmbox-next.png.id
D  data/art/.arch-ids/rhythmbox-pause.png.id
D  data/art/.arch-ids/rhythmbox-play.png.id
D  data/art/.arch-ids/rhythmbox-previous.png.id
D  data/art/.arch-ids/rhythmbox-rewind.png.id
D  data/art/.arch-ids/rhythmbox-stop.png.id
D  data/art/rhythmbox-next.png
D  data/art/rhythmbox-pause.png
D  data/art/rhythmbox-play.png
D  data/art/rhythmbox-previous.png
D  data/art/rhythmbox-rewind.png
D  data/art/rhythmbox-stop.png
D  widgets/.arch-ids/gst-hig-dialog.c.id
D  widgets/.arch-ids/gst-hig-dialog.h.id
D  widgets/gst-hig-dialog.c
D  widgets/gst-hig-dialog.h
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-3
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-4
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-5
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-6
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-7
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-8
M  widgets/Makefile.am
M  data/art/Makefile.am
M  lib/rb-stock-icons.h
M  widgets/rb-dialog.c
M  lib/rb-stock-icons.c
M  shell/rb-shell.c
M  shell/rb-shell-player.c
M  sources/rb-playlist-source-recorder.c
M  configure.ac
M  AUTHORS
M  data/ui/rhythmbox-ui.xml

* modified files

--- orig/AUTHORS
+++ mod/AUTHORS
@@ -25,3 +25,4 @@
 Jeffrey Yasskin <jyasskin mail utexas edu>
 Christophe Fergeau <teuf gnome org>
 David Dollar <david grepninja com>
+William Jon McCann <mccann jhu edu>


--- orig/configure.ac
+++ mod/configure.ac
@@ -56,7 +56,7 @@
 fi
 
 PKG_CHECK_MODULES(RHYTHMBOX,                    \
-                  gtk+-2.0 >= 2.4               \
+                  gtk+-2.0 >= 2.5.4             \
                   libgnomeui-2.0                \
 		  libglade-2.0                  \
 		  gnome-vfs-2.0 >= 2.6          \


--- orig/data/art/Makefile.am
+++ mod/data/art/Makefile.am
@@ -1,12 +1,6 @@
 ## arch-tag: Automake rules for included art
 
-art_DATA = rhythmbox-next.png          \
-	   rhythmbox-play.png          \
-	   rhythmbox-pause.png         \
-	   rhythmbox-stop.png          \
-	   rhythmbox-previous.png      \
-	   rhythmbox-rewind.png	       \
-	   rhythmbox-shuffle.png       \
+art_DATA = rhythmbox-shuffle.png       \
 	   rhythmbox-visuals.png       \
 	   rhythmbox-repeat.png        \
 	   rhythmbox-playlist.png      \


--- orig/data/ui/rhythmbox-ui.xml
+++ mod/data/ui/rhythmbox-ui.xml
@@ -107,12 +107,14 @@
   </popup>
 
   <popup name="PlaylistSourcePopup">
+    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
     <menuitem name="DeletePlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
   </popup>
 
   <popup name="SmartPlaylistSourcePopup">
     <menuitem name="EditSmartPlaylistPopup" action="EditAutomaticPlaylist"/>
     <separator/>
+    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
     <menuitem name="DeleteSmartPlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
   </popup>
 


--- orig/lib/rb-stock-icons.c
+++ mod/lib/rb-stock-icons.c
@@ -37,12 +37,6 @@
 
 	static const char *items[] =
 	{
-		RB_STOCK_PLAY,
-		RB_STOCK_PAUSE,
-		RB_STOCK_STOP,
-		RB_STOCK_PREVIOUS,
-		RB_STOCK_NEXT,
-		RB_STOCK_REWIND,
 		RB_STOCK_SHUFFLE,
 		RB_STOCK_REPEAT,
 		RB_STOCK_VISUALS,


--- orig/lib/rb-stock-icons.h
+++ mod/lib/rb-stock-icons.h
@@ -25,12 +25,6 @@
 
 G_BEGIN_DECLS
 
-#define RB_STOCK_PLAY          "rhythmbox-play"
-#define RB_STOCK_PAUSE         "rhythmbox-pause"
-#define RB_STOCK_STOP          "rhythmbox-stop"
-#define RB_STOCK_PREVIOUS      "rhythmbox-previous"
-#define RB_STOCK_NEXT          "rhythmbox-next"
-#define RB_STOCK_REWIND        "rhythmbox-rewind"
 #define RB_STOCK_SHUFFLE       "rhythmbox-shuffle"
 #define RB_STOCK_REPEAT        "rhythmbox-repeat"
 #define RB_STOCK_VISUALS       "rhythmbox-visuals"


--- orig/shell/rb-shell-player.c
+++ mod/shell/rb-shell-player.c
@@ -254,10 +254,10 @@
 
 static GtkActionEntry rb_shell_player_actions [] =
 {
-	{ "ControlPrevious", RB_STOCK_PREVIOUS, N_("P_revious"), "<control>Left",
+	{ "ControlPrevious", GTK_STOCK_MEDIA_PREVIOUS, N_("P_revious"), "<control>Left",
 	  N_("Start playing the previous song"),
 	  G_CALLBACK (rb_shell_player_cmd_previous) },
-	{ "ControlNext", RB_STOCK_NEXT, N_("_Next"), "<control>Right",
+	{ "ControlNext", GTK_STOCK_MEDIA_NEXT, N_("_Next"), "<control>Right",
 	  N_("Start playing the next song"),
 	  G_CALLBACK (rb_shell_player_cmd_next) },
 	{ "MusicProperties", GTK_STOCK_PROPERTIES, N_("_Properties"), "<control>P",
@@ -268,21 +268,21 @@
 
 static GtkActionEntry rb_shell_player_play_action [] =
 {
-	{ "ControlPlay", RB_STOCK_PLAY, N_("_Play"), "<control>space",
+	{ "ControlPlay", GTK_STOCK_MEDIA_PLAY, N_("_Play"), "<control>space",
 	  N_("Start playback"),
 	  G_CALLBACK (rb_shell_player_cmd_play) },
 };
 
 static GtkActionEntry rb_shell_player_pause_action [] =
 {
-	{ "ControlPause", RB_STOCK_PAUSE, N_("_Pause"), "<control>space",
+	{ "ControlPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause"), "<control>space",
 	  N_("Pause playback"),
 	  G_CALLBACK (rb_shell_player_cmd_pause) },
 };
 
 static GtkActionEntry rb_shell_player_stop_action [] =
 {
-	{ "ControlStop", RB_STOCK_STOP, N_("_Stop"), "<control>space",
+	{ "ControlStop", GTK_STOCK_MEDIA_STOP, N_("_Stop"), "<control>space",
 	  N_("Stop playback"),
 	  G_CALLBACK (rb_shell_player_cmd_stop) },
 };
@@ -598,7 +598,7 @@
 	gtk_tooltips_enable (player->priv->tooltips);
 
 	/* Previous button */
-	image = rb_image_new_from_stock (RB_STOCK_PREVIOUS,
+	image = rb_image_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS,
 					 GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	player->priv->prev_button = gtk_button_new ();
@@ -610,13 +610,13 @@
 			      _("Play previous song"), NULL);
 
 	/* Button images */
-	player->priv->play_image = rb_image_new_from_stock (RB_STOCK_PLAY,
+	player->priv->play_image = rb_image_new_from_stock (GTK_STOCK_MEDIA_PLAY,
 							    GTK_ICON_SIZE_LARGE_TOOLBAR);
 	g_object_ref (player->priv->play_image);
-	player->priv->pause_image = rb_image_new_from_stock (RB_STOCK_PAUSE,
+	player->priv->pause_image = rb_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE,
 							     GTK_ICON_SIZE_LARGE_TOOLBAR);
 	g_object_ref (player->priv->pause_image);
-	player->priv->stop_image = rb_image_new_from_stock (RB_STOCK_STOP,
+	player->priv->stop_image = rb_image_new_from_stock (GTK_STOCK_MEDIA_STOP,
 							    GTK_ICON_SIZE_LARGE_TOOLBAR);
 	g_object_ref (player->priv->stop_image);
 
@@ -628,7 +628,7 @@
 				  "clicked", G_CALLBACK (rb_shell_player_playpause), player);
 
 	/* Next button */
-	image = rb_image_new_from_stock (RB_STOCK_NEXT,
+	image = rb_image_new_from_stock (GTK_STOCK_MEDIA_NEXT,
 					 GTK_ICON_SIZE_LARGE_TOOLBAR);
 	player->priv->next_button = gtk_button_new ();
 	gtk_container_add (GTK_CONTAINER (player->priv->next_button), image);


--- orig/shell/rb-shell.c
+++ mod/shell/rb-shell.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  arch-tag: Implementation of main Rhythmbox shell
  *
@@ -29,7 +30,6 @@
 #include <libgnome/gnome-init.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-window-icon.h>
-#include <libgnomeui/gnome-about.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
@@ -350,7 +350,7 @@
 	{ "MusicImportCD", GTK_STOCK_CDROM, N_("Import _Audio CD..."), "<control>E",
 	  N_("Extract and import songs from a CD"),
 	  G_CALLBACK (rb_shell_cmd_extract_cd) },
-	{ "HelpAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL,
+	{ "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
 	  N_("Show information about the music player"),
 	  G_CALLBACK (rb_shell_cmd_about) },
 	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
@@ -1481,7 +1481,6 @@
 {
 	const char **tem;
 	GString *comment;
-	static GtkWidget *about = NULL;
 	GdkPixbuf *pixbuf = NULL;
 
 	const char *authors[] = {
@@ -1503,11 +1502,6 @@
 
 	const char *translator_credits = _("translator_credits");
 
-	if (about != NULL) {
-		gtk_window_present (GTK_WINDOW (about));
-		return;
-	}
-
 	pixbuf = gdk_pixbuf_new_from_file (rb_file ("about-logo.png"), NULL);
 
 	authors[0] = _("Maintainers:");
@@ -1547,20 +1541,17 @@
 		g_string_free (formats, TRUE);
 	}
 #endif
-	about = gnome_about_new ("Rhythmbox", VERSION,
-				 "Copyright \xc2\xa9 2003, 2004 Colin Walters\nCopyright \xc2\xa9 2002, 2003 Jorn Baayen",
-				 comment->str,
-				 (const char **) authors,
-				 (const char **) documenters,
-				 strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
-				 pixbuf);
+	gtk_show_about_dialog (GTK_WINDOW (shell->priv->window),
+			       "name", "Rhythmbox",
+			       "version", VERSION,
+			       "copyright", "Copyright \xc2\xa9 2003, 2004 Colin Walters\nCopyright \xc2\xa9 2002, 2003 Jorn Baayen",
+			       "comments", comment->str,
+			       "authors", (const char **) authors,
+			       "documenters", (const char **) documenters,
+			       "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
+			       "logo", pixbuf,
+			       NULL);
 	g_string_free (comment, TRUE);
-	gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (shell->priv->window));
-
-	g_object_add_weak_pointer (G_OBJECT (about),
-				   (gpointer) &about);
-
-	gtk_widget_show (about);
 }
 
 static void


--- orig/sources/rb-playlist-source-recorder.c
+++ mod/sources/rb-playlist-source-recorder.c
@@ -43,7 +43,6 @@
 #include "rb-playlist-source-recorder.h"
 #include "rb-debug.h"
 #include "eel-gconf-extensions.h"
-#include "gst-hig-dialog.h"
 
 #ifndef HAVE_MKDTEMP
 #include "mkdtemp.h"
@@ -113,7 +112,7 @@
         LAST_SIGNAL
 } RBPlaylistSourceRecorderSignalType;
 
-static guint rb_playlist_source_recorder_signals[LAST_SIGNAL] = { 0 };
+static guint rb_playlist_source_recorder_signals [LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE(RBPlaylistSourceRecorder, rb_playlist_source_recorder, GTK_TYPE_DIALOG)
 
@@ -150,7 +149,7 @@
 
         g_type_class_add_private (klass, sizeof (RBPlaylistSourceRecorderPrivate));
 
-        rb_playlist_source_recorder_signals[NAME_CHANGED] =
+        rb_playlist_source_recorder_signals [NAME_CHANGED] =
                 g_signal_new ("name_changed",
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
@@ -161,7 +160,7 @@
                               1,
                               G_TYPE_STRING);
         
-        rb_playlist_source_recorder_signals[FILE_ADDED] =
+        rb_playlist_source_recorder_signals [FILE_ADDED] =
                 g_signal_new ("file_added",
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
@@ -281,16 +280,20 @@
         g_vasprintf (&text, secondary, args);
         va_end (args);
 
-        dialog = gst_hig_dialog_new (GTK_WINDOW (source),
-                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                     GST_HIG_MESSAGE_ERROR,
-                                     primary, text,
-                                     _("Close"), GTK_RESPONSE_CLOSE,
-                                     NULL);
+        dialog = gtk_message_dialog_new (GTK_WINDOW (source),
+                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         GTK_MESSAGE_ERROR,
+                                         GTK_BUTTONS_CLOSE,
+                                         primary);
+
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                  text);
 
         gtk_window_set_title (GTK_WINDOW (dialog),
                               _("Error creating audio CD"));
 
+        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+
         g_signal_connect (dialog,
                           "response",
                           G_CALLBACK (error_dialog_response_cb),
@@ -301,6 +304,23 @@
         g_free (text);
 }
 
+static void
+album_progress_set_fraction (GtkWidget *progress,
+                             gdouble    fraction)
+{
+        char *text;
+
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), fraction);
+
+        if (fraction > 0)
+                text = g_strdup_printf (_("%.0f%% complete"), fraction * 100);
+        else
+                text = g_strdup (" ");
+
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), text);
+        g_free (text);
+}
+
 static gboolean
 burn_cd (RBPlaylistSourceRecorder *source,
          GError                  **error)
@@ -312,7 +332,7 @@
         set_message_text (source, _("Burning audio to CD"));
 
         gtk_widget_hide (GTK_WIDGET (source->priv->track_progress_frame));
-        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->album_progress), 0);
+        album_progress_set_fraction (source->priv->album_progress, 0);
 
         source->priv->burning = TRUE;
         res = rb_recorder_burn (source->priv->recorder, error);
@@ -333,7 +353,7 @@
         } else
                 set_message_text (source, _("Writing cancelled.  Try again?"));  
 
-        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->album_progress), 0);
+        album_progress_set_fraction (source->priv->album_progress, 0);
 
         gtk_widget_set_sensitive (GTK_WIDGET (source->priv->burn_button), TRUE);
         gtk_widget_set_sensitive (GTK_WIDGET (source->priv->options_box), TRUE);
@@ -341,6 +361,21 @@
         return res;
 }
 
+static char *
+get_song_description (RBRecorderSong *song)
+{
+        char *desc = NULL;
+
+        if (song->artist && song->title)
+                desc = g_strdup_printf ("%s - %s", song->artist, song->title);
+        else if (song->title)
+                desc = g_strdup (song->title);
+        else if (song->artist)
+                desc = g_strdup (song->artist);
+
+        return desc;
+}
+
 static void
 write_file (RBPlaylistSourceRecorder *source,
             GError                  **error)
@@ -351,14 +386,14 @@
         gtk_widget_set_sensitive (source->priv->track_progress_frame, TRUE);
         gtk_widget_set_sensitive (source->priv->album_progress_frame, TRUE);
 
-        if (song->artist && song->title)
-                cdtext = g_strdup_printf ("%s - %s", song->artist, song->title);
-        else if (song->title)
-                cdtext = g_strdup (song->title);
-        else if (song->artist)
-                cdtext = g_strdup (song->title);
+        cdtext = get_song_description (song);
 
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (source->priv->track_progress), cdtext);
+        
         rb_recorder_open (source->priv->recorder, song->uri, cdtext, error);
+
+        g_free (cdtext);
+
         if (error && *error) {
                 return;
         }
@@ -407,8 +442,7 @@
                 if (num > 0) {
                         float percent = CLAMP ((float)num / (float)total, 0, 1);
                         
-                        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->album_progress),
-                                                       percent);
+                        album_progress_set_fraction (source->priv->album_progress, percent);
                 }
                 write_file (source, &error);
                 if (error) {
@@ -462,7 +496,7 @@
 
 static void
 track_progress_changed_cb (GObject *object,
-                           double   fraction,
+                           gdouble  fraction,
                            gpointer data)
 {
         RBPlaylistSourceRecorder *source = RB_PLAYLIST_SOURCE_RECORDER (data);
@@ -477,8 +511,7 @@
 
         gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->track_progress),
                                        fraction);
-        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->album_progress),
-                                       album_fraction);
+        album_progress_set_fraction (source->priv->album_progress, album_fraction);
 }
 static void
 interrupt_burn_dialog_response_cb (GtkDialog *dialog,
@@ -519,14 +552,21 @@
 
                         source->priv->confirmed_exit = FALSE;
 
-                        interrupt_dialog = gst_hig_dialog_new (GTK_WINDOW (dialog),
-                                                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                               GST_HIG_MESSAGE_QUESTION,
-                                                               _("Do you wish to interrupt writing this disc?"),
-                                                               _("This may result in an unusable disc."),
-                                                               _("_Cancel"), GTK_RESPONSE_CANCEL,
-                                                               _("_Interrupt"), GTK_RESPONSE_ACCEPT,
-                                                               NULL);
+                        interrupt_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
+                                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                                   GTK_MESSAGE_QUESTION,
+                                                                   GTK_BUTTONS_NONE,
+                                                                   _("Do you wish to interrupt writing this disc?"));
+
+                        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (interrupt_dialog),
+                                                                  _("This may result in an unusable disc."));
+
+                        gtk_container_set_border_width (GTK_CONTAINER (interrupt_dialog), 6);
+
+                        gtk_dialog_add_buttons (GTK_DIALOG (interrupt_dialog),
+                                                _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                                _("_Interrupt"), GTK_RESPONSE_ACCEPT,
+                                                NULL);
 
                         gtk_dialog_set_default_response (GTK_DIALOG (interrupt_dialog),
                                                          GTK_RESPONSE_CANCEL);
@@ -584,16 +624,18 @@
                 title = N_("Reload blank media");
         }
 
-        dialog = gst_hig_dialog_new (GTK_WINDOW (source),
-                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                     GST_HIG_MESSAGE_ERROR,
-                                     title,
-                                     msg,
-                                     _("Close"), GTK_RESPONSE_CLOSE,
-                                     NULL);
+        dialog = gtk_message_dialog_new (GTK_WINDOW (source),
+                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         GTK_MESSAGE_ERROR,
+                                         GTK_BUTTONS_CLOSE,
+                                         title);
+
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), msg);
 
         gtk_window_set_title (GTK_WINDOW (dialog), title);
 
+        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+
         g_signal_connect (dialog, "response",
                           G_CALLBACK (gtk_widget_destroy), NULL);
 
@@ -609,9 +651,7 @@
 {
         RBPlaylistSourceRecorder *source = RB_PLAYLIST_SOURCE_RECORDER (data);
 
-        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (source->priv->album_progress),
-                                       fraction);
-
+        album_progress_set_fraction (source->priv->album_progress, fraction);
 }
 
 static void
@@ -658,6 +698,7 @@
         int             font_size;
 	PangoAttrList  *pattrlist;
 	PangoAttribute *attr;
+        PangoFontDescription *fontdesc;
 
         source->priv = g_new0 (RBPlaylistSourceRecorderPrivate, 1);
         source->priv->gconf_client = gconf_client_get_default ();
@@ -696,8 +737,14 @@
         source->priv->vbox = glade_xml_get_widget (xml, "recorder_vbox");
 
         source->priv->message_label  = glade_xml_get_widget (xml, "message_label");
+
         source->priv->track_progress = glade_xml_get_widget (xml, "track_progress");
         source->priv->album_progress = glade_xml_get_widget (xml, "album_progress");
+        gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (source->priv->track_progress), PANGO_ELLIPSIZE_END);
+        gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (source->priv->album_progress), PANGO_ELLIPSIZE_END);
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (source->priv->track_progress), " ");
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (source->priv->album_progress), " ");
+
         source->priv->track_progress_frame = glade_xml_get_widget (xml, "track_progress_frame");
         source->priv->album_progress_frame = glade_xml_get_widget (xml, "album_progress_frame");
 
@@ -741,6 +788,13 @@
 
         pango_attr_list_unref (pattrlist);
 
+        fontdesc = pango_font_description_copy (GTK_WIDGET (source->priv->track_progress)->style->font_desc);
+        font_size = pango_font_description_get_size (fontdesc) * 0.8;
+        pango_font_description_set_size (fontdesc, font_size);
+        gtk_widget_modify_font (source->priv->track_progress, fontdesc);
+        gtk_widget_modify_font (source->priv->album_progress, fontdesc);
+        pango_font_description_free (fontdesc);
+
         gtk_box_pack_start (GTK_BOX (GTK_DIALOG (source)->vbox),
                             source->priv->vbox,
                             TRUE, TRUE, 0);
@@ -891,7 +945,7 @@
         source->priv->name = g_strdup (name);
 
         g_signal_emit (G_OBJECT (source),
-                       rb_playlist_source_recorder_signals[NAME_CHANGED],
+                       rb_playlist_source_recorder_signals [NAME_CHANGED],
                        0,
                        name);
 }
@@ -919,7 +973,7 @@
 
                 source->priv->songs = g_slist_append (source->priv->songs, song);
                 g_signal_emit (G_OBJECT (source),
-                               rb_playlist_source_recorder_signals[FILE_ADDED],
+                               rb_playlist_source_recorder_signals [FILE_ADDED],
                                0,
                                song->uri);
         } while (gtk_tree_model_iter_next (model, &iter));
@@ -1070,8 +1124,8 @@
                                                      "please insert it in the drive and try again."),
                                                    duration / 60);
                 } else if ((media_duration > 0) && (media_duration <= duration)) {
-                        message = g_strdup_printf (_("This playlist is %lld minutes long.  "
-                                                     "This exceeds the %lld  minute length of the media in the drive."),
+                        message = g_strdup_printf (_("This playlist is %" G_GINT64_FORMAT " minutes long.  "
+                                                     "This exceeds the %" G_GINT64_FORMAT " minute length of the media in the drive."),
                                                    duration / 60,
                                                    media_duration / 60);
                 }
@@ -1086,11 +1140,13 @@
                 }
 
                 if (!check_tmp_dir (source, error)) {
-                        guint64 bytes_needed = rb_playlist_source_recorder_estimate_total_size (source);
+                        guint64 mib_needed = rb_playlist_source_recorder_estimate_total_size (source) / 1048576;
+
                         error_dialog (source,
                                       _("Could not find temporary space!"),
-                                      _("Could not find enough temporary space to convert audio tracks.  Need %d MiB."),
-                                      bytes_needed / 1048576);
+                                      _("Could not find enough temporary space to convert audio tracks.  %" G_GUINT64_FORMAT " MiB required."),
+                                      mib_needed);
+
                         return;
                 }
 


--- orig/widgets/Makefile.am
+++ mod/widgets/Makefile.am
@@ -21,8 +21,6 @@
 	rb-druid.h					\
 	disclosure-widget.c				\
 	disclosure-widget.h				\
-	gst-hig-dialog.c				\
-	gst-hig-dialog.h				\
 	eggtrayicon.c					\
 	eggtrayicon.h					\
 	rb-dialog.c					\


--- orig/widgets/rb-dialog.c
+++ mod/widgets/rb-dialog.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  arch-tag: Implementation of Rhythmbox dialog wrapper functions
  *
@@ -30,7 +31,6 @@
 #include <stdarg.h>
 
 #include "rb-dialog.h"
-#include "gst-hig-dialog.h"
 #include "rb-stock-icons.h"
 
 void
@@ -47,18 +47,21 @@
 	g_vasprintf (&text, secondary, args);
 	va_end (args);
 
-	dialog = gst_hig_dialog_new (parent,
-				     GTK_DIALOG_DESTROY_WITH_PARENT,
-				     GST_HIG_MESSAGE_ERROR,
-				     primary, text,
-				     _("Close"), GTK_RESPONSE_ACCEPT,
-				     NULL);
-	g_signal_connect_object (G_OBJECT (dialog),
-				 "response",
-				 G_CALLBACK (gtk_widget_destroy),
-				 NULL, 0);
+	dialog = gtk_message_dialog_new (parent,
+					 GTK_DIALOG_DESTROY_WITH_PARENT,
+					 GTK_MESSAGE_ERROR,
+					 GTK_BUTTONS_CLOSE,
+					 primary);
+
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+						  text);
+
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+
 	gtk_dialog_run (GTK_DIALOG (dialog));
 
+	gtk_widget_destroy (dialog);
+
 	g_free (text);
 }
 



* added files

--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-3
@@ -0,0 +1,34 @@
+Revision: rhythmbox--main--0.9--patch-3
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Wed Sep 15 11:35:25 EDT 2004
+Standard-date: 2004-09-15 15:35:25 GMT
+Modified-files: ChangeLog configure.ac
+    player/rb-recorder-gst.c po/POTFILES.in po/POTFILES.skip
+    po/fr.po sources/rb-ipod-source.c
+    sources/rb-playlist-source-recorder.c
+    widgets/gst-hig-dialog.h widgets/rb-song-info.c
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-3
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-122
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-123
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-124
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-125
+Summary: Merge from mainline
+Keywords: 
+
+
+
+Patches applied:
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-122
+   
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-123
+   Explicitly add files with no taglines.
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-124
+   Switch to -std=gnu89 instead of -std=c89, fix compilation with that flag
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-125
+   Don't use G_GINT64_FORMAT since it makes the translators' job harder
+
--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-4
@@ -0,0 +1,198 @@
+Revision: rhythmbox--main--0.9--patch-4
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Mon Nov 15 19:12:16 EST 2004
+Standard-date: 2004-11-16 00:12:16 GMT
+New-files: help/C/figures/.arch-ids/rb-group-auto.png.id
+    help/C/figures/.arch-ids/rb-prefs-general.png.id
+    help/C/figures/.arch-ids/rb-prefs-ipod.png.id
+    help/C/figures/.arch-ids/rb-prefs-library.png.id
+    help/C/figures/.arch-ids/rb-statusbar.png.id
+    help/C/figures/.arch-ids/rb-window-small.png.id
+    help/C/figures/rb-group-auto.png
+    help/C/figures/rb-prefs-general.png
+    help/C/figures/rb-prefs-ipod.png
+    help/C/figures/rb-prefs-library.png
+    help/C/figures/rb-statusbar.png
+    help/C/figures/rb-window-small.png
+Modified-files: ChangeLog configure.ac
+    data/rhythmbox.desktop.in data/rhythmbox.schemas
+    data/ui/rhythmbox-ui.xml
+    help/C/figures/rb-asst-finish.png
+    help/C/figures/rb-asst-library.png
+    help/C/figures/rb-asst-start.png
+    help/C/figures/rb-context-menu.png
+    help/C/figures/rb-group-create.png
+    help/C/figures/rb-iradio-add.png
+    help/C/figures/rb-iradio.png
+    help/C/figures/rb-volume-changer.png
+    help/C/user-guide.xml lib/rb-preferences.h lib/rb-util.c
+    lib/rb-util.h lib/totem-pl-parser.c
+    lib/totem-pl-parser.h player/.arch-inventory
+    po/ChangeLog po/cs.po po/en_CA.po po/es.po po/hu.po
+    po/lt.po po/nb.po po/nl.po po/no.po po/pt_BR.po po/sk.po
+    rhythmdb/rhythmdb-query-model.c
+    rhythmdb/rhythmdb-tree.c rhythmdb/rhythmdb.c
+    rhythmdb/rhythmdb.h shell/main.c shell/rb-shell-player.c
+    shell/rb-shell.c shell/rb-source-header.c
+    shell/rb-statusbar.c sources/rb-ipod-source.c
+    sources/rb-iradio-source.c sources/rb-library-source.c
+    sources/rb-playlist-source-recorder.c
+    sources/rb-playlist-source.c sources/rb-source.c
+    sources/rb-source.h widgets/Makefile.am
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-4
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-105
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-106
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-107
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-126
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-127
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-128
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-129
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-130
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-131
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-132
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-133
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-134
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-135
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-136
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-137
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-138
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-139
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-140
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-141
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-142
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-143
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-144
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-145
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-146
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-147
+    rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-148
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-1
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-2
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-3
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-4
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-5
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-6
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-7
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-8
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-9
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-10
+    teuf gnome org--2004/rhythmbox--removable--0.9--patch-11
+Summary: Update from mainline
+Keywords: 
+
+
+
+Patches applied:
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-105
+   add MimeType field to .desktop
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-106
+   use ; in MimeType
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.8--patch-107
+   updated manual (Jens Schittenhelm)
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-126
+   merge from 0.8: add MimeType to .desktop
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-127
+   Update from CVS
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-128
+   merge from 0.8: updated manual (Jens Schittenhelm)
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-129
+   Added support for disc number tags in the iPod source
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-130
+   Use the gnome-dev-ipod icon from gnome icon theme if it's available
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-131
+   Remove spurious unref, this was making rhythmbox crashy
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-132
+   add more print-playing options (Jon Oberheide)
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-133
+   bump req on libnautilus-burn
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-134
+   rb-recorder-marshal.[ch] are junk
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-135
+   add dispose methods, be sure to unref db and other objects
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-136
+   many alignment fixes (paolo bacchilega libero it)
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-137
+   Check that files in the library are still available at startup
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-138
+   Handle songs on mount points not mounted at rb start up, add a mountpoint XML tag to old rhythmdb files if it didn't exist yet
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-139
+   Merged teuf gnome org--2004/rhythmbox--removable--0.9, files on transient mount points should be handled better now
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-140
+   Update from CVS
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-141
+   show only CD recorders in burn menu, bump required n-c-b version (Bastien Nocera)
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-142
+   Sync totem-pl-parser to latest version per hadess's request
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-143
+   New totem-pl-parser update, hadess should learn to use arch
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-144
+   Update from CVS
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-145
+   Added first-seen and last-seen properties, update them when necessary, fixed updating of modified files
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-146
+   Update from CVS
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-147
+   Fixed a few small leaks
+
+ * rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-148
+   Another leak fix
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-1
+   Copied and pasted code from the old removable--0.7 branch, #ifdef'ed out for now
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-2
+   Finished adding necessary code, removed #ifdef, now let's debug that ;)
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-3
+   Attempt at preventing non-song entries from being hidden
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-4
+   Fixed importing of songs in the library
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-5
+   Start debugging this code ;)
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-6
+   Emit a changed signal on the entries we modify so entries are actually hidden
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-7
+   Handle songs on mount points not mounted at rb start up, add a mountpoint XML tag to old rhythmdb files if it didn't exist yet
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-8
+   Catch pre-unmount signal to release the file being paused if necessary
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-9
+   First go at adding first-seen and last-seen properties
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-10
+   Remove entries from the database when they haven't been seen in a long time
+
+ * teuf gnome org--2004/rhythmbox--removable--0.9--patch-11
+   Fixed clean up of entries when they didn't show up for some time, fix rereading of files when they are modified
+
--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-5
@@ -0,0 +1,10 @@
+Revision: rhythmbox--main--0.9--patch-5
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Tue Nov 16 18:17:45 EST 2004
+Standard-date: 2004-11-16 23:17:45 GMT
+Modified-files: sources/rb-playlist-source-recorder.c
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-5
+Summary: Use gtk+ 2.5 HIG dialogs.  Build fix for 64-bit systems.  Add burn to playlist context menu (fixes #153558).  Add track name to progress bar (fixes #153560).  Fix potential crasher in cdtext generation.  Fix mangled number of MiB listed in dialog.
+Keywords: 
+
--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-6
@@ -0,0 +1,12 @@
+Revision: rhythmbox--main--0.9--patch-6
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Tue Nov 16 18:32:51 EST 2004
+Standard-date: 2004-11-16 23:32:51 GMT
+Modified-files: configure.ac
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-6
+Summary: Bump required version of GTK+ to 2.5.4. 
+Keywords: 
+
+
+
--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-7
@@ -0,0 +1,17 @@
+Revision: rhythmbox--main--0.9--patch-7
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Wed Nov 17 10:30:39 EST 2004
+Standard-date: 2004-11-17 15:30:39 GMT
+Removed-files: widgets/.arch-ids/gst-hig-dialog.c.id
+    widgets/.arch-ids/gst-hig-dialog.h.id
+    widgets/gst-hig-dialog.c widgets/gst-hig-dialog.h
+Modified-files: AUTHORS shell/rb-shell.c
+    sources/rb-playlist-source-recorder.c
+    widgets/Makefile.am widgets/rb-dialog.c
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-7
+Summary: Use GtkAboutDialog.  Add name to AUTHORS.  Remove gst-hig-dialog.  Use G_ format macros for 64-bit types.
+Keywords: 
+
+
+
--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-148/,,what-changed rhythmbox--main--0 9--patch-148--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-8
@@ -0,0 +1,25 @@
+Revision: rhythmbox--main--0.9--patch-8
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Wed Nov 17 10:57:14 EST 2004
+Standard-date: 2004-11-17 15:57:14 GMT
+Removed-files: data/art/.arch-ids/rhythmbox-next.png.id
+    data/art/.arch-ids/rhythmbox-pause.png.id
+    data/art/.arch-ids/rhythmbox-play.png.id
+    data/art/.arch-ids/rhythmbox-previous.png.id
+    data/art/.arch-ids/rhythmbox-rewind.png.id
+    data/art/.arch-ids/rhythmbox-stop.png.id
+    data/art/rhythmbox-next.png
+    data/art/rhythmbox-pause.png
+    data/art/rhythmbox-play.png
+    data/art/rhythmbox-previous.png
+    data/art/rhythmbox-rewind.png
+    data/art/rhythmbox-stop.png
+Modified-files: data/art/Makefile.am lib/rb-stock-icons.c
+    lib/rb-stock-icons.h shell/rb-shell-player.c
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-8
+Summary: Use new GTK+ stock icons.
+Keywords: 
+
+
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]