Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25189/src
Modified Files:
display.c display_sorttabs.c prefs.c prefs.h prefs_window.c
Log Message:
Moved display_tooltips_main to new prefs.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- display.c 12 Jun 2006 03:35:16 -0000 1.141
+++ display.c 20 Jun 2006 00:54:16 -0000 1.142
@@ -398,7 +398,7 @@
g_return_if_fail (mt);
- if (prefs_get_display_tooltips_main ())
+ if (prefs_get_int("display_tooltips_main"))
{
gtk_tooltips_enable (mt);
gtk_check_menu_item_set_active (mi, TRUE);
@@ -1487,8 +1487,10 @@
on_tooltips_menu_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- prefs_set_display_tooltips_main (
+ prefs_set_int("display_tooltips_main",
gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+ display_show_hide_tooltips();
+
}
void
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- display_sorttabs.c 19 Jun 2006 21:51:37 -0000 1.81
+++ display_sorttabs.c 20 Jun 2006 00:54:19 -0000 1.82
@@ -2898,7 +2898,7 @@
st->sp_tooltips_data = gtk_tooltips_data_get(gtkpod_xml_get_widget
(special_xml, "sp_modified_entry"));
/* Show / don't show tooltips */
g_return_if_fail (st->sp_tooltips_data);
- if (prefs_get_display_tooltips_main ())
+ if (prefs_get_int("display_tooltips_main"))
gtk_tooltips_enable (st->sp_tooltips_data->tooltips);
else gtk_tooltips_disable (st->sp_tooltips_data->tooltips);
/* we don't need this any more */
@@ -3193,7 +3193,7 @@
tt = ttd->tooltips;
g_return_if_fail (tt);
- if (prefs_get_display_tooltips_main ())
+ if (prefs_get_int("display_tooltips_main"))
gtk_tooltips_enable (tt);
else gtk_tooltips_disable (tt);
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- prefs.c 19 Jun 2006 21:51:37 -0000 1.248
+++ prefs.c 20 Jun 2006 00:54:19 -0000 1.249
@@ -255,6 +255,7 @@
prefs_set_int("not_played_track", TRUE);
prefs_set_int("misc_track_nr", 25);
prefs_set_int("update_charset", FALSE);
+ prefs_set_int("display_tooltips_main", TRUE);
/* Set sorting prefs */
prefs_set_int("case_sensitive", FALSE);
@@ -1867,7 +1868,6 @@
mycfg->offline = FALSE;
mycfg->display_toolbar = TRUE;
mycfg->toolbar_style = GTK_TOOLBAR_BOTH;
- mycfg->display_tooltips_main = TRUE;
mycfg->display_tooltips_prefs = TRUE;
g_free (cfgdir);
@@ -2019,10 +2019,6 @@
{
prefs_set_display_toolbar((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "display_tooltips_main") == 0)
- {
- prefs_set_display_tooltips_main((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "display_tooltips_prefs") == 0)
{
prefs_set_display_tooltips_prefs((gboolean)atoi(arg));
@@ -2205,8 +2201,6 @@
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());
- fprintf(fp, "display_tooltips_main=%d\n",
- prefs_get_display_tooltips_main());
fprintf(fp, "display_tooltips_prefs=%d\n",
prefs_get_display_tooltips_prefs());
}
@@ -2422,17 +2416,6 @@
display_show_hide_toolbar ();
}
-void prefs_set_display_tooltips_main (gboolean state)
-{
- cfg->display_tooltips_main = state;
- display_show_hide_tooltips ();
-}
-
-gboolean prefs_get_display_tooltips_main (void)
-{
- return cfg->display_tooltips_main;
-}
-
void prefs_set_display_tooltips_prefs (gboolean state)
{
cfg->display_tooltips_prefs = state;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- prefs.h 15 Jun 2006 14:43:51 -0000 1.175
+++ prefs.h 20 Jun 2006 00:54:20 -0000 1.176
@@ -67,11 +67,8 @@
gboolean offline; /* are we working offline, i.e. without iPod? */
gboolean display_toolbar; /* should toolbar be displayed */
GtkToolbarStyle toolbar_style;/* style of toolbar */
- gboolean display_tooltips_main; /* should tooltips be displayed (main) */
gboolean display_tooltips_prefs;/* should toolbar be displayed (prefs) */
- gboolean group_compilations; /* group compilations when browsing */
guint32 statusbar_timeout; /* timeout for statusbar messages */
- gboolean not_played_track; /* not played track in Highest rated
playlist?*/
float version; /* version of gtkpod writing the cfg file */
};
@@ -224,12 +221,8 @@
gboolean prefs_get_display_toolbar (void);
void prefs_set_display_toolbar (gboolean val);
-gboolean prefs_get_group_compilations (void);
-void prefs_set_group_compilations (gboolean val, gboolean update_display);
GtkToolbarStyle prefs_get_toolbar_style (void);
void prefs_set_toolbar_style (GtkToolbarStyle i);
-void prefs_set_display_tooltips_main (gboolean state);
-gboolean prefs_get_display_tooltips_main (void);
void prefs_set_display_tooltips_prefs (gboolean state);
gboolean prefs_get_display_tooltips_prefs (void);
gboolean prefs_get_disable_sorting(void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- prefs_window.c 19 Jun 2006 21:51:37 -0000 1.170
+++ prefs_window.c 20 Jun 2006 00:54:20 -0000 1.171
@@ -415,7 +415,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_main");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->display_tooltips_main);
+ prefs_get_int("display_tooltips_main"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_prefs");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -698,10 +698,10 @@
prefs_set_block_display(tmpcfg->block_display);
prefs_set_toolbar_style(tmpcfg->toolbar_style);
prefs_set_display_toolbar(tmpcfg->display_toolbar);
- prefs_set_display_tooltips_main (tmpcfg->display_tooltips_main);
prefs_set_display_tooltips_prefs (tmpcfg->display_tooltips_prefs);
tm_show_preferred_columns();
st_show_visible();
+ display_show_hide_tooltips();
}
}
@@ -1196,8 +1196,8 @@
on_cfg_display_tooltips_main_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->display_tooltips_main =
- gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "display_tooltips_main",
+ gtk_toggle_button_get_active (togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
