X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=616d7b340bce7020a8129dd527054fff906423a2;hp=af3aeecbdc02c0e5410d4adfcee4853392487ba5;hb=aafcd0647bb77a5464f907a181767399283c0220;hpb=a61639b7e2f8f5cccb0d4801ef7013d06d175262 diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c index af3aeec..616d7b3 100644 --- a/config-ui/browser-switchboard-cp.c +++ b/config-ui/browser-switchboard-cp.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,8 @@ #include "configfile.h" +#define CONTINUOUS_MODE_DEFAULT 0 + struct browser_entry { char *config; char *displayname; @@ -56,7 +59,8 @@ struct browser_entry browsers[] = { }; struct config_widgets { - GtkWidget *continuous_mode_check; + GtkWidget *continuous_mode_off_radio; + GtkWidget *continuous_mode_on_radio; GtkWidget *default_browser_combo; GtkWidget *other_browser_cmd_entry; GtkWidget *other_browser_cmd_entry_label; @@ -70,10 +74,13 @@ GtkWidget *dialog; **********************************************************************/ static inline int get_continuous_mode(void) { - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_check)); + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_on_radio)); } static inline void set_continuous_mode(int state) { - return gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_check), (gboolean)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) { @@ -152,9 +159,19 @@ static void save_config(void) { int other_browser_cmd_seen = 0; struct swb_config_line line; - /* Put together the path to the new config file and the tempfile */ + /* If CONFIGFILE_DIR doesn't exist already, try to create it */ if (!(homedir = getenv("HOME"))) homedir = DEFAULT_HOMEDIR; + len = strlen(homedir) + strlen(CONFIGFILE_DIR) + 1; + if (!(newfile = calloc(len, sizeof(char)))) + return; + snprintf(newfile, len, "%s%s", homedir, CONFIGFILE_DIR); + if (access(newfile, F_OK) == -1 && errno == ENOENT) { + mkdir(newfile, 0750); + } + free(newfile); + + /* Put together the path to the new config file and the tempfile */ len = strlen(homedir) + strlen(CONFIGFILE_LOC) + 1; if (!(newfile = calloc(len, sizeof(char)))) return; @@ -279,13 +296,15 @@ static GtkDialog *swb_config_dialog(void) { GtkWidget *options_table; GtkWidget *default_browser_combo_label; + GtkWidget *continuous_mode_label; int i; GtkWidget *action_area; GtkWidget *okbutton, *cancelbutton; dialog = gtk_dialog_new(); - gtk_widget_set_size_request(GTK_WIDGET(dialog), 580, 240); + /* Doesn't seem to be necessary? + gtk_widget_set_size_request(GTK_WIDGET(dialog), 580, 180); */ gtk_window_set_title (GTK_WINDOW(dialog), "Browser Switchboard"); gtk_window_set_type_hint (GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); @@ -293,8 +312,7 @@ static GtkDialog *swb_config_dialog(void) { /* 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(); @@ -303,7 +321,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), @@ -311,34 +329,60 @@ 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(); 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); + 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); /* Dialog buttons */