[gnome-themes] Tidy up gtkrc files for HCLP and HCLPI themes, and add better hyperlink colours. Fixes bug #584261.

[Calum Benson <calum src gnome org>]

commit 16134bf59101fca64dc94294db1b1917c66e6161
Author: Calum Benson <calum benson oracle com>
Date:   Wed May 5 15:44:48 2010 +0100

    Tidy up gtkrc files for HCLP and HCLPI themes, and add better hyperlink
    colours.  Fixes bug #584261.

 gtk-themes/HighContrast/gtkrc.in                  |   74 ++++++++++-----
 gtk-themes/HighContrastInverse/gtkrc.in           |   67 ++++++++------
 gtk-themes/HighContrastLargePrint/gtkrc.in        |   93 ++++++++++++-------
 gtk-themes/HighContrastLargePrintInverse/gtkrc.in |  104 ++++++++++++---------
 4 files changed, 205 insertions(+), 133 deletions(-)
---
diff --git a/gtk-themes/HighContrast/gtkrc.in b/gtk-themes/HighContrast/gtkrc.in
index 51abe14..dc1395a 100644
--- a/gtk-themes/HighContrast/gtkrc.in
+++ b/gtk-themes/HighContrast/gtkrc.in
@@ -1,15 +1,21 @@
-# High-Contrast, "Normal Size" Theme v0.1
+# High-Contrast, "Normal Size" Theme
 #
-# Written by Bill Haneman, based on Standard theme by T. Liebeck, 
+# Original gtkrc by Bill Haneman, based on Standard theme by T. Liebeck, 
 # which was in turn based on lots of different gtkrc files but
 # primarily the one for the metal theme.
 #
 # High-contrast pixmap icons by jimmac with input from tigert.
-#
-# email: bill haneman sun com
 
 pixmap_path "@prefix@/share/themes/HighContrastLargePrint/pixmaps"
 
+#TODO: move sun-jds style downstream
+style "sun-jds"
+{
+  PanelMenu::stripe-gradient-top = "#000000"
+  PanelMenu::stripe-gradient-bottom = "#000000"
+}
+class "GtkWidget" style "sun-jds"
+
 style "default"
 {
   engine "hcengine" {
@@ -19,49 +25,65 @@ style "default"
   xthickness = 2
   ythickness = 2
 
-# For Java Desktop System
-  PanelMenu::stripe-gradient-top = "#000000"
-  PanelMenu::stripe-gradient-bottom = "#000000"
+  EelEditableLabel::cursor_aspect_ratio = 0.1
+  EelEditableLabel::cursor_color    = "#cc0000"
+
+  GtkEntry::cursor_color    = "#cc0000"
+  GtkEntry::cursor_aspect_ratio = 0.1
+
+  GtkHSV::focus-line-pattern = "\0"
+
+  GtkRange::stepper-size = 20
+
+  GtkTextView::cursor_aspect_ratio = 0.1
+  GtkTextView::cursor_color    = "#cc0000"
+
+  GtkTreeView::expander-size = 16
 
   GtkWidget::focus-line-pattern = "\4\2"
   GtkWidget::focus-line-width = 2
-  GtkHSV::focus-line-pattern = "\0"
-  GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = "#cc0000"
-  GtkTextView::cursor_color    = "#cc0000"
-  EelEditableLabel::cursor_color    = "#cc0000"
-  GtkTextView::cursor_aspect_ratio = 0.1
-  GtkEntry::cursor_aspect_ratio = 0.1
-  EelEditableLabel::cursor_aspect_ratio = 0.1
+  GtkWidget::interior_focus = 1
+  GtkWidget::link-color = "#000060"
+  GtkWidget::visited-link-color = "#600000"
+
+  # Nautilus
   NautilusIconContainer::frame_text = 1
-  GtkTreeView::expander-size = 16
-  GtkRange::stepper-size = 20
+
+  # Pidgin
+  GtkIMHtml::hyperlink-color = "#000060"
+  GtkIMHtml::hyperlink-visited-color = "#600000" 
+  GtkIMHtml::hyperlink-prelight-color = "#404080"
+
+  # Evolution
+  GtkHTML::link_color = "#000060"
+  GtkHTML::vlink_color = "#600000"
+  GtkHTML::cite_color = "#003000"
 
   fg[NORMAL]      = "#000000"
-  text[NORMAL]      = "#000000"
+  text[NORMAL]    = "#000000"
   bg[NORMAL]      = "#ffffff"
   base[NORMAL]    = "#ffffff"
 
   fg[INSENSITIVE]      = "#999999"
   text[INSENSITIVE]    = "#999999"
   bg[INSENSITIVE]      = "#ccccff"
-  base[INSENSITIVE]      = "#ccccff"
+  base[INSENSITIVE]    = "#ccccff"
 
   fg[PRELIGHT]    = "#ccccff"
-  text[PRELIGHT]    = "#ccccff"
+  text[PRELIGHT]  = "#ccccff"
   bg[PRELIGHT]    = "#000000"
-  base[PRELIGHT]    = "#000000"
+  base[PRELIGHT]  = "#000000"
 
   fg[ACTIVE]      = "#000000"
-  text[ACTIVE]      = "#000000"
-  bg[ACTIVE]      =  "#b8b891"
-  base[ACTIVE]      =  "#b8b891"
+  text[ACTIVE]    = "#000000"
+  bg[ACTIVE]      = "#b8b891"
+  base[ACTIVE]    = "#b8b891"
 
   fg[SELECTED]    = "#ffffff"
-  text[SELECTED]    = "#ffffff"
+  text[SELECTED]  = "#ffffff"
   bg[SELECTED]    = "#000000"
-  base[SELECTED]    = "#333300"
+  base[SELECTED]  = "#333300"
 
 @gtk_stock_icons_rc@
 @panel_stock_icons_rc@
diff --git a/gtk-themes/HighContrastInverse/gtkrc.in b/gtk-themes/HighContrastInverse/gtkrc.in
index f70c482..68970b5 100755
--- a/gtk-themes/HighContrastInverse/gtkrc.in
+++ b/gtk-themes/HighContrastInverse/gtkrc.in
@@ -1,16 +1,24 @@
-# High-Contrast, Inverse Video Theme v0.1
-# This is the whole basic theme, just this one gtkrc file.
-# It uses components of the standard theme engine
-# Written by Bill Haneman, based on Standard theme by T. Liebeck, 
+# High-Contrast Inverse, "Normal Size" Theme
+#
+# Original gtkrc by Bill Haneman, based on Standard theme by T. Liebeck, 
 # which was in turn based on lots of different gtkrc files but
 # primarily the one for the metal theme.
-# email: bill haneman sun com
+#
+# High-contrast pixmap icons by jimmac with input from tigert.
 
 #Note: we just use the LargePrint icons for now, they will be scaled
 #to the correct size
 
 pixmap_path "@prefix@/share/themes/HighContrastLargePrintInverse/pixmaps"
 
+#TODO: move sun-jds style downstream
+style "sun-jds"
+{
+  PanelMenu::stripe-gradient-top = "#000033"
+  PanelMenu::stripe-gradient-bottom = "#000033"
+}
+class "GtkWidget" style "sun-jds"
+
 style "default"   
 { 
   engine "hcengine" {
@@ -20,38 +28,41 @@ style "default"
   xthickness = 2
   ythickness = 2
 
-# For Java Desktop System
-  PanelMenu::stripe-gradient-top = "#000033"
-  PanelMenu::stripe-gradient-bottom = "#000033"
+  EelEditableLabel::cursor_aspect_ratio = 0.1
+  EelEditableLabel::cursor_color    = "#00cccc"
+
+  GtkEntry::cursor_color    = "#00cccc"
+  GtkEntry::cursor_aspect_ratio = 0.1
   
-  GtkWidget::link-color = "#FFFFFF"
-  GtkWidget::visited-link-color = "#FFCCFF"
+  GtkHSV::focus-line-pattern = "\0"
+
+  GtkRange::stepper-size = 20
+
+  GtkTextView::cursor_aspect_ratio = 0.1 
+  GtkTextView::cursor_color    = "#00cccc"
+
+  GtkTreeView::expander-size = 16
+
+# GtkWidget::cursor_aspect_ratio = 0.1
   GtkWidget::focus-line-pattern = "\4\2"
   GtkWidget::focus-line-width = 2
-  GtkHSV::focus-line-pattern = "\0"
-  GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = "#00cccc"
-#  GtkWidget::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = "#00cccc"
-  EelEditableLabel::cursor_color    = "#00cccc"
-  GtkTextView::cursor_aspect_ratio = 0.1 
-  GtkEntry::cursor_aspect_ratio = 0.1
-  EelEditableLabel::cursor_aspect_ratio = 0.1
+  GtkWidget::interior_focus = 1
+  GtkWidget::link-color = "#80ccff"
+  GtkWidget::visited-link-color = "#ff80ff"
+
+  # Nautilus
   NautilusIconContainer::frame_text = 1
-  GtkTreeView::expander-size = 16
-  GtkRange::stepper-size = 20
   
   # Pidgin
-  GtkIMHtml::hyperlink-color = "#99ffff"
-  GtkIMHtml::hyperlink-visited-color = "#ffccff" 
+  GtkIMHtml::hyperlink-color = "#80ccff"
+  GtkIMHtml::hyperlink-visited-color = "#ff80ff" 
   GtkIMHtml::hyperlink-prelight-color = "#ffccff"
 
-  # Used in Evolution
-  GtkHTML::link_color = "#99ffff"
-  GtkHTML::vlink_color = "#ffccff"
-  GtkHTML::vlink_color = "#ffccff"
-  GtkHTML::cite_color = "#BB8E8E"
+  # Evolution
+  GtkHTML::link_color = "#80ccff"
+  GtkHTML::vlink_color = "#ff80ff"
+  GtkHTML::cite_color = "#ccff80"
 
   fg[NORMAL]      = "#ffffff"
   text[NORMAL]      = "#ffffff"
diff --git a/gtk-themes/HighContrastLargePrint/gtkrc.in b/gtk-themes/HighContrastLargePrint/gtkrc.in
index a6092ee..8031a20 100644
--- a/gtk-themes/HighContrastLargePrint/gtkrc.in
+++ b/gtk-themes/HighContrastLargePrint/gtkrc.in
@@ -1,17 +1,23 @@
-# High-Contrast, Large Print Theme v0.1
-# 
-# Written by Bill Haneman, based on Standard theme by T. Liebeck, 
+# High-Contrast, "Large Print" Theme
+#
+# Original gtkrc by Bill Haneman, based on Standard theme by T. Liebeck, 
 # which was in turn based on lots of different gtkrc files but
 # primarily the one for the metal theme.
 #
 # High-contrast pixmap icons by jimmac with input from tigert.
-#
-# email: bill haneman sun com
 
 pixmap_path "@prefix@/share/themes/HighContrastLargePrint/pixmaps"
 
 gtk-icon-sizes = "@LARGEPRINT_ICON_SIZES@"
 
+#TODO: move sun-jds style downstream
+style "sun-jds"
+{
+  PanelMenu::stripe-gradient-top = "#000000"
+  PanelMenu::stripe-gradient-bottom = "#000000"
+}
+class "GtkWidget" style "sun-jds"
+
 style "default"
 {
   engine "hcengine"
@@ -25,59 +31,78 @@ style "default"
   xthickness = 3
   ythickness = 3
 
-# For Java Desktop System
-  PanelMenu::stripe-gradient-top = "#000000"
-  PanelMenu::stripe-gradient-bottom = "#000000"
-	
-  GtkWidget::focus-line-pattern = "\10\3"
-  GtkWidget::focus-line-width = 3
-  GtkWidget::interior_focus = 1
-  GtkWidget::focus-padding = 0
-# GtkWidget::cursor_aspect_ratio = 0.1
-  GtkPaned::handle-size = 10
-  GtkEntry::cursor_color    = "#cc0000"
-  GtkEntry::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = "#cc0000"
-  GtkTextView::cursor_aspect_ratio = 0.1
-  EelEditableLabel::cursor_color    = "#cc0000"
   EelEditableLabel::cursor_aspect_ratio = 0.1
-  NautilusIconContainer::frame_text = 1
-  GtkHSV::focus-line-pattern = "\0"
-  GtkRange::slider_width = 20
-  GtkTreeView::expander_size = 20
-  GtkTreeView::grid-line-width = 2
+  EelEditableLabel::cursor_color    = "#cc0000"
+
   GtkCheckButton::indicator_size = 18
   GtkCheckMenuItem::indicator_size = 18
+
+  GtkEntry::cursor_color    = "#cc0000"
+  GtkEntry::cursor_aspect_ratio = 0.1
+
   GtkExpander::expander-size = 24
   GtkExpander::expander-spacing = 8
+
+  GtkHSV::focus-line-pattern = "\0"
+
+  GtkPaned::handle-size = 10
+
+  GtkRange::slider_width = 20
+  GtkRange::stepper-size = 20
+
+  GtkTextView::cursor_aspect_ratio = 0.1
+  GtkTextView::cursor_color    = "#cc0000"
+
+  GtkTreeView::grid-line-width = 2
   GtkTreeView::expander-size = 24
+
+# GtkWidget::cursor_aspect_ratio = 0.1
+  GtkWidget::focus-line-pattern = "\10\3"
+  GtkWidget::focus-line-width = 3
+  GtkWidget::focus-padding = 0
+  GtkWidget::interior_focus = 1
+  GtkWidget::link-color = "#000060"
+  GtkWidget::visited-link-color = "#600000"
+
   PanelToplevel::arrow-size = 18
-  GtkRange::stepper-size = 20
 
+  #Nautilus
+  NautilusIconContainer::frame_text = 1
+
+  # Pidgin
+  GtkIMHtml::hyperlink-color = "#000060"
+  GtkIMHtml::hyperlink-visited-color = "#600000" 
+  GtkIMHtml::hyperlink-prelight-color = "#404080"
+
+  # Evolution
+  GtkHTML::link_color = "#000060"
+  GtkHTML::vlink_color = "#600000"
+  GtkHTML::cite_color = "#003000"
+ 
   fg[NORMAL]      = "#000000"
-  text[NORMAL]      = "#000000"
+  text[NORMAL]    = "#000000"
   bg[NORMAL]      = "#ffffff"
   base[NORMAL]    = "#ffffff"
 
   fg[INSENSITIVE]      = "#999999"
   text[INSENSITIVE]    = "#999999"
   bg[INSENSITIVE]      = "#ccccff"
-  base[INSENSITIVE]      = "#ccccff"
+  base[INSENSITIVE]    = "#ccccff"
 
   fg[PRELIGHT]    = "#ffffff"
-  text[PRELIGHT]    = "#ffffff"
+  text[PRELIGHT]  = "#ffffff"
   bg[PRELIGHT]    = "#000000"
-  base[PRELIGHT]    = "#000000"
+  base[PRELIGHT]  = "#000000"
 
   fg[ACTIVE]      = "#000000"
-  text[ACTIVE]      = "#000000"
+  text[ACTIVE]    = "#000000"
   bg[ACTIVE]      =  "#b8b891"
-  base[ACTIVE]      = "#b8b891"
+  base[ACTIVE]    = "#b8b891"
 
   fg[SELECTED]    = "#ffffff"
-  text[SELECTED]    = "#ffffff"
+  text[SELECTED]  = "#ffffff"
   bg[SELECTED]    = "#000000"
-  base[SELECTED]    = "#333300"
+  base[SELECTED]  = "#333300"
 
 @gtk_stock_icons_rc@
 @panel_stock_icons_rc@
diff --git a/gtk-themes/HighContrastLargePrintInverse/gtkrc.in b/gtk-themes/HighContrastLargePrintInverse/gtkrc.in
index 9e7de91..42d6578 100755
--- a/gtk-themes/HighContrastLargePrintInverse/gtkrc.in
+++ b/gtk-themes/HighContrastLargePrintInverse/gtkrc.in
@@ -1,15 +1,23 @@
-# High-Contrast, Large Print, Inverse Video Theme v0.1
-# This is the whole basic theme, just this one gtkrc file.
-# It uses components of the standard theme engine
-# Written by Bill Haneman, based on Standard theme by T. Liebeck, 
+# High-Contrast Inverse, "Large Print" Theme
+#
+# Original gtkrc by Bill Haneman, based on Standard theme by T. Liebeck, 
 # which was in turn based on lots of different gtkrc files but
 # primarily the one for the metal theme.
-# email: bill haneman sun com
+#
+# High-contrast pixmap icons by jimmac with input from tigert.
 
 pixmap_path "@prefix@/share/themes/HighContrastLargePrintInverse/pixmaps"
 
 gtk-icon-sizes = "@LARGEPRINT_ICON_SIZES@"
 
+#TODO: move sun-jds style downstream
+style "sun-jds"
+{
+  PanelMenu::stripe-gradient-top = "#000033"
+  PanelMenu::stripe-gradient-bottom = "#000033"
+}
+class "GtkWidget" style "sun-jds"
+
 style "default"
 {
   engine "hcengine"
@@ -23,72 +31,78 @@ style "default"
   xthickness = 3
   ythickness = 3
 
-# For Java Desktop System
-  PanelMenu::stripe-gradient-top = "#000033"
-  PanelMenu::stripe-gradient-bottom = "#000033"
-
-  GtkWidget::link-color = "#FFFFFF"
-  GtkWidget::visited-link-color = "#FFCCFF"
-  GtkWidget::focus-line-pattern = "\10\3"
-  GtkWidget::interior_focus = 1
-  GtkWidget::focus-padding = 0
-  GtkWidget::focus-line-width = 3
-# GtkWidget::cursor_aspect_ratio = 0.1
-  GtkHSV::focus-line-pattern = "\0"
-  GtkRange::slider_width = 20
-  GtkPaned::handle-size = 10
-  GtkEntry::cursor_color    = "#00cccc"
-  GtkEntry::cursor_aspect_ratio = 0.1
-  GtkTreeView::expander_size = 20
-  GtkTreeView::grid-line-width = 2
-  GtkTextView::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = "#00cccc"
-  EelEditableLabel::cursor_color    = "#00cccc"
   EelEditableLabel::cursor_aspect_ratio = 0.1
+  EelEditableLabel::cursor_color    = "#00cccc"
+
   GtkCheckButton::indicator_size = 18
   GtkCheckMenuItem::indicator_size = 18
-  NautilusIconContainer::frame_text = 1
+
+  GtkEntry::cursor_aspect_ratio = 0.1
+  GtkEntry::cursor_color    = "#00cccc"
+
   GtkExpander::expander-size = 24
   GtkExpander::expander-spacing = 8
-  GtkTreeView::expander-size = 24
-  PanelToplevel::arrow-size = 18
+ 
+  GtkHSV::focus-line-pattern = "\0"
+
+  GtkPaned::handle-size = 10
+
+  GtkRange::slider_width = 20
   GtkRange::stepper-size = 20
 
+  GtkTextView::cursor_aspect_ratio = 0.1
+  GtkTextView::cursor_color    = "#00cccc"
+
+# GtkWidget::cursor_aspect_ratio = 0.1
+  GtkWidget::focus-line-pattern = "\10\3"
+  GtkWidget::focus-line-width = 3
+  GtkWidget::focus-padding = 0
+  GtkWidget::interior_focus = 1
+  GtkWidget::link-color = "#80ccff"
+  GtkWidget::visited-link-color = "#ff80ff"
+
+  GtkTreeView::expander_size = 24
+  GtkTreeView::grid-line-width = 2
+
+  PanelToplevel::arrow-size = 18
+
+  #Nautilus
+  NautilusIconContainer::frame_text = 1
+
   # Pidgin
-  GtkIMHtml::hyperlink-color = "#99ffff"
-  GtkIMHtml::hyperlink-visited-color = "#ffccff"
+  GtkIMHtml::hyperlink-color = "#80ccff"
+  GtkIMHtml::hyperlink-visited-color = "#ff80ff"
   GtkIMHtml::hyperlink-prelight-color = "#ffccff"
 
-  # Used in Evolution
-  GtkHTML::link_color = "#99ffff"       
-  GtkHTML::vlink_color = "#ffccff"      
-  GtkHTML::vlink_color = "#ffccff"     
-  GtkHTML::cite_color = "#BB8E8E"
+  # Evolution
+  GtkHTML::link_color = "#80ccff"       
+  GtkHTML::vlink_color = "#ff80ff"     
+  GtkHTML::cite_color = "#ccff80"
 
   fg[NORMAL]      = "#ffffff"
-  text[NORMAL]      = "#ffffff"
+  text[NORMAL]    = "#ffffff"
   bg[NORMAL]      = "#000033" 
   base[NORMAL]    = "#000033"
 
   fg[INSENSITIVE]      = "#999999"
   bg[INSENSITIVE]      = "#333333"
-  text[INSENSITIVE]      = "#999999"
-  base[INSENSITIVE]      = "#333333"
+  text[INSENSITIVE]    = "#999999"
+  base[INSENSITIVE]    = "#333333"
 
   fg[PRELIGHT]    = "#003333"
-  text[PRELIGHT]    = "#003333"
+  text[PRELIGHT]  = "#003333"
   bg[PRELIGHT]    = "#ffffff"
-  base[PRELIGHT]    = "#ffffff"
+  base[PRELIGHT]  = "#ffffff"
 
   fg[ACTIVE]      = "#ffffff"
-  text[ACTIVE]      = "#ffffff"
+  text[ACTIVE]    = "#ffffff"
   bg[ACTIVE]      = "#666699"
-  base[ACTIVE]      = "#666699"
+  base[ACTIVE]    = "#666699"
 
   fg[SELECTED]    = "#000033"
-  text[SELECTED]    = "#000033"
+  text[SELECTED]  = "#000033"
   bg[SELECTED]    = "#ffffff"
-  base[SELECTED]    = "#ffccff"
+  base[SELECTED]  = "#ffccff"
 
 @gtk_stock_icons_rc@
 @panel_stock_icons_rc@