X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..ee7552f86d9438d415cbe61fd897e5c768f4f1a4:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index 346e2fa..8dcae3c 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006-2008 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 @@ -24,12 +24,15 @@ #include "disobedience.h" static GtkWidget *selectall_widget; +static GtkWidget *selectnone_widget; static GtkWidget *properties_widget; /** @brief Main menu widgets */ GtkItemFactory *mainmenufactory; -static void about_popup_got_version(void *v, const char *value); +static void about_popup_got_version(void *v, + const char *error, + const char *value); /** @brief Called when the quit option is activated * @@ -55,7 +58,23 @@ static void select_all(gpointer attribute((unused)) callback_data, (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - t->selectall_activate(tab); + if(t->selectall_activate) + t->selectall_activate(t->extra); +} + +/** @brief Called when the select none option is activated + * + * Calls the per-tab select none function. + */ +static void select_none(gpointer attribute((unused)) callback_data, + guint attribute((unused)) callback_action, + GtkWidget attribute((unused)) *menu_item) { + GtkWidget *tab = gtk_notebook_get_nth_page + (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); + const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); + + if(t->selectnone_activate) + t->selectnone_activate(t->extra); } /** @brief Called when the track properties option is activated @@ -69,7 +88,8 @@ static void properties_item(gpointer attribute((unused)) callback_data, (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - t->properties_activate(tab); + if(t->properties_activate) + t->properties_activate(t->extra); } /** @brief Called when the login option is activated */ @@ -79,24 +99,49 @@ static void login(gpointer attribute((unused)) callback_data, login_box(); } +/** @brief Called when the login option is activated */ +static void users(gpointer attribute((unused)) callback_data, + guint attribute((unused)) callback_action, + GtkWidget attribute((unused)) *menu_item) { + manage_users(); +} + +#if 0 +/** @brief Called when the settings option is activated */ +static void settings(gpointer attribute((unused)) callback_data, + guint attribute((unused)) callback_action, + GtkWidget attribute((unused)) *menu_item) { + popup_settings(); +} +#endif + /** @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. + * + * TODO: base this on menu popup instead? */ void menu_update(int page) { - GtkWidget *tab = gtk_notebook_get_nth_page - (GTK_NOTEBOOK(tabs), - page < 0 ? gtk_notebook_current_page(GTK_NOTEBOOK(tabs)) : page); - const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); + if(tabs) { + GtkWidget *tab = gtk_notebook_get_nth_page + (GTK_NOTEBOOK(tabs), + page < 0 ? gtk_notebook_current_page(GTK_NOTEBOOK(tabs)) : page); + const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - assert(t != 0); - gtk_widget_set_sensitive(properties_widget, - (t->properties_sensitive(tab) - && (disorder_eclient_state(client) & DISORDER_CONNECTED))); - gtk_widget_set_sensitive(selectall_widget, - t->selectall_sensitive(tab)); + assert(t != 0); + gtk_widget_set_sensitive(properties_widget, + (t->properties_sensitive + && t->properties_sensitive(t->extra) + && (disorder_eclient_state(client) & DISORDER_CONNECTED))); + gtk_widget_set_sensitive(selectall_widget, + t->selectall_sensitive + && t->selectall_sensitive(t->extra)); + gtk_widget_set_sensitive(selectnone_widget, + t->selectnone_sensitive + && t->selectnone_sensitive(t->extra)); + } } /** @brief Fetch version in order to display the about... popup */ @@ -119,14 +164,17 @@ static void manual_popup(gpointer attribute((unused)) callback_data, popup_help(); } -/** @brief Callde when version arrives, displays about... popup */ +/** @brief Called when version arrives, displays about... popup */ static void about_popup_got_version(void attribute((unused)) *v, + const char attribute((unused)) *error, const char *value) { GtkWidget *w; char *server_version_string; char *short_version_string; GtkWidget *hbox, *vbox, *title; + if(!value) + value = "[error]"; byte_xasprintf(&server_version_string, "Server version %s", value); byte_xasprintf(&short_version_string, "Disobedience %s", disorder_short_version_string); @@ -155,7 +203,7 @@ static void about_popup_got_version(void attribute((unused)) *v, FALSE/*fill*/, 1/*padding*/); gtk_box_pack_start(GTK_BOX(vbox), - gtk_label_new("\xC2\xA9 2004-2007 Richard Kettlewell"), + gtk_label_new("\xC2\xA9 2004-2008 Richard Kettlewell"), FALSE/*expand*/, FALSE/*fill*/, 1/*padding*/); @@ -181,13 +229,27 @@ static void about_popup_got_version(void attribute((unused)) *v, gtk_widget_destroy(w); } +/** @brief Set 'Manage Users' menu item sensitivity */ +void users_set_sensitive(int sensitive) { + GtkWidget *w = gtk_item_factory_get_widget(mainmenufactory, + "/Server/Manage users"); + gtk_widget_set_sensitive(w, sensitive); +} + +/** @brief Called when our rights change */ +static void menu_rights_changed(const char attribute((unused)) *event, + void attribute((unused)) *eventdata, + void attribute((unused)) *callbackdata) { + users_set_sensitive(!!(last_rights & RIGHT_ADMIN)); +} + /** @brief Create the menu bar widget */ GtkWidget *menubar(GtkWidget *w) { GtkWidget *m; static const GtkItemFactoryEntry entries[] = { { - (char *)"/File", /* path */ + (char *)"/Server", /* path */ 0, /* accelerator */ 0, /* callback */ 0, /* callback_action */ @@ -195,15 +257,33 @@ GtkWidget *menubar(GtkWidget *w) { 0 /* extra_data */ }, { - (char *)"/File/Login", /* path */ + (char *)"/Server/Login", /* path */ (char *)"L", /* accelerator */ login, /* callback */ 0, /* callback_action */ 0, /* item_type */ 0 /* extra_data */ }, + { + (char *)"/Server/Manage users", /* path */ + 0, /* accelerator */ + users, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, +#if 0 + { + (char *)"/Server/Settings", /* path */ + 0, /* accelerator */ + settings, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, +#endif { - (char *)"/File/Quit Disobedience", /* path */ + (char *)"/Server/Quit Disobedience", /* path */ (char *)"Q", /* accelerator */ quit_program, /* callback */ 0, /* callback_action */ @@ -227,6 +307,14 @@ GtkWidget *menubar(GtkWidget *w) { 0, /* item_type */ 0 /* extra_data */ }, + { + (char *)"/Edit/Deselect all tracks", /* path */ + (char *)"A", /* accelerator */ + select_none, /* callback */ + 0, /* callback_action */ + 0, /* item_type */ + 0 /* extra_data */ + }, { (char *)"/Edit/Track properties", /* path */ 0, /* accelerator */ @@ -316,10 +404,15 @@ GtkWidget *menubar(GtkWidget *w) { gtk_window_add_accel_group(GTK_WINDOW(w), accel); selectall_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Select all tracks"); + selectnone_widget = gtk_item_factory_get_widget(mainmenufactory, + "/Edit/Deselect all tracks"); properties_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Track properties"); assert(selectall_widget != 0); + assert(selectnone_widget != 0); assert(properties_widget != 0); + event_register("rights-changed", menu_rights_changed, 0); + users_set_sensitive(0); m = gtk_item_factory_get_widget(mainmenufactory, ""); set_tool_colors(m);