X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/883a4e966126fc7e585a8c08db50024a729ef3a5..14f8878f0b35d342f6a51fe84e1d67d720e7347b:/disobedience/menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 32b3d26..d2bb6a6 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 */
@@ -187,7 +221,7 @@ GtkWidget *menubar(GtkWidget *w) {
 
   static const GtkItemFactoryEntry entries[] = {
     {
-      (char *)"/File",                  /* path */
+      (char *)"/Server",                /* path */
       0,                                /* accelerator */
       0,                                /* callback */
       0,                                /* callback_action */
@@ -195,15 +229,33 @@ GtkWidget *menubar(GtkWidget *w) {
       0                                 /* extra_data */
     },
     { 
-      (char *)"/File/Login",            /* path */
+      (char *)"/Server/Login",          /* path */
       (char *)"<CTRL>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 *)"<CTRL>Q",                /* accelerator */
       quit_program,                     /* callback */
       0,                                /* callback_action */
@@ -228,6 +280,14 @@ GtkWidget *menubar(GtkWidget *w) {
       0                                 /* extra_data */
     },
     {
+      (char *)"/Edit/Deselect all tracks", /* path */
+      (char *)"<CTRL><SHIFT>A",         /* accelerator */
+      select_none,                      /* callback */
+      0,                                /* callback_action */
+      0,                                /* item_type */
+      0                                 /* extra_data */
+    },
+    {
       (char *)"/Edit/Track properties", /* path */
       0,                                /* accelerator */
       properties_item,                  /* callback */
@@ -316,9 +376,12 @@ GtkWidget *menubar(GtkWidget *w) {
   gtk_window_add_accel_group(GTK_WINDOW(w), accel);
   selectall_widget = gtk_item_factory_get_widget(mainmenufactory,
 						 "<GdisorderMain>/Edit/Select all tracks");
+  selectnone_widget = gtk_item_factory_get_widget(mainmenufactory,
+						 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
 						  "<GdisorderMain>/Edit/Track properties");
   assert(selectall_widget != 0);
+  assert(selectnone_widget != 0);
   assert(properties_widget != 0);
   m = gtk_item_factory_get_widget(mainmenufactory,
                                   "<GdisorderMain>");