- Added an enum for document outline columns

* src/yelp-db-pager.c:
* src/yelp-pager.h:
* src/yelp-window.c:
- Added an enum for document outline columns

* stylesheets/toc2html.xsl:
- Some CSS work

5 files changed, 26 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 56b5192e..6c579bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-31  Shaun McCance  <shaunm@gnome.org>
+
+	* src/yelp-db-pager.c:
+	* src/yelp-pager.h:
+	* src/yelp-window.c:
+	- Added an enum for document outline columns
+
+	* stylesheets/toc2html.xsl:
+	- Some CSS work
+
 2004-12-31  Davyd Madeley  <davyd@madeley.id.au>
 
 	* src/yelp-info-parser.c (add):
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index a5bc895d..b144c2e3 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -416,8 +416,8 @@ walker_walk_xml (DBWalker *walker)
 
 	    gtk_tree_store_set (GTK_TREE_STORE (priv->sects),
 				&iter,
-				0, id,
-				1, title,
+				YELP_PAGER_COLUMN_ID, id,
+				YELP_PAGER_COLUMN_TITLE, title,
 				-1);
 
 	    old_id          = walker->page_id;
diff --git a/src/yelp-pager.h b/src/yelp-pager.h
index bc4c7628..4c8a42e6 100644
--- a/src/yelp-pager.h
+++ b/src/yelp-pager.h
@@ -50,6 +50,12 @@ typedef enum {
     YELP_PAGER_NUM_STATES
 } YelpPagerState;
 
+enum {
+    YELP_PAGER_COLUMN_ID = 0,
+    YELP_PAGER_COLUMN_TITLE,
+    YELP_PAGER_NUM_COLUMNS
+};
+
 #include "yelp-utils.h"
 
 struct _YelpPager {
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 4a0fdbb5..5aca956e 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -906,7 +906,7 @@ window_populate (YelpWindow *window)
     gtk_tree_view_insert_column_with_attributes
 	(GTK_TREE_VIEW (priv->side_sects), -1,
 	 NULL, gtk_cell_renderer_text_new (),
-	 "text", 1,
+	 "text", YELP_PAGER_COLUMN_TITLE,
 	 NULL);
 
     gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (priv->side_sects),
@@ -1324,7 +1324,7 @@ window_handle_page (YelpWindow   *window,
 	valid = gtk_tree_model_get_iter_first (model, &iter);
 	while (valid) {
 	    gtk_tree_model_get (model, &iter,
-				0, &id,
+				YELP_PAGER_COLUMN_ID, &id,
 				-1);
 	    if (yelp_pager_page_contains_frag (pager,
 					       id,
@@ -1645,7 +1645,7 @@ tree_selection_changed_cb (GtkTreeSelection *selection,
     if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->side_sects));
 	gtk_tree_model_get (model, &iter,
-			    0, &id,
+			    YELP_PAGER_COLUMN_ID, &id,
 			    -1);
 	uri = yelp_doc_info_get_uri (priv->current_doc, id, YELP_URI_TYPE_ANY);
 	yelp_window_load (window, uri);
@@ -1679,7 +1679,7 @@ tree_drag_data_get_cb (GtkWidget         *widget,
     if (gtk_tree_selection_get_selected (tree_selection, NULL, &iter)) {
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->side_sects));
 	gtk_tree_model_get (model, &iter,
-			    0, &id,
+			    YELP_PAGER_COLUMN_ID, &id,
 			    -1);
 	uri = yelp_doc_info_get_uri (priv->current_doc, id,
 				     YELP_URI_TYPE_NO_FILE);
diff --git a/stylesheets/toc2html.xsl b/stylesheets/toc2html.xsl
index 981b2be9..b8627ffc 100644
--- a/stylesheets/toc2html.xsl
+++ b/stylesheets/toc2html.xsl
@@ -29,26 +29,14 @@
         </title>
         <style><xsl:text>
         body {
-          padding-top: 0px;
-          padding-left: 0px;
-          padding-right: 12px;
+          padding-top: 0em;
+          padding-left: 0em;
+          padding-right: 2em;
         }
-        h1 { font-size: 2em; margin-bottom: 0.4em; }
+        h1 { font-size: 1.6em; margin-bottom: 0.4em; }
         h1 img { float: right; }
         h1 { color: </xsl:text>
         <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h2 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h3 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h4 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h5 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h6 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
-        h7 { color: </xsl:text>
-        <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
         div[class~="leftbar"] {
           width: 200px;
           text-align: center;