Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2632/src
Modified Files:
confirmation.c prefs.c prefs.h
Log Message:
Move size_conf to new prefs
Index: confirmation.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/confirmation.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- confirmation.c 9 Jun 2006 00:42:19 -0000 1.27
+++ confirmation.c 9 Jun 2006 00:58:41 -0000 1.28
@@ -73,7 +73,10 @@
prefs_set_int("size_conf_sw.y", defy);
}
else
- prefs_set_size_conf (defx, defy);
+ {
+ prefs_set_int("size_conf.x", defx);
+ prefs_set_int("size_conf.y", defy);
+ }
gtk_widget_destroy (cd->window);
g_hash_table_remove (id_hash, id);
@@ -405,7 +408,8 @@
if ((w = gtkpod_xml_get_widget (confirm_xml, "scroller")))
gtk_widget_hide (w);
cd->scrolled = FALSE;
- prefs_get_size_conf (&defx, &defy);
+ defx = prefs_get_int("size_conf.x");
+ defy = prefs_get_int("size_conf.y");
}
gtk_window_set_default_size (GTK_WINDOW (window), defx, defy);
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- prefs.c 9 Jun 2006 00:42:22 -0000 1.208
+++ prefs.c 9 Jun 2006 00:58:41 -0000 1.209
@@ -205,6 +205,8 @@
prefs_set_int("size_cal.y", 300);
prefs_set_int("size_conf_sw.x", 300);
prefs_set_int("size_conf_sw.y", 300);
+ prefs_set_int("size_conf.x", 300);
+ prefs_set_int("size_conf.y", -1);
}
/* Initialize default variable-length list entries */
@@ -1751,8 +1753,6 @@
mycfg->autoimport = FALSE;
mycfg->offline = FALSE;
mycfg->write_extended_info = TRUE;
- mycfg->size_conf.x = 300;
- mycfg->size_conf.y = -1;
mycfg->size_dirbr.x = 300;
mycfg->size_dirbr.y = 400;
mycfg->size_prefs.x = -1;
@@ -2362,8 +2362,6 @@
fprintf(fp, "add_recursively=%d\n",prefs_get_add_recursively());
fprintf(fp, "case_sensitive=%d\n",prefs_get_case_sensitive());
fprintf(fp, _("# window sizes: main window, confirmation scrolled,\n#
confirmation non-scrolled, dirbrowser, prefs\n"));
- fprintf (fp, "size_conf.x=%d\n", cfg->size_conf.x);
- fprintf (fp, "size_conf.y=%d\n", cfg->size_conf.y);
fprintf (fp, "size_dirbr.x=%d\n", cfg->size_dirbr.x);
fprintf (fp, "size_dirbr.y=%d\n", cfg->size_dirbr.y);
fprintf (fp, "size_prefs.x=%d\n", cfg->size_prefs.x);
@@ -2597,14 +2595,6 @@
return cfgdir;
}
-/* Sets the default size for the non-scrolled conf window. -2 means:
- * don't change the current size */
-void prefs_set_size_conf (gint x, gint y)
-{
- if (x != -2) cfg->size_conf.x = x;
- if (y != -2) cfg->size_conf.y = y;
-}
-
/* Sets the default size for the dirbrowser window. -2 means:
* don't change the current size */
void prefs_set_size_dirbr (gint x, gint y)
@@ -2629,15 +2619,6 @@
if (y != -2) cfg->size_info.y = y;
}
-/* Writes the current default size for the non-scrolled conf window in
- "x" and "y" */
-void prefs_get_size_conf (gint *x, gint *y)
-{
- *x = cfg->size_conf.x;
- *y = cfg->size_conf.y;
-}
-
-
/* Writes the current default size for the dirbrowser window in
"x" and "y" */
void prefs_get_size_dirbr (gint *x, gint *y)
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- prefs.h 9 Jun 2006 00:42:23 -0000 1.135
+++ prefs.h 9 Jun 2006 00:58:41 -0000 1.136
@@ -124,7 +124,6 @@
{
gboolean track, ipod_file, local_file, database;
} deletion;
- struct win_size size_conf; /* last size of conf window */
struct win_size size_dirbr; /* last size of dirbrowser window */
struct win_size size_prefs; /* last size of prefs window */
struct win_size size_info; /* last size of info window */
@@ -326,7 +325,6 @@
const gchar *prefs_get_coverart_template (void);
void prefs_set_charset (gchar *charset);
void prefs_cfg_set_charset (struct cfg *cfg, gchar *charset);
-void prefs_set_size_conf (gint x, gint y);
void prefs_set_size_dirbr (gint x, gint y);
void prefs_set_size_prefs (gint x, gint y);
void prefs_set_size_info (gint x, gint y);
@@ -344,7 +342,6 @@
gboolean prefs_get_write_extended_info(void);
gboolean prefs_get_autoimport(void);
gchar * prefs_get_charset (void);
-void prefs_get_size_conf (gint *x, gint *y);
void prefs_get_size_dirbr (gint *x, gint *y);
void prefs_get_size_prefs (gint *x, gint *y);
void prefs_get_size_info (gint *x, gint *y);
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
