X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b4f8eba142c9bcd17597494361d48b2e249215ff..ca6b4a12640792d416b9fcbeb4baa8a3b84285ff:/disobedience/settings.c diff --git a/disobedience/settings.c b/disobedience/settings.c index 0fe1237..71b953d 100644 --- a/disobedience/settings.c +++ b/disobedience/settings.c @@ -1,21 +1,19 @@ /* * This file is part of Disobedience - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ /** @file disobedience/settings.c * @brief Disobedience settings @@ -264,22 +262,77 @@ void load_settings(void) { } } -/** @brief Callback used by set_tool_colors() */ -static void set_tool_colors_callback(GtkWidget *w, - gpointer attribute((unused)) data) { - set_tool_colors(w); +/** @brief Recursively set tool widget colors + * + * This is currently unused; the idea was to allow for configurability without + * allowing GTK+ to override our use of color, but things seem generally better + * without this particular call. + */ +void set_tool_colors(GtkWidget attribute((unused)) *w) { } -/** @brief Recursively set tool widget colors */ -void set_tool_colors(GtkWidget *w) { - GtkWidget *child; +/** @brief Pop up a settings editor widget */ +void popup_settings(void) { + static GtkWidget *settings_window; + GtkWidget *table; + unsigned row, col; - gtk_widget_set_style(w, tool_style); - if(GTK_IS_CONTAINER(w)) - gtk_container_foreach(GTK_CONTAINER(w), set_tool_colors_callback, 0); - if(GTK_IS_MENU_ITEM(w) - && (child = gtk_menu_item_get_submenu(GTK_MENU_ITEM(w)))) - set_tool_colors(child); + if(settings_window) { + gtk_window_present(GTK_WINDOW(settings_window)); + return; + } + /* Create the window */ + settings_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_style(settings_window, tool_style); + gtk_window_set_title(GTK_WINDOW(settings_window), "Disobedience Settings"); + /* Clear the pointer to the window widget when it is closed */ + g_signal_connect(settings_window, "destroy", + G_CALLBACK(gtk_widget_destroyed), &settings_window); + + /* The color settings live in a big table */ + table = gtk_table_new(2 * NSTYLES + 1/*rows */, NSTATES + 1/*cols*/, + TRUE/*homogeneous*/); + /* Titles */ + for(row = 0; row < 2 * NSTYLES; ++row) { + char *legend; + + byte_xasprintf(&legend, "%s %s", styles[row / 2].name, + row % 2 ? "background" : "foreground"); + gtk_table_attach(GTK_TABLE(table), + gtk_label_new(legend), + 0, 1, + row + 1, row + 2, + GTK_FILL, GTK_FILL, + 1, 1); + } + for(col = 0; col < NSTATES; ++col) { + gtk_table_attach(GTK_TABLE(table), + gtk_label_new(states[col]), + col + 1, col + 2, + 0, 1, + GTK_FILL, GTK_FILL, + 1, 1); + } + /* The actual colors */ + for(row = 0; row < 2 * NSTYLES; ++row) { + for(col = 0; col < NSTATES; ++col) { + GdkColor *const c = &(row % 2 + ? (**styles[row / 2].style).bg + : (**styles[row / 2].style).fg)[col]; + gtk_table_attach(GTK_TABLE(table), + gtk_color_button_new_with_color(c), + col + 1, col + 2, + row + 1, row + 2, + GTK_FILL, GTK_FILL, + 1, 1); + } + } + gtk_container_add(GTK_CONTAINER(settings_window), frame_widget(table, NULL)); + gtk_widget_show_all(settings_window); + /* TODO: save settings + TODO: web browser + TODO: impose settings when they are set + */ } /*