X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/abf99697b4852dc7c29006d17b8fd35fe66b5cc3..7489d3af05a4394e9621e14a196a9f6c4f788a26:/disobedience/menu.c?ds=inline
diff --git a/disobedience/menu.c b/disobedience/menu.c
index 73773dd..b398606 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -1,21 +1,19 @@
/*
* This file is part of DisOrder.
- * Copyright (C) 2006-2008 Richard Kettlewell
+ * Copyright (C) 2006-2009, 2011, 2013 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
@@ -23,15 +21,24 @@
#include "disobedience.h"
+static void toggled_minimode(GtkCheckMenuItem *item, gpointer userdata);
+
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
+GtkWidget *menu_playlists_widget;
+GtkWidget *playlists_menu;
+GtkWidget *menu_editplaylists_widget;
+static GtkWidget *menu_minimode_widget;
/** @brief Main menu widgets */
GtkItemFactory *mainmenufactory;
+/** @brief Set for full mode, clear for mini mode */
+int full_mode = 1;
+
static void about_popup_got_version(void *v,
- const char *error,
+ const char *err,
const char *value);
/** @brief Called when the quit option is activated
@@ -45,51 +52,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");
-
- if(t->selectall_activate)
- t->selectall_activate(NULL, t->extra);
-}
-
-/** @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");
-
- if(t->selectnone_activate)
- t->selectnone_activate(NULL, t->extra);
-}
-
-/** @brief Called when the track properties option is activated
+/** @brief Called when an edit menu item is selected
*
- * Calls the per-tab properties function.
+ * Shared by several menu items; callback_action is expected to be the offset
+ * of the activate member of struct tabtype.
*/
-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");
- if(t->properties_activate)
- t->properties_activate(NULL, t->extra);
+ 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 */
@@ -142,7 +122,7 @@ static void edit_menu_show(GtkWidget attribute((unused)) *widget,
&& 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,
@@ -160,7 +140,7 @@ static void manual_popup(gpointer attribute((unused)) callback_data,
GtkWidget attribute((unused)) *menu_item) {
D(("manual_popup"));
- popup_help();
+ popup_help(NULL);
}
/** @brief Called when version arrives, displays about... popup */
@@ -174,7 +154,7 @@ static void about_popup_got_version(void attribute((unused)) *v,
if(!value)
value = "[error]";
- byte_xasprintf(&server_version_string, "Server version %s", value);
+ byte_xasprintf(&server_version_string, "DisOrder server version %s", value);
byte_xasprintf(&short_version_string, "Disobedience %s",
disorder_short_version_string);
w = gtk_dialog_new_with_buttons("About Disobedience",
@@ -202,7 +182,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 2003-2013 Richard Kettlewell et al"),
FALSE/*expand*/,
FALSE/*fill*/,
1/*padding*/);
@@ -235,11 +215,23 @@ void users_set_sensitive(int sensitive) {
gtk_widget_set_sensitive(w, sensitive);
}
+static void menu_check_userman(void attribute((unused)) *v,
+ const char *err,
+ const char attribute((unused)) *value) {
+ if(err && !strncmp(err, "510", 3))
+ users_set_sensitive(FALSE);
+ else
+ users_set_sensitive(TRUE);
+}
+
/** @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));
+ if(last_rights & RIGHT_ADMIN)
+ disorder_eclient_userinfo(client, menu_check_userman, "", "email", 0);
+ else
+ users_set_sensitive(FALSE);
}
/** @brief Create the menu bar widget */
@@ -300,29 +292,38 @@ GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Select all tracks", /* path */
- 0, /* accelerator */
- select_all, /* callback */
- 0, /* callback_action */
- 0, /* item_type */
- 0 /* extra_data */
+ (char *)"A", /* accelerator */
+ menu_tab_action, /* callback */
+ offsetof(struct tabtype, selectall_activate), /* callback_action */
+ (char *)"", /* item_type */
+ GTK_STOCK_SELECT_ALL, /* extra_data */
},
{
(char *)"/Edit/Deselect all tracks", /* path */
- 0, /* accelerator */
- select_none, /* callback */
- 0, /* callback_action */
+ (char *)"A", /* 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 */
+ (char *)"", /* item_type */
+ GTK_STOCK_PROPERTIES, /* extra_data */
+ },
+ {
+ (char *)"/Edit/Edit playlists", /* path */
+ 0, /* accelerator */
+ playlist_window_create, /* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
},
+
{
(char *)"/Control", /* path */
0, /* accelerator */
@@ -336,8 +337,8 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"S", /* accelerator */
0, /* callback */
0, /* callback_action */
- 0, /* item_type */
- 0 /* extra_data */
+ (char *)"", /* item_type */
+ GTK_STOCK_STOP, /* extra_data */
},
{
(char *)"/Control/Playing", /* path */
@@ -363,7 +364,31 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"", /* item_type */
0 /* extra_data */
},
-
+ {
+ (char *)"/Control/Compact mode", /* path */
+ (char *)"M", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Global Preferences", /* path */
+ (char *)"G", /* accelerator */
+ popup_globals, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Activate playlist", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+
{
(char *)"/Help", /* path */
0, /* accelerator */
@@ -373,15 +398,15 @@ GtkWidget *menubar(GtkWidget *w) {
0 /* extra_data */
},
{
- (char *)"/Help/Manual page", /* path */
+ (char *)"/Help/Manual", /* path */
0, /* accelerator */
manual_popup, /* callback */
0, /* callback_action */
- 0, /* item_type */
- 0 /* extra_data */
+ (char *)"", /* item_type */
+ GTK_STOCK_HELP, /* extra_data */
},
{
- (char *)"/Help/About DisOrder", /* path */
+ (char *)"/Help/About Disobedience", /* path */
0, /* accelerator */
about_popup, /* callback */
0, /* callback_action */
@@ -407,23 +432,45 @@ GtkWidget *menubar(GtkWidget *w) {
"/Edit/Deselect all tracks");
properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"/Edit/Track properties");
+ menu_playlists_widget = gtk_item_factory_get_item(mainmenufactory,
+ "/Control/Activate playlist");
+ playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
+ "/Control/Activate playlist");
+ menu_editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
+ "/Edit/Edit playlists");
+ menu_minimode_widget = gtk_item_factory_get_widget(mainmenufactory,
+ "/Control/Compact mode");
assert(selectall_widget != 0);
assert(selectnone_widget != 0);
assert(properties_widget != 0);
+ assert(menu_playlists_widget != 0);
+ assert(playlists_menu != 0);
+ assert(menu_editplaylists_widget != 0);
-
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);
+ if(menu_minimode_widget)
+ g_signal_connect(G_OBJECT(menu_minimode_widget), "toggled",
+ G_CALLBACK(toggled_minimode), NULL);
return m;
}
+static void toggled_minimode(GtkCheckMenuItem *item,
+ gpointer attribute((unused)) userdata) {
+ int new_full_mode = !gtk_check_menu_item_get_active(item);
+ if(full_mode != new_full_mode) {
+ full_mode = new_full_mode;
+ event_raise("mini-mode-changed", NULL);
+ }
+}
+
/*
Local Variables:
c-basic-offset:2