From 5e806e9c5f16751a39a9d943c9483754ba73884a Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 14 Jun 2010 19:48:52 +0100 Subject: and the actual rename --- src/transport-widget.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+) create mode 100644 src/transport-widget.c (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c new file mode 100644 index 0000000..bc2ee40 --- /dev/null +++ b/src/transport-widget.c @@ -0,0 +1,238 @@ +/* +Copyright 2010 Canonical Ltd. + +Authors: + Conor Curran + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "transport-bar.h" +#include "common-defs.h" +#include + +// TODO: think about leakage: ted ! + +static DbusmenuMenuitem* twin_item; + +typedef struct _TransportWidgetPrivate TransportWidgetPrivate; + +struct _TransportWidgetPrivate +{ + GtkWidget* hbox; + GtkWidget* previous_button; + GtkWidget* play_button; + GtkWidget* next_button; +}; + +enum { + PLAY, + PAUSE, + NEXT, + PREVIOUS, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +#define TRANSPORT_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRANSPORT_WIDGET_TYPE, TransportWidgetPrivate)) + +/* Gobject boiler plate */ +static void transport_widget_class_init (TransportWidgetClass *klass); +static void transport_widget_init (TransportWidget *self); +static void transport_widget_dispose (GObject *object); +static void transport_widget_finalize (GObject *object); + +/* UI and dbus callbacks */ +static gboolean transport_widget_button_press_event (GtkWidget *menuitem, + GdkEventButton *event); +static gboolean transport_widget_button_release_event (GtkWidget *menuitem, + GdkEventButton *event); +static gboolean transport_widget_play_button_trigger (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static void transport_widget_update_state(DbusmenuMenuitem* item, + gchar * property, + GValue * value, + gpointer userdata); +// utility methods +static gchar* transport_widget_determine_play_label(gchar* state); + +G_DEFINE_TYPE (TransportWidget, transport_widget, GTK_TYPE_MENU_ITEM); + + + +static void +transport_widget_class_init (TransportWidgetClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + widget_class->button_press_event = transport_widget_button_press_event; + widget_class->button_release_event = transport_widget_button_release_event; + + g_type_class_add_private (klass, sizeof (TransportWidgetPrivate)); + + gobject_class->dispose = transport_widget_dispose; + gobject_class->finalize = transport_widget_finalize; + + signals[PLAY] = g_signal_new ("play", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[PAUSE] = g_signal_new ("pause", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + + signals[NEXT] = g_signal_new ("next", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[PREVIOUS] = g_signal_new ("previous", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} + +static void +transport_widget_init (TransportWidget *self) +{ + g_debug("TransportWidget::transport_widget_init"); + + TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(self); + GtkWidget *hbox; + + hbox = gtk_hbox_new(TRUE, 2); + priv->previous_button = gtk_button_new_with_label("<<"); + priv->next_button = gtk_button_new_with_label(">>"); + priv->play_button = gtk_button_new_with_label(">"); + + gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, FALSE, 0); + + g_signal_connect(priv->play_button, "button-press-event", G_CALLBACK(transport_widget_play_button_trigger), NULL); + priv->hbox = hbox; + + g_signal_connect(G_OBJECT(twin_item), "property-changed", G_CALLBACK(transport_widget_update_state), self); + + gtk_widget_show_all (priv->hbox); + gtk_container_add (GTK_CONTAINER (self), hbox); + +} + +static void +transport_widget_dispose (GObject *object) +{ + //if(IS_TRANSPORT_BAR(object) == TRUE){ + // TransportWidgetPrivate * priv = TRANSPORT_BAR_GET_PRIVATE(TRANSPORT_BAR(object)); + // g_object_unref(priv->previous_button); + //} + G_OBJECT_CLASS (transport_widget_parent_class)->dispose (object); +} + +static void +transport_widget_finalize (GObject *object) +{ + G_OBJECT_CLASS (transport_widget_parent_class)->finalize (object); +} + +/* keyevents */ +static gboolean +transport_widget_button_press_event (GtkWidget *menuitem, + GdkEventButton *event) +{ + g_debug("TransportWidget::menu_press_event"); + return FALSE; +} + +static gboolean +transport_widget_button_release_event (GtkWidget *menuitem, + GdkEventButton *event) +{ + g_debug("TransportWidget::menu_release_event"); + return FALSE; +} + +/* Individual keyevents on the buttons */ +static gboolean +transport_widget_play_button_trigger(GtkWidget* widget, + GdkEventButton *event, + gpointer user_data) +{ + g_debug("TransportWidget::PLAY button_press_event"); + return FALSE; +} + +/** +* transport_widget_update_state() +* Callback for updates from the other side of dbus +**/ +static void transport_widget_update_state(DbusmenuMenuitem* item, gchar* property, + GValue* value, gpointer userdata) +{ + g_debug("transport_widget_update_state - with property %s", property); + gchar* input = g_strdup(g_value_get_string(value)); + g_debug("transport_widget_update_state - with value %s", input); + + TransportWidget* bar = (TransportWidget*)userdata; + TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar); + + gtk_button_set_label(GTK_BUTTON(priv->play_button), g_strdup(transport_widget_determine_play_label(property))); +} + +// will be needed for image swapping +static gchar* transport_widget_determine_play_label(gchar* state) +{ + gchar* label = ">"; + if(g_strcmp0(state, "pause") == 0){ + label = "||"; + } + else if(g_strcmp0(state, "play") == 0){ + label = ">"; + } + return label; +} + + /** + * transport_new: + * @returns: a new #TransportWidget. + **/ +GtkWidget* +transport_widget_new(DbusmenuMenuitem *item) +{ + twin_item = item; + return g_object_new(TRANSPORT_WIDGET_TYPE, NULL); +} + -- cgit v1.2.3 From b8519dc8b908adf85f88299c743106c9c3627b64 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 14 Jun 2010 19:52:25 +0100 Subject: and it compiles --- src/indicator-sound.c | 4 ++-- src/transport-widget.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/indicator-sound.c b/src/indicator-sound.c index ebafd9a..9f7e136 100755 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -94,7 +94,7 @@ static void slider_released(GtkWidget *widget, gpointer user_data); static void style_changed_cb(GtkWidget *widget, gpointer user_data); //player widgets related -static gboolean new_transport_bar(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static gboolean new_transport_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static gboolean new_metadata_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); // DBUS communication @@ -241,7 +241,7 @@ get_menu (IndicatorObject * io) DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu); g_object_set_data (G_OBJECT (client), "indicator", io); dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_SLIDER_MENUITEM_TYPE, new_slider_item); - dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_TRANSPORT_MENUITEM_TYPE, new_transport_bar); + dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_TRANSPORT_MENUITEM_TYPE, new_transport_widget); dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_METADATA_MENUITEM_TYPE, new_metadata_widget); // register Key-press listening on the menu widget as the slider does not allow this. diff --git a/src/transport-widget.c b/src/transport-widget.c index bc2ee40..cd73a17 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -22,7 +22,7 @@ with this program. If not, see . #endif #include -#include "transport-bar.h" +#include "transport-widget.h" #include "common-defs.h" #include -- cgit v1.2.3 From ca99bae318b2768e721c2fa0834e8d12c196b245 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 15 Jun 2010 00:32:27 +0100 Subject: key events are not going to be easy --- src/transport-menu-item.vala | 2 - src/transport-widget.c | 91 +++++++++++++++++++++++++++++++------------- 2 files changed, 65 insertions(+), 28 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-menu-item.vala b/src/transport-menu-item.vala index 0ecc9b1..7687a92 100644 --- a/src/transport-menu-item.vala +++ b/src/transport-menu-item.vala @@ -15,7 +15,5 @@ public class TransportMenuitem : Dbusmenu.Menuitem public override void handle_event(string name, GLib.Value input_value, uint timestamp) { - this.property_set(DBUSMENU_TRANSPORT_MENUITEM_STATE, "1"); - debug("TransportItem -> handle event caught!"); } } \ No newline at end of file diff --git a/src/transport-widget.c b/src/transport-widget.c index cd73a17..7e26c68 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -58,14 +58,21 @@ static void transport_widget_init (TransportWidget *self); static void transport_widget_dispose (GObject *object); static void transport_widget_finalize (GObject *object); -/* UI and dbus callbacks */ -static gboolean transport_widget_button_press_event (GtkWidget *menuitem, - GdkEventButton *event); +/* UI and dbusmenu callbacks */ +static gboolean transport_widget_button_press_event (GtkWidget *menuitem, + GdkEventButton *event); static gboolean transport_widget_button_release_event (GtkWidget *menuitem, - GdkEventButton *event); -static gboolean transport_widget_play_button_trigger (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); + GdkEventButton *event); +static gboolean transport_widget_play_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static gboolean transport_widget_previous_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static gboolean transport_widget_next_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); + static void transport_widget_update_state(DbusmenuMenuitem* item, gchar * property, GValue * value, @@ -138,27 +145,26 @@ transport_widget_init (TransportWidget *self) priv->next_button = gtk_button_new_with_label(">>"); priv->play_button = gtk_button_new_with_label(">"); - gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, TRUE, 0); + + g_signal_connect(GTK_OBJECT(priv->play_button), "button-press-event", G_CALLBACK(transport_widget_play_button_press_event), priv->play_button); + g_signal_connect(GTK_OBJECT(priv->previous_button), "button-press-event", G_CALLBACK(transport_widget_previous_button_press_event), NULL); + g_signal_connect(GTK_OBJECT(priv->next_button), "button-press-event", G_CALLBACK(transport_widget_next_button_press_event), NULL); - g_signal_connect(priv->play_button, "button-press-event", G_CALLBACK(transport_widget_play_button_trigger), NULL); - priv->hbox = hbox; + priv->hbox = hbox; g_signal_connect(G_OBJECT(twin_item), "property-changed", G_CALLBACK(transport_widget_update_state), self); - gtk_widget_show_all (priv->hbox); - gtk_container_add (GTK_CONTAINER (self), hbox); + gtk_container_add (GTK_CONTAINER (self), priv->hbox); + gtk_widget_show_all (priv->hbox); } static void transport_widget_dispose (GObject *object) { - //if(IS_TRANSPORT_BAR(object) == TRUE){ - // TransportWidgetPrivate * priv = TRANSPORT_BAR_GET_PRIVATE(TRANSPORT_BAR(object)); - // g_object_unref(priv->previous_button); - //} G_OBJECT_CLASS (transport_widget_parent_class)->dispose (object); } @@ -171,10 +177,25 @@ transport_widget_finalize (GObject *object) /* keyevents */ static gboolean transport_widget_button_press_event (GtkWidget *menuitem, - GdkEventButton *event) + GdkEventButton *event) { g_debug("TransportWidget::menu_press_event"); - return FALSE; + //TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); + //gtk_button_pressed(GTK_BUTTON(priv->play_button)); + //gtk_button_pressed(GTK_BUTTON(priv->previous_button)); + //gtk_button_pressed(GTK_BUTTON(priv->next_button)); + + //if (event->type == GDK_BUTTON_PRESS) { + //GdkEventButton *bevent = (GdkEventButton *) event; + //gtk_button_pressed(bevent->button); +//gtk_menu_popup (GTK_MENU (menuitem), NULL, NULL, NULL, NULL, +// bevent->button, bevent->time); + /* Tell calling code that we have handled this event; the buck + * stops here. */ + //return TRUE; + //} + + return TRUE; } static gboolean @@ -182,17 +203,35 @@ transport_widget_button_release_event (GtkWidget *menuitem, GdkEventButton *event) { g_debug("TransportWidget::menu_release_event"); - return FALSE; + return TRUE; } /* Individual keyevents on the buttons */ static gboolean -transport_widget_play_button_trigger(GtkWidget* widget, - GdkEventButton *event, - gpointer user_data) +transport_widget_play_button_press_event( GtkWidget* widget, + GdkEventButton *event, + gpointer user_data) +{ + g_debug("!!!!! TransportWidget::PLAY button_press_event"); + return TRUE; +} + +static gboolean +transport_widget_previous_button_press_event( GtkWidget* widget, + GdkEventButton *event, + gpointer user_data) +{ + g_debug("!!!!! TransportWidget::PREVIOUS button_press_event"); + return TRUE; +} + +static gboolean +transport_widget_next_button_press_event( GtkWidget* widget, + GdkEventButton *event, + gpointer user_data) { - g_debug("TransportWidget::PLAY button_press_event"); - return FALSE; + g_debug("!!!!! TransportWidget::NEXT button_press_event"); + return TRUE; } /** -- cgit v1.2.3 From 50bea3ce0fad1e36d0a657430a96567986a46638 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 15 Jun 2010 11:33:07 +0100 Subject: for now activated one button due to gtk button press oddness --- src/transport-widget.c | 111 ++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 52 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index 7e26c68..b3f2ee1 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -35,9 +35,9 @@ typedef struct _TransportWidgetPrivate TransportWidgetPrivate; struct _TransportWidgetPrivate { GtkWidget* hbox; - GtkWidget* previous_button; + //GtkWidget* previous_button; GtkWidget* play_button; - GtkWidget* next_button; + //GtkWidget* next_button; }; enum { @@ -63,22 +63,22 @@ static gboolean transport_widget_button_press_event (GtkWidget *men GdkEventButton *event); static gboolean transport_widget_button_release_event (GtkWidget *menuitem, GdkEventButton *event); -static gboolean transport_widget_play_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); -static gboolean transport_widget_previous_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); -static gboolean transport_widget_next_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); +//static gboolean transport_widget_play_button_press_event (GtkWidget *widget, +// GdkEventButton *event, +// gpointer user_data); +//static gboolean transport_widget_previous_button_press_event (GtkWidget *widget, +// GdkEventButton *event, +// gpointer user_data); +//static gboolean transport_widget_next_button_press_event (GtkWidget *widget, +// GdkEventButton *event, +// gpointer user_data); static void transport_widget_update_state(DbusmenuMenuitem* item, gchar * property, GValue * value, gpointer userdata); // utility methods -static gchar* transport_widget_determine_play_label(gchar* state); +static gchar* transport_widget_determine_play_label(const gchar* state); G_DEFINE_TYPE (TransportWidget, transport_widget, GTK_TYPE_MENU_ITEM); @@ -141,24 +141,29 @@ transport_widget_init (TransportWidget *self) GtkWidget *hbox; hbox = gtk_hbox_new(TRUE, 2); - priv->previous_button = gtk_button_new_with_label("<<"); - priv->next_button = gtk_button_new_with_label(">>"); + //priv->previous_button = gtk_button_new_with_label("<<"); + //priv->next_button = gtk_button_new_with_label(">>"); priv->play_button = gtk_button_new_with_label(">"); - gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, TRUE, 0); + //gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, TRUE, 0); + //gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, TRUE, 0); - g_signal_connect(GTK_OBJECT(priv->play_button), "button-press-event", G_CALLBACK(transport_widget_play_button_press_event), priv->play_button); - g_signal_connect(GTK_OBJECT(priv->previous_button), "button-press-event", G_CALLBACK(transport_widget_previous_button_press_event), NULL); - g_signal_connect(GTK_OBJECT(priv->next_button), "button-press-event", G_CALLBACK(transport_widget_next_button_press_event), NULL); + //g_signal_connect(GTK_OBJECT(priv->play_button), "button-press-event", G_CALLBACK(transport_widget_play_button_press_event), priv->play_button); + //g_signal_connect(GTK_OBJECT(priv->previous_button), "button-press-event", G_CALLBACK(transport_widget_previous_button_press_event), NULL); + //g_signal_connect(GTK_OBJECT(priv->next_button), "button-press-event", G_CALLBACK(transport_widget_next_button_press_event), NULL); priv->hbox = hbox; g_signal_connect(G_OBJECT(twin_item), "property-changed", G_CALLBACK(transport_widget_update_state), self); gtk_container_add (GTK_CONTAINER (self), priv->hbox); - + + //GtkWidget* parent = gtk_widget_get_parent(GTK_WIDGET(priv->hbox)); + //if (GTK_IS_MENU_ITEM(parent)){ + // g_debug("as expected the transport item is the parent"); + //} + //gtk_widget_set_parent(GTK_WIDGET(priv->hbox), GTK_WIDGET(self)); gtk_widget_show_all (priv->hbox); } @@ -180,7 +185,9 @@ transport_widget_button_press_event (GtkWidget *menuitem, GdkEventButton *event) { g_debug("TransportWidget::menu_press_event"); - //TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); + TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); + gtk_button_set_label(GTK_BUTTON(priv->play_button), g_strdup(transport_widget_determine_play_label(gtk_button_get_label(GTK_BUTTON(priv->play_button))))); + //gtk_button_pressed(GTK_BUTTON(priv->play_button)); //gtk_button_pressed(GTK_BUTTON(priv->previous_button)); //gtk_button_pressed(GTK_BUTTON(priv->next_button)); @@ -207,32 +214,32 @@ transport_widget_button_release_event (GtkWidget *menuitem, } /* Individual keyevents on the buttons */ -static gboolean -transport_widget_play_button_press_event( GtkWidget* widget, - GdkEventButton *event, - gpointer user_data) -{ - g_debug("!!!!! TransportWidget::PLAY button_press_event"); - return TRUE; -} - -static gboolean -transport_widget_previous_button_press_event( GtkWidget* widget, - GdkEventButton *event, - gpointer user_data) -{ - g_debug("!!!!! TransportWidget::PREVIOUS button_press_event"); - return TRUE; -} - -static gboolean -transport_widget_next_button_press_event( GtkWidget* widget, - GdkEventButton *event, - gpointer user_data) -{ - g_debug("!!!!! TransportWidget::NEXT button_press_event"); - return TRUE; -} +//static gboolean +//transport_widget_play_button_press_event( GtkWidget* widget, +// GdkEventButton *event, +// gpointer user_data) +//{ +// g_debug("!!!!! TransportWidget::PLAY button_press_event"); +// return TRUE; +//} + +//static gboolean +//transport_widget_previous_button_press_event( GtkWidget* widget, +// GdkEventButton *event, +// gpointer user_data) +//{ +// g_debug("!!!!! TransportWidget::PREVIOUS button_press_event"); +// return TRUE; +//} + +//static gboolean +//transport_widget_next_button_press_event( GtkWidget* widget, +// GdkEventButton *event, +// gpointer user_data) +//{ +// g_debug("!!!!! TransportWidget::NEXT button_press_event"); +// return TRUE; +//} /** * transport_widget_update_state() @@ -252,15 +259,15 @@ static void transport_widget_update_state(DbusmenuMenuitem* item, gchar* propert } // will be needed for image swapping -static gchar* transport_widget_determine_play_label(gchar* state) +static gchar* transport_widget_determine_play_label(const gchar* state) { gchar* label = ">"; - if(g_strcmp0(state, "pause") == 0){ + //if(g_strcmp0(state, "||") == 0){ + // label = "||"; + //} + if(g_strcmp0(state, ">") == 0){ label = "||"; } - else if(g_strcmp0(state, "play") == 0){ - label = ">"; - } return label; } -- cgit v1.2.3 From 6cb898210daa87978405e270e159ef2c0d63fb26 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 15 Jun 2010 12:19:01 +0100 Subject: removed commented code --- src/transport-widget.c | 68 -------------------------------------------------- 1 file changed, 68 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index b3f2ee1..2c32315 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -35,9 +35,7 @@ typedef struct _TransportWidgetPrivate TransportWidgetPrivate; struct _TransportWidgetPrivate { GtkWidget* hbox; - //GtkWidget* previous_button; GtkWidget* play_button; - //GtkWidget* next_button; }; enum { @@ -63,15 +61,6 @@ static gboolean transport_widget_button_press_event (GtkWidget *men GdkEventButton *event); static gboolean transport_widget_button_release_event (GtkWidget *menuitem, GdkEventButton *event); -//static gboolean transport_widget_play_button_press_event (GtkWidget *widget, -// GdkEventButton *event, -// gpointer user_data); -//static gboolean transport_widget_previous_button_press_event (GtkWidget *widget, -// GdkEventButton *event, -// gpointer user_data); -//static gboolean transport_widget_next_button_press_event (GtkWidget *widget, -// GdkEventButton *event, -// gpointer user_data); static void transport_widget_update_state(DbusmenuMenuitem* item, gchar * property, @@ -141,17 +130,10 @@ transport_widget_init (TransportWidget *self) GtkWidget *hbox; hbox = gtk_hbox_new(TRUE, 2); - //priv->previous_button = gtk_button_new_with_label("<<"); - //priv->next_button = gtk_button_new_with_label(">>"); priv->play_button = gtk_button_new_with_label(">"); - //gtk_box_pack_start (GTK_BOX (hbox), priv->previous_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, TRUE, 0); - //gtk_box_pack_start (GTK_BOX (hbox), priv->next_button, FALSE, TRUE, 0); - //g_signal_connect(GTK_OBJECT(priv->play_button), "button-press-event", G_CALLBACK(transport_widget_play_button_press_event), priv->play_button); - //g_signal_connect(GTK_OBJECT(priv->previous_button), "button-press-event", G_CALLBACK(transport_widget_previous_button_press_event), NULL); - //g_signal_connect(GTK_OBJECT(priv->next_button), "button-press-event", G_CALLBACK(transport_widget_next_button_press_event), NULL); priv->hbox = hbox; @@ -159,11 +141,6 @@ transport_widget_init (TransportWidget *self) gtk_container_add (GTK_CONTAINER (self), priv->hbox); - //GtkWidget* parent = gtk_widget_get_parent(GTK_WIDGET(priv->hbox)); - //if (GTK_IS_MENU_ITEM(parent)){ - // g_debug("as expected the transport item is the parent"); - //} - //gtk_widget_set_parent(GTK_WIDGET(priv->hbox), GTK_WIDGET(self)); gtk_widget_show_all (priv->hbox); } @@ -187,20 +164,6 @@ transport_widget_button_press_event (GtkWidget *menuitem, g_debug("TransportWidget::menu_press_event"); TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); gtk_button_set_label(GTK_BUTTON(priv->play_button), g_strdup(transport_widget_determine_play_label(gtk_button_get_label(GTK_BUTTON(priv->play_button))))); - - //gtk_button_pressed(GTK_BUTTON(priv->play_button)); - //gtk_button_pressed(GTK_BUTTON(priv->previous_button)); - //gtk_button_pressed(GTK_BUTTON(priv->next_button)); - - //if (event->type == GDK_BUTTON_PRESS) { - //GdkEventButton *bevent = (GdkEventButton *) event; - //gtk_button_pressed(bevent->button); -//gtk_menu_popup (GTK_MENU (menuitem), NULL, NULL, NULL, NULL, -// bevent->button, bevent->time); - /* Tell calling code that we have handled this event; the buck - * stops here. */ - //return TRUE; - //} return TRUE; } @@ -213,34 +176,6 @@ transport_widget_button_release_event (GtkWidget *menuitem, return TRUE; } -/* Individual keyevents on the buttons */ -//static gboolean -//transport_widget_play_button_press_event( GtkWidget* widget, -// GdkEventButton *event, -// gpointer user_data) -//{ -// g_debug("!!!!! TransportWidget::PLAY button_press_event"); -// return TRUE; -//} - -//static gboolean -//transport_widget_previous_button_press_event( GtkWidget* widget, -// GdkEventButton *event, -// gpointer user_data) -//{ -// g_debug("!!!!! TransportWidget::PREVIOUS button_press_event"); -// return TRUE; -//} - -//static gboolean -//transport_widget_next_button_press_event( GtkWidget* widget, -// GdkEventButton *event, -// gpointer user_data) -//{ -// g_debug("!!!!! TransportWidget::NEXT button_press_event"); -// return TRUE; -//} - /** * transport_widget_update_state() * Callback for updates from the other side of dbus @@ -262,9 +197,6 @@ static void transport_widget_update_state(DbusmenuMenuitem* item, gchar* propert static gchar* transport_widget_determine_play_label(const gchar* state) { gchar* label = ">"; - //if(g_strcmp0(state, "||") == 0){ - // label = "||"; - //} if(g_strcmp0(state, ">") == 0){ label = "||"; } -- cgit v1.2.3