X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/bdd2a99650780a1ef4a9e788eaabbc5e810cc39c..d380121b28a162db4d37ed944818b3815504799a:/disobedience/menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index 142857c..f04f720 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 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,6 +24,9 @@
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
+GtkWidget *menu_playlists_widget;
+GtkWidget *playlists_menu;
+GtkWidget *menu_editplaylists_widget;
/** @brief Main menu widgets */
GtkItemFactory *mainmenufactory;
@@ -115,7 +116,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,
@@ -175,7 +176,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*/);
@@ -273,7 +274,7 @@ GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Select all tracks", /* path */
- 0, /* accelerator */
+ (char *)"A", /* accelerator */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectall_activate), /* callback_action */
0, /* item_type */
@@ -281,7 +282,7 @@ GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Deselect all tracks", /* path */
- 0, /* accelerator */
+ (char *)"A", /* accelerator */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectnone_activate), /* callback_action */
0, /* item_type */
@@ -295,6 +296,15 @@ GtkWidget *menubar(GtkWidget *w) {
0, /* item_type */
0 /* 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 */
@@ -336,7 +346,15 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"", /* 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 */
@@ -346,7 +364,7 @@ GtkWidget *menubar(GtkWidget *w) {
0 /* extra_data */
},
{
- (char *)"/Help/Manual page", /* path */
+ (char *)"/Help/Manual", /* path */
0, /* accelerator */
manual_popup, /* callback */
0, /* callback_action */
@@ -380,15 +398,23 @@ 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");
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,