X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ac6bf2bad50653d84388269a6629d121b8c37b8f..87eb933d52879c57c5427a36c2f0b0e7efd9d60c:/disobedience/menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index 5085be2..f24569a 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,6 +24,7 @@
#include "disobedience.h"
static GtkWidget *selectall_widget;
+static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
/** @brief Main menu widgets */
@@ -58,6 +59,20 @@ static void select_all(gpointer attribute((unused)) callback_data,
t->selectall_activate(tab);
}
+/** @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");
+
+ t->selectnone_activate(tab);
+}
+
/** @brief Called when the track properties option is activated
*
* Calls the per-tab properties function.
@@ -79,6 +94,22 @@ 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
@@ -97,6 +128,9 @@ void menu_update(int page) {
&& (disorder_eclient_state(client) & DISORDER_CONNECTED)));
gtk_widget_set_sensitive(selectall_widget,
t->selectall_sensitive(tab));
+ gtk_widget_set_sensitive(selectnone_widget,
+ t->selectnone_sensitive(tab));
+ /* TODO Users should only be sensitive if have RIGHT_ADMIN */
}
/** @brief Fetch version in order to display the about... popup */
@@ -111,52 +145,245 @@ 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 *value) {
GtkWidget *w;
char *server_version_string;
+ char *short_version_string;
+ GtkWidget *hbox, *vbox, *title;
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 with current user's rights string */
+static void menu_got_rights(void attribute((unused)) *v, const char *value) {
+ rights_type r;
+
+ if(parse_rights(value, &r, 0))
+ r = 0;
+ users_set_sensitive(!!(r & RIGHT_ADMIN));
+}
+
+/** @brief Called when we need to reset state */
+static void menu_reset(void) {
+ users_set_sensitive(0); /* until we know better */
+ disorder_eclient_userinfo(client, menu_got_rights, config->username, "rights",
+ 0);
+}
+
/** @brief Create the menu bar widget */
GtkWidget *menubar(GtkWidget *w) {
+ GtkWidget *m;
+
static const GtkItemFactoryEntry entries[] = {
- { (char *)"/File", 0, 0, 0, (char *)"", 0 },
- { (char *)"/File/Login", (char *)"L", login, 0,
- 0, 0 },
- { (char *)"/File/Quit Disobedience", (char *)"Q", quit_program, 0,
- (char *)"", GTK_STOCK_QUIT },
-
- { (char *)"/Edit", 0, 0, 0, (char *)"", 0 },
- { (char *)"/Edit/Select all tracks", (char *)"A", select_all, 0,
- 0, 0 },
- { (char *)"/Edit/Track properties", 0, properties_item, 0,
- 0, 0 },
-
- { (char *)"/Control", 0, 0, 0, (char *)"", 0 },
- { (char *)"/Control/Scratch", (char *)"S", 0, 0, 0, 0 },
+ {
+ (char *)"/Server", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (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 *)"/Server/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/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 */
+ 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", 0, 0, 0, (char *)"", 0 },
- { (char *)"/Help/About DisOrder", 0, about_popup, 0,
- (char *)"", GTK_STOCK_ABOUT },
+ {
+ (char *)"/Help", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (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 */
+ about_popup, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ GTK_STOCK_ABOUT /* extra_data */
+ },
};
GtkAccelGroup *accel = gtk_accel_group_new();
@@ -172,13 +399,19 @@ 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 */
+ register_reset(menu_reset);
+ menu_reset();
+ m = gtk_item_factory_get_widget(mainmenufactory,
+ "");
+ set_tool_colors(m);
+ return m;
}
/*