chiark / gitweb /
~mdw / disorder / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge playlist branch against trunk to date.
[disorder] / disobedience / menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index f24569af7d481cf115f802dac57a0522253be41f..1d50223d3dfff0c9192a06c800552c480da1eada 100644 (file)
--- 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 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
  * 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.
  *
  * (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
  * 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 <http://www.gnu.org/licenses/>.
  */
 /** @file disobedience/menu.c
  * @brief Main menu
  */
 /** @file disobedience/menu.c
  * @brief Main menu
@@ -26,11 +24,16 @@
 static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;
 static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;
+GtkWidget *playlists_widget;
+GtkWidget *playlists_menu;
+GtkWidget *editplaylists_widget;
 
 /** @brief Main menu widgets */
 GtkItemFactory *mainmenufactory;
 
 
 /** @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
  *
 
 /** @brief Called when the quit option is activated
  *
@@ -43,48 +46,24 @@ static void quit_program(gpointer attribute((unused)) callback_data,
   exit(0);
 }
 
   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");
 
                             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 */
 }
 
 /** @brief Called when the login option is activated */
@@ -110,29 +89,34 @@ static void settings(gpointer attribute((unused)) callback_data,
 }
 #endif
 
 }
 #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.
  */
  *
  * 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,
 /** @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 +139,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,
 
 /** @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;
 
                                     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);
   byte_xasprintf(&server_version_string, "Server version %s", value);
   byte_xasprintf(&short_version_string, "Disobedience %s",
                  disorder_short_version_string);
@@ -222,20 +209,11 @@ void users_set_sensitive(int sensitive) {
   gtk_widget_set_sensitive(w, sensitive);
 }
 
   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 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 */
 }
 
 /** @brief Create the menu bar widget */
@@ -296,29 +274,38 @@ GtkWidget *menubar(GtkWidget *w) {
     },
     {
       (char *)"/Edit/Select all tracks", /* path */
     },
     {
       (char *)"/Edit/Select all tracks", /* path */
-      (char *)"<CTRL>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,                                /* item_type */
       0                                 /* extra_data */
     },
     {
       (char *)"/Edit/Deselect all tracks", /* path */
-      (char *)"<CTRL><SHIFT>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 */
       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 */
+    },
+    {
+      (char *)"/Edit/Edit playlists",   /* path */
+      0,                                /* accelerator */
+      edit_playlists,                   /* callback */
       0,                                /* callback_action */
       0,                                /* item_type */
       0                                 /* extra_data */
     },
     
       0,                                /* callback_action */
       0,                                /* item_type */
       0                                 /* extra_data */
     },
     
+    
     {
       (char *)"/Control",               /* path */
       0,                                /* accelerator */
     {
       (char *)"/Control",               /* path */
       0,                                /* accelerator */
@@ -359,6 +346,14 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
+    {
+      (char *)"/Control/Activate playlist", /* path */
+      0,                                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<Branch>",               /* item_type */
+      0                                 /* extra_data */
+    },
     
     {
       (char *)"/Help",                  /* path */
     
     {
       (char *)"/Help",                  /* path */
@@ -403,11 +398,25 @@ GtkWidget *menubar(GtkWidget *w) {
                                                 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                  "<GdisorderMain>/Edit/Track properties");
                                                 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                  "<GdisorderMain>/Edit/Track properties");
+  playlists_widget = gtk_item_factory_get_item(mainmenufactory,
+                                               "<GdisorderMain>/Control/Activate playlist");
+  playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
+                                               "<GdisorderMain>/Control/Activate playlist");
+  editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
+                                                     "<GdisorderMain>/Edit/Edit playlists");
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_widget != 0);
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_widget != 0);
-  register_reset(menu_reset);
-  menu_reset();
+  assert(playlists_widget != 0);
+  assert(playlists_menu != 0);
+  assert(editplaylists_widget != 0);
+
+  GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
+                                                       "<GdisorderMain>/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,
                                   "<GdisorderMain>");
   set_tool_colors(m);
   m = gtk_item_factory_get_widget(mainmenufactory,
                                   "<GdisorderMain>");
   set_tool_colors(m);
Multi-user software jukebox -- https://www.greenend.org.uk/rjk/disorder/