[longomatch/newui: 118/157] Style comboboxes

[Andoni Morales Alastruey <amorales src gnome org>]

commit d5e18a7302e84ee7d7f8069b819fcbbd21470b9e
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Aug 27 17:14:00 2014 +0200

    Style comboboxes

 .../gtk-2.0/Entry/combo-entry-border-bg-rtl.png    |  Bin 0 -> 208 bytes
 data/theme/gtk-2.0/Entry/combo-entry-border-bg.png |  Bin 0 -> 1035 bytes
 .../theme/gtk-2.0/Entry/combo-entry-button-rtl.png |  Bin 0 -> 1035 bytes
 data/theme/gtk-2.0/Entry/combo-entry-button.png    |  Bin 0 -> 208 bytes
 data/theme/gtk-2.0/combobox.rc                     |   58 +++++++++-----------
 data/theme/gtk-2.0/gtkrc                           |   17 ++++--
 6 files changed, 37 insertions(+), 38 deletions(-)
---
diff --git a/data/theme/gtk-2.0/Entry/combo-entry-border-bg-rtl.png 
b/data/theme/gtk-2.0/Entry/combo-entry-border-bg-rtl.png
new file mode 100644
index 0000000..6dd5f30
Binary files /dev/null and b/data/theme/gtk-2.0/Entry/combo-entry-border-bg-rtl.png differ
diff --git a/data/theme/gtk-2.0/Entry/combo-entry-border-bg.png 
b/data/theme/gtk-2.0/Entry/combo-entry-border-bg.png
new file mode 100644
index 0000000..7628ce6
Binary files /dev/null and b/data/theme/gtk-2.0/Entry/combo-entry-border-bg.png differ
diff --git a/data/theme/gtk-2.0/Entry/combo-entry-button-rtl.png 
b/data/theme/gtk-2.0/Entry/combo-entry-button-rtl.png
new file mode 100644
index 0000000..7628ce6
Binary files /dev/null and b/data/theme/gtk-2.0/Entry/combo-entry-button-rtl.png differ
diff --git a/data/theme/gtk-2.0/Entry/combo-entry-button.png b/data/theme/gtk-2.0/Entry/combo-entry-button.png
new file mode 100644
index 0000000..6dd5f30
Binary files /dev/null and b/data/theme/gtk-2.0/Entry/combo-entry-button.png differ
diff --git a/data/theme/gtk-2.0/combobox.rc b/data/theme/gtk-2.0/combobox.rc
index 18e2f8e..752a5e9 100644
--- a/data/theme/gtk-2.0/combobox.rc
+++ b/data/theme/gtk-2.0/combobox.rc
@@ -1,28 +1,13 @@
 style "longomatch-combobox" = "longomatch-default" {
   xthickness = 2
   ythickness = 2
-}
-
-style "longomatch-combobox-arrow"
-{
-  # Arrows
 
-  engine "pixmap"
-  {
-    image
-    {
-      function         = ARROW
-      overlay_file     = "Arrows/arrow-up-down.png"
-      overlay_border   = { 0, 0, 0, 0 }
-      overlay_stretch  = FALSE
-      arrow_direction  = DOWN
-    }
-  }
-}
+  base[NORMAL]      = @bg_light_color
+  bg[NORMAL]        = @bg_light_color
 
-style "longomatch-combobox-entry" = "longomatch-combobox" {
-  xthickness = 3
-  ythickness = 4
+  fg[NORMAL]        = @text_color
+  text[NORMAL]      = @text_color
+  text[INSENSITIVE] = darker (@text_color)
 
   engine "pixmap"
   {
@@ -30,7 +15,6 @@ style "longomatch-combobox-entry" = "longomatch-combobox" {
     image
     {
       function   = SHADOW
-      detail     = "entry"
       shadow     = IN
       file       = "Entry/combo-entry-border-bg.png"
       border     = { 4, 4, 5, 4 }
@@ -41,25 +25,35 @@ style "longomatch-combobox-entry" = "longomatch-combobox" {
     image
     {
       function   = SHADOW
-      detail     = "entry"
       shadow     = IN
       file       = "Entry/combo-entry-border-bg-rtl.png"
       border     = { 4, 4, 5, 4 }
       stretch    = TRUE
       direction  = RTL
     }
-     image
-     {
-       function        = FLAT_BOX
-       detail          = "entry_bg"
-       overlay_file    = "Entry/filechooser-entry-fill.png"
-       overlay_border  = { 0, 0, 0, 0 }
-       overlay_stretch = TRUE
-     }
   }
 }
 
-style "longomatch-combobox-button" {
+style "longomatch-combobox-arrow"
+{
+  # Arrows
+
+  engine "pixmap"
+  {
+    image
+    {
+      function         = ARROW
+      overlay_file     = "Arrows/arrow-up-down.png"
+      overlay_border   = { 0, 0, 0, 0 }
+      overlay_stretch  = FALSE
+      arrow_direction  = DOWN
+    }
+  }
+}
+
+style "longomatch-combobox-button" = "longomatch-combo
+"
+{
   fg[ACTIVE] = @text_color
 
   engine "pixmap"
@@ -70,7 +64,7 @@ style "longomatch-combobox-button" {
     {
       function    = BOX
       file        = "Entry/combo-entry-button.png"
-      border      = { 10, 10, 10, 10 }
+      border      = { 4, 4, 4, 4 }
       stretch     = TRUE
       direction   = LTR
     }
diff --git a/data/theme/gtk-2.0/gtkrc b/data/theme/gtk-2.0/gtkrc
index 22fb6a8..aa36897 100644
--- a/data/theme/gtk-2.0/gtkrc
+++ b/data/theme/gtk-2.0/gtkrc
@@ -277,16 +277,22 @@ class "GtkPaned"                                style "longomatch-handles"
 class "GtkAspectFrame"                           style "longomatch-aspect-frame"
 # Background for the menubar
 class "GtkMenuBar"                               style "longomatch-menubar"
-class "GtkCheckButton"                              style "longomatch-checkbox"
-class "GtkRadioButton"                              style "longomatch-radiobutton"
+
+class "GtkCheckButton"                           style "longomatch-checkbox"
+class "GtkCheckMenuItem"                         style "longomatch-checkbox"
+class "GtkRadioButton"                           style "longomatch-radiobutton"
+
 # Text color for the menu items in the bar and the menus
 widget_class "*.GtkMenu.*"                       style "longomatch-menuitem"
 widget_class "*.GtkMenuBar.*"                    style "longomatch-menuitem"
-widget_class "*<GtkComboBox>"                    style "longomatch-combobox"
+widget_class "*<GtkComboBox>*"                    style "longomatch-combobox"
 #widget_class "*<GtkComboBox>*<GtkButton>"        style "longomatch-combobox-button"
 #widget_class "*<GtkComboBox>*<GtkEntry>"         style "longomatch-combobox-entry"
-#widget_class "*<GtkComboBoxEntry>*<GtkEntry>"   style "longomatch-combobox-entry"
-#widget_class "*<GtkComboBoxEntry>*<GtkButton>"  style "longomatch-combobox-msbutton"
+widget_class "*<GtkComboBox>*<GtkButton>"  style "longomatch-combobox-button"
+widget_class "*<GtkComboBox>*<GtkArrow>" style "longomatch-combobox-arrow"
+
+
+
 widget_class "*HomeTeamsComboBox*" style "longomatch-home-teams-combobox"
 widget_class "*HomeTeamsComboBox*<GtkButton>" style "longomatch-home-teams-combobox-button"
 widget_class "*AwayTeamsComboBox*" style "longomatch-away-teams-combobox"
@@ -294,7 +300,6 @@ widget_class "*AwayTeamsComboBox*<GtkButton>" style "longomatch-away-teams-combo
 widget_class "*TeamsComboBox*<GtkArrow>" style "longomatch-teams-combobox-arrow"
 
 
-
 class "GtkNotebook"                              style "longomatch-notebook"
 widget_class "*<GtkNotebook>*<GtkLabel>"                style "longomatch-notebook-tab-label"