X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/2d504956e1c3612ed62f16a05fd504b5998e6759..61366360ff395427a76472e407debad7d3cbecdf:/disobedience/menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index fcf9e9f..283c0d1 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -1,21 +1,19 @@
/*
* 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file disobedience/menu.c
* @brief Main menu
@@ -24,12 +22,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 *err,
+ const char *value);
/** @brief Called when the quit option is activated
*
@@ -42,34 +43,24 @@ static void quit_program(gpointer attribute((unused)) callback_data,
exit(0);
}
-/* 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) {
- 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");
-
- t->selectall_activate(tab);
-}
-
-/** @brief Called when the track properties option is activated
+/** @brief Called when an edit menu item is selected
*
- * Calls the per-tab properties function.
+ * Shared by several menu items; callback_action is expected to be the offset
+ * of the activate member of struct tabtype.
*/
-static void properties_item(gpointer attribute((unused)) callback_data,
- guint attribute((unused)) callback_action,
+static void menu_tab_action(gpointer attribute((unused)) callback_data,
+ guint 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");
- t->properties_activate(tab);
+ void (**activatep)(GtkMenuItem *, gpointer)
+ = (void *)((const char *)t + callback_action);
+ void (*activate)(GtkMenuItem *, gpointer) = *activatep;
+
+ if(activate)
+ activate(NULL, t->extra);
}
/** @brief Called when the login option is activated */
@@ -79,24 +70,48 @@ static void login(gpointer attribute((unused)) callback_data,
login_box();
}
-/** @brief Update menu state
+/** @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 Called when edit menu is shown
*
* 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),
- page < 0 ? gtk_notebook_current_page(GTK_NOTEBOOK(tabs)) : page);
- const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type");
+static void edit_menu_show(GtkWidget attribute((unused)) *widget,
+ gpointer attribute((unused)) user_data) {
+ if(tabs) {
+ 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");
- 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 */
@@ -111,36 +126,100 @@ static void about_popup(gpointer attribute((unused)) callback_data,
0);
}
-/** @brief Callde when version arrives, displays about... popup */
+static void manual_popup(gpointer attribute((unused)) callback_data,
+ guint attribute((unused)) callback_action,
+ GtkWidget attribute((unused)) *menu_item) {
+ D(("manual_popup"));
+
+ popup_help();
+}
+
+/** @brief Called when version arrives, displays about... popup */
static void about_popup_got_version(void attribute((unused)) *v,
+ const char attribute((unused)) *err,
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);
- w = gtk_dialog_new_with_buttons("About DisOrder",
+ byte_xasprintf(&short_version_string, "Disobedience %s",
+ disorder_short_version_string);
+ w = gtk_dialog_new_with_buttons("About Disobedience",
GTK_WINDOW(toplevel),
(GTK_DIALOG_MODAL
|GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
(char *)NULL);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
- gtk_label_new("DisOrder client " VERSION));
- 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-2007 Richard Kettlewell"));
+ hbox = gtk_hbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+ vbox = gtk_vbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(hbox),
+ gtk_image_new_from_pixbuf(find_image("duck.png")),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 4/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new(short_version_string),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new(server_version_string),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new("\xC2\xA9 2004-2008 Richard Kettlewell"),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_end(GTK_BOX(hbox),
+ vbox,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ title = gtk_label_new(0);
+ gtk_label_set_markup(GTK_LABEL(title),
+ "Disobedience");
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), title,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), hbox,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ set_tool_colors(w);
gtk_widget_show_all(w);
gtk_dialog_run(GTK_DIALOG(w));
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 */
@@ -148,15 +227,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 *)"/File/Quit Disobedience", /* path */
+ (char *)"/Server/Settings", /* path */
+ 0, /* accelerator */
+ settings, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+#endif
+ {
+ (char *)"/Server/Quit Disobedience", /* path */
(char *)"Q", /* accelerator */
quit_program, /* callback */
0, /* callback_action */
@@ -174,17 +271,25 @@ GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Select all tracks", /* path */
- (char *)"A", /* accelerator */
- select_all, /* callback */
- 0, /* callback_action */
+ 0, /* accelerator */
+ menu_tab_action, /* callback */
+ offsetof(struct tabtype, selectall_activate), /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Edit/Deselect all tracks", /* path */
+ 0, /* accelerator */
+ menu_tab_action, /* callback */
+ offsetof(struct tabtype, selectnone_activate), /* callback_action */
0, /* item_type */
0 /* extra_data */
},
{
(char *)"/Edit/Track properties", /* path */
0, /* accelerator */
- properties_item, /* callback */
- 0, /* callback_action */
+ menu_tab_action, /* callback */
+ offsetof(struct tabtype, properties_activate), /* callback_action */
0, /* item_type */
0 /* extra_data */
},
@@ -205,6 +310,14 @@ GtkWidget *menubar(GtkWidget *w) {
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 */
@@ -213,6 +326,14 @@ GtkWidget *menubar(GtkWidget *w) {
(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 */
@@ -222,6 +343,14 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"", /* item_type */
0 /* extra_data */
},
+ {
+ (char *)"/Help/Manual page", /* path */
+ 0, /* accelerator */
+ manual_popup, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
{
(char *)"/Help/About DisOrder", /* path */
0, /* accelerator */
@@ -245,13 +374,25 @@ 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);
- return gtk_item_factory_get_widget(mainmenufactory,
- "");
- /* menu bar had better not expand vertically if the window is too big */
+
+
+ GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
+ "/Edit");
+ g_signal_connect(edit_widget, "show", G_CALLBACK(edit_menu_show), 0);
+
+ event_register("rights-changed", menu_rights_changed, 0);
+ users_set_sensitive(0);
+ m = gtk_item_factory_get_widget(mainmenufactory,
+ "");
+ set_tool_colors(m);
+ return m;
}
/*