Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8599
Modified Files:
ChangeLog_detailed gtkpod.glade
Log Message:
* gtkpod.glade
src/file.c
src/prefs_window.c: file exclusion mask when adding tracks
-- thanks to Richard Hyde for the patch.
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- ChangeLog_detailed 30 Aug 2006 15:39:31 -0000 1.312
+++ ChangeLog_detailed 1 Sep 2006 13:18:42 -0000 1.313
@@ -1,3 +1,10 @@
+2006-09-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * gtkpod.glade
+ src/file.c
+ src/prefs_window.c: file exclusion mask when adding tracks
+ -- thanks to Richard Hyde for the patch.
+
2006-08-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
* syncdir.c (sync_playlist): fix segfault when removing track
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- gtkpod.glade 24 Jun 2006 15:39:18 -0000 1.212
+++ gtkpod.glade 1 Sep 2006 13:18:42 -0000 1.213
@@ -8228,6 +8228,69 @@
<property name="spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox205">
+ <property name="visible">True</property>
+ <property
name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label435">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Exclude file mask(s)</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>
+ <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>
+
+ <child>
+ <widget class="GtkEntry"
id="exclude_file_mask_entry">
+ <property
name="visible">True</property>
+ <property name="tooltip"
translatable="yes">Semicolon seperated list of file exclusion masks, e.g.
'*.mp3'</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_exclude_file_mask_entry_changed" last_modification_time="Mon, 21
Aug 2006 10:37:14 GMT"/>
+ </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>
+
+ <child>
<widget class="GtkHBox" id="hbox110">
<property name="visible">True</property>
<property
name="homogeneous">False</property>
@@ -8625,91 +8688,105 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox116">
+ <widget class="GtkAlignment"
id="alignment13">
<property
name="visible">True</property>
- <property
name="homogeneous">False</property>
- <property name="spacing">4</property>
-
- <child>
- <widget class="GtkCheckButton"
id="sync_confirm_dirs_toggle">
- <property
name="can_focus">True</property>
- <property name="label"
translatable="yes">Confirm lists of directories</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>
- </widget>
- <packing>
- <property
name="padding">0</property>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- </packing>
- </child>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</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="GtkCheckButton"
id="sync_delete_tracks_toggle">
+ <widget class="GtkVBox"
id="vbox116">
<property
name="visible">True</property>
- <property name="tooltip"
translatable="yes">Normally, if a track is no longer present in the sync
directory, it will be removed from the playlist, but not from the iPod or local
repository.
+ <property
name="homogeneous">False</property>
+ <property
name="spacing">4</property>
+
+ <child>
+ <widget class="GtkCheckButton"
id="sync_confirm_dirs_toggle">
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">Confirm lists of directories</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>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton"
id="sync_delete_tracks_toggle">
+ <property
name="visible">True</property>
+ <property name="tooltip"
translatable="yes">Normally, if a track is no longer present in the sync
directory, it will be removed from the playlist, but not from the iPod or local
repository.
If this option is checked, tracks will be completely removed from the iPod or
local repository, unless the track is a member of other playlists as well.
NOTE: if you sync with the master playlist, you must check this option if you
want tracks to be removed, because removing from the master playlist means
removing from the iPod.</property>
- <property
name="can_focus">True</property>
- <property name="label"
translatable="yes">Delete tracks that are no longer present from the
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">Delete tracks that are no longer present from the
ipod or repository</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>
- </widget>
- <packing>
- <property
name="padding">0</property>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- </packing>
- </child>
+ <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>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkCheckButton"
id="sync_confirm_delete_toggle">
- <property
name="visible">True</property>
- <property name="tooltip"
translatable="yes">This is the same option as in 'Edit/Delete
Confirmation'</property>
- <property
name="can_focus">True</property>
- <property name="label"
translatable="yes">Confirm before removing tracks from the iPod or
repository</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_sync_confirm_delete_toggled" last_modification_time="Mon, 15 May
2006 15:28:49 GMT"/>
- </widget>
- <packing>
- <property
name="padding">0</property>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkCheckButton"
id="sync_confirm_delete_toggle">
+ <property
name="visible">True</property>
+ <property name="tooltip"
translatable="yes">This is the same option as in 'Edit/Delete
Confirmation'</property>
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">Confirm before removing tracks from the iPod or
repository</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_sync_confirm_delete_toggled" last_modification_time="Mon, 15 May
2006 15:28:49 GMT"/>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkCheckButton"
id="sync_show_summary_toggle">
- <property
name="visible">True</property>
- <property name="tooltip"
translatable="yes">Will show a list of tracks removed and a list of tracks
newly added or updated.</property>
- <property
name="can_focus">True</property>
- <property name="label"
translatable="yes">Show summary of sync result</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>
+ <child>
+ <widget class="GtkCheckButton"
id="sync_show_summary_toggle">
+ <property
name="visible">True</property>
+ <property name="tooltip"
translatable="yes">Will show a list of tracks removed and a list of tracks
newly added or updated.</property>
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">Show summary of sync result</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>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property
name="padding">0</property>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- </packing>
</child>
</widget>
<packing>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
