chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge scratch fixes branch
[disorder]
/
disobedience
/
menu.c
diff --git
a/disobedience/menu.c
b/disobedience/menu.c
index 02431393b5343ff469acafc9cb4dcd3cccc01a29..d248b3f96a5e1fde85f363a7f8dfa131cc373d10 100644
(file)
--- a/
disobedience/menu.c
+++ b/
disobedience/menu.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006-200
8
Richard Kettlewell
+ * Copyright (C) 2006-200
9
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
*
* 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"
#include "disobedience.h"
+static void toggled_minimode(GtkCheckMenuItem *item, gpointer userdata);
+
static GtkWidget *selectall_widget;
static GtkWidget *selectnone_widget;
static GtkWidget *properties_widget;
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 *playlists_menu;
-GtkWidget *editplaylists_widget;
-#endif
+GtkWidget *
menu_
editplaylists_widget;
+static GtkWidget *menu_minimode_widget;
/** @brief Main menu widgets */
GtkItemFactory *mainmenufactory;
/** @brief Main menu widgets */
GtkItemFactory *mainmenufactory;
+/** @brief Set for full mode, clear for mini mode */
+int full_mode;
+
static void about_popup_got_version(void *v,
const char *err,
const char *value);
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"));
GtkWidget attribute((unused)) *menu_item) {
D(("manual_popup"));
- popup_help();
+ popup_help(
NULL
);
}
/** @brief Called when version arrives, displays about... popup */
}
/** @brief Called when version arrives, displays about... popup */
@@
-276,7
+280,7
@@
GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Select all tracks", /* path */
},
{
(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 */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectall_activate), /* callback_action */
0, /* item_type */
@@
-284,7
+288,7
@@
GtkWidget *menubar(GtkWidget *w) {
},
{
(char *)"/Edit/Deselect all tracks", /* path */
},
{
(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 */
menu_tab_action, /* callback */
offsetof(struct tabtype, selectnone_activate), /* callback_action */
0, /* item_type */
@@
-298,16
+302,14
@@
GtkWidget *menubar(GtkWidget *w) {
0, /* item_type */
0 /* extra_data */
},
0, /* item_type */
0 /* extra_data */
},
-#if PLAYLISTS
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
{
(char *)"/Edit/Edit playlists", /* path */
0, /* accelerator */
-
edit_playlists,
/* callback */
+
playlist_window_create,
/* callback */
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
},
0, /* callback_action */
0, /* item_type */
0 /* extra_data */
},
-#endif
{
{
@@
-350,7
+352,16
@@
GtkWidget *menubar(GtkWidget *w) {
(char *)"<CheckItem>", /* item_type */
0 /* extra_data */
},
(char *)"<CheckItem>", /* item_type */
0 /* extra_data */
},
-#if PLAYLISTS
+#if 0
+ {
+ (char *)"/Control/Compact mode", /* path */
+ (char *)"<CTRL>M", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"<CheckItem>", /* item_type */
+ 0 /* extra_data */
+ },
+#endif
{
(char *)"/Control/Activate playlist", /* path */
0, /* accelerator */
{
(char *)"/Control/Activate playlist", /* path */
0, /* accelerator */
@@
-359,8
+370,7
@@
GtkWidget *menubar(GtkWidget *w) {
(char *)"<Branch>", /* item_type */
0 /* extra_data */
},
(char *)"<Branch>", /* item_type */
0 /* extra_data */
},
-#endif
-
+
{
(char *)"/Help", /* path */
0, /* accelerator */
{
(char *)"/Help", /* path */
0, /* accelerator */
@@
-370,7
+380,7
@@
GtkWidget *menubar(GtkWidget *w) {
0 /* extra_data */
},
{
0 /* extra_data */
},
{
- (char *)"/Help/Manual
page",
/* path */
+ (char *)"/Help/Manual
",
/* path */
0, /* accelerator */
manual_popup, /* callback */
0, /* callback_action */
0, /* accelerator */
manual_popup, /* callback */
0, /* callback_action */
@@
-404,22
+414,20
@@
GtkWidget *menubar(GtkWidget *w) {
"<GdisorderMain>/Edit/Deselect all tracks");
properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>/Edit/Track properties");
"<GdisorderMain>/Edit/Deselect all tracks");
properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>/Edit/Track properties");
-#if PLAYLISTS
- 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");
"<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");
"<GdisorderMain>/Edit/Edit playlists");
-#endif
+ menu_minimode_widget = gtk_item_factory_get_widget(mainmenufactory,
+ "<GdisorderMain>/Control/Compact mode");
assert(selectall_widget != 0);
assert(selectnone_widget != 0);
assert(properties_widget != 0);
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(playlists_menu != 0);
- assert(editplaylists_widget != 0);
-#endif
+ assert(menu_editplaylists_widget != 0);
GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>/Edit");
GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>/Edit");
@@
-430,9
+438,18
@@
GtkWidget *menubar(GtkWidget *w) {
m = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>");
set_tool_colors(m);
m = gtk_item_factory_get_widget(mainmenufactory,
"<GdisorderMain>");
set_tool_colors(m);
+ if(menu_minimode_widget)
+ g_signal_connect(G_OBJECT(menu_minimode_widget), "toggled",
+ G_CALLBACK(toggled_minimode), NULL);
return m;
}
return m;
}
+static void toggled_minimode(GtkCheckMenuItem *item,
+ gpointer attribute((unused)) userdata) {
+ full_mode = !gtk_check_menu_item_get_active(item);
+ event_raise("mini-mode-changed", NULL);
+}
+
/*
Local Variables:
c-basic-offset:2
/*
Local Variables:
c-basic-offset:2