X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f9b20469107a0d4b6f707cbbdd9a17a7e2c4bf82..02d50cbd5926b4ef1f88c6f9ca28486fa45508c0:/disobedience/menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index d2f190d..435aeb4 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
@@ -23,15 +21,22 @@
#include "disobedience.h"
+static void toggled_minimode(GtkCheckMenuItem *item, gpointer userdata);
+
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
-GtkWidget *playlists_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 *err,
const char *value);
@@ -135,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 */
@@ -177,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-2011 Richard Kettlewell et al"),
FALSE/*expand*/,
FALSE/*fill*/,
1/*padding*/);
@@ -275,15 +280,15 @@ 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 */
- 0 /* extra_data */
+ (char *)"", /* item_type */
+ GTK_STOCK_SELECT_ALL, /* extra_data */
},
{
(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 */
@@ -294,13 +299,13 @@ GtkWidget *menubar(GtkWidget *w) {
0, /* accelerator */
menu_tab_action, /* callback */
offsetof(struct tabtype, properties_activate), /* callback_action */
- 0, /* item_type */
- 0 /* extra_data */
+ (char *)"", /* item_type */
+ GTK_STOCK_PROPERTIES, /* extra_data */
},
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
- edit_playlists, /* callback */
+ playlist_window_create, /* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
@@ -320,8 +325,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 */
@@ -347,6 +352,22 @@ 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 */
@@ -355,7 +376,7 @@ GtkWidget *menubar(GtkWidget *w) {
(char *)"", /* item_type */
0 /* extra_data */
},
-
+
{
(char *)"/Help", /* path */
0, /* accelerator */
@@ -365,12 +386,12 @@ 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 */
@@ -399,15 +420,20 @@ GtkWidget *menubar(GtkWidget *w) {
"/Edit/Deselect all tracks");
properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"/Edit/Track properties");
- playlists_widget = gtk_item_factory_get_item(mainmenufactory,
+ 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(playlists_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");
@@ -418,9 +444,21 @@ GtkWidget *menubar(GtkWidget *w) {
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