- Adding nice large yelpish icon from Human

* data/icons/Makefile.am:
* src/yelp-toc-pager.c:
- Adding nice large yelpish icon from Human

* src/yelp-settings.c:
* src/yelp-settings.h:
* stylesheets/db2html.xsl.in:
- A nice yellow color for admonitions

* stylesheets/toc2html.xsl:
- Fixed document sorting problem

3 files changed, 22 insertions, 3 deletions

diff --git a/src/yelp-settings.c b/src/yelp-settings.c
index 4b420bb5..1d49d8ef 100644
--- a/src/yelp-settings.c
+++ b/src/yelp-settings.c
@@ -62,7 +62,9 @@ static const gchar *color_params[YELP_NUM_COLORS] = {
     "yelp.color.selected0",
     "yelp.color.selected1",
     "yelp.color.selected2",
-    "yelp.color.selected3"
+    "yelp.color.selected3",
+    "yelp.color.yellow.bg",
+    "yelp.color.yellow.fg"
 };
 
 static const gchar *icon_params[YELP_NUM_ICONS] = {
@@ -556,7 +558,7 @@ settings_update (YelpSettingsType type)
     GtkStyle  *style;
     GdkColor  *color;
     GdkColor   blue = { 0, 0x0000, 0x0000, 0xffff };
-    guint8     max_text;
+    guint8     max_text, max_base;
     guint16    rval, gval, bval;
     gint i;
 
@@ -574,6 +576,9 @@ settings_update (YelpSettingsType type)
 	max_text = MAX(style->text[GTK_STATE_NORMAL].red,
 		       MAX(style->text[GTK_STATE_NORMAL].green,
 			   style->text[GTK_STATE_NORMAL].blue   )) >> 8;
+	max_base = MAX(style->base[GTK_STATE_NORMAL].red,
+		       MAX(style->base[GTK_STATE_NORMAL].green,
+			   style->base[GTK_STATE_NORMAL].blue   )) >> 8;
 
 	g_snprintf (colors[YELP_COLOR_TEXT], 8,
 		    "#%02X%02X%02X",
@@ -616,6 +621,18 @@ settings_update (YelpSettingsType type)
 			"#%02X%02X%02X", rval, gval, bval);
 	}
 
+	for (i = 0; i < 2; i++) {
+	    gint mult = (i == 0) ? max_base : max_text;
+	    mult = (mult / 2) + 128;
+
+	    rval = ((mult * 255) / 255);
+	    gval = ((mult * 255) / 255);
+	    bval = ((mult * 207) / 255);
+
+	    g_snprintf (colors[YELP_COLOR_YELLOW_BG + i], 8,
+			"#%02X%02X%02X", rval, gval, bval);
+	}
+
 	g_object_unref (G_OBJECT (style));
 
 	widget = gnome_href_new ("http://www.gnome.org/", "GNOME");
diff --git a/src/yelp-settings.h b/src/yelp-settings.h
index 4f43245a..ead8a5a7 100644
--- a/src/yelp-settings.h
+++ b/src/yelp-settings.h
@@ -61,6 +61,8 @@ typedef enum {
     YELP_COLOR_SELECTED1,
     YELP_COLOR_SELECTED2,
     YELP_COLOR_SELECTED3,
+    YELP_COLOR_YELLOW_BG,
+    YELP_COLOR_YELLOW_FG,
     YELP_NUM_COLORS
 } YelpColorType;
 
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index b7c4b249..7886a109 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -894,7 +894,7 @@ process_xslt (YelpTocPager *pager)
 	params = g_renew (gchar *, params, params_max);
     }
 
-    info = gtk_icon_theme_lookup_icon (theme, "gnome-help", 192, 0);
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-icon-big", 192, 0);
     if (info) {
 	params[params_i++] = "help_icon";
 	params[params_i++] = g_strdup_printf ("\"%s\"",