Author: remi Date: 2009-04-14 14:33:53 +0200 (Tue, 14 Apr 2009) New Revision: 4500
Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/data/xsl/web_gadget.xsl softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/GadgetParameter.py softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py Log: * added 3 parameter attributes * fixed the "password" parameter type Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/data/xsl/web_gadget.xsl =================================================================== --- softwares_suite_v3/kysoh/tuxware/server/trunk/data/xsl/web_gadget.xsl 2009-04-14 09:08:43 UTC (rev 4499) +++ softwares_suite_v3/kysoh/tuxware/server/trunk/data/xsl/web_gadget.xsl 2009-04-14 12:33:53 UTC (rev 4500) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format";> <xsl:template match="/"> <html> @@ -13,22 +13,22 @@ var parametersString = ""; var command = document.getElementById("command").value; var uuid = document.getElementById("uuid").value; - + var parameters = document.getElementsByTagName("input"); - + for (var i = 0; i < parameters.length; i++) { var param = parameters[i]; - if (param.id == 'internals') + if (param.id == 'unvisible') { parametersString += param.name + '=' + param.value.replace('&', '&&') + '|'; } } - + for (var i = 0; i < parameters.length; i++) { var param = parameters[i]; - if ((param.type != 'button') && (param.id != 'internals')) + if ((param.type != 'button') && (param.id != 'unvisible')) { if (param.type == 'checkbox') { @@ -40,21 +40,21 @@ } } } - + parameters = document.getElementsByTagName("select"); for (var i = 0; i < parameters.length; i++) { var param = parameters[i]; parametersString += param.name + '=' + param.value.replace('&', '&&') + '|'; } - + var url = "/gadget_framework/start_gadget_by_uuid?command="; url += command + "&uuid=" + uuid; url += "¶meters=" + parametersString; url += "&rndTag=" + Math.random(); document.getElementById("fake_image").src = url; } - + function stopGadget() { var uuid = document.getElementById("uuid").value; @@ -63,7 +63,7 @@ url += "&rndTag=" + Math.random(); document.getElementById("fake_image").src = url; } - + function setpng(img) { if (document.all && (IEver=parseFloat(navigator.appVersion.split("MSIE")[1])) && (IEver>=5.5) && (IEver<7) && document.body.filters && img) @@ -83,7 +83,7 @@ </head> <body> <xsl:for-each select="root/data"> - <!-- Gadget UUID --> + <!-- Gadget UUID --> <xsl:element name="input"> <xsl:attribute name="type">hidden</xsl:attribute> <xsl:attribute name="id">uuid</xsl:attribute> @@ -91,7 +91,7 @@ <xsl:value-of select="description/uuid"/> </xsl:attribute> </xsl:element> - <!-- Gadget Command --> + <!-- Gadget Command --> <xsl:element name="input"> <xsl:attribute name="type">hidden</xsl:attribute> <xsl:attribute name="id">command</xsl:attribute> @@ -99,7 +99,7 @@ <xsl:value-of select="command"/> </xsl:attribute> </xsl:element> - <!-- A table for the parameters --> + <!-- A table for the parameters --> <table border="0" cellpadding="1" width="360" bgcolor="#838588" style="position:absolute;left:0px;top:0px;"> <tr> <td align="center" colspan="2"> @@ -107,7 +107,7 @@ <tr> <xsl:element name="img"> <xsl:attribute name="style"> - position:absolute;text-align: left;margin: 0 auto; padding: 0; + position:absolute;text-align: left;margin: 0 auto; padding: 0; </xsl:attribute> <xsl:attribute name="src"> <xsl:value-of select="description/icon_file"/> @@ -127,17 +127,17 @@ </table> </td> </tr> - <!-- For all parameters --> + <!-- For all parameters --> <xsl:for-each select="parameters/*"> - <xsl:if test="category != 'internals'"> + <xsl:if test="visible = 'true'"> <tr bgcolor="#D7D8DA"> <td align="right" width="180"> <span class="paramName"> - <xsl:value-of select="description"/> : + <xsl:value-of select="description"/> : </span> </td> <td> - <!-- Parameter is "string" then show it as "input" --> + <!-- Parameter is "string" then show it as "input" --> <xsl:if test="type = 'string'"> <xsl:element name="input"> <xsl:attribute name="class">text</xsl:attribute> @@ -151,7 +151,7 @@ <xsl:attribute name="size">20</xsl:attribute> </xsl:element> </xsl:if> - <!-- Parameter is "integer" then show it as "input" --> + <!-- Parameter is "integer" then show it as "input" --> <xsl:if test="type = 'integer'"> <xsl:element name="input"> <xsl:attribute name="class">text</xsl:attribute> @@ -165,7 +165,7 @@ <xsl:attribute name="size">20</xsl:attribute> </xsl:element> </xsl:if> - <!-- Parameter is "password" then show it as "input" --> + <!-- Parameter is "password" then show it as "input" --> <xsl:if test="type = 'password'"> <xsl:element name="input"> <xsl:attribute name="class">text</xsl:attribute> @@ -177,7 +177,7 @@ <xsl:attribute name="size">20</xsl:attribute> </xsl:element> </xsl:if> - <!-- Parameter is "boolean" then show it as "checkbox" --> + <!-- Parameter is "boolean" then show it as "checkbox" --> <xsl:if test="type = 'boolean'"> <xsl:element name="input"> <xsl:attribute name="class">checkbox</xsl:attribute> @@ -190,7 +190,7 @@ </xsl:attribute> </xsl:element> </xsl:if> - <!-- Parameter is "enum" then show it as "input" --> + <!-- Parameter is "enum" then show it as "input" --> <xsl:if test="type = 'enum'"> <xsl:element name="select"> <xsl:attribute name="class">select</xsl:attribute> @@ -213,7 +213,7 @@ </td> </tr> </xsl:if> - <xsl:if test="category = 'internals'"> + <xsl:if test="visible = 'false'"> <xsl:element name="input"> <xsl:attribute name="type">hidden</xsl:attribute> <xsl:attribute name="name"> @@ -222,7 +222,7 @@ <xsl:attribute name="value"> <xsl:value-of select="default_value"/> </xsl:attribute> - <xsl:attribute name="id">internals</xsl:attribute> + <xsl:attribute name="id">unvisible</xsl:attribute> </xsl:element> </xsl:if> </xsl:for-each> @@ -249,7 +249,7 @@ </tr> </table> </xsl:for-each> - <!-- Fake image to execute the gadget --> + <!-- Fake image to execute the gadget --> <xsl:element name="img"> <xsl:attribute name="id">fake_image</xsl:attribute> <xsl:attribute name="src"></xsl:attribute> Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py =================================================================== --- softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py 2009-04-14 09:08:43 UTC (rev 4499) +++ softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py 2009-04-14 12:33:53 UTC (rev 4500) @@ -62,10 +62,10 @@ if paramPlatform != "all": if paramPlatform == "windows": if os.name != "nt": - gadgetParameter.setCategory('internals') + gadgetParameter.setVisible('false') else: if os.name == "nt": - gadgetParameter.setCategory('internals') + gadgetParameter.setVisible('false') self.__parameters.append(gadgetParameter) # Add some other parameters gadgetParameter = GadgetParameter(self, { @@ -74,6 +74,7 @@ 'defaultValue' : 'true', 'description' : 'Verbose mode', 'category' : 'internals', + 'visible' : 'false', }) self.__parameters.append(gadgetParameter) gadgetParameter = GadgetParameter(self, { @@ -82,6 +83,7 @@ 'defaultValue' : self.__parent.getLanguage(), 'description' : 'Language', 'category' : 'internals', + 'visible' : 'false', }) self.__parameters.append(gadgetParameter) gadgetParameter = GadgetParameter(self, { @@ -90,6 +92,7 @@ 'defaultValue' : self.__parent.getCountry(), 'description' : 'Country', 'category' : 'internals', + 'visible' : 'false', }) self.__parameters.append(gadgetParameter) gadgetParameter = GadgetParameter(self, { @@ -98,6 +101,7 @@ 'defaultValue' : self.__parent.getLocutor(), 'description' : 'Locutor', 'category' : 'internals', + 'visible' : 'false', }) self.__parameters.append(gadgetParameter) gadgetParameter = GadgetParameter(self, { @@ -106,6 +110,7 @@ 'defaultValue' : str(self.__parent.getPitch()), 'description' : 'Pitch', 'category' : 'internals', + 'visible' : 'false', }) self.__parameters.append(gadgetParameter) # Create commands Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/GadgetParameter.py =================================================================== --- softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/GadgetParameter.py 2009-04-14 09:08:43 UTC (rev 4499) +++ softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/GadgetParameter.py 2009-04-14 12:33:53 UTC (rev 4500) @@ -33,6 +33,9 @@ self.__minValue = None self.__maxValue = None self.__platform = None + self.__visible = None + self.__filters = None + self.__stepValue = None self.__update() # -------------------------------------------------------------------------- @@ -46,10 +49,11 @@ if self.__type.lower().find("enum") == 0: self.__type = "enum" self.__enumValues = self.__dictionary['type'].split("(")[1][:-1] + elif self.__type.lower().find("booleans") == 0: + self.__type = "booleans" + self.__enumValues = self.__dictionary['type'].split("(")[1][:-1] else: self.__enumValues = "" - if self.__name.lower().find("password") == 0: - self.__type = "password" self.__defaultValue = self.__dictionary['defaultValue'] self.__description = self.__dictionary['description'] self.__category = "" @@ -64,6 +68,15 @@ self.__platform = "all" if self.__dictionary.has_key('platform'): self.__platform = self.__dictionary['platform'].lower() + self.__visible = "true" + if self.__dictionary.has_key('visible'): + self.__visible = self.__dictionary['visible'].lower() + self.__filters = "" + if self.__dictionary.has_key('filters'): + self.__filters = self.__dictionary['filters'] + self.__stepValue = "1" + if self.__dictionary.has_key('stepValue'): + self.__stepValue = self.__dictionary['stepValue'] # -------------------------------------------------------------------------- # Get the parent gadget. @@ -193,3 +206,39 @@ @return: A string. <"all"|"linux"|"windows"> """ return self.__platform + + # -------------------------------------------------------------------------- + # Get if the parameter is visible or not. + # -------------------------------------------------------------------------- + def isVisible(self): + """Get if the parameter is visible or not. + @return: A string. <"true"|"false"> + """ + return self.__visible + + # -------------------------------------------------------------------------- + # Set if the parameter is visible or not. + # -------------------------------------------------------------------------- + def setVisible(self, isVisible): + """Set if the parameter is visible or not. + @param isVisible: A string. <"true"|"false"> + """ + self.__visible = isVisible + + # -------------------------------------------------------------------------- + # Get the file extention filters. (for type="file") + # -------------------------------------------------------------------------- + def getFilters(self): + """Get the file extention filters. (for type="file") + @return: A string. + """ + return self.__filters + + # -------------------------------------------------------------------------- + # Get the step value. + # -------------------------------------------------------------------------- + def getStepValue(self): + """Get the step value. + @return: A string. + """ + return self.__stepValue Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py =================================================================== --- softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py 2009-04-14 09:08:43 UTC (rev 4499) +++ softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py 2009-04-14 12:33:53 UTC (rev 4500) @@ -116,6 +116,9 @@ structure['parameters'][nodeName]['enum_values'] = parameter.getEnumValues(language) structure['parameters'][nodeName]['min_value'] = parameter.getMinValue() structure['parameters'][nodeName]['max_value'] = parameter.getMaxValue() + structure['parameters'][nodeName]['step_value'] = parameter.getStepValue() + structure['parameters'][nodeName]['visible'] = parameter.isVisible() + structure['parameters'][nodeName]['filters'] = parameter.getFilters() # Serialize enum values for key in structure['parameters']: param = structure['parameters'][key] ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Tux-droid-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
