Changeset 44cdd3164cb959ab9418ac310b52388d8cc96ca7

Timestamp:

02/21/10 20:11:30 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

fa67487ea8ca6701a10256e458178aa161280964

Parents:

97f4150664c833e181971788d8f58962f4b5e66d

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-21T20:11:30Z+0200

Message:

Use custom status icons (and more of them). Fixes #65

Files:

• art/status_down.png (added)
• art/status_error.png (added)
• art/status_started.png (added)
• art/status_stopped.png (added)
• art/status_unloaded.png (added)
• art/status_warning.png (added)
• gui/main.c (modified) (13 diffs)
• wscript (modified) (1 diff)

gui/main.c

@@ -116 +116 @@
 static unsigned int g_jack_state = JACK_STATE_NA;
 
+#define ABOUT_DIALOG_LOGO     "ladish-logo-128x128.png"
+#define STATUS_ICON_DOWN      "status_down.png"         /* temporary down during service restart */
+#define STATUS_ICON_UNLOADED  "status_unloaded.png"
+#define STATUS_ICON_STARTED   "status_started.png"
+#define STATUS_ICON_STOPPED   "status_stopped.png"
+#define STATUS_ICON_WARNING   "status_warning.png"      /* xruns */
+#define STATUS_ICON_ERROR     "status_error.png"        /* bad error */
+
 struct studio_list
 {
@@ -156 +164 @@
 
 #endif
+
+static GdkPixbuf * load_pixbuf_internal(const char * directory, const char * filename)
+{
+  char * fullpath;
+  GdkPixbuf * pixbuf;
+
+  fullpath = catdup(directory, filename);
+  if (fullpath == NULL)
+  {
+    return NULL;
+  }
+
+  pixbuf = gdk_pixbuf_new_from_file(fullpath, NULL);
+
+  free(fullpath);
+
+  return pixbuf;
+}
+
+static GdkPixbuf * load_pixbuf(const char * filename)
+{
+  GdkPixbuf * pixbuf;
+  static const char * pixbuf_dirs[] = {"./art/", DATA_DIR "/", NULL};
+  const char ** dir;
+
+  for (dir = pixbuf_dirs; *dir != NULL; dir++)
+  {
+    pixbuf = load_pixbuf_internal(*dir, filename);
+    if (pixbuf != NULL)
+    {
+      return pixbuf;
+    }
+  }
+
+  return NULL;
+}
 
 void set_latency_items_sensivity(bool sensitive)
@@ -668 +712 @@
   const char * name;
   char * buffer;
-  const gchar * stock_id;
+  const char * status_image_path;
   const char * tooltip;
+  GdkPixbuf * pixbuf;
 
   gtk_widget_set_sensitive(g_menu_item_start_studio, g_studio_state == STUDIO_STATE_STOPPED);
@@ -682 +727 @@
   //gtk_widget_set_sensitive(g_menu_item_load_project, g_studio_loaded);
 
-  stock_id = NULL;
   tooltip = NULL;
+  status_image_path = NULL;
 
   switch (g_jack_state)
@@ -689 +734 @@
   case JACK_STATE_NA:
     tooltip = status = "JACK is sick";
-    stock_id = GTK_STOCK_DIALOG_WARNING;
+    status_image_path = STATUS_ICON_ERROR;
     break;
   case JACK_STATE_STOPPED:
@@ -700 +745 @@
     status = "???";
     tooltip = "Internal error - unknown jack state";
-    stock_id = GTK_STOCK_DIALOG_WARNING;
+    status_image_path = STATUS_ICON_ERROR;
   }
 
@@ -709 +754 @@
   case STUDIO_STATE_NA:
     name = "ladishd is down";
+    status_image_path = STATUS_ICON_DOWN;
     break;
   case STUDIO_STATE_SICK:
   case STUDIO_STATE_UNKNOWN:
     tooltip = name = "ladishd is sick";
-    stock_id = GTK_STOCK_DIALOG_WARNING;
+    status_image_path = STATUS_ICON_ERROR;
     break;
   case STUDIO_STATE_UNLOADED:
     name = "No studio loaded";
+    status_image_path = STATUS_ICON_UNLOADED;
     break;
   case STUDIO_STATE_CRASHED:
     status = "Crashed";
     tooltip = "Crashed studio, save your work if you can and unload the studio";
-    stock_id = GTK_STOCK_DIALOG_WARNING;
+    status_image_path = STATUS_ICON_ERROR;
     /* fall through */
   case STUDIO_STATE_STOPPED:
@@ -729 +776 @@
       tooltip = "failed to get studio name";
       log_error("%s", tooltip);
-      stock_id = GTK_STOCK_DIALOG_WARNING;
+      status_image_path = STATUS_ICON_ERROR;
     }
     else
@@ -737 +784 @@
       {
       case STUDIO_STATE_STARTED:
-        stock_id = GTK_STOCK_YES;
+        status_image_path = STATUS_ICON_STARTED;
         tooltip = "Studio is started";
         break;
       case STUDIO_STATE_STOPPED:
-        stock_id = GTK_STOCK_NO;
+        status_image_path = STATUS_ICON_STOPPED;
         tooltip = "Studio is stopped";
         break;
@@ -750 +797 @@
     name = "???";
     tooltip = "Internal error - unknown studio state";
-    stock_id = GTK_STOCK_DIALOG_WARNING;
+    status_image_path = STATUS_ICON_ERROR;
   }
 
@@ -756 +803 @@
   gtk_label_set_text(GTK_LABEL(g_studio_status_label), name);
 
-  log_error("status icon stock id: %s", stock_id);
-  gtk_image_set_from_stock(GTK_IMAGE(g_status_image), stock_id, GTK_ICON_SIZE_SMALL_TOOLBAR);
+  if (status_image_path == NULL || (pixbuf = load_pixbuf(status_image_path)) == NULL)
+  {
+    gtk_image_set_from_stock(GTK_IMAGE(g_status_image), GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_SMALL_TOOLBAR);
+  }
+  else
+  {
+    gtk_image_set_from_pixbuf(GTK_IMAGE(g_status_image), pixbuf);
+    g_object_unref(pixbuf);
+  }
+
   //gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(g_status_tool_item), tooltip);
 
@@ -1076 +1131 @@
 }
 
-#define ABOUT_DIALOG_LOGO "ladish-logo-128x128.png"
-
 static void show_about(void)
 {
@@ -1086 +1139 @@
   char * license;
 
-  pixbuf = gdk_pixbuf_new_from_file("./art/" ABOUT_DIALOG_LOGO, NULL);
-  if (pixbuf == NULL)
-  {
-    pixbuf = gdk_pixbuf_new_from_file(DATA_DIR "/" ABOUT_DIALOG_LOGO, NULL);
-  }
-
+  pixbuf =  load_pixbuf(ABOUT_DIALOG_LOGO);
   license = read_file_contents(DATA_DIR "/COPYING");
 

wscript

@@ -363 +363 @@
     #    install_as(os.path.normpath(bld.env()['DATADIR'] + '/icons/hicolor/' + icon_size + '/apps/'), bld.env()['APP_INSTALL_NAME'] + '.png', 'icons/' + icon_size + '/patchage.png')
 
+    status_images = []
+    for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
+        status_images.append("art/status_" + status + ".png")
+
+    bld.install_files(bld.env['DATA_DIR'], status_images)
     bld.install_files(bld.env['DATA_DIR'], "art/ladish-logo-128x128.png")
     bld.install_files(bld.env['DATA_DIR'], ["COPYING", "AUTHORS", "README", "NEWS"])