/*
* 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
* it under the terms of the GNU General Public License as published by
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
-GtkWidget *playlists_widget;
+GtkWidget *menu_playlists_widget;
GtkWidget *playlists_menu;
-GtkWidget *editplaylists_widget;
+GtkWidget *menu_editplaylists_widget;
/** @brief Main menu widgets */
GtkItemFactory *mainmenufactory;
},
{
(char *)"/Edit/Select all tracks", /* path */
- 0, /* accelerator */
+ (char *)"<CTRL>A", /* accelerator */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectall_activate), /* callback_action */
0, /* item_type */
},
{
(char *)"/Edit/Deselect all tracks", /* path */
- 0, /* accelerator */
+ (char *)"<CTRL><SHIFT>A", /* accelerator */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectnone_activate), /* callback_action */
0, /* item_type */
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
- edit_playlists, /* callback */
+ playlist_window_create, /* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
(char *)"<Branch>", /* item_type */
0 /* extra_data */
},
-
+
{
(char *)"/Help", /* path */
0, /* accelerator */
0 /* extra_data */
},
{
- (char *)"/Help/Manual page", /* path */
+ (char *)"/Help/Manual", /* path */
0, /* accelerator */
manual_popup, /* callback */
0, /* callback_action */
"<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,
+ menu_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,
+ menu_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(playlists_widget != 0);
+ assert(menu_playlists_widget != 0);
assert(playlists_menu != 0);
- assert(editplaylists_widget != 0);
+ assert(menu_editplaylists_widget != 0);
GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>/Edit");