X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/52b88d2428a808d0636a1cb8205a1f891fc23e6a..0b0fb26bbfa5a32d00cf3f234c5066648128df8e:/disobedience/menu.c?ds=inline
diff --git a/disobedience/menu.c b/disobedience/menu.c
index d2bb6a6..0243139 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -2,20 +2,18 @@
* This file is part of DisOrder.
* 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
@@ -26,11 +24,18 @@
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
+#if PLAYLISTS
+GtkWidget *playlists_widget;
+GtkWidget *playlists_menu;
+GtkWidget *editplaylists_widget;
+#endif
/** @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
*
@@ -43,48 +48,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 select none option is activated
+/** @brief Called when an edit menu item is selected
*
- * Calls the per-tab select none function.
+ * Shared by several menu items; callback_action is expected to be the offset
+ * of the activate member of struct tabtype.
*/
-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.
- */
-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 */
@@ -110,29 +91,34 @@ static void settings(gpointer attribute((unused)) callback_data,
}
#endif
-/** @brief Update menu state
+/** @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));
- gtk_widget_set_sensitive(selectnone_widget,
- t->selectnone_sensitive(tab));
- /* TODO Users should only be sensitive if have RIGHT_ADMIN */
+ 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 */
static void about_popup(gpointer attribute((unused)) callback_data,
guint attribute((unused)) callback_action,
@@ -155,12 +141,15 @@ static void manual_popup(gpointer attribute((unused)) callback_data,
/** @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);
byte_xasprintf(&short_version_string, "Disobedience %s",
disorder_short_version_string);
@@ -189,7 +178,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-2008 Richard Kettlewell"),
+ gtk_label_new("\xC2\xA9 2004-2009 Richard Kettlewell"),
FALSE/*expand*/,
FALSE/*fill*/,
1/*padding*/);
@@ -215,6 +204,20 @@ 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;
@@ -273,28 +276,39 @@ 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 */
- (char *)"A", /* accelerator */
- select_none, /* callback */
- 0, /* callback_action */
+ 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 */
+ menu_tab_action, /* callback */
+ offsetof(struct tabtype, properties_activate), /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+#if PLAYLISTS
+ {
+ (char *)"/Edit/Edit playlists", /* path */
+ 0, /* accelerator */
+ edit_playlists, /* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
},
+#endif
+
{
(char *)"/Control", /* path */
@@ -336,6 +350,16 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"", /* item_type */
0 /* extra_data */
},
+#if PLAYLISTS
+ {
+ (char *)"/Control/Activate playlist", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+#endif
{
(char *)"/Help", /* path */
@@ -380,9 +404,29 @@ GtkWidget *menubar(GtkWidget *w) {
"/Edit/Deselect all tracks");
properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"/Edit/Track properties");
+#if PLAYLISTS
+ playlists_widget = gtk_item_factory_get_item(mainmenufactory,
+ "/Control/Activate playlist");
+ playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
+ "/Control/Activate playlist");
+ editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
+ "/Edit/Edit playlists");
+#endif
assert(selectall_widget != 0);
assert(selectnone_widget != 0);
assert(properties_widget != 0);
+#if PLAYLISTS
+ assert(playlists_widget != 0);
+ assert(playlists_menu != 0);
+ assert(editplaylists_widget != 0);
+#endif
+
+ 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);