Revision: 1865
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1865&view=rev
Author: phantom_sf
Date: 2007-12-27 05:46:18 -0800 (Thu, 27 Dec 2007)
Log Message:
-----------
2007-12-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
* src/prefs_window.c
Fixed potential memory leak in on_coverart_display_bg_color_set
* data/gtkpod.glade
* src/prefsdlg.c
Support for change background colour added to new prefs dialog
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/data/gtkpod.glade
gtkpod/trunk/src/prefs_window.c
gtkpod/trunk/src/prefsdlg.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2007-12-27 13:00:54 UTC (rev 1864)
+++ gtkpod/trunk/ChangeLog 2007-12-27 13:46:18 UTC (rev 1865)
@@ -1,5 +1,16 @@
2007-12-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+ * src/prefs_window.c
+
+ Fixed potential memory leak in on_coverart_display_bg_color_set
+
+ * data/gtkpod.glade
+ * src/prefsdlg.c
+
+ Support for change background colour added to new prefs dialog
+
+2007-12-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
* data/cdshine.png
* data/cdshine_main.png
* data/Makefile.am
Modified: gtkpod/trunk/data/gtkpod.glade
===================================================================
--- gtkpod/trunk/data/gtkpod.glade 2007-12-27 13:00:54 UTC (rev 1864)
+++ gtkpod/trunk/data/gtkpod.glade 2007-12-27 13:46:18 UTC (rev 1865)
@@ -22272,6 +22272,60 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox214">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkColorButton"
id="coverart_display_bg_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="use_alpha">False</property>
+ <property name="title"
translatable="yes">Choose a Different Colour for the CoverArt Display
Background</property>
+ <property
name="focus_on_click">True</property>
+ <signal name="color_set"
handler="on_coverart_dialog_bg_color_set" last_modification_time="Thu, 27 Dec
2007 13:34:16 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label472">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">CoverArt Display Background Colour</property>
+ <property
name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">10</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
Modified: gtkpod/trunk/src/prefs_window.c
===================================================================
--- gtkpod/trunk/src/prefs_window.c 2007-12-27 13:00:54 UTC (rev 1864)
+++ gtkpod/trunk/src/prefs_window.c 2007-12-27 13:46:18 UTC (rev 1865)
@@ -1133,7 +1133,7 @@
----------------------------------------------------------------- */
-void on_coverart_display_bg_color_set (GtkColorButton *widget, gpointer
user_data)
+G_MODULE_EXPORT void on_coverart_display_bg_color_set (GtkColorButton *widget,
gpointer user_data)
{
GdkColor colour;
gtk_color_button_get_color (widget, &colour);
@@ -1144,6 +1144,7 @@
temp_prefs,
"coverart_display_bg_colour",
hexstring);
+ g_free(hexstring);
}
G_MODULE_EXPORT void
Modified: gtkpod/trunk/src/prefsdlg.c
===================================================================
--- gtkpod/trunk/src/prefsdlg.c 2007-12-27 13:00:54 UTC (rev 1864)
+++ gtkpod/trunk/src/prefsdlg.c 2007-12-27 13:46:18 UTC (rev 1865)
@@ -33,6 +33,7 @@
#include "misc.h"
#include "help.h"
#include "prefs.h"
+#include "display_coverart.h"
/*
Begin types
@@ -263,6 +264,7 @@
gint i;
GtkWidget *toolbar_style_combo = gtkpod_xml_get_widget (xml,
"toolbar_style");
GtkWidget *skip_track_update_radio = gtkpod_xml_get_widget (xml,
"skip_track_update");
+ GtkWidget *coverart_colorselect_button = gtkpod_xml_get_widget (xml,
"coverart_display_bg_button");
/* Display */
@@ -310,6 +312,10 @@
if(!prefs_get_int("update_existing"))
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(skip_track_update_radio), TRUE);
+
+ GdkColor *color = coverart_get_background_display_colour();
+ gtk_color_button_set_color
(GTK_COLOR_BUTTON(coverart_colorselect_button), color);
+
}
void open_prefs_dlg ()
@@ -518,3 +524,18 @@
/* and then call the default handler */
on_simple_checkbox_toggled (sender, e);
}
+
+/*
+ glade callback
+*/
+G_MODULE_EXPORT void on_coverart_dialog_bg_color_set (GtkColorButton *widget,
gpointer user_data)
+{
+ GdkColor colour;
+ gtk_color_button_get_color (widget, &colour);
+ gchar *hexstring;
+
+ hexstring = g_strdup_printf("#%02X%02X%02X", colour.red >> 8,
colour.green >> 8, colour.blue >> 8);
+ prefs_set_string ("coverart_display_bg_colour", hexstring);
+ g_free (hexstring);
+ force_update_covers ();
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
