commit 5e2eb9cf5e7d03d63e0caa52d008adc842c6c615
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sun Jun 20 09:06:11 2010 +0100
Fixes defect with showing the cover art preview dialog
plugins/cover_display/cover_display_context_menu.c | 14 +----------
src/details.c | 2 -
src/display_coverart.c | 25 +++++++++++--------
src/display_coverart.h | 4 +--
4 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/plugins/cover_display/cover_display_context_menu.c
b/plugins/cover_display/cover_display_context_menu.c
index 73871a0..b491281 100644
--- a/plugins/cover_display/cover_display_context_menu.c
+++ b/plugins/cover_display/cover_display_context_menu.c
@@ -51,19 +51,7 @@ static void display_track_artwork(GtkMenuItem *mi, gpointer
data) {
}
static GtkWidget *add_display_big_coverart(GtkWidget *menu) {
- const gchar *icon;
- /* gets defined in gtk+ V2.8, but we only require V2.6 */
-#ifndef GTK_STOCK_FULLSCREEN
-#define GTK_STOCK_FULLSCREEN "gtk-fullscreen"
-#endif
- if (gtk_check_version(2, 8, 0) == NULL) {
- icon = GTK_STOCK_FULLSCREEN;
- }
- else {
- icon = NULL;
- }
-
- return hookup_menu_item(menu, _("View Full Size Artwork"), icon,
G_CALLBACK (display_track_artwork), NULL);
+ return hookup_menu_item(menu, _("View Full Size Artwork"),
GTK_STOCK_FULLSCREEN, G_CALLBACK (display_track_artwork), NULL);
}
/**
diff --git a/src/details.c b/src/details.c
index d89539a..1d09525 100644
--- a/src/details.c
+++ b/src/details.c
@@ -1518,11 +1518,9 @@ void details_edit(GList *selected_tracks) {
gint page, num_pages;
if (!details_view || !details_view->window) {
- g_message("Creating details editor window");
create_details_editor_view();
}
else {
- g_message("Redisplaying details editor window");
gtkpod_display_widget(details_view->window);
}
details_set_tracks(selected_tracks);
diff --git a/src/display_coverart.c b/src/display_coverart.c
index b460ebe..9fbe524 100644
--- a/src/display_coverart.c
+++ b/src/display_coverart.c
@@ -163,20 +163,21 @@ static gboolean coverart_window_valid() {
*/
void coverart_init_display(GtkWidget *parent) {
GtkWidget *cover_temp_window;
+ GladeXML *xml;
DEFAULT_FILE = g_build_filename(GTKPOD_IMAGE_DIR, "default-cover.png",
NULL);
cdwidget = g_new0(CD_Widget, 1);
cdwidget->parent = parent;
- cdwidget->xml = gtkpod_xml_new(GLADE_FILE, "cover_display_window");
- cover_temp_window = gtkpod_xml_get_widget(cdwidget->xml,
"cover_display_window");
- cdwidget->contentpanel = gtkpod_xml_get_widget(cdwidget->xml,
"cover_display_panel");
- cdwidget->canvasbox = gtkpod_xml_get_widget(cdwidget->xml,
"cover_display_canvasbox");
- cdwidget->controlbox = gtkpod_xml_get_widget(cdwidget->xml,
"cover_display_controlbox");
- cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget (cdwidget->xml,
"cover_display_leftbutton"));
- cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget (cdwidget->xml,
"cover_display_rightbutton"));
- cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget (cdwidget->xml,
"cover_display_scaler"));
+ xml = gtkpod_xml_new(GLADE_FILE, "cover_display_window");
+ cover_temp_window = gtkpod_xml_get_widget(xml, "cover_display_window");
+ cdwidget->contentpanel = gtkpod_xml_get_widget(xml, "cover_display_panel");
+ cdwidget->canvasbox = gtkpod_xml_get_widget(xml,
"cover_display_canvasbox");
+ cdwidget->controlbox = gtkpod_xml_get_widget(xml,
"cover_display_controlbox");
+ cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget (xml,
"cover_display_leftbutton"));
+ cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget (xml,
"cover_display_rightbutton"));
+ cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget (xml,
"cover_display_scaler"));
/* create a new drawing area */
cdwidget->draw_area = gtk_drawing_area_new();
cdwidget->cdcovers = g_ptr_array_sized_new(IMG_TOTAL);
@@ -1502,10 +1503,12 @@ static void display_coverart_image_dialog(GdkPixbuf
*image) {
GtkWidget *res_label;
GdkPixbuf *scaled = NULL;
gchar *text;
+ GladeXML *xml;
- dialog = gtkpod_xml_get_widget(cdwidget->xml, "coverart_preview_dialog");
- drawarea = gtkpod_xml_get_widget(cdwidget->xml,
"coverart_preview_dialog_drawarea");
- res_label = gtkpod_xml_get_widget(cdwidget->xml,
"coverart_preview_dialog_res_lbl");
+ xml = gtkpod_xml_new(GLADE_FILE, "coverart_preview_dialog");
+ dialog = gtkpod_xml_get_widget(xml, "coverart_preview_dialog");
+ drawarea = gtkpod_xml_get_widget(xml, "coverart_preview_dialog_drawarea");
+ res_label = gtkpod_xml_get_widget(xml, "coverart_preview_dialog_res_lbl");
g_return_if_fail (dialog);
g_return_if_fail (drawarea);
g_return_if_fail (res_label);
diff --git a/src/display_coverart.h b/src/display_coverart.h
index 5e10336..be4a8f9 100644
--- a/src/display_coverart.h
+++ b/src/display_coverart.h
@@ -63,9 +63,7 @@ typedef struct {
} Cover_Item;
typedef struct {
- GladeXML *xml;
-
- /* Gtk widgets */
+ /* Gtk widgets */
GtkWidget *parent;
GtkWidget *contentpanel;
GtkWidget *canvasbox;
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
