Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32136
Modified Files:
ChangeLog ChangeLog_detailed gtkpod.glade
Log Message:
NEW: Automatic adding of thumbnail images when adding new
tracks or updating existing ones. See the option on the 'Track
Info' page of the preferences dialog for settings about which
filename will be used. Any filename is possible, even filenames
constructed from the album or artist name.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- ChangeLog 10 Dec 2005 08:21:58 -0000 1.157
+++ ChangeLog 10 Dec 2005 17:04:27 -0000 1.158
@@ -19,6 +19,12 @@
thumbnails are displayed by the iPod but get wiped by iTunes,
however.
+ NEW: Automatic adding of thumbnail images when adding new
+ tracks or updating existing ones. See the option on the 'Track
+ Info' page of the preferences dialog for settings about which
+ filename will be used. Any filename is possible, even filenames
+ constructed from the album or artist name.
+
NEW: very basic iPod video support (you can add Videos but no
metadata is filled in). Thanks to Uwe Herman for the input.
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- ChangeLog_detailed 10 Dec 2005 08:21:58 -0000 1.121
+++ ChangeLog_detailed 10 Dec 2005 17:04:27 -0000 1.122
@@ -1,6 +1,10 @@
-2005-12-09 Jorg Schuler <[EMAIL PROTECTED]>
+2005-12-11 Jorg Schuler <[EMAIL PROTECTED]>
- * re-enable delete menu (in addition to context menu).
+ * file.c, misc.c: add thumbnail images automatically.
+
+2005-12-10 Jorg Schuler <[EMAIL PROTECTED]>
+
+ * re-enable delete menus (in addition to context menu).
2005-12-09 Jorg Schuler <[EMAIL PROTECTED]>
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- gtkpod.glade 10 Dec 2005 08:21:58 -0000 1.187
+++ gtkpod.glade 10 Dec 2005 17:04:27 -0000 1.188
@@ -7701,7 +7701,7 @@
<widget class="GtkVBox" id="vbox113">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox108">
@@ -7879,7 +7879,7 @@
<widget class="GtkVBox" id="vbox115">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox110">
@@ -8593,7 +8593,7 @@
<child>
<widget class="GtkLabel" id="label193">
<property name="visible">True</property>
- <property name="label" translatable="yes">
</property>
+ <property name="label"> </property>
<property
name="use_underline">False</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8699,7 +8699,7 @@
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">True</property>
- <property name="row_spacing">8</property>
+ <property name="row_spacing">0</property>
<property name="column_spacing">8</property>
<child>
@@ -8841,6 +8841,465 @@
</child>
<child>
+ <widget class="GtkVBox" id="vbox155">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkLabel" id="label394">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Artwork</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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="GtkHBox" id="hbox195">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label395">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox156">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="coverart">
+ <property name="visible">True</property>
+ <property name="tooltip"
translatable="yes">artist: %a, album: %A, composer: %c, title: %t, genre: %G,
track nr: %T, CD nr: %C, year: %Y, skip data: %*, the character '%': %%. You
can separate several templates by a ';'. The first one matching the filename
will be used. Example: '%a - %A/%T %t.mp3;%t.wav'.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Add
artwork from file using the following template</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_coverart_toggled" last_modification_time="Sat, 10 Dec 2005 13:46:30
GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox196">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label396">
+ <property name="visible">True</property>
+ <property name="label"> </property>
+ <property
name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox157">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkEntry"
id="coverart_template">
+ <property name="visible">True</property>
+ <property name="tooltip"
translatable="yes">Determines the name of the file with the cover art. You can
separate several patterns by semicolons which will be tried in order. Artist:
%a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C,
year: %Y, original filename (requires extended information file): %o, original
filename without file extension: %O, current playlist: %p, the character '%':
%%.</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property
name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text"
translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property
name="invisible_char">*</property>
+ <property
name="activates_default">False</property>
+ <signal name="changed"
handler="on_coverart_template_changed" last_modification_time="Sat, 10 Dec 2005
13:42:35 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label397">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Examples</b></property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</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="GtkTable" id="table42">
+ <property name="visible">True</property>
+ <property name="n_rows">6</property>
+ <property name="n_columns">2</property>
+ <property
name="homogeneous">False</property>
+ <property name="row_spacing">2</property>
+ <property
name="column_spacing">20</property>
+
+ <child>
+ <widget class="GtkLabel" id="label398">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">folder.jpg</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="right_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property
name="bottom_attach">1</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label399">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">folder</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="right_attach">1</property>
+ <property
name="top_attach">1</property>
+ <property
name="bottom_attach">2</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label400">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">%A.jpg</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="right_attach">1</property>
+ <property
name="top_attach">2</property>
+ <property
name="bottom_attach">3</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label401">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">%A</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="right_attach">1</property>
+ <property
name="top_attach">3</property>
+ <property
name="bottom_attach">4</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label402">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Use <i>folder.jpg</i> as cover art.</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ <property
name="top_attach">0</property>
+ <property
name="bottom_attach">1</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label403">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Use <i>folder.jpg</i>,
<i>folder.png</i>...</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ <property
name="top_attach">1</property>
+ <property
name="bottom_attach">2</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label404">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Use <i>&lt;Album&gt;.jpg</i></property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ <property
name="top_attach">2</property>
+ <property
name="bottom_attach">3</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label405">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Use <i>&lt;Album&gt;.jpg</i>,
<i>&lt;Album&gt;.png</i>...</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ <property
name="top_attach">3</property>
+ <property
name="bottom_attach">4</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label406">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">folder.jpg;%a.jpg</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="right_attach">1</property>
+ <property
name="top_attach">4</property>
+ <property
name="bottom_attach">5</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label407">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">First try <i>folder.jpg</i>, then
<i>&lt;artist&gt;.jpg</i></property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">True</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ <property
name="top_attach">4</property>
+ <property
name="bottom_attach">5</property>
+ <property
name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkVBox" id="vbox76">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -9165,7 +9624,7 @@
<child>
<widget class="GtkLabel" id="label178">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Reading</property>
+ <property name="label" translatable="yes">_Track Info</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -11257,7 +11716,7 @@
<property
name="update_policy">GTK_UPDATE_ALWAYS</property>
<property
name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">25 0 100 1 10
10</property>
+ <property name="adjustment">20 0 100 1 10
10</property>
<signal name="value_changed"
handler="on_cfg_misc_track_nr_value_changed" last_modification_time="Thu, 28
Apr 2005 18:09:09 GMT"/>
</widget>
<packing>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
