Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26111/src
Modified Files:
display.c display_coverart.c display_coverart.h prefs.c
prefs_window.c
Log Message:
* src/prefs_window.c
src/prefs.c: removed references to "display_artcovers".
* src/displac.c
src/display_coverart.c: remember if coverart was last shown
or hidden.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- display.c 20 Feb 2007 14:11:23 -0000 1.151
+++ display.c 24 Feb 2007 06:24:10 -0000 1.152
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-20 23:05:44 jcs>
+/* Time-stamp: <2007-02-24 15:18:00 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -97,6 +97,9 @@
gtkpod_tracks_statusbar_init ();
gtkpod_space_statusbar_init ();
+ /* Initialize the coverart display */
+ coverart_init_display ();
+
/* set the menu item for the info window correctly */
/* CAREFUL: must be done after calling ..._space_statusbar_init() */
display_set_info_window_menu ();
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- display_coverart.c 22 Feb 2007 23:50:45 -0000 1.5
+++ display_coverart.c 24 Feb 2007 06:24:10 -0000 1.6
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-23 00:04:30 jcs>
+/* Time-stamp: <2007-02-24 15:22:41 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -38,6 +38,7 @@
#include "display_coverart.h"
/* Declarations */
+static gint sort_tracks (Itdb_Track *a, Itdb_Track *b);
static void set_display_dimensions ();
static GdkPixbuf *draw_blank_cdimage ();
static void set_highlight (Cover_Item *cover);
@@ -51,6 +52,9 @@
static void prepare_canvas ();
static void set_covers ();
+/* Prefs keys */
+const gchar *KEY_DISPLAY_COVERART="display_coverart";
+
/* The structure that holds values used throughout all the functions */
static CD_Widget *cdwidget = NULL;
/* Dimensions used for the canvas */
@@ -620,6 +624,7 @@
void on_cover_up_button_clicked (GtkWidget *widget, gpointer data)
{
gtk_widget_show_all (cdwidget->contentpanel);
+ prefs_set_int (KEY_DISPLAY_COVERART, TRUE);
}
/**
@@ -634,6 +639,7 @@
void on_cover_down_button_clicked (GtkWidget *widget, gpointer data)
{
gtk_widget_hide_all (cdwidget->contentpanel);
+ prefs_set_int (KEY_DISPLAY_COVERART, FALSE);
}
/**
@@ -915,23 +921,23 @@
* Initialise the boxes and canvases of the coverart_display.
*
*/
-static void coverart_init_display ()
+void coverart_init_display ()
{
cdwidget = g_new0(CD_Widget, 1);
- cdwidget->canvasbox = gtkpod_xml_get_widget (main_window_xml,
"cover_display_canvasbox");
+ cdwidget->canvasbox = gtkpod_xml_get_widget (main_window_xml,
"cover_display_canvasbox");
cdwidget->contentpanel = gtkpod_xml_get_widget (main_window_xml,
"cover_display_window");
- cdwidget->controlbox = gtkpod_xml_get_widget (main_window_xml,
"cover_display_controlbox");
- cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml,
"cover_display_leftbutton"));
- cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml,
"cover_display_rightbutton"));
- cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget (main_window_xml,
"cover_display_scaler"));
+ cdwidget->controlbox = gtkpod_xml_get_widget (main_window_xml,
"cover_display_controlbox");
+ cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget
(main_window_xml, "cover_display_leftbutton"));
+ cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget
(main_window_xml, "cover_display_rightbutton"));
+ cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget
(main_window_xml, "cover_display_scaler"));
g_return_if_fail (cdwidget->contentpanel);
g_return_if_fail (cdwidget->canvasbox);
g_return_if_fail (cdwidget->controlbox);
g_return_if_fail (cdwidget->leftbutton);
- g_return_if_fail (cdwidget->rightbutton);
- g_return_if_fail (cdwidget->cdslider);
+ g_return_if_fail (cdwidget->rightbutton);
+ g_return_if_fail (cdwidget->cdslider);
set_display_dimensions ();
@@ -953,7 +959,22 @@
coverart_block_change (FALSE);
- gtk_widget_show_all (cdwidget->contentpanel);
+ /* show/hide coverart display -- default to show */
+ if (prefs_get_int_value (KEY_DISPLAY_COVERART, NULL))
+ {
+ if (prefs_get_int (KEY_DISPLAY_COVERART))
+ {
+ gtk_widget_show_all (cdwidget->contentpanel);
+ }
+ else
+ {
+ gtk_widget_hide_all (cdwidget->contentpanel);
+ }
+ }
+ else
+ {
+ gtk_widget_show_all (cdwidget->contentpanel);
+ }
}
/**
@@ -970,7 +991,7 @@
* integer indicating order of tracks
*
*/
-gint sort_tracks (Itdb_Track *a, Itdb_Track *b)
+static gint sort_tracks (Itdb_Track *a, Itdb_Track *b)
{
gint artistval;
Index: display_coverart.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display_coverart.h 20 Feb 2007 14:11:24 -0000 1.2
+++ display_coverart.h 24 Feb 2007 06:24:10 -0000 1.3
@@ -38,15 +38,14 @@
gboolean block_display_change;
} CD_Widget;
+
+extern const gchar *DISPLAY_COVER_SHOW;
+
void init_default_file (gchar *progpath);
void coverart_sort_images (GtkSortType order);
void coverart_select_cover (Itdb_Track *track);
void coverart_set_images (GList *tracks);
void coverart_clear_images ();
void coverart_block_change ();
-gint sort_tracks (Itdb_Track *a, Itdb_Track *b);
-void on_cover_up_button_clicked (GtkWidget *widget, gpointer data);
-void on_cover_down_button_clicked (GtkWidget *widget, gpointer data);
-void on_paned0_check_resize (GtkContainer *container, gpointer data);
-
+void coverart_init_display ();
#endif
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- prefs.c 20 Feb 2007 14:11:25 -0000 1.276
+++ prefs.c 24 Feb 2007 06:24:10 -0000 1.277
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-20 23:05:44 jcs>
+/* Time-stamp: <2007-02-24 15:22:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Copyright (C) 2006 James Liggett <jrliggett at cox.net>
@@ -261,7 +261,6 @@
prefs_set_int("info_window", FALSE);
prefs_set_int("last_prefs_page", 0);
prefs_set_int("tmp_disable_sort", TRUE);
- prefs_set_int("display_artcovers", FALSE);
prefs_set_int("multi_edit_title", TRUE);
prefs_set_int("multi_edit", FALSE);
prefs_set_int("not_played_track", TRUE);
@@ -896,6 +895,7 @@
prefs_set_string("fix_path", NULL);
prefs_set_string("write_gaintag", NULL);
prefs_set_string("automount", NULL);
+ prefs_set_string("display_artcovers", NULL);
/* sp_created_cond renamed to sp_added_cond */
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- prefs_window.c 20 Feb 2007 14:11:25 -0000 1.191
+++ prefs_window.c 24 Feb 2007 06:24:10 -0000 1.192
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-20 23:05:44 jcs>
+/* Time-stamp: <2007-02-24 15:17:58 jcs>
|
| Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -454,10 +454,6 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("display_tooltips_prefs"));
- w = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_display_artcovers");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- prefs_get_int("display_artcovers"));
-
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("multi_edit"));
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
