Revision: 1562
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1562&view=rev
Author: jcsjcs
Date: 2007-06-19 06:20:14 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
* src/file_itunesdb.c: Todd's patch to display the repository
name while writing to the iPod.
* data/gtkpod.glade: Todd's patch to substitute custom button
with stock button in the export dialog.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/data/gtkpod.glade
gtkpod/trunk/src/file_itunesdb.c
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-06-18 22:39:26 UTC (rev 1561)
+++ gtkpod/trunk/ChangeLog_detailed 2007-06-19 13:20:14 UTC (rev 1562)
@@ -1,5 +1,13 @@
-2007-06-17 P.G. Richardson <phantom_sf at users.sourceforge.net>
+2007-06-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * src/file_itunesdb.c: Todd's patch to display the repository
+ name while writing to the iPod.
+
+ * data/gtkpod.glade: Todd's patch to substitute custom button
+ with stock button in the export dialog.
+
+2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
Bug fixes spotted by Daniele Forsi.
Change in coverart not made to coverart display when apply button
@@ -10,24 +18,24 @@
Should always be a default value of folder.jpg if none of the templates
provide a non-null value.
- * details.c:
+ * src/details.c:
details_copy_artwork() has to now always recopy the artwork
from file. The reason being, fetchcover overwrites the artwork hence
the file name will still be the same while different artwork.
- * display_coverart.h
- display_coverart.c:
+ * src/display_coverart.h
+ src/display_coverart.c:
set_covers() and set_cover_item() now has a
parameter to force an update of the cover images from file. Only used
by details_copy_artwork() when the apply button is clicked on the
details window.
- * fetchcover.c:
+ * src/fetchcover.c:
dialog will now appear if a cover image file already exists in the
tracks directory. Gives the options to overwrite, save as unique name
or cancel completely.
-2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+2007-06-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/misc.h
src/details.c
Modified: gtkpod/trunk/data/gtkpod.glade
===================================================================
--- gtkpod/trunk/data/gtkpod.glade 2007-06-18 22:39:26 UTC (rev 1561)
+++ gtkpod/trunk/data/gtkpod.glade 2007-06-19 13:20:14 UTC (rev 1562)
@@ -21065,75 +21065,13 @@
<widget class="GtkButton" id="abortbutton">
<property name="border_width">2</property>
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Export can be
continued at a later time if canceled.</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment15">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox211">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image3881">
- <property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label458">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Press
button to abort.
-Export can be continued at a later time.</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
</widget>
</child>
</widget>
Modified: gtkpod/trunk/src/file_itunesdb.c
===================================================================
--- gtkpod/trunk/src/file_itunesdb.c 2007-06-18 22:39:26 UTC (rev 1561)
+++ gtkpod/trunk/src/file_itunesdb.c 2007-06-19 13:20:14 UTC (rev 1562)
@@ -1754,6 +1754,7 @@
gboolean success = TRUE;
ExtraiTunesDBData *eitdb;
GtkWidget *dialog;
+ Playlist *mpl;
TransferData *transferdata;
g_return_val_if_fail (itdb, FALSE);
@@ -1763,6 +1764,9 @@
cfgdir = prefs_get_cfgdir ();
g_return_val_if_fail (cfgdir, FALSE);
+ mpl = itdb_playlist_mpl (itdb);
+ g_return_val_if_fail (mpl, FALSE);
+
if (!eitdb->itdb_imported)
{ /* No iTunesDB was read but user wants to export current
data. If an iTunesDB is present on the iPod or in cfgdir,
@@ -1854,8 +1858,10 @@
if (success)
{
- gtk_label_set_text (GTK_LABEL (transferdata->textlabel),
- _("Now writing database. Please wait..."));
+ gchar *buf;
+ buf = g_strdup_printf (_("Now writing database '%s'. Please wait..."),
mpl->name);
+ gtk_label_set_text (GTK_LABEL (transferdata->textlabel), buf);
+ g_free (buf);
while (widgets_blocked && gtk_events_pending ())
gtk_main_iteration ();
@@ -1983,8 +1989,6 @@
/* indicate that files and/or database is saved */
if (success)
{
- Playlist *mpl = itdb_playlist_mpl (itdb);
- g_return_val_if_fail (mpl, success);
data_unchanged (itdb);
if (itdb->usertype & GP_ITDB_TYPE_IPOD)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
