Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28971/src
Modified Files:
display_songs.c display_sorttabs.c prefs.c prefs.h
prefs_window.c
Log Message:
* applied James Liggett's preferences patches (id3-write,
sort-prefs)
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- display_songs.c 5 Apr 2006 14:24:47 -0000 1.95
+++ display_songs.c 24 Apr 2006 14:11:30 -0000 1.96
@@ -890,7 +890,7 @@
pm_track_changed (track); /* notify playlist model... */
data_changed (track->itdb); /* indicate that data has changed */
- if (prefs_get_id3_write())
+ if (prefs_get_int("id3_write"))
{
/* T_item tag_id;*/
/* should we update all ID3 tags or just the one
@@ -1089,7 +1089,7 @@
/* If the changed column is the compilation flag update the file
if required */
if (column == TM_COLUMN_COMPILATION)
- if (prefs_get_id3_write())
+ if (prefs_get_int("id3_write"))
write_tags_to_file (track);
}
@@ -2419,4 +2419,3 @@
C_FREE (buf);
return TRUE;
}
-
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- display_sorttabs.c 26 Nov 2005 13:44:41 -0000 1.65
+++ display_sorttabs.c 24 Apr 2006 14:11:31 -0000 1.66
@@ -2130,7 +2130,7 @@
members = g_list_copy (entry->members);
n = g_list_length (members);
/* block user input if we write tags (might take a while) */
- if (prefs_get_id3_write ()) block_widgets ();
+ if (prefs_get_int("id3_write")) block_widgets ();
for (i=0; i<n; ++i)
{
ExtraTrackData *etr;
@@ -2163,7 +2163,7 @@
track->time_modified = itdb_time_get_mac_time ();
pm_track_changed (track);
/* If prefs say to write changes to file, do so */
- if (prefs_get_id3_write ())
+ if (prefs_get_int("id3_write"))
{
/* T_item tag_id;*/
/* should we update all ID3 tags or just the one
@@ -2177,7 +2177,7 @@
}
g_list_free (members);
/* allow user input again */
- if (prefs_get_id3_write ()) release_widgets ();
+ if (prefs_get_int("id3_write")) release_widgets ();
/* display possible duplicates that have been removed */
gp_duplicate_remove (NULL, NULL);
/* indicate that data has changed */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- prefs.c 19 Apr 2006 12:39:33 -0000 1.160
+++ prefs.c 24 Apr 2006 14:11:31 -0000 1.161
@@ -121,6 +121,7 @@
static void set_default_prefrences()
{
prefs_set_int("update_existing", FALSE);
+ prefs_set_int("id3_write", FALSE);
}
/* Initialize default variable-length list entries */
@@ -1122,7 +1123,6 @@
mycfg->mpl_autoselect = TRUE;
mycfg->offline = FALSE;
mycfg->write_extended_info = TRUE;
- mycfg->id3_write = FALSE;
mycfg->id3_write_id3v24 = FALSE;
mycfg->size_gtkpod.x = 600;
mycfg->size_gtkpod.y = 500;
@@ -1424,10 +1424,6 @@
{
if(strlen (arg)) prefs_set_charset(arg);
}
- else if(g_ascii_strcasecmp (line, "id3") == 0)
- {
- prefs_set_id3_write((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "id3_all") == 0)
{
/* obsoleted since 0.71 */
@@ -2105,7 +2101,6 @@
} else {
fprintf(fp, "charset=\n");
}
- fprintf(fp, "id3=%d\n", prefs_get_id3_write ());
fprintf(fp, "id3_write_id3v24=%d\n", prefs_get_id3_write_id3v24 ());
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
@@ -2385,16 +2380,6 @@
return cfg->block_display;
}
-void prefs_set_id3_write(gboolean active)
-{
- cfg->id3_write = active;
-}
-
-gboolean prefs_get_id3_write(void)
-{
- return cfg->id3_write;
-}
-
void prefs_set_id3_write_id3v24(gboolean active)
{
cfg->id3_write_id3v24 = active;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- prefs.h 19 Apr 2006 12:39:33 -0000 1.104
+++ prefs.h 24 Apr 2006 14:11:31 -0000 1.105
@@ -67,7 +67,6 @@
{
gchar *ipod_mount; /* mount point of iPod */
gchar *charset; /* CHARSET to use with file operations */
- gboolean id3_write; /* should changes to ID3 tags be written to file */
gboolean id3_write_id3v24;/* should all ID3 tags be updated */
gboolean md5tracks; /* don't allow track duplication on your ipod */
gboolean block_display; /* block display during change of selection? */
@@ -330,7 +329,6 @@
void prefs_set_st_category (guint32 inst, guint category);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
-void prefs_set_id3_write (gboolean active);
void prefs_set_id3_write_id3v24 (gboolean active);
void prefs_set_readtags (gboolean active);
gboolean prefs_get_readtags(void);
@@ -377,7 +375,6 @@
gboolean prefs_get_st_autoselect (guint32 inst);
gboolean prefs_get_mpl_autoselect (void);
guint prefs_get_st_category (guint32 inst);
-gboolean prefs_get_id3_write(void);
gboolean prefs_get_id3_write_id3v24(void);
const gchar *prefs_get_ipod_mount (void);
gchar * prefs_get_charset (void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- prefs_window.c 19 Apr 2006 12:39:33 -0000 1.116
+++ prefs_window.c 24 Apr 2006 14:11:31 -0000 1.117
@@ -52,6 +52,8 @@
/* New prefs temp handling */
static TempPrefs *temp_prefs;
static TempLists *temp_lists;
+static TempPrefs *sort_temp_prefs;
+static TempLists *sort_temp_lists;
/* keeps the check buttons for "Select Entry 'All' in Sorttab %d" */
static GtkWidget *autoselect_widget[SORT_TAB_MAX];
@@ -547,17 +549,17 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->id3_write);
+ prefs_get_int("id3_write"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write_id3v24");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
tmpcfg->id3_write_id3v24);
- if (!tmpcfg->id3_write) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("id3_write")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_charset");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
tmpcfg->write_charset);
- if (!tmpcfg->id3_write) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("id3_write")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_add_recursively");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -896,7 +898,6 @@
/* Need this in case user reordered column order (we don't
* catch the reorder signal) */
tm_store_col_order ();
- prefs_set_id3_write(tmpcfg->id3_write);
prefs_set_id3_write_id3v24(tmpcfg->id3_write_id3v24);
prefs_set_ipod_mount(tmpcfg->ipod_mount);
for (i=0; i<PATH_NUM; ++i)
@@ -1376,7 +1377,7 @@
gboolean val = gtk_toggle_button_get_active (togglebutton);
GtkWidget *w;
- tmpcfg->id3_write = val;
+ temp_prefs_set_int(temp_prefs, "id3_write", val);
if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write_id3v24")))
gtk_widget_set_sensitive (w, val);
if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_charset")))
@@ -1931,6 +1932,9 @@
g_warning ("Programming error: tmpsortcfg is not NULL!!\n");
g_return_if_reached ();
}
+
+ sort_temp_prefs = create_temp_prefs();
+ sort_temp_lists = create_temp_lists();
sort_window_xml = glade_xml_new (xml_file, "sort_window", NULL);
glade_xml_signal_autoconnect (sort_window_xml);
@@ -2564,6 +2568,11 @@
{
g_return_if_fail (tmpsortcfg);
g_return_if_fail (origsortcfg);
+
+ destroy_temp_prefs(sort_temp_prefs);
+ sort_temp_prefs = NULL;
+ destroy_temp_lists(sort_temp_lists);
+ sort_temp_lists = NULL;
/* delete sortcfg structs */
sortcfg_free (tmpsortcfg);
@@ -2588,6 +2597,9 @@
sort_window_read_sort_ign (tmpsortcfg);
/* save current settings */
sort_window_set (tmpsortcfg);
+
+ apply_temp_prefs(sort_temp_prefs);
+ apply_temp_lists(sort_temp_lists);
/* delete sortcfg structs */
sortcfg_free (tmpsortcfg);
@@ -2607,6 +2619,9 @@
{
g_return_if_fail (tmpsortcfg);
g_return_if_fail (origsortcfg);
+
+ apply_temp_prefs(sort_temp_prefs);
+ apply_temp_lists(sort_temp_lists);
/* update the sort ignore strings */
sort_window_read_sort_ign (tmpsortcfg);
-------------------------------------------------------
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
