From: Richard Kettlewell Date: Fri, 27 Nov 2009 21:04:34 +0000 (+0000) Subject: Some more Disobedience work X-Git-Tag: 5.0~35 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/93ca1bcfefc511c5d3ca0fd71d01b24614d0d7fd?hp=379096a3a25f5b4847442f1ce3331430292f6209 Some more Disobedience work --- diff --git a/disobedience/control.c b/disobedience/control.c index 931746a..e371ca9 100644 --- a/disobedience/control.c +++ b/disobedience/control.c @@ -51,6 +51,9 @@ static void icon_changed(const char *event, static void volume_changed(const char *event, void *eventdata, void *callbackdata); +static void control_minimode(const char *event, + void *eventdata, + void *callbackdata); /* Control bar ------------------------------------------------------------- */ @@ -308,27 +311,28 @@ GtkWidget *control_widget(void) { G_CALLBACK(format_balance), 0); event_register("volume-changed", volume_changed, 0); event_register("rtp-changed", volume_changed, 0); + event_register("mini-mode-changed", control_minimode, 0); return hbox; } +/** @brief Return TRUE if volume setting is supported */ +static int volume_supported(void) { + /* TODO: if the server doesn't know how to set the volume [but isn't using + * network play] then we should have volume_supported = FALSE */ + return (!rtp_supported + || (rtp_supported && backend && backend->set_volume)); +} + /** @brief Update the volume control when it changes */ static void volume_changed(const char attribute((unused)) *event, void attribute((unused)) *eventdata, void attribute((unused)) *callbackdata) { double l, r; - gboolean volume_supported; D(("volume_changed")); ++suppress_actions; /* Only display volume/balance controls if they will work */ - if(!rtp_supported - || (rtp_supported && backend && backend->set_volume)) - volume_supported = TRUE; - else - volume_supported = FALSE; - /* TODO: if the server doesn't know how to set the volume [but isn't using - * network play] then we should have volume_supported = FALSE */ - if(volume_supported) { + if(volume_supported()) { gtk_widget_show(volume_widget); gtk_widget_show(balance_widget); l = volume_l / 100.0; @@ -559,6 +563,15 @@ static int disable_rtp(disorder_eclient attribute((unused)) *c, return 0; } +static void control_minimode(const char attribute((unused)) *event, + void attribute((unused)) *evendata, + void attribute((unused)) *callbackdata) { + if(full_mode && volume_supported()) + gtk_widget_show(balance_widget); + else + gtk_widget_hide(balance_widget); +} + /* Local Variables: c-basic-offset:2 diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 8ce1601..a804863 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -166,6 +166,7 @@ void all_update(void); GtkWidget *menubar(GtkWidget *w); /* Create the menu bar */ +int full_mode; void users_set_sensitive(int sensitive); diff --git a/disobedience/help.c b/disobedience/help.c index 5b708e8..ca5a8d8 100644 --- a/disobedience/help.c +++ b/disobedience/help.c @@ -31,7 +31,16 @@ void popup_help(const char *what) { if(!what) what = "index.html"; - byte_xasprintf(&path, "%s/%s", dochtmldir, what); +#if __APPLE__ + if(!strcmp(browser, "open")) + /* Apple's open(1) isn't really a web browser so needs some extra hints + * that it should see the argument as a URL. Otherwise it doesn't treat # + * specially. A better answer would be to identify the system web browser + * and invoke it directly. */ + byte_xasprintf(&path, "file:///%s/%s", dochtmldir, what); + else +#endif + byte_xasprintf(&path, "%s/%s", dochtmldir, what); if(!(pid = xfork())) { exitfn = _exit; if(!xfork()) { diff --git a/disobedience/login.c b/disobedience/login.c index 4031c3a..a02c1c6 100644 --- a/disobedience/login.c +++ b/disobedience/login.c @@ -230,6 +230,12 @@ static void login_cancel(GtkButton attribute((unused)) *button, gtk_widget_destroy(login_window); } +/** @brief User pressed cancel in the login window */ +static void login_help(GtkButton attribute((unused)) *button, + gpointer attribute((unused)) userdata) { + popup_help("intro.html#login"); +} + /** @brief Keypress handler */ static gboolean login_keypress(GtkWidget attribute((unused)) *widget, GdkEventKey *event, @@ -251,18 +257,25 @@ static gboolean login_keypress(GtkWidget attribute((unused)) *widget, /* Buttons that appear at the bottom of the window */ static struct button buttons[] = { { - "Login", - login_ok, - "(Re-)connect using these settings", + GTK_STOCK_HELP, + login_help, + "Go to manual", 0, - NULL, + gtk_box_pack_start, }, { GTK_STOCK_CLOSE, login_cancel, "Discard changes and close window", 0, - NULL, + gtk_box_pack_end, + }, + { + "Login", + login_ok, + "(Re-)connect using these settings", + 0, + gtk_box_pack_end, }, }; diff --git a/disobedience/menu.c b/disobedience/menu.c index 86ea177..d248b3f 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -21,16 +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 *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; + static void about_popup_got_version(void *v, const char *err, const char *value); @@ -346,6 +352,16 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, +#if 0 + { + (char *)"/Control/Compact mode", /* path */ + (char *)"M", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, +#endif { (char *)"/Control/Activate playlist", /* path */ 0, /* accelerator */ @@ -404,6 +420,8 @@ GtkWidget *menubar(GtkWidget *w) { "/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); @@ -420,9 +438,18 @@ 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) { + full_mode = !gtk_check_menu_item_get_active(item); + event_raise("mini-mode-changed", NULL); +} + /* Local Variables: c-basic-offset:2