*/
#include "disobedience.h"
+#include "table.h"
+
+struct image {
+ const char *name;
+ const guint8 *data;
+};
+
+#include "images.h"
/* Miscellaneous GTK+ stuff ------------------------------------------------ */
/** @brief Put scrollbars around a widget
* @param child Widget to surround
- * @param widgetname Name for (both) widgets
* @return Scroll widget
*/
-GtkWidget *scroll_widget(GtkWidget *child,
- const char *widgetname) {
+GtkWidget *scroll_widget(GtkWidget *child) {
GtkWidget *scroller = gtk_scrolled_window_new(0, 0);
GtkAdjustment *adj;
/* Child widget requires a viewport */
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroller),
child);
+ gtk_widget_modify_bg(gtk_bin_get_child(GTK_BIN(scroller)),
+ GTK_STATE_NORMAL, &tool_bg);
}
- /* Apply a name to the widget so it can be recolored */
- gtk_widget_set_name(GTK_BIN(scroller)->child, widgetname);
- gtk_widget_set_name(scroller, widgetname);
+ set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->hscrollbar);
+ set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->vscrollbar);
return scroller;
}
GdkPixbuf *pb;
char *path;
GError *err = 0;
+ int n;
if(!(pb = (GdkPixbuf *)cache_get(&image_cache_type, name))) {
- byte_xasprintf(&path, "%s/static/%s", pkgdatadir, name);
- if(!(pb = gdk_pixbuf_new_from_file(path, &err))) {
- error(0, "%s", err->message);
- return 0;
+ if((n = TABLE_FIND(images, struct image, name, name)) >= 0) {
+ /* Use the built-in copy */
+ if(!(pb = gdk_pixbuf_new_from_inline(-1, images[n].data, FALSE, &err))) {
+ error(0, "%s", err->message);
+ return 0;
+ }
+ } else {
+ /* See if there's a copy on disk */
+ byte_xasprintf(&path, "%s/static/%s", pkgdatadir, name);
+ if(!(pb = gdk_pixbuf_new_from_file(path, &err))) {
+ error(0, "%s", err->message);
+ return 0;
+ }
}
NW(cached_image);
cache_put(&image_cache_type, name, pb);
for(n = 0; n < nbuttons; ++n) {
GtkWidget *const button = gtk_button_new_from_stock(buttons[n].stock);
+ gtk_widget_modify_bg(button, GTK_STATE_NORMAL, &tool_bg);
+ gtk_widget_modify_bg(button, GTK_STATE_ACTIVE, &tool_active);
+ gtk_widget_modify_bg(button, GTK_STATE_PRELIGHT, &tool_active);
+ gtk_widget_modify_bg(button, GTK_STATE_SELECTED, &tool_active);
+ gtk_widget_modify_bg(button, GTK_STATE_INSENSITIVE, &tool_active);
+ gtk_widget_modify_fg(button, GTK_STATE_NORMAL, &tool_fg);
+ gtk_widget_modify_fg(button, GTK_STATE_ACTIVE, &tool_fg);
+ gtk_widget_modify_fg(button, GTK_STATE_PRELIGHT, &tool_fg);
+ gtk_widget_modify_fg(button, GTK_STATE_SELECTED, &tool_fg);
+ gtk_widget_modify_fg(button, GTK_STATE_INSENSITIVE, &tool_fg);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(buttons[n].clicked), 0);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);