X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0b0fb26bbfa5a32d00cf3f234c5066648128df8e..b56bb147b52671fb2e4dc667e69c9ca476863367:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index 0243139..bae0f00 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -1,6 +1,6 @@ /* * 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 @@ -21,18 +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; -#if PLAYLISTS -GtkWidget *playlists_widget; +GtkWidget *menu_playlists_widget; GtkWidget *playlists_menu; -GtkWidget *editplaylists_widget; -#endif +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); @@ -136,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 */ @@ -276,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 */ @@ -295,19 +299,17 @@ 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 */ }, -#if PLAYLISTS { (char *)"/Edit/Edit playlists", /* path */ 0, /* accelerator */ - edit_playlists, /* callback */ + playlist_window_create, /* callback */ 0, /* callback_action */ 0, /* item_type */ 0 /* extra_data */ }, -#endif { @@ -323,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 */ @@ -350,7 +352,14 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, -#if PLAYLISTS + { + (char *)"/Control/Compact mode", /* path */ + (char *)"M", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, { (char *)"/Control/Activate playlist", /* path */ 0, /* accelerator */ @@ -359,8 +368,7 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, -#endif - + { (char *)"/Help", /* path */ 0, /* accelerator */ @@ -370,12 +378,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 */ @@ -404,22 +412,20 @@ GtkWidget *menubar(GtkWidget *w) { "/Edit/Deselect all tracks"); properties_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Track properties"); -#if PLAYLISTS - 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"); - editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory, + menu_editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit/Edit playlists"); -#endif + menu_minimode_widget = gtk_item_factory_get_widget(mainmenufactory, + "/Control/Compact mode"); assert(selectall_widget != 0); assert(selectnone_widget != 0); assert(properties_widget != 0); -#if PLAYLISTS - assert(playlists_widget != 0); + assert(menu_playlists_widget != 0); assert(playlists_menu != 0); - assert(editplaylists_widget != 0); -#endif + assert(menu_editplaylists_widget != 0); GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory, "/Edit"); @@ -430,9 +436,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