chiark / gitweb /
Disobedience login window now has a 'remote' switch. When off it will
[disorder] / disobedience / menu.c
index f93e2f7a2dfce973d509cba04780c41435167b86..142857c742295197791a7420ad48f6edbf0fb953 100644 (file)
@@ -30,7 +30,9 @@ 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
  *
@@ -43,48 +45,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 */
@@ -94,6 +72,13 @@ 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,
@@ -103,26 +88,32 @@ 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));
+    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 */
@@ -147,12 +138,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);
@@ -207,13 +201,27 @@ 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,
+                                             "<GdisorderMain>/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 */
@@ -221,16 +229,24 @@ 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/Settings",         /* path */
+      (char *)"/Server/Settings",       /* path */
       0,                                /* accelerator */
       settings,                         /* callback */
       0,                                /* callback_action */
@@ -239,7 +255,7 @@ GtkWidget *menubar(GtkWidget *w) {
     },
 #endif
     {
-      (char *)"/File/Quit Disobedience", /* path */
+      (char *)"/Server/Quit Disobedience", /* path */
       (char *)"<CTRL>Q",                /* accelerator */
       quit_program,                     /* callback */
       0,                                /* callback_action */
@@ -257,25 +273,25 @@ GtkWidget *menubar(GtkWidget *w) {
     },
     {
       (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 */
-      (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 */
-      properties_item,                  /* callback */
-      0,                                /* callback_action */
+      menu_tab_action,                  /* callback */
+      offsetof(struct tabtype, properties_activate), /* callback_action */
       0,                                /* item_type */
       0                                 /* extra_data */
     },
@@ -367,6 +383,14 @@ GtkWidget *menubar(GtkWidget *w) {
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_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);