X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=6866c84cb0de80fe0601e9c7bd92fc667a171eb6;hp=f43093292542cc2409fa2dd9ba093acb34d8f139;hb=ec8b58af1b1cf22f34478faf476047e7ce996245;hpb=cd56dd8d30d5ea7d0923dd37437063338f2899f6 diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c index f430932..6866c84 100644 --- a/config-ui/browser-switchboard-cp.c +++ b/config-ui/browser-switchboard-cp.c @@ -2,12 +2,12 @@ * browser-switchboard-cp.c -- a hildon-control-panel applet for * selecting the default browser for Browser Switchboard * - * Copyright (C) 2009 Steven Luo + * Copyright (C) 2009-2010 Steven Luo + * Copyright (C) 2009-2010 Faheem Pervez * * Derived from services-cp.c from maemo-control-services * Copyright (c) 2008 Janne Kataja * Copyright (c) 2008 Nokia Corporation - * Contact: integration@maemo.org * * 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 @@ -26,17 +26,37 @@ */ -#include +#include #include +#include +#include +#include #include #include #include + #ifdef HILDON #include #include + +#ifdef FREMANTLE +#include +#include +#include +#include +#endif /* FREMANTLE */ + #ifdef HILDON_CP_APPLET #include -#endif +#endif /* HILDON_CP_APPLET */ +#endif /* HILDON */ + +#include "config.h" + +#define CONTINUOUS_MODE_DEFAULT 0 + +#if defined(HILDON) && defined(FREMANTLE) +#define _HILDON_SIZE_DEFAULT (HILDON_SIZE_AUTO_WIDTH|HILDON_SIZE_FINGER_HEIGHT) #endif struct browser_entry { @@ -47,95 +67,264 @@ struct browser_entry browsers[] = { { "microb", "MicroB" }, /* First entry is the default! */ { "tear", "Tear" }, { "fennec", "Mobile Firefox (Fennec)" }, + { "opera", "Opera Mobile" }, { "midori", "Midori" }, { "other", "Other" }, { NULL, NULL }, }; +struct swb_config orig_cfg; + struct config_widgets { - GtkWidget *continuous_mode_check; +#if defined(HILDON) && defined(FREMANTLE) + GtkWidget *continuous_mode_selector; + GtkWidget *default_browser_selector; +#else + GtkWidget *continuous_mode_off_radio; + GtkWidget *continuous_mode_on_radio; GtkWidget *default_browser_combo; +#endif GtkWidget *other_browser_cmd_entry; GtkWidget *other_browser_cmd_entry_label; }; struct config_widgets cw; GtkWidget *dialog; + +/********************************************************************** + * Configuration routines + **********************************************************************/ + +#if defined(HILDON) && defined(FREMANTLE) + static inline int get_continuous_mode(void) { - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_check)); + return hildon_touch_selector_get_active(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), 0); +} +static inline void set_continuous_mode(int state) { + hildon_touch_selector_set_active(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), 0, state); } -static inline char * get_default_browser(void) { + +static inline char *get_default_browser(void) { + return browsers[hildon_touch_selector_get_active(HILDON_TOUCH_SELECTOR(cw.default_browser_selector), 0)].config; +} + +#else /* !defined(HILDON) || !defined(FREMANTLE) */ + +static inline int get_continuous_mode(void) { + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_on_radio)); +} +static inline void set_continuous_mode(int state) { + if (state) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_on_radio), TRUE); + else + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_off_radio), TRUE); +} + +static inline char *get_default_browser(void) { return browsers[gtk_combo_box_get_active(GTK_COMBO_BOX(cw.default_browser_combo))].config; } -static inline char * get_other_browser_cmd(void) { + +#endif /* defined(HILDON) && defined(FREMANTLE) */ + +static void set_default_browser(char *browser) { + gint i; + + /* Loop through browsers looking for a match */ + for (i = 0; browsers[i].config && strcmp(browsers[i].config, browser); + ++i); + + if (!browsers[i].config) + /* No match found, set to the default browser */ + i = 0; + +#if defined(HILDON) && defined(FREMANTLE) + hildon_touch_selector_set_active(HILDON_TOUCH_SELECTOR(cw.default_browser_selector), 0, i); +#else + gtk_combo_box_set_active(GTK_COMBO_BOX(cw.default_browser_combo), i); +#endif +} + +static inline char *get_other_browser_cmd(void) { return (char *)gtk_entry_get_text(GTK_ENTRY(cw.other_browser_cmd_entry)); } +static inline void set_other_browser_cmd(char *cmd) { + gtk_entry_set_text(GTK_ENTRY(cw.other_browser_cmd_entry), cmd); +} + +static void load_config(void) { + swb_config_init(&orig_cfg); + + swb_config_load(&orig_cfg); + + set_continuous_mode(orig_cfg.continuous_mode); + set_default_browser(orig_cfg.default_browser); + if (orig_cfg.other_browser_cmd) + set_other_browser_cmd(orig_cfg.other_browser_cmd); +} +static void save_config(void) { + struct swb_config new_cfg = orig_cfg; -static inline void close_dialog(void) { - gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_NONE); + if (get_continuous_mode() != orig_cfg.continuous_mode) { + new_cfg.continuous_mode = get_continuous_mode(); + new_cfg.flags |= SWB_CONFIG_CONTINUOUS_MODE_SET; + } + if (strcmp(get_default_browser(), orig_cfg.default_browser)) { + new_cfg.default_browser = get_default_browser(); + new_cfg.flags |= SWB_CONFIG_DEFAULT_BROWSER_SET; + } + if ((orig_cfg.other_browser_cmd && + strcmp(get_other_browser_cmd(), orig_cfg.other_browser_cmd)) || + (!orig_cfg.other_browser_cmd && + strlen(get_other_browser_cmd()) > 0)) { + new_cfg.other_browser_cmd = get_other_browser_cmd(); + new_cfg.flags |= SWB_CONFIG_OTHER_BROWSER_CMD_SET; + } + + swb_config_save(&new_cfg); } static void do_reconfig(void) { - printf("continuous_mode: %d\n", get_continuous_mode()); - printf("default_browser: %s\n", get_default_browser()); - printf("other_browser_cmd: '%s'\n", get_other_browser_cmd()); + save_config(); - /* TODO: actually implement configuration */ - return; + /* Try to send SIGHUP to any running browser-switchboard process + This causes it to reread config files if in continuous_mode, or + die so that the config will be reloaded on next start otherwise */ + system("kill -HUP `pidof browser-switchboard` > /dev/null 2>&1"); } + /********************************************************************** * Callbacks **********************************************************************/ +#if defined(HILDON) && defined(FREMANTLE) +static void default_browser_selector_callback(GtkWidget *widget, + gint column, gpointer data) { +#else static void default_browser_combo_callback(GtkWidget *widget, gpointer data) { +#endif if (!strcmp(get_default_browser(), "other")) { + gtk_editable_set_editable(GTK_EDITABLE(cw.other_browser_cmd_entry), TRUE); gtk_widget_set_sensitive(cw.other_browser_cmd_entry, TRUE); gtk_widget_set_sensitive(cw.other_browser_cmd_entry_label, TRUE); } else { + gtk_editable_set_editable(GTK_EDITABLE(cw.other_browser_cmd_entry), FALSE); /* FREMANTLE: give the text the greyed-out look */ gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE); gtk_widget_set_sensitive(cw.other_browser_cmd_entry_label, FALSE); } } -static void ok_callback(GtkWidget *widget, gpointer data) { - do_reconfig(); - /* TODO: is there any cleanup necessary? */ - close_dialog(); -} - -static void cancel_callback(GtkWidget *widget, gpointer data) { - /* TODO: is there any cleanup necessary? */ - close_dialog(); -} - /********************************************************************** * Interface **********************************************************************/ -static GtkDialog * swb_config_dialog(void) { +#if defined(HILDON) && defined(FREMANTLE) +/* + * Fremantle Hildon dialog + */ +static GtkDialog *swb_config_dialog(gpointer cp_window) { + GtkWidget *dialog_vbox; + + GtkWidget *default_browser_selector_button; + GtkWidget *continuous_mode_selector_button; + int i; + HildonGtkInputMode input_mode; + + dialog = gtk_dialog_new_with_buttons( + "Browser Switchboard", + GTK_WINDOW(cp_window), + GTK_DIALOG_MODAL, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + NULL); + + dialog_vbox = GTK_DIALOG(dialog)->vbox; + + /* Config options */ + cw.default_browser_selector = hildon_touch_selector_new_text(); + for (i = 0; browsers[i].config; ++i) + hildon_touch_selector_append_text(HILDON_TOUCH_SELECTOR(cw.default_browser_selector), browsers[i].displayname); + hildon_touch_selector_set_active(HILDON_TOUCH_SELECTOR(cw.default_browser_selector), 0, 0); + default_browser_selector_button = hildon_picker_button_new(_HILDON_SIZE_DEFAULT, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + hildon_button_set_title(HILDON_BUTTON(default_browser_selector_button), + "Default browser:"); + hildon_picker_button_set_selector(HILDON_PICKER_BUTTON(default_browser_selector_button), HILDON_TOUCH_SELECTOR(cw.default_browser_selector)); + hildon_button_set_alignment(HILDON_BUTTON(default_browser_selector_button), + 0, 0.5, 0, 0); + g_signal_connect(G_OBJECT(cw.default_browser_selector), "changed", + G_CALLBACK(default_browser_selector_callback), NULL); + gtk_box_pack_start(GTK_BOX(dialog_vbox), + default_browser_selector_button, FALSE, FALSE, 0); + + cw.other_browser_cmd_entry = hildon_entry_new(_HILDON_SIZE_DEFAULT); + /* Disable autocapitalization and dictionary features for the entry */ + input_mode = hildon_gtk_entry_get_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry)); + input_mode &= ~(HILDON_GTK_INPUT_MODE_AUTOCAP | + HILDON_GTK_INPUT_MODE_DICTIONARY); + hildon_gtk_entry_set_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry), input_mode); + + cw.other_browser_cmd_entry_label = hildon_caption_new(NULL, + "Command (%s for URI):", + cw.other_browser_cmd_entry, + NULL, HILDON_CAPTION_OPTIONAL); + gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE); + gtk_widget_set_sensitive(cw.other_browser_cmd_entry_label, FALSE); + hildon_gtk_widget_set_theme_size(cw.other_browser_cmd_entry_label, _HILDON_SIZE_DEFAULT); + gtk_box_pack_start(GTK_BOX(dialog_vbox), + cw.other_browser_cmd_entry_label, FALSE, FALSE, 0); + + cw.continuous_mode_selector = hildon_touch_selector_new_text(); + hildon_touch_selector_append_text(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), "Lower memory usage"); + hildon_touch_selector_append_text(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), "Faster browser startup time"); + + continuous_mode_selector_button = hildon_picker_button_new(_HILDON_SIZE_DEFAULT, HILDON_BUTTON_ARRANGEMENT_VERTICAL); + hildon_button_set_title(HILDON_BUTTON(continuous_mode_selector_button), + "Optimize Browser Switchboard for:"); + hildon_picker_button_set_selector(HILDON_PICKER_BUTTON(continuous_mode_selector_button), HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector)); + hildon_button_set_alignment(HILDON_BUTTON(continuous_mode_selector_button), + 0, 0, 0, 0); + set_continuous_mode(CONTINUOUS_MODE_DEFAULT); + gtk_box_pack_start(GTK_BOX(dialog_vbox), + continuous_mode_selector_button, FALSE, FALSE, 0); + + gtk_widget_show_all(dialog); + return GTK_DIALOG(dialog); +} + +#else /* !defined(HILDON) || !defined(FREMANTLE) */ +/* + * GTK+/Diablo Hildon dialog + */ +static GtkDialog *swb_config_dialog(gpointer cp_window) { GtkWidget *dialog_vbox; GtkWidget *options_table; GtkWidget *default_browser_combo_label; + GtkWidget *continuous_mode_label; int i; +#ifdef HILDON + HildonGtkInputMode input_mode; +#endif - GtkWidget *action_area; - GtkWidget *okbutton, *cancelbutton; - - dialog = gtk_dialog_new(); - gtk_widget_set_size_request(GTK_WIDGET(dialog), 620, 400); - gtk_window_set_title (GTK_WINDOW(dialog), "Browser Switchboard"); - gtk_window_set_type_hint (GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); + dialog = gtk_dialog_new_with_buttons( + "Browser Switchboard", + GTK_WINDOW(cp_window), + GTK_DIALOG_MODAL, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + NULL); dialog_vbox = GTK_DIALOG(dialog)->vbox; /* Config options */ options_table = gtk_table_new(3, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(options_table), 10); - gtk_table_set_col_spacings(GTK_TABLE(options_table), 10); + gtk_table_set_row_spacings(GTK_TABLE(options_table), 5); gtk_box_pack_start(GTK_BOX(dialog_vbox), options_table, FALSE, FALSE, 0); cw.default_browser_combo = gtk_combo_box_new_text(); @@ -144,7 +333,7 @@ static GtkDialog * swb_config_dialog(void) { browsers[i].displayname); gtk_combo_box_set_active(GTK_COMBO_BOX(cw.default_browser_combo), 0); default_browser_combo_label = gtk_label_new("Default browser:"); - gtk_misc_set_alignment(GTK_MISC(default_browser_combo_label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(default_browser_combo_label), 1, 0.5); g_signal_connect(G_OBJECT(cw.default_browser_combo), "changed", G_CALLBACK(default_browser_combo_callback), NULL); gtk_table_attach(GTK_TABLE(options_table), @@ -152,53 +341,75 @@ static GtkDialog * swb_config_dialog(void) { 0, 1, 0, 1, GTK_FILL, GTK_FILL|GTK_EXPAND, - 0, 0); - gtk_table_attach_defaults(GTK_TABLE(options_table), + 5, 0); + gtk_table_attach(GTK_TABLE(options_table), cw.default_browser_combo, 1, 2, - 0, 1); - gtk_table_set_row_spacing(GTK_TABLE(options_table), 0, 5); + 0, 1, + GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, + 5, 0); cw.other_browser_cmd_entry = gtk_entry_new(); +#ifdef HILDON + /* Disable autocapitalization and dictionary features for the entry */ + input_mode = hildon_gtk_entry_get_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry)); + input_mode &= ~(HILDON_GTK_INPUT_MODE_AUTOCAP | + HILDON_GTK_INPUT_MODE_DICTIONARY); + hildon_gtk_entry_set_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry), input_mode); +#endif cw.other_browser_cmd_entry_label = gtk_label_new("Command (%s for URI):"); - gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 1, 0.5); gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE); gtk_widget_set_sensitive(cw.other_browser_cmd_entry_label, FALSE); gtk_table_attach(GTK_TABLE(options_table), cw.other_browser_cmd_entry_label, 0, 1, 1, 2, - 0, GTK_FILL|GTK_EXPAND, - 0, 0); - gtk_table_attach_defaults(GTK_TABLE(options_table), + GTK_FILL, GTK_FILL|GTK_EXPAND, + 5, 0); + gtk_table_attach(GTK_TABLE(options_table), cw.other_browser_cmd_entry, 1, 2, - 1, 2); - - cw.continuous_mode_check = gtk_check_button_new_with_label("Run browser launcher continuously in the background"); - gtk_table_attach_defaults(GTK_TABLE(options_table), - cw.continuous_mode_check, + 1, 2, + GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, + 5, 0); + gtk_table_set_row_spacing(GTK_TABLE(options_table), 1, 15); + + continuous_mode_label = gtk_label_new("Optimize Browser Switchboard for:"); + gtk_misc_set_alignment(GTK_MISC(continuous_mode_label), 0, 0.5); + cw.continuous_mode_off_radio = gtk_radio_button_new_with_label(NULL, + "Lower memory usage"); + cw.continuous_mode_on_radio = gtk_radio_button_new_with_label_from_widget( + GTK_RADIO_BUTTON(cw.continuous_mode_off_radio), + "Faster browser startup time"); + set_continuous_mode(CONTINUOUS_MODE_DEFAULT); + gtk_table_attach(GTK_TABLE(options_table), + continuous_mode_label, 0, 2, - 2, 3); - - - /* Dialog buttons */ - action_area = GTK_DIALOG(dialog)->action_area; - - okbutton = gtk_button_new_from_stock(GTK_STOCK_OK); - g_signal_connect(G_OBJECT(okbutton), "clicked", - G_CALLBACK(ok_callback), NULL); - gtk_box_pack_start(GTK_BOX(action_area), okbutton, FALSE, FALSE, 0); + 2, 3, + GTK_FILL, GTK_FILL|GTK_EXPAND, + 5, 0); + gtk_table_attach(GTK_TABLE(options_table), + cw.continuous_mode_off_radio, + 0, 2, + 3, 4, + GTK_FILL, GTK_FILL|GTK_EXPAND, + 20, 0); + gtk_table_attach(GTK_TABLE(options_table), + cw.continuous_mode_on_radio, + 0, 2, + 4, 5, + GTK_FILL, GTK_FILL|GTK_EXPAND, + 20, 5); + gtk_table_set_row_spacing(GTK_TABLE(options_table), 3, 0); - cancelbutton = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - g_signal_connect(G_OBJECT(cancelbutton), "clicked", - G_CALLBACK(cancel_callback), NULL); - gtk_box_pack_start(GTK_BOX(action_area), cancelbutton, FALSE, FALSE, 0); gtk_widget_show_all(dialog); return GTK_DIALOG(dialog); } +#endif /* defined(HILDON) && defined(FREMANTLE) */ + /********************************************************************** * Entry @@ -208,20 +419,21 @@ static GtkDialog * swb_config_dialog(void) { /* * Application was started from control panel. */ -osso_return_t execute(osso_context_t * osso, - gpointer userdata, gboolean user_activated) -{ - HildonProgram *program; - program = HILDON_PROGRAM(hildon_program_get_instance()); - +osso_return_t execute(osso_context_t *osso, + gpointer userdata, gboolean user_activated) { + GtkDialog *dialog; + gint response; + if (osso == NULL) return OSSO_ERROR; - data.osso_context = osso; - /* enable help system on dialog */ - GtkDialog * dialog = GTK_DIALOG(swb_config_dialog()); + dialog = GTK_DIALOG(swb_config_dialog(userdata)); + load_config(); + + response = gtk_dialog_run(dialog); + if (response == GTK_RESPONSE_OK) + do_reconfig(); - gtk_dialog_run(dialog); gtk_widget_destroy(GTK_WIDGET(dialog)); return OSSO_OK; @@ -230,22 +442,29 @@ osso_return_t execute(osso_context_t * osso, /* * Application was started from command line. */ -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { GtkDialog *dialog; + gint response; #ifdef HILDON HildonProgram *program = NULL; - program = HILDON_PROGRAM(hildon_program_get_instance()); #endif gtk_init(&argc, &argv); +#ifdef HILDON + program = HILDON_PROGRAM(hildon_program_get_instance()); +#endif g_set_application_name("Browser Switchboard"); - dialog = GTK_DIALOG(swb_config_dialog()); - gtk_dialog_run(dialog); + dialog = GTK_DIALOG(swb_config_dialog(NULL)); + load_config(); + + response = gtk_dialog_run(dialog); + if (response == GTK_RESPONSE_OK) + do_reconfig(); + gtk_widget_destroy(GTK_WIDGET(dialog)); - return 0; + exit(0); } -#endif +#endif /* HILDON_CP_APPLET */