gtk-css-engine r91 - in branches/bzr: . libccd/ccd themes/Gilouche-CSS/gtk-2.0 themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Fri Sep  5 11:34:10 2008
New Revision: 91
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=91&view=rev

Log:
was missing a image

Added:
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/scale-background-vertical.png
Modified:
   branches/bzr/   (props changed)
   branches/bzr/HACKING
   branches/bzr/TODO
   branches/bzr/configure.in
   branches/bzr/libccd/ccd/ccd-selector.c
   branches/bzr/libccd/ccd/ccd-selector.h
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/Makefile.am
   branches/bzr/themes/gtk-css-test/gtk-2.0/Makefile.am
   branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css

Modified: branches/bzr/HACKING
==============================================================================
--- branches/bzr/HACKING	(original)
+++ branches/bzr/HACKING	Fri Sep  5 11:34:10 2008
@@ -49,8 +49,11 @@
 ----------------
 
 * NEWS.
+* Remove extra version in configure.in.
 * `make distcheck'.
 * Commit to trunk (bzr).
 * Push to svn.
 * Tag in svn.
 * Announce.
+* Bump version and add extra version in configure.in.
+

Modified: branches/bzr/TODO
==============================================================================
--- branches/bzr/TODO	(original)
+++ branches/bzr/TODO	Fri Sep  5 11:34:10 2008
@@ -1,6 +1,6 @@
 
-TODO
-====
+ROADMAP
+=======
 
 0.1 "Infrastructure"
 --------------------
@@ -8,15 +8,7 @@
 * Matching (descendant and child).
 * Background color.
 * Basic border styles, also through the `color' property.
-* Single background image, repeating, tiling.
-* Prototypical default theme.
-* Bugzilla module.
-
-Code review:
-  + Check all list iterators for const-ness.
-  + Make all string comparisons case insensitive?
-  + Get rid of the _match() functions all toghether?
-  + Check 80 column code width.
+* Single background image.
 
 0.2 "Correctness"
 -----------------
@@ -27,6 +19,14 @@
 * Unit tests.
 * Test using the theme torturer.
 * Test using valgrind.
+* Gilouche-CSS theme pretty much matches the original.
+* Bugzilla module.
+
+Code review:
+  + Check all list iterators for const-ness.
+  + Make all string comparisons case insensitive?
+  + Get rid of the _match() functions all toghether?
+  + Check 80 column code width.
 
 0.3 "Features"
 --------------

Modified: branches/bzr/configure.in
==============================================================================
--- branches/bzr/configure.in	(original)
+++ branches/bzr/configure.in	Fri Sep  5 11:34:10 2008
@@ -7,9 +7,9 @@
 AC_PREREQ(2.54)
 
 m4_define([ccd_version_major], [0])
-m4_define([ccd_version_minor], [0])
-m4_define([ccd_version_micro], [9])
-m4_define([ccd_version_extra], [.trunk])
+m4_define([ccd_version_minor], [1])
+m4_define([ccd_version_micro], [0])
+m4_define([ccd_version_extra], [])
 m4_define([ccd_version],
     [ccd_version_major.ccd_version_minor.ccd_version_micro[]ccd_version_extra])
 

Modified: branches/bzr/libccd/ccd/ccd-selector.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-selector.c	(original)
+++ branches/bzr/libccd/ccd/ccd-selector.c	Fri Sep  5 11:34:10 2008
@@ -528,8 +528,8 @@
  * Does it matter that the refinements order is reversed?
  */
 void
-ccd_selector_refine (ccd_selector_t		*self,
-		     ccd_selector_t const	*selector)
+ccd_selector_refine (ccd_selector_t *self,
+		     ccd_selector_t *selector)
 {
 	g_assert (self && self->refinement == NULL && selector);
 
@@ -541,62 +541,6 @@
 	self->c += selector->c;
 	self->d += selector->d;
 	self->e += selector->e;
-
-	switch (selector->modality) {
-	case CCD_SELECTOR_MODALITY_CLASS:
-		g_assert (selector->c < CCD_SELECTOR_MAX_SPECIFICITY);
-		self->c++;
-		break;
-	case CCD_SELECTOR_MODALITY_ID:
-		g_assert (selector->b < CCD_SELECTOR_MAX_SPECIFICITY);
-		self->b++;
-		break;
-	case CCD_SELECTOR_MODALITY_ATTRIBUTE:
-		g_assert (selector->c < CCD_SELECTOR_MAX_SPECIFICITY);
-		self->c++;
-		break;
-	case CCD_SELECTOR_MODALITY_PSEUDO_CLASS:
-		g_assert (selector->d < CCD_SELECTOR_MAX_SPECIFICITY);
-		self->d++;
-		break;
-	case CCD_SELECTOR_MODALITY_UNIVERSAL:
-	case CCD_SELECTOR_MODALITY_TYPE:
-	case CCD_SELECTOR_MODALITY_BASE_TYPE:
-	default:
-		g_warning ("Invalid selector modality %d", self->modality);
-	}
-}
-
-static void
-append (ccd_selector_t const	*self,
-	ccd_selector_t		*selector)
-{
-	g_assert (self && selector);
-
-	/* propagate specificity */
-	selector->a = self->a;
-	selector->b = self->b;
-	selector->c = self->c;
-	selector->d = self->d;
-	selector->e = self->e;
-
-	/* update specificity */
-	switch (self->modality) {
-	case CCD_SELECTOR_MODALITY_UNIVERSAL:
-		/* no weight */
-		break;
-	case CCD_SELECTOR_MODALITY_TYPE:
-		g_assert (selector->d < CCD_SELECTOR_MAX_SPECIFICITY);
-		selector->d++;
-		break;
-	case CCD_SELECTOR_MODALITY_BASE_TYPE:
-	case CCD_SELECTOR_MODALITY_CLASS:
-	case CCD_SELECTOR_MODALITY_ID:
-	case CCD_SELECTOR_MODALITY_ATTRIBUTE:
-	case CCD_SELECTOR_MODALITY_PSEUDO_CLASS:
-	default:
-		g_warning ("Invalid selector modality %d", self->modality);
-	}
 }
 
 /*
@@ -607,7 +551,13 @@
 ccd_selector_append_child (ccd_selector_t *self,
 			   ccd_selector_t *selector)
 {
-	append (self, selector);
+	/* propagate specificity */
+	selector->a += self->a;
+	selector->b += self->b;
+	selector->c += self->c;
+	selector->d += self->d;
+	selector->e += self->e;
+
 	selector->container = self;
 
 	return selector;
@@ -621,7 +571,13 @@
 ccd_selector_append_descendant (ccd_selector_t *self,
 				ccd_selector_t *selector)
 {
-	append (self, selector);
+	/* propagate specificity */
+	selector->a += self->a;
+	selector->b += self->b;
+	selector->c += self->c;
+	selector->d += self->d;
+	selector->e += self->e;
+
 	selector->antecessor = self;
 
 	return selector;
@@ -791,9 +747,9 @@
 			  ccd_style_t		*style)
 {
 	ccd_node_class_t const	*node_class;
-	char const		*name;
-	char const		*value;
-	bool			 is_matching;
+	char const	*name;
+	char		*value;
+	bool		 is_matching;
 
 	g_return_val_if_fail (self && node, false);
 

Modified: branches/bzr/libccd/ccd/ccd-selector.h
==============================================================================
--- branches/bzr/libccd/ccd/ccd-selector.h	(original)
+++ branches/bzr/libccd/ccd/ccd-selector.h	Fri Sep  5 11:34:10 2008
@@ -55,7 +55,7 @@
 
 void ccd_selector_free	(ccd_selector_t *self);
 
-void		 ccd_selector_refine		(ccd_selector_t *self, ccd_selector_t const *selector);
+void		 ccd_selector_refine		(ccd_selector_t *self, ccd_selector_t *selector);
 ccd_selector_t * ccd_selector_append_child	(ccd_selector_t *self, ccd_selector_t *selector);
 ccd_selector_t * ccd_selector_append_descendant	(ccd_selector_t *self, ccd_selector_t *selector);
 

Modified: branches/bzr/themes/Gilouche-CSS/gtk-2.0/Makefile.am
==============================================================================
--- branches/bzr/themes/Gilouche-CSS/gtk-2.0/Makefile.am	(original)
+++ branches/bzr/themes/Gilouche-CSS/gtk-2.0/Makefile.am	Fri Sep  5 11:34:10 2008
@@ -2,6 +2,31 @@
 themedir = $(datadir)/themes/Gilouche-CSS/gtk-2.0
 theme_DATA = \
 	gtkrc \
-	styles.css
+	styles.css \
+	\
+	arrow-up.svg \
+	arrow-down.svg \
+	arrow-left.svg \
+	arrow-right.svg \
+	button-back.png \
+	check-inactive.png \
+	check-inactive-selected.png \
+	check.png \
+	check-selected.png \
+	progressbar.png \
+	radiobutton-inactive.png \
+	radiobutton-inactive-selected.png \
+	radiobutton.png \
+	radiobutton-selected.png \
+	resizegrip.png \
+	scale-slider.png \
+	scale-slider-vertical.png \
+	slider-background-horizontal.png \
+	slider-background.png \
+	tab-back-down.png \
+	tab-back-left.png \
+	tab-back.png \
+	tab-back-right.png
 
 EXTRA_DIST = $(theme_DATA)
+

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/scale-background-vertical.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/scale-background-vertical.png	Fri Sep  5 11:34:10 2008 differ

Modified: branches/bzr/themes/gtk-css-test/gtk-2.0/Makefile.am
==============================================================================
--- branches/bzr/themes/gtk-css-test/gtk-2.0/Makefile.am	(original)
+++ branches/bzr/themes/gtk-css-test/gtk-2.0/Makefile.am	Fri Sep  5 11:34:10 2008
@@ -1,7 +1,10 @@
 
-themedir = $(datadir)/themes/gtk-css-test/gtk-2.0
-theme_DATA = \
+# Do not install.
+#themedir = $(datadir)/themes/gtk-css-test/gtk-2.0
+#theme_DATA = $(resources)
+resources = \
 	gtkrc \
 	styles.css
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(resources)
+

Modified: branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	Fri Sep  5 11:34:10 2008
@@ -118,3 +118,6 @@
 background-color:white;
 }
 
+GtkHScale box.trough {
+	background: yellow;
+}