/*
* This file is part of DisOrder
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006-2008, 2010 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 <http://www.gnu.org/licenses/>.
*/
/** @file disobedience/misc.c
* @brief Miscellaneous GTK+ interfacing stuff
#include "disobedience.h"
#include "table.h"
+/** @brief Embedded image */
struct image {
+ /** @brief Image name */
const char *name;
+ /** @brief Image data in GDK pixbuf inline format */
const guint8 *data;
};
-#include "images.h"
+#include "../images/images.h"
/* Miscellaneous GTK+ stuff ------------------------------------------------ */
-WT(cached_image);
-
/* Functions */
/** @brief Put scrollbars around a widget
int n;
if(!(pb = (GdkPixbuf *)cache_get(&image_cache_type, name))) {
- if((n = TABLE_FIND(images, struct image, name, name)) >= 0) {
+ if((n = TABLE_FIND(images, 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);
+ disorder_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);
+ disorder_error(0, "%s", err->message);
return 0;
}
}
- NW(cached_image);
cache_put(&image_cache_type, name, pb);
}
return pb;
GtkWidget *button, *content;
GdkPixbuf *pb;
- NW(button);
button = gtk_button_new();
if((pb = find_image(path))) {
- NW(image);
content = gtk_image_new_from_pixbuf(pb);
} else {
- NW(label);
content = gtk_label_new(path);
}
gtk_widget_set_style(button, tool_style);
gtk_widget_set_style(content, tool_style);
gtk_container_add(GTK_CONTAINER(button), content);
if(tip)
- gtk_tooltips_set_tip(tips, button, tip, "");
+ gtk_widget_set_tooltip_text(button, tip);
return button;
}
gtk_widget_set_style(buttons[n].widget, tool_style);
g_signal_connect(G_OBJECT(buttons[n].widget), "clicked",
G_CALLBACK(buttons[n].clicked), 0);
- gtk_box_pack_start(GTK_BOX(box), buttons[n].widget, FALSE, FALSE, 1);
- gtk_tooltips_set_tip(tips, buttons[n].widget, buttons[n].tip, "");
+ void (*pack)(GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding);
+ if(!(pack = buttons[n].pack))
+ pack = gtk_box_pack_start;
+ pack(GTK_BOX(box), buttons[n].widget, FALSE, FALSE, 1);
+ gtk_widget_set_tooltip_text(buttons[n].widget, buttons[n].tip);
}
return box;
}