X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..685bdfbd932f507bfe86c668a6970b360f895617:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index b4b6ca0..843f451 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006, 2007 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,14 +17,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ +/** @file disobedience/menu.c + * @brief Main menu + */ #include "disobedience.h" static GtkWidget *selectall_widget; static GtkWidget *properties_widget; +/** @brief Main menu widgets */ +GtkItemFactory *mainmenufactory; + static void about_popup_got_version(void *v, const char *value); +/** @brief Called when the quit option is activated + * + * Just exits. + */ static void quit_program(gpointer attribute((unused)) callback_data, guint attribute((unused)) callback_action, GtkWidget attribute((unused)) *menu_item) { @@ -33,6 +43,11 @@ static void quit_program(gpointer attribute((unused)) callback_data, } /* TODO can we have a single parameterized callback for all these */ + +/** @brief Called when the select all option is activated + * + * Calls the per-tab select all function. + */ static void select_all(gpointer attribute((unused)) callback_data, guint attribute((unused)) callback_action, GtkWidget attribute((unused)) *menu_item) { @@ -43,6 +58,10 @@ static void select_all(gpointer attribute((unused)) callback_data, t->selectall_activate(tab); } +/** @brief Called when the track properties option is activated + * + * Calls the per-tab properties function. + */ static void properties_item(gpointer attribute((unused)) callback_data, guint attribute((unused)) callback_action, GtkWidget attribute((unused)) *menu_item) { @@ -53,6 +72,19 @@ static void properties_item(gpointer attribute((unused)) callback_data, t->properties_activate(tab); } +/** @brief Called when the login option is activated */ +static void login(gpointer attribute((unused)) callback_data, + guint attribute((unused)) callback_action, + GtkWidget attribute((unused)) *menu_item) { + login_box(); +} + +/** @brief Update menu state + * + * Determines option sensitivity according to the current tab and adjusts the + * widgets accordingly. Knows about @ref DISORDER_CONNECTED so the callbacks + * need not. + */ void menu_update(int page) { GtkWidget *tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK(tabs), @@ -61,11 +93,13 @@ void menu_update(int page) { assert(t != 0); gtk_widget_set_sensitive(properties_widget, - t->properties_sensitive(tab)); + (t->properties_sensitive(tab) + && (disorder_eclient_state(client) & DISORDER_CONNECTED))); gtk_widget_set_sensitive(selectall_widget, t->selectall_sensitive(tab)); } - + +/** @brief Fetch version in order to display the about... popup */ static void about_popup(gpointer attribute((unused)) callback_data, guint attribute((unused)) callback_action, GtkWidget attribute((unused)) *menu_item) { @@ -77,6 +111,7 @@ static void about_popup(gpointer attribute((unused)) callback_data, 0); } +/** @brief Callde when version arrives, displays about... popup */ static void about_popup_got_version(void attribute((unused)) *v, const char *value) { GtkWidget *w; @@ -95,46 +130,142 @@ static void about_popup_got_version(void attribute((unused)) *v, gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox), gtk_label_new(server_version_string)); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox), - gtk_label_new("(c) 2004-2006 Richard Kettlewell")); + gtk_label_new("(c) 2004-2007 Richard Kettlewell")); gtk_widget_show_all(w); gtk_dialog_run(GTK_DIALOG(w)); gtk_widget_destroy(w); } +/** @brief Create the menu bar widget */ GtkWidget *menubar(GtkWidget *w) { static const GtkItemFactoryEntry entries[] = { - { (char *)"/File", 0, 0, 0, (char *)"", 0 }, - { (char *)"/File/Quit", (char *)"Q", quit_program, 0, - (char *)"", GTK_STOCK_QUIT }, - { (char *)"/Edit", 0, 0, 0, (char *)"", 0 }, - { (char *)"/Edit/Select All", (char *)"A", select_all, 0, - 0, 0 }, - { (char *)"/Edit/Properties", 0, properties_item, 0, - 0, 0 }, - { (char *)"/Help", 0, 0, 0, (char *)"", 0 }, - { (char *)"/Help/About DisOrder", 0, about_popup, 0, - (char *)"", GTK_STOCK_ABOUT }, + { + (char *)"/File", /* path */ + 0, /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/File/Login", /* path */ + (char *)"L", /* accelerator */ + login, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/File/Quit Disobedience", /* path */ + (char *)"Q", /* accelerator */ + quit_program, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + GTK_STOCK_QUIT /* extra_data */ + }, + + { + (char *)"/Edit", /* path */ + 0, /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Edit/Select all tracks", /* path */ + (char *)"A", /* accelerator */ + select_all, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Edit/Track properties", /* path */ + 0, /* accelerator */ + properties_item, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, + + { + (char *)"/Control", /* path */ + 0, /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Control/Scratch", /* path */ + (char *)"S", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Control/Playing", /* path */ + (char *)"P", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Control/Random play", /* path */ + (char *)"R", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Control/Network player", /* path */ + (char *)"N", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + + { + (char *)"/Help", /* path */ + 0, /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, + { + (char *)"/Help/About DisOrder", /* path */ + 0, /* accelerator */ + about_popup, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + GTK_STOCK_ABOUT /* extra_data */ + }, }; - GtkItemFactory *itemfactory; GtkAccelGroup *accel = gtk_accel_group_new(); D(("add_menubar")); /* TODO: item factories are deprecated in favour of some XML thing */ - itemfactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "", - accel); - gtk_item_factory_create_items(itemfactory, + mainmenufactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "", + accel); + gtk_item_factory_create_items(mainmenufactory, sizeof entries / sizeof *entries, (GtkItemFactoryEntry *)entries, 0); gtk_window_add_accel_group(GTK_WINDOW(w), accel); - selectall_widget = gtk_item_factory_get_widget(itemfactory, - "/Edit/Select All"); - properties_widget = gtk_item_factory_get_widget(itemfactory, - "/Edit/Properties"); + selectall_widget = gtk_item_factory_get_widget(mainmenufactory, + "/Edit/Select all tracks"); + properties_widget = gtk_item_factory_get_widget(mainmenufactory, + "/Edit/Track properties"); assert(selectall_widget != 0); assert(properties_widget != 0); - return gtk_item_factory_get_widget(itemfactory, + return gtk_item_factory_get_widget(mainmenufactory, ""); /* menu bar had better not expand vertically if the window is too big */ }