X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fc36ecb7248f60d2dfc1736ccaeb93d57da57f01..f9b20469107a0d4b6f707cbbdd9a17a7e2c4bf82:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index 63d89be..d2f190d 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -26,8 +26,8 @@ static GtkWidget *selectall_widget; static GtkWidget *selectnone_widget; static GtkWidget *properties_widget; -static GtkWidget *playlists_widget; -static GtkWidget *playlists_menu; +GtkWidget *playlists_widget; +GtkWidget *playlists_menu; /** @brief Main menu widgets */ GtkItemFactory *mainmenufactory; @@ -217,41 +217,6 @@ static void menu_rights_changed(const char attribute((unused)) *event, users_set_sensitive(!!(last_rights & RIGHT_ADMIN)); } -/** @brief Called to activate a playlist */ -static void menu_activate_playlist(GtkMenuItem *menuitem, - gpointer attribute((unused)) user_data) { - GtkLabel *label = GTK_LABEL(GTK_BIN(menuitem)->child); - const char *playlist = gtk_label_get_text(label); - - fprintf(stderr, "activate playlist %s\n", playlist); /* TODO */ -} - -/** @brief Called when the playlists change */ -static void menu_playlists_changed(const char attribute((unused)) *event, - void attribute((unused)) *eventdata, - void attribute((unused)) *callbackdata) { - GtkMenuShell *menu = GTK_MENU_SHELL(playlists_menu); - /* TODO: we could be more sophisticated and only insert/remove widgets as - * needed. For now that's too much effort. */ - while(menu->children) - gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(menu->children->data)); - /* NB nplaylists can be -1 as well as 0 */ - for(int n = 0; n < nplaylists; ++n) { - GtkWidget *w = gtk_menu_item_new_with_label(playlists[n]); - g_signal_connect(w, "activate", G_CALLBACK(menu_activate_playlist), 0); - gtk_widget_show(w); - gtk_menu_shell_append(menu, w); - } - gtk_widget_set_sensitive(playlists_widget, - nplaylists > 0); -} - -static void edit_playlists(gpointer attribute((unused)) callback_data, - guint attribute((unused)) callback_action, - GtkWidget attribute((unused)) *menu_item) { - fprintf(stderr, "edit playlists\n"); /* TODO */ -} - /** @brief Create the menu bar widget */ GtkWidget *menubar(GtkWidget *w) { GtkWidget *m; @@ -449,7 +414,6 @@ GtkWidget *menubar(GtkWidget *w) { g_signal_connect(edit_widget, "show", G_CALLBACK(edit_menu_show), 0); event_register("rights-changed", menu_rights_changed, 0); - event_register("playlists-updated", menu_playlists_changed, 0); users_set_sensitive(0); m = gtk_item_factory_get_widget(mainmenufactory, "");