*/
#include "disobedience.h"
+#include "table.h"
+
+struct image {
+ const char *name;
+ const guint8 *data;
+};
+
+#include "images.h"
/* Miscellaneous GTK+ stuff ------------------------------------------------ */
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);
return pb;
}
-/** @brief Pop up an error message */
-void popup_error(const char *msg) {
+/** @brief Pop up a message */
+void popup_msg(GtkMessageType mt, const char *msg) {
GtkWidget *w;
w = gtk_message_dialog_new(GTK_WINDOW(toplevel),
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
+ mt,
GTK_BUTTONS_CLOSE,
"%s", msg);
gtk_dialog_run(GTK_DIALOG(w));
}
/** @brief Pop up an error message */
-void fpopup_error(const char *fmt, ...) {
+void fpopup_msg(GtkMessageType mt, const char *fmt, ...) {
va_list ap;
char *msg;
va_start(ap, fmt);
byte_xvasprintf(&msg, fmt, ap);
va_end(ap);
- popup_error(msg);
+ popup_msg(mt, msg);
}
/** @brief Create a button with an icon in it