X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/2c34878904d76d323b4698fe705c5f9d002e65f8..34a3e24603f115809eb08d74541c1fce5e988924:/disobedience/misc.c

diff --git a/disobedience/misc.c b/disobedience/misc.c
index f87f4a0..2db0173 100644
--- a/disobedience/misc.c
+++ b/disobedience/misc.c
@@ -22,6 +22,14 @@
  */
 
 #include "disobedience.h"
+#include "table.h"
+
+struct image {
+  const char *name;
+  const guint8 *data;
+};
+
+#include "images.h"
 
 /* Miscellaneous GTK+ stuff ------------------------------------------------ */
 
@@ -80,12 +88,22 @@ GdkPixbuf *find_image(const char *name) {
   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);
@@ -93,19 +111,70 @@ GdkPixbuf *find_image(const char *name) {
   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));
   gtk_widget_destroy(w);
 }
 
+/** @brief Pop up an error message */
+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_msg(mt, msg);
+}
+
+/** @brief Create a button with an icon in it
+ * @param path (relative) path to image
+ * @param tooltip Tooltip or NULL to not set one
+ * @return Button
+ */
+GtkWidget *iconbutton(const char *path, const char *tip) {
+  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_container_add(GTK_CONTAINER(button), content);
+  if(tip)
+    gtk_tooltips_set_tip(tips, button, tip, "");
+  return button;
+}
+
+/** @brief Create buttons and pack them into an hbox */
+GtkWidget *create_buttons(const struct button *buttons,
+                          size_t nbuttons) {
+  size_t n;
+  GtkWidget *const hbox = gtk_hbox_new(FALSE, 1);
+
+  for(n = 0; n < nbuttons; ++n) {
+    GtkWidget *const button = gtk_button_new_from_stock(buttons[n].stock);
+    g_signal_connect(G_OBJECT(button), "clicked",
+                     G_CALLBACK(buttons[n].clicked), 0);
+    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
+    gtk_tooltips_set_tip(tips, button, buttons[n].tip, "");
+  }
+  return hbox;
+}
+
 /*
 Local Variables:
 c-basic-offset:2