[beryl-commits] compiz mirror: Changes to 'master' (6c584e3f6831f59abd1265ec90312aa0189fd3d5)

[compiz at server.beryl-project.org]

New commits:
commit 6c584e3f6831f59abd1265ec90312aa0189fd3d5
Author: Dennis Kasprzyk <onestone at beryl-project.org>
Date:   Mon Jun 11 20:55:06 2007 +0200

    Add int descriptions to long option description.

commit adc6bf15d801ec978f7a63f861dcc2f4b0987ea0
Author: Dennis Kasprzyk <onestone at beryl-project.org>
Date:   Mon Jun 11 20:43:07 2007 +0200

    Removed string description handling.

commit 620e48d3fa3eddceefb5d67ad21113caa35abb10
Author: Dennis Kasprzyk <onestone at beryl-project.org>
Date:   Mon Jun 11 20:41:19 2007 +0200

    Ignore read_only options in schema creation.


 metadata/schemas.xslt |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)


Modified: compiz/metadata/schemas.xslt
===================================================================
--- compiz/metadata/schemas.xslt
+++ compiz/metadata/schemas.xslt
@@ -31,7 +31,7 @@
   <xsl:template  match="/compiz">
     <gconfschemafile>
       <schemalist>
-        <xsl:for-each select="/compiz//option">
+        <xsl:for-each select="/compiz//option[not(@read_only='true')]">
           <xsl:call-template name="dumpOption"/>
         </xsl:for-each>
       </schemalist>
@@ -269,18 +269,15 @@
     <xsl:variable name="info">
       <xsl:text> (</xsl:text>
       <xsl:choose>
-        <xsl:when test="contains('int,float', at type)">
+        <xsl:when test="contains('int,float', at type) and not(desc/value/text())">
           <xsl:value-of select="min/text()"/> - <xsl:value-of select="max/text()"/>
         </xsl:when>
+	<xsl:when test="@type='int' and desc/value/text()">
+          <xsl:call-template name="printIntDescList"/>
+        </xsl:when>
         <xsl:when test="@type = 'match'">
           <xsl:text>match</xsl:text>
         </xsl:when>
-        <xsl:when test="@type = 'string' and allowed/value">
-          <xsl:call-template name="printAllowedList"/>
-        </xsl:when>
-        <xsl:when test="@type = 'list' and type/text() = 'string' and allowed/value">
-          <xsl:call-template name="printAllowedList"/>
-        </xsl:when>
       </xsl:choose>
       <xsl:text>)</xsl:text>
     </xsl:variable>
@@ -288,12 +285,14 @@
       <xsl:value-of select="$info"/>
     </xsl:if>
   </xsl:template>
-
-  <!-- generates a list of allowed string values -->
-  <xsl:template name="printAllowedList">
+  
+  <!-- generates a list of int descriptions -->
+  <xsl:template name="printIntDescList">
     <xsl:variable name="list">
-      <xsl:for-each select="allowed/value">
-          <xsl:value-of select="text()"/>
+      <xsl:for-each select="desc">
+          <xsl:value-of select="value/text()"/>
+	  <xsl:text> = </xsl:text>
+	  <xsl:value-of select="name/text()"/>
           <xsl:text>, </xsl:text>
       </xsl:for-each>
     </xsl:variable>