Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv398/src
Modified Files:
display.c prefs.c prefs.h prefs_window.c
Log Message:
Moved display_toolbar and toolbar_style to new prefs.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- display.c 20 Jun 2006 00:54:16 -0000 1.142
+++ display.c 20 Jun 2006 04:03:34 -0000 1.143
@@ -332,9 +332,9 @@
GtkWidget *tb = gtkpod_xml_get_widget (main_window_xml, "toolbar");
GtkWidget *mi = gtkpod_xml_get_widget (main_window_xml, "toolbar_menu");
- if (prefs_get_display_toolbar ())
+ if (prefs_get_int("display_toolbar"))
{
- gtk_toolbar_set_style (GTK_TOOLBAR (tb), prefs_get_toolbar_style ());
+ gtk_toolbar_set_style (GTK_TOOLBAR (tb),
prefs_get_int("toolbar_style"));
gtk_widget_show (tb);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), TRUE);
}
@@ -1249,8 +1249,9 @@
on_toolbar_menu_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- prefs_set_display_toolbar (
+ prefs_set_int("display_toolbar",
gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+ display_show_hide_toolbar();
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- prefs.c 20 Jun 2006 02:32:29 -0000 1.251
+++ prefs.c 20 Jun 2006 04:03:34 -0000 1.252
@@ -257,6 +257,8 @@
prefs_set_int("update_charset", FALSE);
prefs_set_int("display_tooltips_main", TRUE);
prefs_set_int("display_tooltips_prefs", TRUE);
+ prefs_set_int("display_toolbar", TRUE);
+ prefs_set_int("toolbar_style", GTK_TOOLBAR_BOTH);
/* Set sorting prefs */
prefs_set_int("case_sensitive", FALSE);
@@ -1867,8 +1869,6 @@
mycfg->md5tracks = TRUE;
mycfg->block_display = FALSE;
mycfg->offline = FALSE;
- mycfg->display_toolbar = TRUE;
- mycfg->toolbar_style = GTK_TOOLBAR_BOTH;
g_free (cfgdir);
@@ -1995,10 +1995,6 @@
{
prefs_set_offline((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "toolbar_style") == 0)
- {
- prefs_set_toolbar_style(atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "pm_autostore") == 0)
{
/* ignore */
@@ -2015,10 +2011,6 @@
{
prefs_set_string (EXPORT_FILES_PATH, arg);
}
- else if(g_ascii_strcasecmp (line, "display_toolbar") == 0)
- {
- prefs_set_display_toolbar((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "save_sorted_order") == 0)
{
/* ignore option -- has been deleted with 0.53 */
@@ -2195,8 +2187,6 @@
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
fprintf(fp, "offline=%d\n",prefs_get_offline());
- fprintf(fp, "display_toolbar=%d\n",prefs_get_display_toolbar());
- fprintf(fp, "toolbar_style=%d\n",prefs_get_toolbar_style());
}
@@ -2374,39 +2364,4 @@
return cfg->statusbar_timeout;
}
-gboolean prefs_get_display_toolbar (void)
-{
- return cfg->display_toolbar;
-}
-
-void prefs_set_display_toolbar (gboolean val)
-{
- cfg->display_toolbar = val;
- display_show_hide_toolbar ();
-}
-
-GtkToolbarStyle prefs_get_toolbar_style (void)
-{
- return cfg->toolbar_style;
-}
-
-void prefs_set_toolbar_style (GtkToolbarStyle i)
-{
- switch (i)
- {
- case GTK_TOOLBAR_ICONS:
- case GTK_TOOLBAR_TEXT:
- case GTK_TOOLBAR_BOTH:
- break;
- case GTK_TOOLBAR_BOTH_HORIZ:
- i = GTK_TOOLBAR_BOTH;
- break;
- default: /* illegal -- ignore */
- gtkpod_warning (_("prefs_set_toolbar_style: illegal style '%d'
ignored\n"), i);
- return;
- }
-
- cfg->toolbar_style = i;
- display_show_hide_toolbar ();
-}
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- prefs.h 20 Jun 2006 02:32:31 -0000 1.178
+++ prefs.h 20 Jun 2006 04:03:34 -0000 1.179
@@ -65,8 +65,6 @@
gboolean offline; /* are we working offline, i.e. without iPod? */
- gboolean display_toolbar; /* should toolbar be displayed */
- GtkToolbarStyle toolbar_style;/* style of toolbar */
guint32 statusbar_timeout; /* timeout for statusbar messages */
float version; /* version of gtkpod writing the cfg file */
};
@@ -218,9 +216,4 @@
gboolean prefs_get_block_display(void);
guint32 prefs_get_statusbar_timeout (void);
-gboolean prefs_get_display_toolbar (void);
-void prefs_set_display_toolbar (gboolean val);
-GtkToolbarStyle prefs_get_toolbar_style (void);
-void prefs_set_toolbar_style (GtkToolbarStyle i);
-
#endif
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- prefs_window.c 20 Jun 2006 01:17:43 -0000 1.172
+++ prefs_window.c 20 Jun 2006 04:03:34 -0000 1.173
@@ -284,6 +284,7 @@
GtkWidget *w = NULL;
GtkTooltips *tt;
GtkTooltipsData *tooltipsdata;
+ GtkToolbarStyle toolbar_style;
gchar *buf = NULL;
/* List of standard toggle widget names */
const gchar *toggle_widget_names[] = {
@@ -396,22 +397,24 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_toolbar");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->display_toolbar);
+ prefs_get_int("display_toolbar"));
+
+ toolbar_style = prefs_get_int("toolbar_style");
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_icons");
- if (tmpcfg->toolbar_style == GTK_TOOLBAR_ICONS)
+ if (toolbar_style == GTK_TOOLBAR_ICONS)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
- if (!tmpcfg->display_toolbar) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_text");
- if (tmpcfg->toolbar_style == GTK_TOOLBAR_TEXT)
+ if (toolbar_style == GTK_TOOLBAR_TEXT)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
- if (!tmpcfg->display_toolbar) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_both");
- if (tmpcfg->toolbar_style == GTK_TOOLBAR_BOTH)
+ if (toolbar_style == GTK_TOOLBAR_BOTH)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
- if (!tmpcfg->display_toolbar) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_main");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -696,11 +699,10 @@
/* this call well automatically destroy/setup the md5 hash table */
prefs_set_md5tracks(tmpcfg->md5tracks);
prefs_set_block_display(tmpcfg->block_display);
- prefs_set_toolbar_style(tmpcfg->toolbar_style);
- prefs_set_display_toolbar(tmpcfg->display_toolbar);
tm_show_preferred_columns();
st_show_visible();
display_show_hide_tooltips();
+ display_show_hide_toolbar();
}
}
@@ -1217,7 +1219,7 @@
GtkWidget *w2 = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_toolbar_style_text");
GtkWidget *w3 = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_toolbar_style_both");
- tmpcfg->display_toolbar = val;
+ temp_prefs_set_int(temp_prefs, "display_toolbar", val);
if (w1) gtk_widget_set_sensitive (w1, val);
if (w2) gtk_widget_set_sensitive (w2, val);
@@ -1318,7 +1320,8 @@
{
if (gtk_toggle_button_get_active (togglebutton))
{
- tmpcfg->toolbar_style = GTK_TOOLBAR_BOTH;
+ temp_prefs_set_int(temp_prefs, "toolbar_style",
+ GTK_TOOLBAR_BOTH);
}
}
@@ -1329,7 +1332,8 @@
{
if (gtk_toggle_button_get_active (togglebutton))
{
- tmpcfg->toolbar_style = GTK_TOOLBAR_TEXT;
+ temp_prefs_set_int(temp_prefs, "toolbar_style",
+ GTK_TOOLBAR_TEXT);
}
}
@@ -1340,7 +1344,8 @@
{
if (gtk_toggle_button_get_active (togglebutton))
{
- tmpcfg->toolbar_style = GTK_TOOLBAR_ICONS;
+ temp_prefs_set_int(temp_prefs, "toolbar_style",
+ GTK_TOOLBAR_ICONS);
}
}
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
