X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/73f1b9f30c98dc525a5b6a540f6f135855d640a0..299a14ee0d61b7994dc4ce5246b55b4d75fdcb2e:/disobedience/menu.c
diff --git a/disobedience/menu.c b/disobedience/menu.c
index db51ba8..216b5de 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -26,6 +26,9 @@
static GtkWidget *selectall_widget;
static GtkWidget *properties_widget;
+/** @brief Main menu widgets */
+GtkItemFactory *mainmenufactory;
+
static void about_popup_got_version(void *v, const char *value);
/** @brief Called when the quit option is activated
@@ -108,26 +111,68 @@ static void about_popup(gpointer attribute((unused)) callback_data,
0);
}
+static void manual_popup(gpointer attribute((unused)) callback_data,
+ guint attribute((unused)) callback_action,
+ GtkWidget attribute((unused)) *menu_item) {
+ D(("manual_popup"));
+
+ popup_help();
+}
+
/** @brief Callde when version arrives, displays about... popup */
static void about_popup_got_version(void attribute((unused)) *v,
const char *value) {
GtkWidget *w;
char *server_version_string;
+ GtkWidget *hbox, *vbox, *title;
byte_xasprintf(&server_version_string, "Server version %s", value);
- w = gtk_dialog_new_with_buttons("About DisOrder",
+ w = gtk_dialog_new_with_buttons("About Disobedience",
GTK_WINDOW(toplevel),
(GTK_DIALOG_MODAL
|GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
(char *)NULL);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
- gtk_label_new("DisOrder client " VERSION));
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
- gtk_label_new(server_version_string));
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
- gtk_label_new("(c) 2004-2007 Richard Kettlewell"));
+ hbox = gtk_hbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+ vbox = gtk_vbox_new(FALSE/*homogeneous*/, 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(hbox),
+ gtk_image_new_from_pixbuf(find_image("duck.png")),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 4/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new("Disobedience " VERSION),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new(server_version_string),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_start(GTK_BOX(vbox),
+ gtk_label_new("(c) 2004-2007 Richard Kettlewell"),
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 1/*padding*/);
+ gtk_box_pack_end(GTK_BOX(hbox),
+ vbox,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ title = gtk_label_new(0);
+ gtk_label_set_markup(GTK_LABEL(title),
+ "Disobedience");
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), title,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(w)->vbox), hbox,
+ FALSE/*expand*/,
+ FALSE/*fill*/,
+ 0/*padding*/);
+ set_tool_colors(w);
gtk_widget_show_all(w);
gtk_dialog_run(GTK_DIALOG(w));
gtk_widget_destroy(w);
@@ -135,43 +180,147 @@ static void about_popup_got_version(void attribute((unused)) *v,
/** @brief Create the menu bar widget */
GtkWidget *menubar(GtkWidget *w) {
+ GtkWidget *m;
+
static const GtkItemFactoryEntry entries[] = {
- { (char *)"/File", 0, 0, 0, (char *)"", 0 },
- { (char *)"/File/Login", (char *)"L", login, 0,
- 0, 0 },
- { (char *)"/File/Quit Disobedience", (char *)"Q", quit_program, 0,
- (char *)"", GTK_STOCK_QUIT },
- { (char *)"/Edit", 0, 0, 0, (char *)"", 0 },
- { (char *)"/Edit/Select all tracks", (char *)"A", select_all, 0,
- 0, 0 },
- { (char *)"/Edit/Track properties", 0, properties_item, 0,
- 0, 0 },
- { (char *)"/Help", 0, 0, 0, (char *)"", 0 },
- { (char *)"/Help/About DisOrder", 0, about_popup, 0,
- (char *)"", GTK_STOCK_ABOUT },
+ {
+ (char *)"/File", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/File/Login", /* path */
+ (char *)"L", /* accelerator */
+ login, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/File/Quit Disobedience", /* path */
+ (char *)"Q", /* accelerator */
+ quit_program, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ GTK_STOCK_QUIT /* extra_data */
+ },
+
+ {
+ (char *)"/Edit", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Edit/Select all tracks", /* path */
+ (char *)"A", /* accelerator */
+ select_all, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Edit/Track properties", /* path */
+ 0, /* accelerator */
+ properties_item, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+
+ {
+ (char *)"/Control", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Scratch", /* path */
+ (char *)"S", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Playing", /* path */
+ (char *)"P", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Random play", /* path */
+ (char *)"R", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Control/Network player", /* path */
+ (char *)"N", /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+
+ {
+ (char *)"/Help", /* path */
+ 0, /* accelerator */
+ 0, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Help/Manual page", /* path */
+ 0, /* accelerator */
+ manual_popup, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
+ {
+ (char *)"/Help/About DisOrder", /* path */
+ 0, /* accelerator */
+ about_popup, /* callback */
+ 0, /* callback_action */
+ (char *)"", /* item_type */
+ GTK_STOCK_ABOUT /* extra_data */
+ },
};
- GtkItemFactory *itemfactory;
GtkAccelGroup *accel = gtk_accel_group_new();
D(("add_menubar"));
/* TODO: item factories are deprecated in favour of some XML thing */
- itemfactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "",
- accel);
- gtk_item_factory_create_items(itemfactory,
+ mainmenufactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "",
+ accel);
+ gtk_item_factory_create_items(mainmenufactory,
sizeof entries / sizeof *entries,
(GtkItemFactoryEntry *)entries,
0);
gtk_window_add_accel_group(GTK_WINDOW(w), accel);
- selectall_widget = gtk_item_factory_get_widget(itemfactory,
+ selectall_widget = gtk_item_factory_get_widget(mainmenufactory,
"/Edit/Select all tracks");
- properties_widget = gtk_item_factory_get_widget(itemfactory,
+ properties_widget = gtk_item_factory_get_widget(mainmenufactory,
"/Edit/Track properties");
assert(selectall_widget != 0);
assert(properties_widget != 0);
- return gtk_item_factory_get_widget(itemfactory,
- "");
- /* menu bar had better not expand vertically if the window is too big */
+ m = gtk_item_factory_get_widget(mainmenufactory,
+ "");
+ set_tool_colors(m);
+ return m;
}
/*