You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
(24) |
Aug
(93) |
Sep
(261) |
Oct
(257) |
Nov
(218) |
Dec
(95) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(184) |
Feb
(87) |
Mar
(155) |
Apr
(398) |
May
(201) |
Jun
(35) |
Jul
(68) |
Aug
(92) |
Sep
(52) |
Oct
(111) |
Nov
(135) |
Dec
(116) |
2009 |
Jan
(225) |
Feb
(204) |
Mar
(113) |
Apr
(137) |
May
(220) |
Jun
(199) |
Jul
(196) |
Aug
(98) |
Sep
(100) |
Oct
(179) |
Nov
(164) |
Dec
(72) |
2010 |
Jan
(59) |
Feb
(61) |
Mar
(64) |
Apr
(159) |
May
(107) |
Jun
(252) |
Jul
(180) |
Aug
(96) |
Sep
(82) |
Oct
(58) |
Nov
(43) |
Dec
(53) |
2011 |
Jan
(39) |
Feb
(18) |
Mar
(33) |
Apr
(66) |
May
(48) |
Jun
(124) |
Jul
(112) |
Aug
(62) |
Sep
(45) |
Oct
(102) |
Nov
(47) |
Dec
(37) |
2012 |
Jan
(22) |
Feb
(18) |
Mar
(1) |
Apr
(5) |
May
(18) |
Jun
(13) |
Jul
(9) |
Aug
(38) |
Sep
(3) |
Oct
(7) |
Nov
(24) |
Dec
(6) |
2013 |
Jan
(1) |
Feb
(14) |
Mar
(1) |
Apr
(2) |
May
(3) |
Jun
(4) |
Jul
(9) |
Aug
(4) |
Sep
(7) |
Oct
|
Nov
(1) |
Dec
(4) |
2014 |
Jan
(9) |
Feb
(2) |
Mar
|
Apr
|
May
(4) |
Jun
(2) |
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(1) |
Dec
|
2015 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <spa...@us...> - 2012-01-20 18:48:52
|
Revision: 21680 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21680&view=rev Author: spackers Date: 2012-01-20 18:48:43 +0000 (Fri, 20 Jan 2012) Log Message: ----------- Modified Paths: -------------- trunk/qooxdoo-contrib/Aristo/trunk/Manifest.json trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/Aristo.js trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Appearance.js trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Color.js trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Decoration.js trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Font.js Added Paths: ----------- trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/decorators/ trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/decorators/MTextShadow.js Modified: trunk/qooxdoo-contrib/Aristo/trunk/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/Aristo/trunk/Manifest.json 2012-01-18 16:59:31 UTC (rev 21679) +++ trunk/qooxdoo-contrib/Aristo/trunk/Manifest.json 2012-01-20 18:48:43 UTC (rev 21680) @@ -16,6 +16,10 @@ "email" : "gradinf AT gmail DOT com" }, { + "name" : "John Spackman", + "email" : "john DOT spackman AT zenesis DOT com" + }, + { "name" : "Original creators: 280 North, Inc.", "email" : "http://280north.com/" }, Modified: trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/Aristo.js =================================================================== --- trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/Aristo.js 2012-01-18 16:59:31 UTC (rev 21679) +++ trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/Aristo.js 2012-01-20 18:48:43 UTC (rev 21680) @@ -9,6 +9,7 @@ Authors: * Guilherme R. Aiolfi (guilhermeaiolfi) + * John Spackman (joh...@ze...) ====================================================================== Added: trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/decorators/MTextShadow.js =================================================================== --- trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/decorators/MTextShadow.js (rev 0) +++ trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/decorators/MTextShadow.js 2012-01-20 18:48:43 UTC (rev 21680) @@ -0,0 +1,91 @@ +/* ************************************************************************ + + Copyright: + 2010 Guilherme R. Aiolfi + + License: + LGPL: http://www.gnu.org/licenses/lgpl.html + EPL: http://www.eclipse.org/org/documents/epl-v10.php + + Authors: + * Guilherme R. Aiolfi (guilhermeaiolfi) + * John Spackman (joh...@ze...) + + ====================================================================== + + This class contains code and resources based on the following work: + + * Aristo + http://github.com/280north/aristo + + License: + http://creativecommons.org/licenses/by-sa/3.0/us/ + + Authors: + * 280 North, Inc., http://280north.com/ + * Sofa, http://madebysofa.com/ + +************************************************************************ */ +/** + * Mixin for the text shadow CSS property. + * This mixin is usually used by {@link qx.ui.decoration.DynamicDecorator}. + * + */ +qx.Mixin.define("aristo.decorators.MTextShadow", { + properties: { + + textShadowX: { + check: "Integer", + nullable: true, + apply: "_applyTextShadow" + }, + + textShadowY: { + check: "Integer", + nullable: true, + apply: "_applyTextShadow" + }, + + textShadowBlur: { + check: "Integer", + nullable: true, + apply: "_applyTextShadow" + }, + + textShadowColor: { + check: "Color", + nullable: true, + apply: "_applyTextShadow" + } + }, + + members: { + _styleTextShadow: function(styles) { + var Color = qx.theme.manager.Color.getInstance(); + var color = Color.resolve(this.getTextShadowColor()); + + if (color != null) { + var shadowX = this.getTextShadowX()||0, + shadowY = this.getTextShadowY()||0, + shadowBlur = this.getTextShadowBlur()||0; + + if (qx.core.Environment.get("engine.name") == "mshtml") { + styles["filter"] = "Shadow(Color=" + color + ", Direction=135, Strength=" + shadowBlur + ")"; + } else { + var value = color + " " + shadowX + "px " + shadowY + "px " + shadowBlur + "px"; + styles["text-shadow"] = value; + } + styles["font-size"] = "20px"; + } + }, + + + _applyTextShadow : function() { + if (qx.core.Environment.get("qx.debug")) { + if (this._isInitialized()) { + throw new Error("This decorator is already in-use. Modification is not possible anymore!"); + } + } + } + } +}); \ No newline at end of file Modified: trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Appearance.js =================================================================== --- trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Appearance.js 2012-01-18 16:59:31 UTC (rev 21679) +++ trunk/qooxdoo-contrib/Aristo/trunk/source/class/aristo/theme/Appearance.js 2012-01-20 18:48:43 UTC (rev 21680) @@ -8,2863 +8,2558 @@ EPL: http://www.eclipse.org/org/documents/epl-v10.php Authors: - * Guilherme R. Aiolfi (guilhermeaiolfi) + * Guilherme R. Aiolfi (guilhermeaiolfi) + * John Spackman (joh...@ze...) ====================================================================== This class contains code and resources based on the following work: - * Aristo + * Aristo http://github.com/280north/aristo License: http://creativecommons.org/licenses/by-sa/3.0/us/ Authors: - * 280 North, Inc., http://280north.com/ - * Sofa, http://madebysofa.com/ + * 280 North, Inc., http://280north.com/ + * Sofa, http://madebysofa.com/ -************************************************************************ */ + ************************************************************************ */ /* ************************************************************************ -#asset(aristo/decoration/*) + #asset(aristo/decoration/*) -************************************************************************* */ + ************************************************************************* */ /** * The Aristo appearance theme. */ -qx.Theme.define("aristo.theme.Appearance", -{ - appearances : - { - "widget": {}, - - "root" : - { - style : function(states) - { - return { - backgroundColor : "background-application", - textColor : "text-label", - font : "default" - }; - } +qx.Theme.define("aristo.theme.Appearance", { + appearances : { + "widget" : {}, + + "root" : { + style : function(states) { + return { + backgroundColor : "background-application", + textColor : "text-label", + font : "default" + }; + } }, - - "label" : - { - style : function(states) - { - return { - textColor : states.disabled ? "text-disabled" : "text-label" - }; - } - }, - "image" : - { - style : function(states) - { - return { - opacity : !states.replacement && states.disabled ? 0.3 : 1 - }; - } - }, - "atom" : {}, - "atom/label" : "label", - "atom/icon" : "image", - - "move-frame" : - { - style : function(states) - { - return { - decorator : "main" - }; - } - }, - "resize-frame" : "move-frame", + "label" : { + style : function(states) { + return { + textColor : states.disabled ? "text-disabled" + : "text-label" + }; + } + }, + "image" : { + style : function(states) { + return { + opacity : !states.replacement + && states.disabled ? 0.3 : 1 + }; + } + }, + "atom" : {}, + "atom/label" : "label", + "atom/icon" : "image", - "dragdrop-cursor" : - { - style : function(states) - { - var icon = "nodrop"; + "move-frame" : { + style : function(states) { + return { + decorator : "main" + }; + } + }, - if (states.copy) { - icon = "copy"; - } else if (states.move) { - icon = "move"; - } else if (states.alias) { - icon = "alias"; - } + "resize-frame" : "move-frame", + "window-resize-frame" : "resize-frame", - return { - source : "aristo/decoration/cursors/" + icon + ".gif", - position : "right-top", - offset : [ 2, 16, 2, 6 ] - }; - } - }, + "dragdrop-cursor" : { + style : function(states) { + var icon = "nodrop"; - "popup" : - { - style : function(states) - { - return { - decorator : "list", - backgroundColor : "background-light" - //shadow : "gray-shadow" - }; - } - }, - - /* - --------------------------------------------------------------------------- - BUTTON - --------------------------------------------------------------------------- - */ + if (states.copy) { + icon = "copy"; + } else if (states.move) { + icon = "move"; + } else if (states.alias) { + icon = "alias"; + } - "button-frame" : - { - alias : "atom", + return { + source : "aristo/decoration/cursors/" + + icon + ".gif", + position : "right-top", + offset : [ 2, 16, 2, 6 ] + }; + } + }, - style : function(states) - { - var decorator, textColor, shadow; + "popup" : { + style : function(states) { + return { + decorator : "list", + backgroundColor : "background-light" + // shadow : "gray-shadow" + }; + } + }, - if (states.checked) - { - decorator = "button-checked"; - textColor = undefined; - } - else if (states.disabled) - { - decorator = "button-disabled"; - textColor = undefined; - } - else if (states.pressed) - { - decorator = "button-pressed"; - textColor = "text-hovered"; - } - else if (states.checked) - { - decorator = "button-checked"; - textColor = undefined; - } - else if (states.hovered || states.preselected) - { - decorator = "button-hovered"; - textColor = "text-hovered"; - } - else - { - decorator = "button"; - textColor = undefined; - } - - if (states.focused) - { - shadow = "shadow"; - } + /* + * --------------------------------------------------------------------------- + * BUTTON + * --------------------------------------------------------------------------- + */ - return { - decorator : decorator, - textColor : textColor, - shadow : shadow? shadow : states.invalid && !states.disabled ? "shadow" : undefined - }; - } - }, + "button-frame" : { + alias : "atom", - "button-frame/image" : - { - style : function(states) - { - return { - opacity : !states.replacement && states.disabled ? 0.5 : 1 - }; - } - }, + style : function(states) { + var decorator, textColor, shadow; - "button" : - { - alias : "button-frame", - include : "button-frame", + if (states.checked) { + decorator = "button-checked"; + textColor = undefined; + } else if (states.disabled) { + decorator = "button-disabled"; + textColor = undefined; + } else if (states.pressed) { + decorator = "button-pressed"; + textColor = "text-hovered"; + } else if (states.checked) { + decorator = "button-checked"; + textColor = undefined; + } else if (states.hovered || states.preselected) { + decorator = "button-hovered"; + textColor = "text-hovered"; + } else { + decorator = "button"; + textColor = undefined; + } + var useCSS = qx.core.Environment.get("css.boxshadow"); + if (useCSS) + decorator += "-css"; - style : function(states) - { - return { - padding : [ 2, 8 ], - center : true - }; - } - }, + if (states.focused || (states.invalid && !states.disabled)) { + shadow = /*useCSS ? "shadow-css" :*/ "shadow"; + } - "hover-button" : - { - alias : "atom", - include : "atom", + return { + decorator : decorator, + textColor : textColor, + shadow : shadow + }; + } + }, - style : function(states) - { - return { - decorator : states.hovered ? "selected" : undefined, - textColor : states.hovered ? "text-selected" : undefined - }; - } - }, - - "splitbutton" : { - style : function(states) - { - return { - shadow: states.focused? "shadow" : undefined - } - } - }, - "splitbutton/button" : { - include: "button", - style: function(states) - { - return { - shadow: undefined - } - } - }, - "splitbutton/arrow" : - { - //alias : "button", - include : "button", + "button-frame/image" : { + style : function(states) { + return { + opacity : !states.replacement + && states.disabled ? 0.5 : 1 + }; + } + }, - style : function(states) - { - return { - icon : "aristo/decoration/arrows/arrow-down.png", - padding : 2, - marginLeft: -2, - shadow: undefined - }; - } - }, - - - /* - --------------------------------------------------------------------------- - LIST - --------------------------------------------------------------------------- - */ + "button" : { + alias : "button-frame", + include : "button-frame", - "list" : - { - alias : "scrollarea", + style : function(states) { + return { + padding : [ 2, 8 ], + center : true + }; + } + }, - style : function(states) - { - var decorator = "list"; - var shadow = "shadow"; - - var focused = !!states.focused; - var invalid = !!states.invalid; - var disabled = !!states.disabled; + "hover-button" : { + alias : "atom", + include : "atom", - if (focused && invalid && !disabled) { - shadow = "red-shadow"; - } else if (focused && !invalid && !disabled) { - shadow = "shadow"; - } else if (disabled) { - decorator = "input"; - } else if (!focused && invalid && !disabled) { - shadow = "red-shadow"; - } + style : function(states) { + return { + decorator : states.hovered ? "selected" + : undefined, + textColor : states.hovered ? "text-selected" + : undefined + }; + } + }, - if (!focused) - { - shadow = undefined; - } - return { - backgroundColor : "background-light", - decorator : decorator, - shadow: shadow, - margin: 2 - }; - } - }, + "splitbutton" : { + style : function(states) { + return { + shadow : states.focused ? "shadow" + : undefined + }; + } + }, + "splitbutton/button" : { + include : "button", + style : function(states) { + return { + shadow : undefined + }; + } + }, + "splitbutton/arrow" : { + // alias : "button", + include : "button", - "list/pane" : "widget", + style : function(states) { + return { + icon : "aristo/decoration/arrows/arrow-down.png", + padding : 2, + marginLeft : -2, + shadow : undefined + }; + } + }, - "listitem" : - { - alias : "atom", + /* + * --------------------------------------------------------------------------- + * LIST + * --------------------------------------------------------------------------- + */ - style : function(states) - { - var decorator; - if (states.dragover) { - decorator = states.selected ? "selected-dragover" : "dragover"; - } else { - decorator = states.selected ? "selected" : undefined; - } + "list" : { + alias : "scrollarea", - return { - padding : states.dragover ? [4, 4, 2, 4] : 4, - textColor : states.selected ? "text-selected" : undefined, - decorator : decorator - }; - } - }, - - - /* - --------------------------------------------------------------------------- - SCROLLAREA - --------------------------------------------------------------------------- - */ + style : function(states) { + var decorator = "list"; + var shadow = "shadow"; - "scrollarea" : - { - style : function(states) - { - return { - // since the scroll container disregards the min size of the scrollbars - // we have to set the min size of the scroll area to ensure that the - // scrollbars always have a usable size. - minWidth : 50, - minHeight : 50 - }; - } - }, + var focused = !!states.focused; + var invalid = !!states.invalid; + var disabled = !!states.disabled; - "scrollarea/corner" : - { - style : function(states) - { - return { - backgroundColor : "background-application" - }; - } - }, + if (focused && invalid && !disabled) { + shadow = "red-shadow"; + } else if (focused && !invalid && !disabled) { + shadow = "shadow"; + } else if (disabled) { + decorator = "input"; + } else if (!focused && invalid && !disabled) { + shadow = "red-shadow"; + } - "scrollarea/pane" : "widget", - "scrollarea/scrollbar-x" : "scrollbar", - "scrollarea/scrollbar-y" : "scrollbar", - - - "scrollbar" : - { - style : function(states) - { - if (states["native"]) { - return {}; - } + if (!focused) { + shadow = undefined; + } + return { + backgroundColor : "background-light", + decorator : decorator, + shadow : shadow, + margin : 2 + }; + } + }, - return { - maxWidth : states.horizontal ? undefined : 17, - maxHeight : states.horizontal ? 17 : undefined, - decorator : states.horizontal ? "scrollbar-horizontal" : "scrollbar-vertical", - padding : 0 - }; - } - }, - - "scrollbar/slider" : - { - alias : "slider", + "list/pane" : "widget", - style : function(states) - { - return { - padding : states.horizontal ? [1, -7, 0, -8] : [-8, 0, -9, 0] - }; - } - }, + "listitem" : { + alias : "atom", - "scrollbar/slider/knob" : - { - style : function(states) - { - var decorator = states.horizontal ? "scrollbar-slider-horizontal" : - "scrollbar-slider-vertical"; - if (states.disabled) { - decorator += "-disabled"; - } + style : function(states) { + var decorator; + if (states.dragover) { + decorator = states.selected ? "selected-dragover" + : "dragover"; + } else { + decorator = states.selected ? "selected" + : undefined; + } - return { - decorator : decorator, - //width: states.horizontal? undefined : 16, - marginLeft: qx.bom.client.Browser.NAME == "ie" && !states.horizontal? 2: 1, - marginTop: qx.bom.client.Browser.NAME == "ie" && states.horizontal? 1 : undefined, - minHeight : states.horizontal ? undefined : 16, - minWidth : states.horizontal ? 16 : undefined - }; - } - }, - - "scrollbar/button" : - { - alias : "button-frame", - //include : "button-frame", + return { + padding : states.dragover ? [ 4, 4, 2, 4 ] + : 4, + textColor : states.selected ? "text-selected" + : undefined, + decorator : decorator + }; + } + }, - style : function(states) - { - var icon = "aristo/decoration/arrows/arrow-"; - var decorator; - if (states.left) { - icon += states.pressed? "focused-left.png" : "left.png"; - decorator = states.hovered || states.docused? "scroll-bt-left-focused" : "scroll-bt-left"; - } else if (states.right) { - icon += states.pressed? "focused-right.png" : "right.png"; - decorator = states.hovered || states.docused? "scroll-bt-right-focused" : "scroll-bt-right"; - } else if (states.up) { - icon += states.pressed? "focused-up.png" : "up.png"; - decorator = states.hovered || states.focused? "scroll-bt-up-focused" : "scroll-bt-up"; - } else { - icon += states.pressed? "focused-down.png" : "down.png"; - decorator = states.hovered || states.focused? "scroll-bt-down-focused" : "scroll-bt-down"; - } + /* + * --------------------------------------------------------------------------- + * SCROLLAREA + * --------------------------------------------------------------------------- + */ - if (states.left || states.right) - { - return { - padding : [0, 0, 0, states.left? 6 : 16], - icon : icon, - width: 29, - height: 17, - decorator: decorator - }; - } - else - { - return { - padding : [states.up? -10 : 12, 0, 0, 4], - icon : icon, - width: 17, - height: 29, - decorator: decorator - }; - } - } - }, + "scrollarea" : { + style : function(states) { + return { + // since the scroll container disregards the + // min size of the scrollbars + // we have to set the min size of the scroll + // area to ensure that the + // scrollbars always have a usable size. + minWidth : 50, + minHeight : 50 + }; + } + }, - "scrollbar/button-begin" : "scrollbar/button", - "scrollbar/button-end" : "scrollbar/button", - + "scrollarea/corner" : { + style : function(states) { + return { + backgroundColor : "background-application" + }; + } + }, + + "scrollarea/pane" : "widget", + "scrollarea/scrollbar-x" : "scrollbar", + "scrollarea/scrollbar-y" : "scrollbar", + + "scrollbar" : { + style : function(states) { + if (states["native"]) { + return {}; + } + + return { + maxWidth : states.horizontal ? undefined + : 17, + maxHeight : states.horizontal ? 17 + : undefined, + decorator : states.horizontal ? "scrollbar-horizontal" + : "scrollbar-vertical", + padding : 0 + }; + } + }, + + "scrollbar/slider" : { + alias : "slider", + + style : function(states) { + return { + padding : states.horizontal ? [ 1, -7, 0, + -8 ] : [ -8, 0, -9, 0 ] + }; + } + }, + + "scrollbar/slider/knob" : { + style : function(states) { + var decorator = states.horizontal ? "scrollbar-slider-horizontal" + : "scrollbar-slider-vertical"; + if (states.disabled) { + decorator += "-disabled"; + } + + return { + decorator : decorator, + // width: states.horizontal? undefined : 16, + marginLeft : qx.bom.client.Browser.NAME == "ie" + && !states.horizontal ? 2 : 1, + marginTop : qx.bom.client.Browser.NAME == "ie" + && states.horizontal ? 1 + : undefined, + minHeight : states.horizontal ? undefined + : 16, + minWidth : states.horizontal ? 16 + : undefined + }; + } + }, + + "scrollbar/button" : { + alias : "button-frame", + // include : "button-frame", + + style : function(states) { + var icon = "aristo/decoration/arrows/arrow-"; + var decorator; + if (states.left) { + icon += states.pressed ? "focused-left.png" + : "left.png"; + decorator = states.hovered + || states.docused ? "scroll-bt-left-focused" + : "scroll-bt-left"; + } else if (states.right) { + icon += states.pressed ? "focused-right.png" + : "right.png"; + decorator = states.hovered + || states.docused ? "scroll-bt-right-focused" + : "scroll-bt-right"; + } else if (states.up) { + icon += states.pressed ? "focused-up.png" + : "up.png"; + decorator = states.hovered + || states.focused ? "scroll-bt-up-focused" + : "scroll-bt-up"; + } else { + icon += states.pressed ? "focused-down.png" + : "down.png"; + decorator = states.hovered + || states.focused ? "scroll-bt-down-focused" + : "scroll-bt-down"; + } + + if (states.left || states.right) { + return { + padding : [ 0, 0, 0, + states.left ? 6 : 16 ], + icon : icon, + width : 29, + height : 17, + decorator : decorator + }; + } else { + return { + padding : [ states.up ? -10 : 12, 0, 0, + 4 ], + icon : icon, + width : 17, + height : 29, + decorator : decorator + }; + } + } + }, + + "scrollbar/button-begin" : "scrollbar/button", + "scrollbar/button-end" : "scrollbar/button", + /* - --------------------------------------------------------------------------- - SPINNER - --------------------------------------------------------------------------- - */ - - "spinner" : - { - style : function(states) - { - var decorator, shadow; - - var focused = !!states.focused; - var invalid = !!states.invalid; - var disabled = !!states.disabled; - - if (focused && invalid && !disabled) { - decorator = "input-focused-invalid"; - } else if (focused && !invalid && !disabled) { - //decorator = "input-focused"; - shadow = "shadow"; - decorator = "input"; - } else if (disabled) { - decorator = "input"; - } else if (!focused && invalid && !disabled) { - decorator = "red-shadow"; - } else { - decorator = "input"; - } - - return { - decorator : decorator, - shadow: shadow, - margin: 2 - }; - } + * --------------------------------------------------------------------------- + * SPINNER + * --------------------------------------------------------------------------- + */ + + "spinner" : { + style : function(states) { + var decorator, shadow; + + var focused = !!states.focused; + var invalid = !!states.invalid; + var disabled = !!states.disabled; + + if (focused && invalid && !disabled) { + decorator = "input"; + shadow = "red-shadow"; + } else if (focused && !invalid && !disabled) { + // decorator = "input-focused"; + shadow = "shadow"; + decorator = "input"; + } else if (disabled) { + decorator = "input"; + } else if (!focused && invalid && !disabled) { + decorator = "red-shadow"; + } else { + decorator = "input"; + } + + return { + decorator : decorator, + shadow : shadow, + margin : 2 + }; + } }, - - "spinner/textfield" : - { - style : function(states) - { - return { - marginRight: 2, - padding: [2, 4, 1], - textColor: states.disabled ? "text-disabled" : "text-input", - decorator: "spinner-input" - }; - } + + "spinner/textfield" : { + style : function(states) { + return { + marginRight : 2, + padding : [ 2, 4, 1 ], + textColor : states.disabled ? "text-disabled" + : "text-input", + decorator : "spinner-input" + }; + } }, - - "spinner/upbutton" : - { - alias : "button-frame", - include : "button-frame", - - style : function(states) - { - return { - icon : "aristo/decoration/arrows/up-small.png", - padding : states.pressed ? [2, 2, 0, 4] : [1, 3, 1, 3], - shadow: undefined - }; - } + + "spinner/upbutton" : { + alias : "button-frame", + include : "button-frame", + + style : function(states) { + return { + icon : "aristo/decoration/arrows/up-small.png", + padding : states.pressed ? [ 2, 2, 0, 4 ] + : [ 1, 3, 1, 3 ], + shadow : undefined + }; + } }, - - "spinner/downbutton" : - { - alias : "button-frame", - include : "button-frame", - - style : function(states) - { - return { - icon : "aristo/decoration/arrows/down-small.png", - padding : states.pressed ? [2, 2, 0, 4] : [1, 3, 1, 3], - shadow: undefined - }; - } + + "spinner/downbutton" : { + alias : "button-frame", + include : "button-frame", + + style : function(states) { + return { + icon : "aristo/decoration/arrows/down-small.png", + padding : states.pressed ? [ 2, 2, 0, 4 ] + : [ 1, 3, 1, 3 ], + shadow : undefined + }; + } }, - - /* - --------------------------------------------------------------------------- - FORM FIELDS - --------------------------------------------------------------------------- - */ + /* + * --------------------------------------------------------------------------- + * FORM FIELDS + * --------------------------------------------------------------------------- + */ - "checkbox": - { - alias : "atom", + "checkbox" : { + alias : "atom", - style : function(states) - { - // "disabled" state is not handled here with purpose. The image widget - // does handle this already by replacing the current image with a - // disabled version (if available). If no disabled image is found the - // opacity style is used. - var icon; - if (states.checked && states.focused) { - icon = "checkbox-checked-focused"; - } else if (states.checked && states.disabled) { - icon = "checkbox-checked-disabled"; - } else if (states.checked && states.pressed) { - icon = "checkbox-checked-pressed"; - } else if (states.checked && states.hovered) { - icon = "checkbox-checked-hovered"; - } else if (states.checked) { - icon = "checkbox-checked"; - } else if (states.focused) { - icon = "checkbox-focused"; - } else if (states.pressed) { - icon = "checkbox-pressed"; - } else if (states.hovered && !states.disabled) { - icon = "checkbox-hovered"; - } else { - icon = "checkbox"; - } + style : function(states) { + // "disabled" state is not handled here with + // purpose. The image widget + // does handle this already by replacing the + // current image with a + // disabled version (if available). If no + // disabled image is found the + // opacity style is used. + var icon; + if (states.checked && states.focused) { + icon = "checkbox-checked-focused"; + } else if (states.checked && states.disabled) { + icon = "checkbox-checked-disabled"; + } else if (states.checked && states.pressed) { + icon = "checkbox-checked-pressed"; + } else if (states.checked && states.hovered) { + icon = "checkbox-checked-hovered"; + } else if (states.checked) { + icon = "checkbox-checked"; + } else if (states.focused) { + icon = "checkbox-focused"; + } else if (states.pressed) { + icon = "checkbox-pressed"; + } else if (states.hovered && !states.disabled) { + icon = "checkbox-hovered"; + } else { + icon = "checkbox"; + } - var invalid = states.invalid && !states.disabled ? "-invalid" : ""; + var invalid = states.invalid + && !states.disabled ? "-invalid" : ""; - return { - icon: "aristo/decoration/form/" + icon + invalid + ".png", - gap: 6 - }; - } - }, - "radiobutton": - { - alias : "atom", - - style : function(states) - { - var icon = "radiobutton"; - - if (states.checked) - icon += "-checked"; - if (states.pressed) - icon += "-pressed"; - if (states.focused) - icon += "-focused"; - if (states.hovered && !states.pressed) - icon += "-hovered"; - if (states.invalid) - icon += "-invalid"; - if (states.disabled) - icon += "-disabled"; - - return { - icon: "aristo/decoration/form/" + icon + ".png", - gap : 6 - }; - } - }, - - /* - --------------------------------------------------------------------------- - SELECTBOX - --------------------------------------------------------------------------- - */ + return { + icon : "aristo/decoration/form/" + icon + + invalid + ".png", + gap : 6 + }; + } + }, + "radiobutton" : { + alias : "atom", - "selectbox" : - { - alias : "button-frame", - include : "button-frame", + style : function(states) { + var icon = "radiobutton"; - style : function(states) - { - return { - padding : [ 2, 8 ], - margin: 2 - }; - } - }, + if (states.checked) + icon += "-checked"; + if (states.pressed) + icon += "-pressed"; + if (states.focused) + icon += "-focused"; + if (states.hovered && !states.pressed) + icon += "-hovered"; + if (states.invalid) + icon += "-invalid"; + if (states.disabled) + icon += "-disabled"; - "selectbox/atom" : "atom", - "selectbox/popup" : "popup", + return { + icon : "aristo/decoration/form/" + icon + + ".png", + gap : 6 + }; + } + }, - "selectbox/list" : { - alias : "list" - }, + /* + * --------------------------------------------------------------------------- + * SELECTBOX + * --------------------------------------------------------------------------- + */ - "selectbox/arrow" : - { - include : "image", + "selectbox" : { + alias : "button-frame", + include : "button-frame", - style : function(states) - { - return { - source : "aristo/decoration/arrows/arrow-down.png", - paddingLeft : 5 - }; - } - }, - - "textfield" : - { - style : function(states) - { - var decorator, shadow; + style : function(states) { + return { + padding : [ 2, 8 ], + margin : 2 + }; + } + }, - var focused = !!states.focused; - var invalid = !!states.invalid; - var disabled = !!states.disabled; + "selectbox/atom" : "atom", + "selectbox/popup" : "popup", - decorator = "input"; - - if (focused && invalid && !disabled) { - shadow = "red-shadow"; - } else if (focused && !invalid && !disabled) { - shadow = "shadow"; - } else if (disabled) { - decorator = "input-disabled"; - shadow = undefined; - } else if (!focused && invalid && !disabled) { - shadow = "red-shadow"; - } else { - shadow = undefined; - } + "selectbox/list" : { + alias : "list" + }, - var textColor; - if (states.disabled) { - textColor = "text-disabled"; - } else if (states.showingPlaceholder) { - textColor = "text-placeholder"; - } else { - textColor = "text-input"; - } + "selectbox/arrow" : { + include : "image", - return { - decorator : "input", - padding : [ 2, 4, 1 ], - textColor : textColor, - shadow: shadow, - margin: 2 - }; - } - }, - - "textarea" : - { - include : "textfield", + style : function(states) { + return { + source : "aristo/decoration/arrows/arrow-down.png", + paddingLeft : 5 + }; + } + }, - style : function(states) - { - return { - padding : 4, - margin: 2 - }; - } - }, + "textfield" : { + style : function(states) { + var decorator, shadow; - - /* - --------------------------------------------------------------------------- - WINDOW - --------------------------------------------------------------------------- - */ + var focused = !!states.focused; + var invalid = !!states.invalid; + var disabled = !!states.disabled; - "window" : - { - style : function(states) - { - return { - shadow : "shadow-window-inactive", // states.focused? "shadow-window" : "gray-shadow", - contentPadding : [ 10, 10, 10, 10 ] - }; - } - }, + decorator = "input"; - "window/pane" : - { - style : function(states) - { - return { - decorator : "window" - }; - } - }, + if (focused && invalid && !disabled) { + shadow = "red-shadow"; + } else if (focused && !invalid && !disabled) { + shadow = "shadow"; + } else if (disabled) { + decorator = "input-disabled"; + shadow = undefined; + } else if (!focused && invalid && !disabled) { + shadow = "red-shadow"; + } else { + shadow = undefined; + } - "window/captionbar" : - { - style : function(states) - { - return { - decorator : "window-captionbar", - textColor : states.active? "text-label" : "text-disabled", - minHeight : 28, - maxHeight : 28, - paddingRight : 2 - }; - } - }, + var textColor; + if (states.disabled) { + textColor = "text-disabled"; + } else if (states.showingPlaceholder) { + textColor = "text-placeholder"; + } else { + textColor = "text-input"; + } - "window/title" : - { - style : function(states) - { - return { - textAlign : "center", - alignY : "middle", - font : "bold", - marginLeft : 6, - marginRight : 6 - }; - } - }, + return { + decorator : "input", + padding : [ 2, 4, 1 ], + textColor : textColor, + shadow : shadow, + margin : 2 + }; + } + }, - "window/minimize-button" : - { - alias : "atom", + "textarea" : { + include : "textfield", - style : function(states) - { - return { - icon : states.active ? states.hovered ? "aristo/decoration/window/minimize-active-hovered.png" : - "aristo/decoration/window/minimize-active.png" : - "aristo/decoration/window/minimize-inactive.png", - margin : [ 2, 3, 2, 0 ] - }; - } - }, + style : function(states) { + return { + padding : 4, + margin : 2 + }; + } + }, - "window/restore-button" : - { - alias : "atom", + /* + * --------------------------------------------------------------------------- + * WINDOW + * --------------------------------------------------------------------------- + */ - style : function(states) - { - return { - icon : states.active ? states.hovered ? "aristo/decoration/window/restore-active-hovered.png" : - "aristo/decoration/window/restore-active.png" : - "aristo/decoration/window/restore-inactive.png", - margin : [ 2, 3, 2, 0 ] - }; - } - }, + "window" : { + style : function(states) { + return { + shadow : "shadow-window-inactive", // states.focused? + // "shadow-window" + // : + // "gray-shadow", + contentPadding : [ 10, 10, 10, 10 ] + }; + } + }, - "window/maximize-button" : - { - alias : "atom", + "window/pane" : { + style : function(states) { + return { + decorator : "window" + }; + } + }, - style : function(states) - { - return { - icon : states.active ? states.hovered ? "aristo/decoration/window/maximize-active-hovered.png" : - "aristo/decoration/window/maximize-active.png" : - "aristo/decoration/window/maximize-inactive.png", - margin : [ 2, 3, 2, 0 ] - }; - } - }, + "window/captionbar" : { + style : function(states) { + return { + decorator : "window-captionbar", + textColor : states.active ? "text-label" + : "text-disabled", + minHeight : 28, + maxHeight : 28, + paddingRight : 2 + }; + } + }, - "window/close-button" : - { - alias : "atom", + "window/title" : { + style : function(states) { + return { + textAlign : "center", + alignY : "middle", + font : "bold", + marginLeft : 6, + marginRight : 6 + }; + } + }, - style : function(states) - { - return { - icon : states.active ? states.hovered ? "aristo/decoration/window/close-active-hovered.png" : - "aristo/decoration/window/close-active.png" : - "aristo/decoration/window/close-inactive.png", - margin : [ 2, 3, 2, 0 ] - }; - } - }, - - "window/close-button/icon" : "window/icon", - "window/maximize-button/icon" : "window/icon", - "window/restore-button/icon" : "window/icon", - "window/minimize-button/icon" : "window/icon", - "window/icon": - { - style : function(states) - { - return { - alignY: "middle", - marginLeft: 5, - height: 16, - width: 16 - }; - } - }, - + "window/minimize-button" : { + alias : "atom", - "window/statusbar" : - { - style : function(states) - { - return { - padding : [ 2, 6 ], - decorator : "window-statusbar", - minHeight : 18 - }; - } - }, + style : function(states) { + return { + icon : states.active ? states.hovered ? "aristo/decoration/window/minimize-active-hovered.png" + : "aristo/decoration/window/minimize-active.png" + : "aristo/decoration/window/minimize-inactive.png", + margin : [ 2, 3, 2, 0 ] + }; + } + }, - "window/statusbar-text" : - { - style : function(states) - { - return { - font : "small" - }; - } - }, - - - /* - --------------------------------------------------------------------------- - PROGRESSBAR - --------------------------------------------------------------------------- - */ - "progressbar": - { - style: function(states) { - return { - decorator: "progressbar", - padding: 1, - backgroundColor: "background-light" - }; - } - }, + "window/restore-button" : { + alias : "atom", - "progressbar/progress": - { - style: function(states) { - return { - backgroundColor: states.disabled ? - "text-disabled" : - "button-active-grad-to" - }; - } - }, + style : function(states) { + return { + icon : states.active ? states.hovered ? "aristo/decoration/window/restore-active-hovered.png" + : "aristo/decoration/window/restore-active.png" + : "aristo/decoration/window/restore-inactive.png", + margin : [ 2, 3, 2, 0 ] + }; + } + }, + "window/maximize-button" : { + alias : "atom", + style : function(states) { + return { + icon : states.active ? states.hovered ? "aristo/decoration/window/maximize-active-hovered.png" + : "aristo/decoration/window/maximize-active.png" + : "aristo/decoration/window/maximize-inactive.png", + margin : [ 2, 3, 2, 0 ] + }; + } + }, - /* - --------------------------------------------------------------------------- - TOOLBAR - --------------------------------------------------------------------------- - */ + "window/close-button" : { + alias : "atom", - "toolbar" : - { - style : function(states) - { - return { - decorator : "toolbar", - spacing : 2 - }; - } - }, - - "toolbar-window" : - { - include: "toolbar", - style : function(states) - { - return { - margin: -10, - decorator : "toolbar-window" - }; - } - }, + style : function(states) { + return { + icon : states.active ? states.hovered ? "aristo/decoration/window/close-active-hovered.png" + : "aristo/decoration/window/close-active.png" + : "aristo/decoration/window/close-inactive.png", + margin : [ 2, 3, 2, 0 ] + }; + } + }, - "toolbar/part" : - { - style : function(states) - { - return { - decorator : "toolbar-part", - spacing : 2 - }; - } - }, + "window/close-button/icon" : "window/icon", + "window/maximize-button/icon" : "window/icon", + "window/restore-button/icon" : "window/icon", + "window/minimize-button/icon" : "window/icon", + "window/icon" : { + style : function(states) { + return { + alignY : "middle", + marginLeft : 5, + height : 16, + width : 16 + }; + } + }, - "toolbar/part/container" : - { - style : function(states) - { - return { - paddingLeft : 2, - paddingRight : 2 - }; - } - }, + "window/statusbar" : { + style : function(states) { + return { + padding : [ 2, 6 ], + decorator : "window-statusbar", + minHeight : 18 + }; + } + }, - "toolbar/part/handle" : - { - style : function(states) - { - return { - source : "aristo/decoration/toolbar/toolbar-handle-knob.gif", - marginLeft : 3, - marginRight : 3 - }; - } - }, + "window/statusbar-text" : { + style : function(states) { + return { + font : "small" + }; + } + }, - "toolbar-button" : - { - alias : "atom", + /* + * --------------------------------------------------------------------------- + * PROGRESSBAR + * --------------------------------------------------------------------------- + */ + "progressbar" : { + style : function(states) { + return { + decorator : "progressbar", + padding : 1, + backgroundColor : "background-light" + }; + } + }, - style : function(states) - { - return { - marginTop : 2, - marginBottom : 2, - padding : (states.pressed || states.checked || states.hovered) && !states.disabled - || (states.disabled && states.checked) ? 3 : 5, - decorator : states.pressed || (states.checked && !states.hovered) || (states.checked && states.disabled) ? - "toolbar-button-checked" : - states.hovered && !states.disabled ? - "toolbar-button-hovered" : undefined - }; - } - }, + "progressbar/progress" : { + style : function(states) { + return { + backgroundColor : states.disabled ? "text-disabled" + : "button-gradient-end" + }; + } + }, - "toolbar-menubutton" : - { - alias : "toolbar-button", - include : "toolbar-button", + /* + * --------------------------------------------------------------------------- + * TOOLBAR + * --------------------------------------------------------------------------- + */ - style : function(states) - { - return { - showArrow : true - }; - } - }, + "toolbar" : { + style : function(states) { + return { + decorator : "toolbar", + spacing : 2 + }; + } + }, - "toolbar-menubutton/arrow" : - { - alias : "image", - include : "image", + "toolbar-window" : { + include : "toolbar", + style : function(states) { + return { + margin : -10, + decorator : "toolbar-window" + }; + } + }, - style : function(states) - { - return { - source : "aristo/decoration/arrows/down-small.png" - }; - } - }, + "toolbar/part" : { + style : function(states) { + return { + decorator : "toolbar-part", + spacing : 2 + }; + } + }, - "toolbar-splitbutton" : - { - style : function(states) - { - return { - marginTop : 2, - marginBottom : 2 - }; - } - }, + "toolbar/part/container" : { + style : function(states) { + return { + paddingLeft : 2, + paddingRight : 2 + }; + } + }, - "toolbar-splitbutton/button" : - { - alias : "toolbar-button", - include : "toolbar-button", + "toolbar/part/handle" : { + style : function(states) { + return { + source : "aristo/decoration/toolbar/toolbar-handle-knob.gif", + marginLeft : 3, + marginRight : 3 + }; + } + }, - style : function(states) - { - return { - icon : "aristo/decoration/arrows/down.png", - marginTop : undefined, - marginBottom : undefined - }; - } - }, + "toolbar-button" : { + alias : "atom", - "toolbar-splitbutton/arrow" : - { - alias : "toolbar-button", - include : "toolbar-button", + style : function(states) { + return { + marginTop : 2, + marginBottom : 2, + padding : (states.pressed || states.checked || states.hovered) + && !states.disabled + || (states.disabled && states.checked) ? 3 + : 5, + decorator : states.pressed + || (states.checked && !states.hovered) + || (states.checked && states.disabled) ? "toolbar-button-checked" + : states.hovered + && !states.disabled ? "toolbar-button-hovered" + : undefined + }; + } + }, - style : function(states) - { - if (states.pressed || states.checked || (states.hovered && !states.disabled)) { - var padding = 1; - } else { - var padding = 3; - } + "toolbar-menubutton" : { + alias : "toolbar-button", + include : "toolbar-button", - return { - padding : padding, - icon : "aristo/decoration/arrows/down.png", - marginTop : undefined, - marginBottom : undefined - }; - } - }, + style : function(states) { + return { + showArrow : true + }; + } + }, - "toolbar-separator" : - { - style : function(states) - { - return { - decorator : "toolbar-separator", - margin : 7 - }; - } - }, - - - - /* - --------------------------------------------------------------------------- - SLIDER - --------------------------------------------------------------------------- - */ + "toolbar-menubutton/arrow" : { + alias : "image", + include : "image", - "slider" : - { - style : function(states) - { - var decorator = states.horizontal? "slider-horizontal" : "slider-vertical"; + style : function(states) { + return { + source : "aristo/decoration/arrows/down-small.png" + }; + } + }, - var focused = !!states.focused; - var invalid = !!states.invalid; - var disabled = !!states.disabled; + "toolbar-splitbutton" : { + style : function(states) { + return { + marginTop : 2, + marginBottom : 2 + }; + } + }, - /*if (focused && invalid && !disabled) { - decorator = "input-focused-invalid"; - } else if (focused && !invalid && !disabled) { - decorator = "input-focused"; - } else if (disabled) { - decorator = "input-disabled"; - } else if (!focused && invalid && !disabled) { - decorator = "border-invalid"; - } */ + "toolbar-splitbutton/button" : { + alias : "toolbar-button", + include : "toolbar-button", - return { - decorator : decorator, - maxHeight: states.horizontal? 20 : undefined, - maxWidth: states.horizontal? undefined : 20, - minHeight: states.horizontal? 20 : undefined, - minWidth: states.horizontal? undefined : 20, - padding: [states.horizontal? 0 : -10, states.horizontal? -10 : 0, states.horizontal? 0 : -10, states.horizontal? -10 : 2] - }; - } - }, + style : function(states) { + return { + icon : "aristo/decoration/arrows/down.png", + marginTop : undefined, + marginBottom : undefined + }; + } + }, - "slider/knob" : - { - alias : "atom", - include : "atom", + "toolbar-splitbutton/arrow" : { + alias : "toolbar-button", + include : "toolbar-button", - style : function(states) - { - return { - decorator : states.disabled ? "slider-knob-disabled" : - states.focused? "slider-knob-focused" : "slider-knob", - //shadow: states.focused? "shadow" : undefined, - maxHeight : 18, - //minHeight: 17, - //marginTop: -0, - maxWidth : 18 - }; - } - }, - - /* - --------------------------------------------------------------------------- - MENU - --------------------------------------------------------------------------- - */ - - "menu" : - { - style : function(states) - { - var result = - { - decorator : "menu", - shadow : "shadow-popup", - spacingX : 6, - spacingY : 1, - iconColumnWidth : 16, - arrowColumnWidth : 4, - placementModeY : states.submenu || states.contextmenu ? "best-fit" : "keep-align" - }; - - if (states.submenu) - { - result.position = "right-top"; - result.offset = [-2, -3]; - } - - return result; - } - }, - - "menu/slidebar" : "menu-slidebar", - - "menu-slidebar" : "widget", - - "menu-slidebar-button" : - { - style : function(states) - { - return { - decorator : states.hovered ? "selected" : undefined, - padding : 7, - center : true - }; - } - }, - - "menu-slidebar/button-backward" : - { - include : "menu-slidebar-button", - - style : function(states) - { - return { - icon : states.hovered ? "aristo/decoration/arrows/up-invert.png" : "aristo/decoration/arrows/up.png" - }; - } - }, - - "menu-slidebar/button-forward" : - { - include : "menu-slidebar-button", - - style : function(states) - { - return { - icon : states.hovered ? "aristo/decoration/arrows/down-invert.png" : "aristo/decoration/arrows/down.png" - }; - } - }, - - "menu-separator" : - { - style : function(states) - { - return { - height : 0, - decorator : "menu-separator", - margin : [ 4, 2 ] - }; - } - }, - - "menu-button" : - { - alias : "atom", - - style : function(states) - { - return { - decorator : states.selected ? "selected" : undefined, - textColor : states.selected ? "text-selected" : undefined, - padding : [ 4, 6 ] - }; - } - }, - - "menu-button/icon" : - { - include : "image", - - style : function(states) - { - return { - alignY : "middle" - }; - } - }, - - "menu-button/label" : - { - include : "label", - - style : function(states) - { - return { - alignY : "middle", - padding : 1 - }; - } - }, - - "menu-button/shortcut" : - { - include : "label", - - style : function(states) - { - return { - alignY : "middle", - marginLeft : 14, - padding : 1 - }; - } - }, - - "menu-button/arrow" : - { - include : "image", - - style : function(states) - { - return { - source : states.selected ? "aristo/decoration/arrows/right-invert.png" : "aristo/decoration/arrows/right.png", - alignY : "middle" - }; - } - }, - - "menu-checkbox" : - { - alias : "menu-button", - include : "menu-button", - - style : function(states) - { - return { - icon : !states.checked ? undefined : - states.selected ? "aristo/decoration/menu/checkbox-invert.gif" : - "aristo/decoration/menu/checkbox.gif" - }; - } - }, - - "menu-radiobutton" : - { - alias : "menu-button", - include : "menu-button", - - style : function(states) - { - return { - icon : !states.checked ? undefined : - states.selected ? "aristo/decoration/menu/radiobutton-invert.gif" : - "aristo/decoration/menu/radiobutton.gif" - }; - } - }, - - - /* - --------------------------------------------------------------------------- - MENU BAR - --------------------------------------------------------------------------- - */ + style : function(states) { + if (states.pressed || states.checked + || (states.hovered && !states.disabled)) { + var padding = 1; + } else { + var padding = 3; + } - "menubar" : - { - style : function(states) - { - return { - decorator : "menubar" - }; - } - }, + return { + padding : padding, + icon : "aristo/decoration/arrows/down.png", + marginTop : undefined, + marginBottom : undefined + }; + } + }, - "menubar-button" : - { - alias : "atom", + "toolbar-separator" : { + style : function(states) { + return { + decorator : "toolbar-separator", + margin : 7 + }; + } + }, - style : function(states) - { - return { - decorator : (states.pressed || states.hovered) && !states.disabled ? "selected" : undefined, - textColor : states.pressed || states.hovered ? "text-selected" : undefined, - padding : [ 3, 8 ] - }; - } - }, - - /* - --------------------------------------------------------------------------- - DATEFIELD - --------------------------------------------------------------------------- - */ + /* + * --------------------------------------------------------------------------- + * SLIDER + * --------------------------------------------------------------------------- + */ - "datefield" : "combobox", + "slider" : { + style : function(states) { + var decorator = states.horizontal ? "slider-horizontal" + : "slider-vertical"; - "datefield/button" : - { - alias : "combobox/button", - include : "combobox/button", + var focused = !!states.focused; + var invalid = !!states.invalid; + var disabled = !!states.disabled; - style : function(states) - { - return { - icon : "aristo/decoration/icons/16x16/calendar.png", - padding : [0, 3], - decorator : "blank", - marginLeft: -3, - shadow: undefined - }; - } - }, + /* + * if (focused && invalid && !disabled) { + * decorator = "input-focused-invalid"; } else + * if (focused && !invalid && !disabled) { + * decorator = "input-focused"; } else if + * (disabled) { decorator = "input-disabled"; } + * else if (!focused && invalid && !disabled) { + * decorator = "border-invalid"; } + */ - "datefield/textfield" : "combobox/textfield", + return { + decorator : decorator, + maxHeight : states.horizontal ? 20 + : undefined, + maxWidth : states.horizontal ? undefined + : 20, + minHeight : states.horizontal ? 20 + : undefined, + minWidth : states.horizontal ? undefined + : 20, + padding : [ states.horizontal ? 0 : -10, + states.horizontal ? -10 : 0, + states.horizontal ? 0 : -10, + states.horizontal ? -10 : 2 ] + }; + } + }, - "datefield/list" : - { - alias : "datechooser", - include : "datechooser", + "slider/knob" : { + alias : "atom", + include : "atom", - style : function(states) - { - return { - decorator : undefined - }; - } - }, - - - /* - --------------------------------------------------------------------------- - DATE CHOOSER - --------------------------------------------------------------------------- - */ + style : function(states) { + return { + decorator : states.disabled ? "slider-kn... [truncated message content] |
From: <d_w...@us...> - 2012-01-18 16:59:42
|
Revision: 21679 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21679&view=rev Author: d_wagner Date: 2012-01-18 16:59:31 +0000 (Wed, 18 Jan 2012) Log Message: ----------- toolbar test causes problems; disabled it for now Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 16:15:25 UTC (rev 21678) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 16:59:31 UTC (rev 21679) @@ -93,7 +93,7 @@ this.waitForElementPresent("//div[contains(text(), 'touchstart touchend tap')]"); }; -simulation.Simulation.prototype.testToolbar = function() +simulation.Simulation.prototype.testToolbarX = function() { this.log("Testing Toolbar", "info"); this.waitForElementPresent("//div[contains(@class, 'toolbar')]"); @@ -119,7 +119,6 @@ } //click load button - /* this.qxClick("//div[contains(@class, 'toolbar-button')]/descendant::div[text() = 'Load']"); var loadingDialogLocator = "//div[text() = 'Loading...']"; this.waitForElementPresent(loadingDialogLocator); @@ -128,7 +127,6 @@ if (this.__sel.isVisible(loadingDialogLocator)) { throw new Error("Loading Dialog did not disappear!"); } - */ }; mySim.runTest = function() @@ -143,14 +141,12 @@ this.log("Selecting item " + listItems[i], "info"); this.selectItem(listItems[i]); if (this[testMethodName] && typeof this[testMethodName] == "function") { - //try { + try { this[testMethodName](); - /* } catch(ex) { this.log("Error while testing " + listItems[i] + ": " + ex.message, "error"); } - */ } this.log("Going back " + i, "info"); this.goBack("Overview"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-18 16:15:35
|
Revision: 21678 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21678&view=rev Author: d_wagner Date: 2012-01-18 16:15:25 +0000 (Wed, 18 Jan 2012) Log Message: ----------- Added tests for Page Transitions, List, Events and Toolbar Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 14:35:13 UTC (rev 21677) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 16:15:25 UTC (rev 21678) @@ -49,11 +49,88 @@ this.waitForElementPresent("//div[@class='navigationbar-backbutton']"); }; -simulation.Simulation.prototype.goBack = function() { +simulation.Simulation.prototype.goBack = function(parentPageTitle) { this.qxClick("//div[@class='navigationbar-backbutton']"); - this.waitForElementPresent("//h1[text() = 'Overview']"); + if (parentPageTitle) { + this.waitForElementPresent("//h1[text() = '" + parentPageTitle + "']"); + } }; +simulation.Simulation.prototype.testPageTransitions = function() +{ + this.log("Testing Animations", "info"); + this.waitForElementPresent("//h1[text() = 'Animation']"); + var listItems = this.getListItemLabels(); + for (var i=0, l=listItems.length; i<l; i++) { + this.selectItem(listItems[i]); + Packages.java.lang.Thread.sleep(1500); + this.waitForElementPresent("//strong[contains(text(), 'reverse animation')]"); + this.goBack("Animation"); + } +}; + +simulation.Simulation.prototype.testList = function() +{ + this.log("Testing List", "info"); + this.waitForElementPresent("//h1[text() = 'List']"); + this.qxClick("//div[text() = 'Selectable Item2']"); + if (!this.__sel.isAlertPresent()) { + throw new Error("Clicking Selectable Item2 did not open an alert box!"); + } + var expectedText = "Item Selected #2"; + var foundText = String(this.__sel.getAlert()); + if (foundText !== expectedText) { + throw new Error("Expected alert box text " + expectedText + " but found " + foundText); + } +}; + +simulation.Simulation.prototype.testEvents = function() +{ + this.log("Testing Events", "info"); + var eventContainerLocator = "//div[contains(@class, 'eventcontainer')]"; + this.waitForElementPresent(eventContainerLocator); + this.qxClick(eventContainerLocator); + this.waitForElementPresent("//div[contains(text(), 'touchstart touchend tap')]"); +}; + +simulation.Simulation.prototype.testToolbar = function() +{ + this.log("Testing Toolbar", "info"); + this.waitForElementPresent("//div[contains(@class, 'toolbar')]"); + + //click search button + this.qxClick("//div[contains(@class, 'toolbar-button')]/descendant::div[text() = 'Search']"); + this.waitForElementPresent("//div[contains(@class, 'dialog')]"); + var searchDialogButtonLocator = "//div[contains(@class, 'button')]"; + this.qxClick(searchDialogButtonLocator); + Packages.java.lang.Thread.sleep(500); + if (this.__sel.isVisible(searchDialogButtonLocator)) { + throw new Error("Clicking Search did not close the search dialog!"); + } + + //click 'left arrow' button + var noButtonLocator = "//div[text() = 'no']"; + this.qxClick("//img[contains(@src, 'arrowleft')]"); + this.waitForElementPresent(noButtonLocator); + this.qxClick(yesButtonLocator); + Packages.java.lang.Thread.sleep(500); + if (this.__sel.isVisible(noButtonLocator)) { + throw new Error("Clicking No did not close the Are you sure dialog!"); + } + + //click load button + /* + this.qxClick("//div[contains(@class, 'toolbar-button')]/descendant::div[text() = 'Load']"); + var loadingDialogLocator = "//div[text() = 'Loading...']"; + this.waitForElementPresent(loadingDialogLocator); + //the loading dialog disappears after 5sec + Packages.java.lang.Thread.sleep(5500); + if (this.__sel.isVisible(loadingDialogLocator)) { + throw new Error("Loading Dialog did not disappear!"); + } + */ +}; + mySim.runTest = function() { this.waitForElementPresent("//h1[text() = 'Overview']"); @@ -65,13 +142,18 @@ var testMethodName = "test" + listItems[i].replace(/ /i, ""); this.log("Selecting item " + listItems[i], "info"); this.selectItem(listItems[i]); - /* if (this[testMethodName] && typeof this[testMethodName] == "function") { - this[testMethodName](); + //try { + this[testMethodName](); + /* + } + catch(ex) { + this.log("Error while testing " + listItems[i] + ": " + ex.message, "error"); + } + */ } - */ this.log("Going back " + i, "info"); - this.goBack(); + this.goBack("Overview"); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-18 14:35:19
|
Revision: 21677 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21677&view=rev Author: d_wagner Date: 2012-01-18 14:35:13 +0000 (Wed, 18 Jan 2012) Log Message: ----------- Get the labels of the main list items from the application Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 12:26:53 UTC (rev 21676) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-18 14:35:13 UTC (rev 21677) @@ -20,6 +20,30 @@ //var selWin = simulation.Simulation.SELENIUMWINDOW; //var qxAppInst = simulation.Simulation.QXAPPINSTANCE; +simulation.Simulation.prototype.addListItemLabelGetter = function() +{ + var titleGetter = function() { + var labels = []; + var items = selenium.browserbot.getCurrentWindow().document.getElementsByClassName("list-itemlabel"); + for (var i=0,l=items.length; i<l; i++) { + labels.push(items[i].textContent); + } + return selenium.browserbot.getCurrentWindow().JSON.stringify(labels); + }; + + this.addOwnFunction("getTitles", titleGetter); +}; + +simulation.Simulation.prototype.getListItemLabels = function() +{ + var selWin = simulation.Simulation.SELENIUMWINDOW; + //var qxAppInst = simulation.Simulation.QXAPPINSTANCE; + var titlesJson = this.getEval(selWin + ".qx.Simulation.getTitles();", "Getting feed titles"); + eval("var titles = " + titlesJson); + + return titles; +}; + simulation.Simulation.prototype.selectItem = function(itemName) { this.qxClick("//div[text() = '" + itemName + "']"); this.waitForElementPresent("//div[@class='navigationbar-backbutton']"); @@ -32,9 +56,10 @@ mySim.runTest = function() { - var listItems = ["Form Elements", "List", "Tab Bar", "Toolbar", "Events", "Page Transitions"]; + this.waitForElementPresent("//h1[text() = 'Overview']"); - this.waitForElementPresent("//div[text() = 'Page Transitions']"); + this.addListItemLabelGetter(); + var listItems = this.getListItemLabels(); for (var i=0, l=listItems.length; i<l; i++) { var testMethodName = "test" + listItems[i].replace(/ /i, ""); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-18 12:27:04
|
Revision: 21676 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21676&view=rev Author: d_wagner Date: 2012-01-18 12:26:53 +0000 (Wed, 18 Jan 2012) Log Message: ----------- Mobile Feedreader test Added Paths: ----------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_mobile.js Added: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_mobile.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_mobile.js (rev 0) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_mobile.js 2012-01-18 12:26:53 UTC (rev 21676) @@ -0,0 +1,171 @@ +var baseConf = { + autName : 'Feedreader (Mobile View)', + globalTimeout : 300000, + stepSpeed : '250', + debug : true +}; + +var args = arguments ? arguments : ""; +var simSvn = baseConf.simulatorSvn; +for (var i=0; i<args.length; i++) { + if (args[i].indexOf('simulatorSvn') >= 0) { + simSvn = args[i].substr(args[i].indexOf('simulatorSvn=') + 13); + } +} + +load([simSvn + "/trunk/tool/selenium/simulation/Simulation.js"]); + +var mySim = new simulation.Simulation(baseConf,args); + +simulation.Simulation.prototype.addListItemLabelGetter = function() +{ + var titleGetter = function() { + var labels = []; + var items = selenium.browserbot.getCurrentWindow().document.getElementsByClassName("list-itemlabel"); + for (var i=0,l=items.length; i<l; i++) { + labels.push(items[i].textContent); + } + return selenium.browserbot.getCurrentWindow().JSON.stringify(labels); + }; + + this.addOwnFunction("getTitles", titleGetter); +}; + +simulation.Simulation.prototype.getListItemLabels = function() +{ + var selWin = simulation.Simulation.SELENIUMWINDOW; + //var qxAppInst = simulation.Simulation.QXAPPINSTANCE; + var titlesJson = this.getEval(selWin + ".qx.Simulation.getTitles();", "Getting feed titles"); + eval("var titles = " + titlesJson); + + return titles; +}; + + +simulation.Simulation.prototype.checkFeeds = function(titles) +{ + var feedTitles = []; + // remove single quotes from feed titles, e.g. Surfin' Safari + for (var i=0,l=titles.length; i<l; i++) { + if (titles[i].indexOf("'") >= 0) { + titles[i] = titles[i].substr(0, titles[i].indexOf("'")); + } + feedTitles.push(titles[i]); + } + + var firstArticleTitle = null; + + for (var i=0,l=feedTitles.length; i<l; i++) { + var feedTitleLocator = "//div[contains(text(),'" + feedTitles[i] + "')]"; + this.waitForElementPresent(feedTitleLocator); + + try { + this.__sel.qxClick(feedTitleLocator); + this.waitForElementPresent(this.backButtonLocator, 2000); + } + catch(ex) { + this.log("Error while clicking feed title '" + feedTitles[i] + "': " + ex.message, "error"); + continue; + } + try { + var articleTitles = this.getListItemLabels(); + } + catch(ex) { + this.log("Couldn't get article titles for '" + feedTitles[i] + "': " + ex.message, "error"); + continue; + } + if (articleTitles.length == 0) { + this.log("Feed " + feedTitles[i] + " has no articles!", "error"); + var firstArticleTitle = null; + } + else if (articleTitles[0] == firstArticleTitle) { + this.log("Found the same article title for '" + feedTitles[i-1] + "' and '" + feedTitles[i] + "'", "error"); + } + else { + this.log("Found " + articleTitles.length + " articles in feed '" + feedTitles[i] + "'", "info"); + this.checkRandomArticle(articleTitles); + Packages.java.lang.Thread.sleep(2000); + } + firstArticleTitle = feedTitles[0]; + + this.__sel.qxClick(this.backButtonLocator); + } +}; + + +simulation.Simulation.prototype.checkRandomArticle = function(titles) +{ + var index = Math.floor(Math.random() * (titles.length)); + var title = titles[index].replace(/([^a-z0-9\ -'"])/gi, ""); + var labelLoc = "//div[text() = '" + titles[index] + "']"; + + try { + this.__sel.qxClick(labelLoc); + } + catch(ex) { + this.log("Error while clicking article '" + title + "': " + ex.message, "error"); + return; + } + + try { + this.waitForElementPresent("//a[text() = 'read more ...']"); + } + catch(ex) { + this.log("Content of article '" + title + "' is not displayed!", "error"); + } + + this.__sel.qxClick(this.backButtonLocator); +}; + + +mySim.runTest = function() +{ + this.feedLoadTimeout = 30000; + this.backButtonLocator = "//div[@class='navigationbar-backbutton']"; + + this.waitForElementPresent("//h1[contains(text(), 'Feed Reader')]"); + this.addListItemLabelGetter(); + var titles = this.getListItemLabels(); + this.checkFeeds(titles); +}; + +// - Main -------------------------------------------------------------------- + +(function() { + mySim.testFailed = false; + + var sessionStarted = mySim.startSession(); + + if (!sessionStarted) { + return; + } + + var isAppReady = mySim.waitForCondition(simulation.Simulation.ISQXAPPREADY, 60000, + "Waiting for qooxdoo application"); + + if (!isAppReady) { + mySim.testFailed = true; + mySim.stop(); + return; + } + + try { + mySim.setupApplicationLogging(); + mySim.addGlobalErrorHandler(); + mySim.runTest(); + } + catch(ex) { + mySim.testFailed = true; + var msg = "Unexpected error while running test!"; + if (mySim.getConfigSetting("debug")) { + print(msg + "\n" + ex); + } + mySim.log(msg, "error"); + } + + mySim.logGlobalErrors(); + mySim.logResults(); + + mySim.stop(); + +})(); Property changes on: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_mobile.js ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2012-01-16 12:40:18
|
Revision: 21675 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21675&view=rev Author: spackers Date: 2012-01-16 12:40:09 +0000 (Mon, 16 Jan 2012) Log Message: ----------- updated for 1.6 and added param output to servlet demo Modified Paths: -------------- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:39:01 UTC (rev 21674) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:40:09 UTC (rev 21675) @@ -37,8 +37,8 @@ "let" : { "APPLICATION" : "uploadmgr.demo", - //"QOOXDOO_PATH" : "../../../../../../../../Local/WebContent/public/grasshopper/qooxdoo-1.6-sdk/", "QOOXDOO_PATH" : "../../../../qooxdoo/1.6", + "XXXQOOXDOO_PATH" : "../../../../../../../../Local/WebContent/public/grasshopper/qooxdoo-1.6-sdk/", "QXTHEME" : "uploadmgr.demo.theme.Theme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"], "LOCALES" : [ "en" ], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2012-01-16 12:39:10
|
Revision: 21674 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21674&view=rev Author: spackers Date: 2012-01-16 12:39:01 +0000 (Mon, 16 Jan 2012) Log Message: ----------- updated for 1.6 and added param output to servlet demo Modified Paths: -------------- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:25:36 UTC (rev 21673) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:39:01 UTC (rev 21674) @@ -37,8 +37,8 @@ "let" : { "APPLICATION" : "uploadmgr.demo", - "QOOXDOO_PATH" : "../../../../../../../../Local/WebContent/public/grasshopper/qooxdoo-1.6-sdk/", - //"QOOXDOO_PATH" : "../../../../qooxdoo/1.6", + //"QOOXDOO_PATH" : "../../../../../../../../Local/WebContent/public/grasshopper/qooxdoo-1.6-sdk/", + "QOOXDOO_PATH" : "../../../../qooxdoo/1.6", "QXTHEME" : "uploadmgr.demo.theme.Theme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"], "LOCALES" : [ "en" ], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2012-01-16 12:25:43
|
Revision: 21673 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21673&view=rev Author: spackers Date: 2012-01-16 12:25:36 +0000 (Mon, 16 Jan 2012) Log Message: ----------- updated for 1.6 and added param output to servlet demo Modified Paths: -------------- trunk/qooxdoo-contrib/UploadMgr/trunk/Manifest.json trunk/qooxdoo-contrib/UploadMgr/trunk/config.json trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/Manifest.json trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/source/class/uploadmgr/demo/Application.js trunk/qooxdoo-contrib/UploadMgr/trunk/generate.py trunk/qooxdoo-contrib/UploadMgr/trunk/server/java/com/zenesis/qx/upload/DemoUploadServlet.java Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/Manifest.json 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/Manifest.json 2012-01-16 12:25:36 UTC (rev 21673) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.5"] + "qooxdoo-versions": ["1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/config.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/config.json 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/config.json 2012-01-16 12:25:36 UTC (rev 21673) @@ -29,8 +29,7 @@ { "APPLICATION" : "com.zenesis.qx.upload", "APPLICATION_MAIN_CLASS" : "${APPLICATION}.demo.Demo", - "QOOXDOO_PATH" : "../../qooxdoo/1.5", - //"QXTHEME" : "uploadmgr.theme.modern.Theme", + "QOOXDOO_PATH" : "../../qooxdoo/1.6", "QXTHEME" : "qx.theme.Modern", "API_EXCLUDE" : ["qx.test.*", "uploadmgr.demo.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"], "LOCALES" : [ "en" ], Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/Manifest.json 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/Manifest.json 2012-01-16 12:25:36 UTC (rev 21673) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.5"] + "qooxdoo-versions": ["1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/config.json 2012-01-16 12:25:36 UTC (rev 21673) @@ -37,7 +37,8 @@ "let" : { "APPLICATION" : "uploadmgr.demo", - "QOOXDOO_PATH" : "../../../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../../../../../../../Local/WebContent/public/grasshopper/qooxdoo-1.6-sdk/", + //"QOOXDOO_PATH" : "../../../../qooxdoo/1.6", "QXTHEME" : "uploadmgr.demo.theme.Theme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"], "LOCALES" : [ "en" ], Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/source/class/uploadmgr/demo/Application.js =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/source/class/uploadmgr/demo/Application.js 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/demo/default/source/class/uploadmgr/demo/Application.js 2012-01-16 12:25:36 UTC (rev 21673) @@ -77,7 +77,7 @@ // attached, and "/demoupload" is the path files will be uploaded to (i.e. it's the value used // for the form's action attribute) // - var uploader = new com.zenesis.qx.upload.UploadMgr(btn, "http://www.zenesis.com/demoupload"); + var uploader = new com.zenesis.qx.upload.UploadMgr(btn, "http://www.zenesis.com/demoupload"); //"http://my.grasshopperwebsites.com:8080/demoupload" // Parameter tp be added to all uploads (can be overridden by individual files) uploader.setParam("myGlobalParam", "global123"); Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/generate.py =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/generate.py 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/generate.py 2012-01-16 12:25:36 UTC (rev 21673) @@ -25,7 +25,7 @@ import sys, os, re, subprocess CMD_PYTHON = sys.executable -QOOXDOO_PATH = '../../qooxdoo/1.5' +QOOXDOO_PATH = '../../qooxdoo/1.6' def getQxPath(): path = QOOXDOO_PATH Modified: trunk/qooxdoo-contrib/UploadMgr/trunk/server/java/com/zenesis/qx/upload/DemoUploadServlet.java =================================================================== --- trunk/qooxdoo-contrib/UploadMgr/trunk/server/java/com/zenesis/qx/upload/DemoUploadServlet.java 2012-01-16 12:13:22 UTC (rev 21672) +++ trunk/qooxdoo-contrib/UploadMgr/trunk/server/java/com/zenesis/qx/upload/DemoUploadServlet.java 2012-01-16 12:25:36 UTC (rev 21673) @@ -16,6 +16,7 @@ import com.oreilly.servlet.multipart.FilePart; import com.oreilly.servlet.multipart.MultipartParser; +import com.oreilly.servlet.multipart.ParamPart; import com.oreilly.servlet.multipart.Part; /** @@ -40,12 +41,39 @@ super.init(config); String strUploadFilesTo = config.getInitParameter("uploadFilesTo"); if (strUploadFilesTo == null || strUploadFilesTo.trim().length() == 0) - strUploadFilesTo = getServletContext().getRealPath("uploaded-files"); - uploadFilesToDir = new File(strUploadFilesTo); + uploadFilesToDir = (File)config.getServletContext().getAttribute("javax.servlet.context.tempdir"); + else + uploadFilesToDir = new File(strUploadFilesTo); uploadFilesToDir.mkdirs(); } - /** + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doOptions(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + @Override + protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + super.doOptions(request, response); + + /* + * NOTE:: This is used to allow posts from ANY website to this server - this is so that the demo browser + * (http://demo.qooxdoo.org/contrib/demobrowser/) is able to have something to upload to, but it's likely + * that you won't want this in your code because it's a security risk. + */ + if (request.getHeader("Access-Control-Request-Method").equals("POST")) { + String origin = request.getHeader("Origin"); + log.info("Received request for Origin: " + origin + " from " + request.getRemoteAddr()); + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS"); + response.setHeader("Access-Control-Allow-Headers", "content-type,x-file-name,x-requested-with"); + response.setHeader("Access-Control-Max-Age", "100"); + response.setHeader("Vary", "Accept-Encoding"); + response.setHeader("Accept-Encoding", "gzip"); + response.setHeader("Connection", "Keep-Alive"); + response.setHeader("Content-Type", "text/plain"); + } + } + + /** * Handles the HTTP <code>POST</code> method. * @param request servlet request * @param response servlet response @@ -56,6 +84,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException { PrintWriter writer = null; + // Requored only for cross-origin requests (@see doOptions()) + response.setHeader("Access-Control-Allow-Origin", "*"); + try { writer = response.getWriter(); } catch (IOException ex) { @@ -100,16 +131,18 @@ MultipartParser parser = new MultipartParser(request, Integer.MAX_VALUE, true, true, null); Part part; while ((part = parser.readNextPart()) != null) { - if (!part.isFile()) - continue; - - // Get the file details - FilePart filePart = (FilePart) part; - filePart.setRenamePolicy(null); - String filename = filePart.getFileName(); - - // Save the file - receiveFile(filePart.getInputStream(), new File(uploadFilesToDir, filename)); + if (part.isFile()) { + // Get the file details + FilePart filePart = (FilePart) part; + filePart.setRenamePolicy(null); + String filename = filePart.getFileName(); + + // Save the file + receiveFile(filePart.getInputStream(), new File(uploadFilesToDir, filename)); + } else { + ParamPart paramPart = (ParamPart) part; + log.info("received param " + paramPart.getName() + "=" + paramPart.getStringValue()); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2012-01-16 12:13:33
|
Revision: 21672 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21672&view=rev Author: spackers Date: 2012-01-16 12:13:22 +0000 (Mon, 16 Jan 2012) Log Message: ----------- Property Changed: ---------------- trunk/qooxdoo-contrib/UploadMgr/trunk/ Property changes on: trunk/qooxdoo-contrib/UploadMgr/trunk ___________________________________________________________________ Added: svn:ignore + build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-13 13:48:09
|
Revision: 21671 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21671&view=rev Author: d_wagner Date: 2012-01-13 13:47:58 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Test case for the MobileShowcase application Added Paths: ----------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js Added: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js (rev 0) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js 2012-01-13 13:47:58 UTC (rev 21671) @@ -0,0 +1,92 @@ +var baseConf = { + autName : 'MobileShowcase', + globalTimeout : 300000, + stepSpeed : '500', + debug : true +}; + +var args = arguments ? arguments : ""; +var simSvn = baseConf.simulatorSvn; +for (var i=0; i<args.length; i++) { + if (args[i].indexOf('simulatorSvn') >= 0) { + simSvn = args[i].substr(args[i].indexOf('simulatorSvn=') + 13); + } +} + +load([simSvn + "/trunk/tool/selenium/simulation/Simulation.js"]); + +var mySim = new simulation.Simulation(baseConf,args); + +//var selWin = simulation.Simulation.SELENIUMWINDOW; +//var qxAppInst = simulation.Simulation.QXAPPINSTANCE; + +simulation.Simulation.prototype.selectItem = function(itemName) { + this.qxClick("//div[text() = '" + itemName + "']"); + this.waitForElementPresent("//div[@class='navigationbar-backbutton']"); +}; + +simulation.Simulation.prototype.goBack = function() { + this.qxClick("//div[@class='navigationbar-backbutton']"); + this.waitForElementPresent("//h1[text() = 'Overview']"); +}; + +mySim.runTest = function() +{ + var listItems = ["Form Elements", "List", "Tab Bar", "Toolbar", "Events", "Page Transitions"]; + + this.waitForElementPresent("//div[text() = 'Page Transitions']"); + + for (var i=0, l=listItems.length; i<l; i++) { + var testMethodName = "test" + listItems[i].replace(/ /i, ""); + this.log("Selecting item " + listItems[i], "info"); + this.selectItem(listItems[i]); + /* + if (this[testMethodName] && typeof this[testMethodName] == "function") { + this[testMethodName](); + } + */ + this.log("Going back " + i, "info"); + this.goBack(); + } +}; + +// - Main -------------------------------------------------------------------- + +(function() { + mySim.testFailed = false; + + var sessionStarted = mySim.startSession(); + + if (!sessionStarted) { + return; + } + + var isAppReady = mySim.waitForCondition(simulation.Simulation.ISQXAPPREADY, 60000, + "Waiting for qooxdoo application"); + + if (!isAppReady) { + mySim.testFailed = true; + mySim.stop(); + return; + } + + try { + mySim.setupApplicationLogging(); + mySim.addGlobalErrorHandler(); + mySim.runTest(); + } + catch(ex) { + mySim.testFailed = true; + var msg = "Unexpected error while running test!"; + if (mySim.getConfigSetting("debug")) { + print(msg + "\n" + ex); + } + mySim.log(msg, "error"); + } + + mySim.logGlobalErrors(); + mySim.logResults(); + + mySim.stop(); + +})(); Property changes on: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/mobileshowcase/test_mobileshowcase.js ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-13 13:47:17
|
Revision: 21670 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21670&view=rev Author: d_wagner Date: 2012-01-13 13:47:10 +0000 (Fri, 13 Jan 2012) Log Message: ----------- moved getInnerHtmlFromCollection and isElementPresent methods to Simulation Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/Simulation.js trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/Simulation.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/Simulation.js 2012-01-11 13:47:22 UTC (rev 21669) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/Simulation.js 2012-01-13 13:47:10 UTC (rev 21670) @@ -746,6 +746,34 @@ } }; + +simulation.Simulation.prototype.waitForElementPresent = function(locator, timeout) +{ + var condition = 'selenium.isElementPresent("' + locator + '")'; + this.__sel.waitForCondition(condition, timeout || 5000); +}; + + +simulation.Simulation.prototype.getInnerHtmlFromCollection = function(query) +{ + var getter="var titles = [];" + + "var coll = selenium.browserbot.getCurrentWindow().qx.bom.Collection.query('" + query + "');" + + "for (var i=0, l=coll.length; i<l; i++) {" + + "titles.push(coll[i].innerHTML)" + + "}" + + "selenium.browserbot.getCurrentWindow().qx.lang.Json.stringify(titles);"; + + try { + var stringResult = "var temp=" + String(this.__sel.getEval(getter)); + } + catch(ex) { + this.log("Couldn't get innerHTML for selector " + query + ": " + ex.message); + return []; + } + eval(stringResult); + return temp; +}; + /** * Logs the amount of time passed since the given start date. * Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js 2012-01-11 13:47:22 UTC (rev 21669) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js 2012-01-13 13:47:10 UTC (rev 21670) @@ -35,27 +35,7 @@ } }; -simulation.Simulation.prototype.getInnerHtmlFromCollection = function(query) -{ - var getter="var titles = [];" + - "var coll = selenium.browserbot.getCurrentWindow().qx.bom.Collection.query('" + query + "');" + - "for (var i=0, l=coll.length; i<l; i++) {" + - "titles.push(coll[i].innerHTML)" + - "}" + - "selenium.browserbot.getCurrentWindow().qx.lang.Json.stringify(titles);"; - - try { - var stringResult = "var temp=" + String(this.__sel.getEval(getter)); - } - catch(ex) { - this.log("Couldn't get innerHTML for selector " + query + ": " + ex.message); - return []; - } - eval(stringResult); - return temp; -}; - simulation.Simulation.prototype.getFeedTitles = function() { return this.getInnerHtmlFromCollection("#tree .feed-item"); @@ -138,12 +118,6 @@ }; -simulation.Simulation.prototype.waitForElementPresent = function(locator, timeout) -{ - var condition = 'selenium.isElementPresent("' + locator + '")'; - this.__sel.waitForCondition(condition, timeout || 5000); -}; - mySim.runTest = function() { this.feedLoadTimeout = 30000; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-11 13:47:29
|
Revision: 21669 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21669&view=rev Author: d_wagner Date: 2012-01-11 13:47:22 +0000 (Wed, 11 Jan 2012) Log Message: ----------- initial interaction test for the Mobiletweets tutorial (application startup) Added Paths: ----------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/tutorial/test_mobiletweets.js Added: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/tutorial/test_mobiletweets.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/tutorial/test_mobiletweets.js (rev 0) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/tutorial/test_mobiletweets.js 2012-01-11 13:47:22 UTC (rev 21669) @@ -0,0 +1,51 @@ +var baseConf = { + 'autName' : 'TutorialMobiletweets', + 'globalTimeout' : 300000, + 'stepSpeed' : '500', + 'debug' : true +}; + +var args = arguments ? arguments : ""; +var simSvn = baseConf.simulatorSvn; +for (var i=0; i<args.length; i++) { + if (args[i].indexOf('simulatorSvn') >= 0) { + simSvn = args[i].substr(args[i].indexOf('simulatorSvn=') + 13); + } +} + +load([simSvn + "/trunk/tool/selenium/simulation/Simulation.js"]); + +var mySim = new simulation.Simulation(baseConf,args); + +var selWin = simulation.Simulation.SELENIUMWINDOW; +var qxAppInst = simulation.Simulation.QXAPPINSTANCE; + +// - Main -------------------------------------------------------------------- +(function() { + mySim.testFailed = false; + + var sessionStarted = mySim.startSession(); + + if (!sessionStarted) { + return; + } + + var isAppReady = mySim.waitForCondition(simulation.Simulation.ISQXAPPREADY, 60000, + "Waiting for qooxdoo application"); + + + if (!isAppReady) { + mySim.testFailed = true; + mySim.stop(); + return; + } + + mySim.setupApplicationLogging(); + mySim.addGlobalErrorHandler(); + java.lang.Thread.sleep(5000); + mySim.logGlobalErrors(); + mySim.logResults(); + + mySim.stop(); + +})(); \ No newline at end of file Property changes on: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/tutorial/test_mobiletweets.js ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-10 15:52:16
|
Revision: 21668 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21668&view=rev Author: d_wagner Date: 2012-01-10 15:52:10 +0000 (Tue, 10 Jan 2012) Log Message: ----------- remove special characters from info messages Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js 2012-01-10 09:06:21 UTC (rev 21667) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/feedreader/test_feedreader_website.js 2012-01-10 15:52:10 UTC (rev 21668) @@ -116,23 +116,24 @@ simulation.Simulation.prototype.checkRandomArticle = function(titles) { var index = Math.floor(Math.random() * (titles.length)); + var title = titles[index].replace(/([^a-z0-9\ -'"])/gi, ""); var labelLoc = "//label[text() = '" + titles[index] + "']"; try { this.__sel.click(labelLoc); } catch(ex) { - this.log("Error while clicking article '" + titles[index] + "': " + ex.message, "error"); + this.log("Error while clicking article '" + title + "': " + ex.message, "error"); return; } Packages.java.lang.Thread.sleep(1500); var visible = this.__sel.isVisible(labelLoc + "/following-sibling::div[@class='article-content']"); if (!visible) { - this.log("Content of article '" + titles[index] + "' is not displayed!", "error"); + this.log("Content of article '" + title + "' is not displayed!", "error"); } else { - this.log("Content of article '" + titles[index] + "' displayed correctly.", "info"); + this.log("Content of article '" + title + "' displayed correctly.", "info"); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-10 09:06:27
|
Revision: 21667 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21667&view=rev Author: d_wagner Date: 2012-01-10 09:06:21 +0000 (Tue, 10 Jan 2012) Log Message: ----------- Click the item's checkbox instead of its label (workaround for Opera) Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-10 08:27:41 UTC (rev 21666) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-10 09:06:21 UTC (rev 21667) @@ -41,7 +41,9 @@ { var labelLocator = '//label[contains(text(), "' + itemLabel + '")]'; this.assertElementPresent(labelLocator); - this.__sel.qxClick(labelLocator); + //Synthetic click events on the label will not trigger checkbox selection + //changes in Opera, so we need to click the checkbox itself + this.__sel.qxClick(labelLocator + "/preceding-sibling::input"); this.__sel.click("clear"); this.assertNotElementPresent(labelLocator); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-10 08:27:48
|
Revision: 21666 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21666&view=rev Author: d_wagner Date: 2012-01-10 08:27:41 +0000 (Tue, 10 Jan 2012) Log Message: ----------- Improved error logging Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 15:55:19 UTC (rev 21665) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-10 08:27:41 UTC (rev 21666) @@ -79,8 +79,14 @@ this.waitForElementPresent("add"); this.log("Adding custom item " + customItemLabel, "info"); - this.testAddItem(customItemLabel); - this.log("Custom item " + customItemLabel + " added", "info"); + try { + this.testAddItem(customItemLabel); + this.log("Custom item " + customItemLabel + " added", "info"); + } + catch(ex) { + this.log("Could not create custom item: " + ex.message, "error"); + return; + } this.log("Reloading application", "info"); if (!this.reload()) { @@ -88,8 +94,13 @@ } this.log("Clearing custom item " + customItemLabel, "info"); - this.testClearItem(customItemLabel); - this.log("Custom item " + customItemLabel + " cleared", "info"); + try { + this.testClearItem(customItemLabel); + this.log("Custom item " + customItemLabel + " cleared", "info"); + } + catch(ex) { + this.log("Could not clear custom item: " + ex.message, "error"); + } }; // - Main -------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-09 15:55:25
|
Revision: 21665 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21665&view=rev Author: d_wagner Date: 2012-01-09 15:55:19 +0000 (Mon, 09 Jan 2012) Log Message: ----------- Use qxClick to select an item since the regular click has no effect in Opera Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 15:33:11 UTC (rev 21664) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 15:55:19 UTC (rev 21665) @@ -41,7 +41,7 @@ { var labelLocator = '//label[contains(text(), "' + itemLabel + '")]'; this.assertElementPresent(labelLocator); - this.__sel.click(labelLocator); + this.__sel.qxClick(labelLocator); this.__sel.click("clear"); this.assertNotElementPresent(labelLocator); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-09 15:33:20
|
Revision: 21664 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21664&view=rev Author: d_wagner Date: 2012-01-09 15:33:11 +0000 (Mon, 09 Jan 2012) Log Message: ----------- Fixed test Modified Paths: -------------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js Modified: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 14:20:41 UTC (rev 21663) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 15:33:11 UTC (rev 21664) @@ -75,14 +75,9 @@ mySim.runTest = function() { - var predefinedItemLabel = "My first ToDo"; var customItemLabel = "Pass the Test"; this.waitForElementPresent("add"); - this.log("Clearing predefined item " + predefinedItemLabel, "info"); - this.testClearItem(predefinedItemLabel); - this.log("Predefined item " + predefinedItemLabel + " cleared", "info"); - this.log("Adding custom item " + customItemLabel, "info"); this.testAddItem(customItemLabel); this.log("Custom item " + customItemLabel + " added", "info"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_w...@us...> - 2012-01-09 14:20:52
|
Revision: 21663 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21663&view=rev Author: d_wagner Date: 2012-01-09 14:20:41 +0000 (Mon, 09 Jan 2012) Log Message: ----------- [BUG #5952] Test for the ToDo app Added Paths: ----------- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js Added: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js =================================================================== --- trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js (rev 0) +++ trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js 2012-01-09 14:20:41 UTC (rev 21663) @@ -0,0 +1,139 @@ +var baseConf = { + autName : 'ToDo', + globalTimeout : 300000, + stepSpeed : '250', + debug : true +}; + +var args = arguments ? arguments : ""; +var simSvn = baseConf.simulatorSvn; +for (var i=0; i<args.length; i++) { + if (args[i].indexOf('simulatorSvn') >= 0) { + simSvn = args[i].substr(args[i].indexOf('simulatorSvn=') + 13); + } +} + +load([simSvn + "/trunk/tool/selenium/simulation/Simulation.js"]); + +var mySim = new simulation.Simulation(baseConf,args); + +simulation.Simulation.prototype.assertElementPresent = function(locator) +{ + if (!this.__sel.isElementPresent(locator)) { + throw new Error("Element " + locator + " is not present!"); + } +}; + +simulation.Simulation.prototype.assertNotElementPresent = function(locator) +{ + if (this.__sel.isElementPresent(locator)) { + throw new Error("Element " + locator + " is present!"); + } +}; + +simulation.Simulation.prototype.waitForElementPresent = function(locator, timeout) +{ + var condition = 'selenium.isElementPresent("' + locator + '")'; + this.__sel.waitForCondition(condition, timeout || 5000); +}; + +simulation.Simulation.prototype.testClearItem = function(itemLabel) +{ + var labelLocator = '//label[contains(text(), "' + itemLabel + '")]'; + this.assertElementPresent(labelLocator); + this.__sel.click(labelLocator); + this.__sel.click("clear"); + this.assertNotElementPresent(labelLocator); +}; + +simulation.Simulation.prototype.testAddItem = function(itemLabel) +{ + this.__sel.answerOnNextPrompt(itemLabel); + this.__sel.click("add"); + + var labelLocator = '//label[contains(text(), "' + itemLabel + '")]'; + this.assertElementPresent(labelLocator); +}; + +simulation.Simulation.prototype.reload = function() +{ + this.qxOpen(); + var isAppReady = this.waitForCondition(simulation.Simulation.ISQXAPPREADY, 60000, + "Waiting for qooxdoo application"); + + if (!isAppReady) { + this.testFailed = true; + this.log("Application was not reloaded correctly!", "error"); + return false; + } + + this.addGlobalErrorHandler(); + this.setupApplicationLogging(); + + return true; +}; + +mySim.runTest = function() +{ + var predefinedItemLabel = "My first ToDo"; + var customItemLabel = "Pass the Test"; + this.waitForElementPresent("add"); + + this.log("Clearing predefined item " + predefinedItemLabel, "info"); + this.testClearItem(predefinedItemLabel); + this.log("Predefined item " + predefinedItemLabel + " cleared", "info"); + + this.log("Adding custom item " + customItemLabel, "info"); + this.testAddItem(customItemLabel); + this.log("Custom item " + customItemLabel + " added", "info"); + + this.log("Reloading application", "info"); + if (!this.reload()) { + return; + } + + this.log("Clearing custom item " + customItemLabel, "info"); + this.testClearItem(customItemLabel); + this.log("Custom item " + customItemLabel + " cleared", "info"); +}; + +// - Main -------------------------------------------------------------------- + +(function() { + mySim.testFailed = false; + + var sessionStarted = mySim.startSession(); + + if (!sessionStarted) { + return; + } + + var isAppReady = mySim.waitForCondition(simulation.Simulation.ISQXAPPREADY, 60000, + "Waiting for qooxdoo application"); + + if (!isAppReady) { + mySim.testFailed = true; + mySim.stop(); + return; + } + + try { + mySim.setupApplicationLogging(); + mySim.addGlobalErrorHandler(); + mySim.runTest(); + } + catch(ex) { + mySim.testFailed = true; + var msg = "Unexpected error while running test!"; + if (mySim.getConfigSetting("debug")) { + print(msg + "\n" + ex); + } + mySim.log(msg, "error"); + } + + mySim.logGlobalErrors(); + mySim.logResults(); + + mySim.stop(); + +})(); Property changes on: trunk/qooxdoo-contrib/Simulator/trunk/tool/selenium/simulation/todo/test_todo.js ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2011-12-23 12:23:13
|
Revision: 21662 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21662&view=rev Author: scro34 Date: 2011-12-23 12:23:06 +0000 (Fri, 23 Dec 2011) Log Message: ----------- Upgrade to qx v1.6 Modified Paths: -------------- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/Manifest.json trunk/qooxdoo-contrib/SilverBlueTheme/trunk/config.json trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/Manifest.json trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/config.json trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/class/silverbluetheme/demo/FormWindow.js trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/script/silverbluetheme.demo.js trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/class/silverbluetheme/theme/Appearance.js trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/class/silverbluetheme/theme/Decoration.js trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-b.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-bl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-br.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-c.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-combined.meta trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-combined.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-l.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-r.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-t.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-tl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red-tr.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red.png Removed Paths: ------------- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-b.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-bl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-br.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-c.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-combined.meta trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-combined.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-l.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-r.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-t.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-tl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2-tr.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red2.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-b.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-bl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-br.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-c.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-combined.meta trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-combined.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-l.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-r.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-t.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-tl.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3-tr.png trunk/qooxdoo-contrib/SilverBlueTheme/trunk/source/resource/silverbluetheme/decoration/button/button-red3.png Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/Manifest.json 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/Manifest.json 2011-12-23 12:23:06 UTC (rev 21662) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/config.json =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/config.json 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/config.json 2011-12-23 12:23:06 UTC (rev 21662) @@ -29,11 +29,11 @@ { "APPLICATION" : "silverbluetheme", "APPLICATION_MAIN_CLASS" : "${APPLICATION}.demo.Demo", - "QOOXDOO_PATH" : "../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../qooxdoo/1.6", "QXTHEME" : "silverbluetheme.theme.Theme", "API_EXCLUDE" : ["qx.test.*", "silverbluetheme.demo.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], - "CACHE" : "${TMPDIR}/cache", + "CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache", "ROOT" : "." } Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/Manifest.json 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/Manifest.json 2011-12-23 12:23:06 UTC (rev 21662) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/config.json 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/config.json 2011-12-23 12:23:06 UTC (rev 21662) @@ -32,7 +32,7 @@ "let" : { "APPLICATION" : "silverbluetheme.demo", - "QOOXDOO_PATH" : "../../../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../../../qooxdoo/1.6", "QXTHEME" : "silverbluetheme.SilverBlueTheme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/class/silverbluetheme/demo/FormWindow.js =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/class/silverbluetheme/demo/FormWindow.js 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/class/silverbluetheme/demo/FormWindow.js 2011-12-23 12:23:06 UTC (rev 21662) @@ -213,9 +213,13 @@ { var boolLabel1 = new qx.ui.basic.Label("CheckBox:"); var bool1 = new qx.ui.form.CheckBox("CheckBox"); + + var boolLabel2 = new qx.ui.basic.Label("Tri-State:"); + var bool2 = new qx.ui.form.CheckBox("CheckBox"); + bool2.set({triState: true, value: null}); - var boolLabel2 = new qx.ui.basic.Label("RadioButtons:"); - var bool2 = new qx.ui.form.RadioButton("RadioButton"); + var boolLabel3 = new qx.ui.basic.Label("RadioButton:"); + var bool3 = new qx.ui.form.RadioButton("RadioButton"); var boolBoxLayout = new qx.ui.layout.Grid(5, 8); boolBoxLayout.setColumnAlign(0, "right", "middle"); @@ -226,6 +230,8 @@ boolBox.add(bool1, {row: 0, column: 1}); boolBox.add(boolLabel2, {row: 1, column: 0}); boolBox.add(bool2, {row: 1, column: 1}); + boolBox.add(boolLabel3, {row: 2, column: 0}); + boolBox.add(bool3, {row: 2, column: 1}); return boolBox; }, Modified: trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/script/silverbluetheme.demo.js =================================================================== --- trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/script/silverbluetheme.demo.js 2011-12-23 12:19:14 UTC (rev 21661) +++ trunk/qooxdoo-contrib/SilverBlueTheme/trunk/demo/default/source/script/silverbluetheme.demo.js 2011-12-23 12:23:06 UTC (rev 21662) @@ -4,32 +4,24 @@ qx.$$start = new Date(); -if (!window.qxsettings) qxsettings = {}; -var settings = {"qx.application":"silverbluetheme.demo.Application","qx.revision":"unknown","qx.theme":"silverbluetheme.SilverBlueTheme","qx.version":"1.4"}; -for (var k in settings) qxsettings[k] = settings[k]; - -if (!window.qxvariants) qxvariants = {}; -var variants = {}; -for (var k in variants) qxvariants[k] = variants[k]; - if (!qx.$$environment) qx.$$environment = {}; -var envinfo = {"qx.application":"silverbluetheme.demo.Application","qx.revision":"unknown","qx.theme":"silverbluetheme.SilverBlueTheme","qx.version":"1.4"}; +var envinfo = {"qx.application":"silverbluetheme.demo.Application","qx.revision":"","qx.theme":"silverbluetheme.SilverBlueTheme","qx.version":"1.6"}; for (var k in envinfo) qx.$$environment[k] = envinfo[k]; if (!qx.$$libraries) qx.$$libraries = {}; -var libinfo = {"__out__":{"sourceUri":"script"},"qx":{"resourceUri":"../../../../../qooxdoo/1.4/framework/source/resource","sourceUri":"../../../../../qooxdoo/1.4/framework/source/class","version":"1.4"},"silverbluetheme":{"resourceUri":"../../../source/resource","sourceUri":"../../../source/class","version":"trunk"},"silverbluetheme.demo":{"resourceUri":"../source/resource","sourceUri":"../source/class","version":"trunk"}}; +var libinfo = {"__out__":{"sourceUri":"script"},"qx":{"resourceUri":"../../../../../qooxdoo/1.6/framework/source/resource","sourceUri":"../../../../../qooxdoo/1.6/framework/source/class"},"silverbluetheme":{"resourceUri":"../../../source/resource","sourceUri":"../../../source/class"},"silverbluetheme.demo":{"resourceUri":"../source/resource","sourceUri":"../source/class"}}; for (var k in libinfo) qx.$$libraries[k] = libinfo[k]; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2011-12-23 12:19:21
|
Revision: 21661 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21661&view=rev Author: scro34 Date: 2011-12-23 12:19:14 +0000 (Fri, 23 Dec 2011) Log Message: ----------- Housekeeping after upgrading to qx v1.6 Removed Paths: ------------- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt Deleted: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt 2011-12-23 11:50:40 UTC (rev 21660) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt 2011-12-23 12:19:14 UTC (rev 21661) @@ -1,389 +0,0 @@ -qx.Class.define("darktheme.demo.FormWindow", -{ - extend: qx.ui.window.Window, - - construct: function() - { - this.base(arguments); - - this.setCaption("Form Widgets"); - this._createControls(); - }, - - /* - ***************************************************************************** - MEMBERS - ***************************************************************************** - */ - - members : - { - _createControls: function() - { - var layout = new qx.ui.layout.Grid(1, 5); - this.set({layout: layout, status: "Status text"}); - - this.add(this.getTextFieldBox(), {row: 0, column: 0}); - this.add(this.getButtonBox(), {row: 0, column: 1}); - this.add(this.getSelectionBox(), {row: 1, column: 0, rowSpan: 2}); - this.add(this.getBooleanBox(), {row: 1, column: 1}); - this.add(this.getNumBox(), {row: 2, column: 1}); - this.add(this.getBottomBox(), {row: 3, column: 0, colSpan: 2}); - - this.addListenerOnce("appear", function(e) - { - this.center(); - }, this); - }, - - getTextFieldBox: function() - { - var tfLabel1 = new qx.ui.basic.Label("TextField:"); - var tf1 = new qx.ui.form.TextField(); - tf1.setPlaceholder("placeholder"); - tf1.setReadOnly(false); - - var tfLabel2 = new qx.ui.basic.Label("PasswordField:"); - var tf2 = new qx.ui.form.PasswordField(); - tf2.setPlaceholder("placeholder"); - - var tfLabel3 = new qx.ui.basic.Label("TextArea:"); - var tf3 = new qx.ui.form.TextArea(); - tf3.setPlaceholder("placeholder"); - tf3.setAlignY("top"); - - var comboLabel1 = new qx.ui.basic.Label("ComboBox"); - var combo1 = new qx.ui.form.ComboBox(); - combo1.setPlaceholder("placeholder"); - combo1.add(new qx.ui.form.ListItem("Item 1")); - combo1.add(new qx.ui.form.ListItem("Item 2")); - combo1.add(new qx.ui.form.ListItem("Item 3")); - combo1.add(new qx.ui.form.ListItem("Item 4")); - - var dfLabel1 = new qx.ui.basic.Label("DateField:"); - var df1 = new qx.ui.form.DateField(); - - var tfBoxLayout = new qx.ui.layout.Grid(5, 5); - tfBoxLayout.setColumnAlign(0, "right", "middle"); - - var tfBox = new qx.ui.groupbox.GroupBox("Text"); - tfBox.set({layout: tfBoxLayout, margin: 5}); - tfBox.add(tfLabel1, {row: 0, column: 0}); - tfBox.add(tf1, {row: 0, column: 1}); - tfBox.add(tfLabel2, {row: 1, column: 0}); - tfBox.add(tf2, {row: 1, column: 1}); - tfBox.add(tfLabel3, {row: 2, column: 0}); - tfBox.add(tf3, {row: 2, column: 1}); - tfBox.add(comboLabel1, {row: 3, column: 0}); - tfBox.add(combo1, {row: 3, column: 1}); - tfBox.add(dfLabel1, {row: 4, column: 0}); - tfBox.add(df1, {row: 4, column: 1}); - - return tfBox; - }, - - getButtonBox: function() - { - var btnLabel0 = new qx.ui.basic.Label("Button:"); - var btn0 = new qx.ui.form.Button("Button"); - btn0.set({width: 100}); - - var btnLabel1 = new qx.ui.basic.Label("Red Button:"); - var btn1 = new qx.ui.form.Button("Red Button"); - btn1.setAppearance("button-red"); - - var btnLabel2 = new qx.ui.basic.Label("ToggleButton:"); - var btn2 = this.btn2 = new qx.ui.form.ToggleButton("ToggleButton"); - - var btnLabel3 = new qx.ui.basic.Label("RepeatButton:"); - var btn3 = new qx.ui.form.RepeatButton("0"); - btn3.addListener("execute", function() - { - var tempValue = parseInt(btn3.getLabel()) + 1; - btn3.setLabel(tempValue.toString()); - }); - - var btnLabel4 = new qx.ui.basic.Label("MenuButton:"); - var btn4 = new qx.ui.form.MenuButton("MenuButton", null, this.getViewMenu()); - - var btnLabel5 = new qx.ui.basic.Label("SplitButton:"); - var btn5 = new qx.ui.form.SplitButton("SplitButton", null, this.getBackMenu()); - - var btnBoxLayout = new qx.ui.layout.Grid(5, 5); - btnBoxLayout.setColumnAlign(0, "right", "middle"); - - var btnBox = new qx.ui.groupbox.GroupBox("Buttons"); - btnBox.set({layout: btnBoxLayout, margin: 5}); - btnBox.add(btnLabel0, {row: 0, column: 0}); - btnBox.add(btn0, {row: 0, column: 1}); - btnBox.add(btnLabel1, {row: 1, column: 0}); - btnBox.add(btn1, {row: 1, column: 1}); - btnBox.add(btnLabel2, {row: 2, column: 0}); - btnBox.add(btn2, {row: 2, column: 1}); - btnBox.add(btnLabel3, {row: 3, column: 0}); - btnBox.add(btn3, {row: 3, column: 1}); - btnBox.add(btnLabel4, {row: 4, column: 0}); - btnBox.add(btn4, {row: 4, column: 1}); - btnBox.add(btnLabel5, {row: 5, column: 0}); - btnBox.add(btn5, {row: 5, column: 1}); - - return btnBox; - }, - - /* - ------------------------------------------------------------------------- - Selection - ------------------------------------------------------------------------- - */ - getSelectionBox: function() - { - var selLabel1 = new qx.ui.basic.Label("SelectBox:"); - var sel1 = new qx.ui.form.SelectBox(); - - var listItem = new qx.ui.form.ListItem("Item 1"); - sel1.add(listItem); - listItem = new qx.ui.form.ListItem("Item 2"); - sel1.add(listItem); - listItem = new qx.ui.form.ListItem("Item 3"); - sel1.add(listItem); - listItem = new qx.ui.form.ListItem("Item 4"); - sel1.add(listItem); - - var selLabel2 = new qx.ui.basic.Label("List:"); - var sel2 = new qx.ui.form.List(); - sel2.set({height: 60, textColor: "text-active"}); - - var listItem = new qx.ui.form.ListItem("Item 1"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 2"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 3"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 4"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 5"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 6"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 7"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 8"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 9"); - sel2.add(listItem); - listItem = new qx.ui.form.ListItem("Item 10"); - sel2.add(listItem); - - var selLabel3 = new qx.ui.basic.Label("RadioButtonGroup:"); - var sel3 = new qx.ui.form.RadioButtonGroup(new qx.ui.layout.Grid(3, 3)); - - var listItem = new qx.ui.form.RadioButton("Option 1"); - sel3.add(listItem, {row: 0, column: 0}); - listItem = new qx.ui.form.RadioButton("Option 2"); - sel3.add(listItem, {row: 0, column: 1}); - listItem = new qx.ui.form.RadioButton("Option 3"); - sel3.add(listItem, {row: 1, column: 0}); - listItem = new qx.ui.form.RadioButton("Option 4"); - sel3.add(listItem, {row: 1, column: 1}); - - var selBoxLayout = new qx.ui.layout.Grid(5, 5); - selBoxLayout.setColumnAlign(0, "right", "middle"); - - var selBox = new qx.ui.groupbox.GroupBox("Selection"); - selBox.set({layout: selBoxLayout, margin: 5}); - selBox.add(selLabel1, {row: 0, column: 0}); - selBox.add(sel1, {row: 0, column: 1}); - selBox.add(selLabel2, {row: 1, column: 0}); - selBox.add(sel2, {row: 1, column: 1}); - selBox.add(selLabel3, {row: 2, column: 0}); - selBox.add(sel3, {row: 2, column: 1}); - - return selBox; - }, - - /* - ------------------------------------------------------------------------- - Boolean - ------------------------------------------------------------------------- - */ - getBooleanBox: function() - { - var boolLabel1 = new qx.ui.basic.Label("CheckBox:"); - var bool1 = new qx.ui.form.CheckBox("CheckBox"); - - var boolLabel2 = new qx.ui.basic.Label("RadioButtons:"); - var bool2 = new qx.ui.form.RadioButton("RadioButton"); - - var boolBoxLayout = new qx.ui.layout.Grid(5, 5); - boolBoxLayout.setColumnAlign(0, "right", "middle"); - - var boolBox = new qx.ui.groupbox.GroupBox("Boolean"); - boolBox.set({layout: boolBoxLayout, margin: 5}); - boolBox.add(boolLabel1, {row: 0, column: 0}); - boolBox.add(bool1, {row: 0, column: 1}); - boolBox.add(boolLabel2, {row: 1, column: 0}); - boolBox.add(bool2, {row: 1, column: 1}); - - return boolBox; - }, - - /* - ------------------------------------------------------------------------- - Number - ------------------------------------------------------------------------- - */ - getNumBox: function() - { - var numLabel1 = new qx.ui.basic.Label("Spinner:"); - var num1 = new qx.ui.form.Spinner(0, 0, 100); - - var numLabel2 = new qx.ui.basic.Label("Slider:"); - var num2 = new qx.ui.form.Slider(); - - var numBoxLayout = new qx.ui.layout.Grid(5, 5); - numBoxLayout.setColumnAlign(0, "right", "middle"); - numBoxLayout.setColumnWidth(1, 130); - - var numBox = new qx.ui.groupbox.GroupBox("Number"); - numBox.set({layout: numBoxLayout, margin: 5}); - numBox.add(numLabel1, {row: 0, column: 0}); - numBox.add(num1, {row: 0, column: 1}); - numBox.add(numLabel2, {row: 1, column: 0}); - numBox.add(num2, {row: 1, column: 1}); - - num1.bind("value", num2, "value"); - num2.bind("value", num1, "value"); - - return numBox; - }, - - getBottomBox: function() - { - var okButton = new qx.ui.form.Button("OK"); - okButton.set({width: 100}); - okButton.addListener("execute", this.close, this); - - var cancelButton = new qx.ui.form.Button("Cancel"); - cancelButton.set({width: 100, appearance: "button-red"}); - cancelButton.addListener("execute", this.close, this); - - var layout = new qx.ui.layout.HBox(10); - layout.set({alignX: "center"}); - - var bottomBox = new qx.ui.container.Composite(layout); - bottomBox.add(okButton); - bottomBox.add(cancelButton); - - return bottomBox; - }, - - getViewMenu: function() - { - var menu = new qx.ui.menu.Menu; - - var panesButton = new qx.ui.menu.Button("Panes", null, null, this.getPanesMenu()); - var syntaxButton = new qx.ui.menu.Button("Syntax", null, null, this.getSyntaxMenu()); - var rulerButton = new qx.ui.menu.CheckBox("Show ruler"); - var numbersButton = new qx.ui.menu.CheckBox("Show line numbers"); - var asciiButton = new qx.ui.menu.Button("ASCII table"); - - menu.add(panesButton); - menu.add(syntaxButton); - menu.addSeparator(); - menu.add(rulerButton); - menu.add(numbersButton); - menu.addSeparator(); - menu.add(asciiButton); - - return menu; - }, - - getPanesMenu : function() - { - var menu = new qx.ui.menu.Menu; - - var tabsCheckbox = new qx.ui.menu.CheckBox("Show tabs"); - var statusCheckbox = new qx.ui.menu.CheckBox("Show status bar"); - - var treeCheckbox = new qx.ui.menu.CheckBox("Show tree"); - var macroCheckbox = new qx.ui.menu.CheckBox("Show macros"); - var tagCheckbox = new qx.ui.menu.CheckBox("Show tags"); - var consoleCheckbox = new qx.ui.menu.CheckBox("Show console"); - - tabsCheckbox.setValue(true); - statusCheckbox.setValue(true); - macroCheckbox.setValue(true); - - menu.add(statusCheckbox); - menu.add(tabsCheckbox); - menu.addSeparator(); - menu.add(treeCheckbox); - menu.add(macroCheckbox); - menu.add(tagCheckbox); - menu.add(consoleCheckbox); - - return menu; - }, - - getSyntaxMenu : function() - { - var menu = new qx.ui.menu.Menu; - - var htmlButton = new qx.ui.menu.RadioButton("HTML"); - var xmlButton = new qx.ui.menu.RadioButton("XML"); - var jsButton = new qx.ui.menu.RadioButton("JavaScript"); - var cdialectButton = new qx.ui.menu.Button("C Dialect", null, null, this.getSyntaxCMenu()); - var perlButton = new qx.ui.menu.RadioButton("Perl"); - var pythonButton = new qx.ui.menu.RadioButton("Python"); - - menu.add(htmlButton); - menu.add(xmlButton); - menu.add(jsButton); - menu.add(cdialectButton); - menu.add(perlButton); - menu.add(pythonButton); - - // Configure and fill radio group - var langGroup = new qx.ui.form.RadioGroup; - langGroup.add(htmlButton, xmlButton, jsButton, perlButton, pythonButton); - langGroup.add.apply(langGroup, cdialectButton.getMenu().getChildren()); - - return menu; - }, - - getSyntaxCMenu : function() - { - var menu = new qx.ui.menu.Menu; - - var cButton = new qx.ui.menu.RadioButton("C"); - var csharpButton = new qx.ui.menu.RadioButton("C Sharp"); - var objcButton = new qx.ui.menu.RadioButton("Objective C"); - var cplusButton = new qx.ui.menu.RadioButton("C Plus Plus"); - - menu.add(cButton); - menu.add(csharpButton); - menu.add(objcButton); - menu.add(cplusButton); - - return menu; - }, - - getBackMenu : function() - { - var menu = new qx.ui.menu.Menu; - - var button1 = new qx.ui.menu.Button("Line 313"); - var button2 = new qx.ui.menu.Button("Line 1039"); - var button3 = new qx.ui.menu.Button("Line 12"); - var button4 = new qx.ui.menu.Button("Line 26"); - - menu.add(button1); - menu.add(button2); - menu.add(button3); - menu.add(button4); - - return menu; - } - - } -}); \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2011-12-23 11:50:50
|
Revision: 21660 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21660&view=rev Author: scro34 Date: 2011-12-23 11:50:40 +0000 (Fri, 23 Dec 2011) Log Message: ----------- Upgraded to qx v1.6 Modified Paths: -------------- trunk/qooxdoo-contrib/GraydientTheme/trunk/Manifest.json trunk/qooxdoo-contrib/GraydientTheme/trunk/config.json trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/Manifest.json trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/config.json Property Changed: ---------------- trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/source/ Modified: trunk/qooxdoo-contrib/GraydientTheme/trunk/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/GraydientTheme/trunk/Manifest.json 2011-12-22 17:03:59 UTC (rev 21659) +++ trunk/qooxdoo-contrib/GraydientTheme/trunk/Manifest.json 2011-12-23 11:50:40 UTC (rev 21660) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/GraydientTheme/trunk/config.json =================================================================== --- trunk/qooxdoo-contrib/GraydientTheme/trunk/config.json 2011-12-22 17:03:59 UTC (rev 21659) +++ trunk/qooxdoo-contrib/GraydientTheme/trunk/config.json 2011-12-23 11:50:40 UTC (rev 21660) @@ -29,7 +29,7 @@ { "APPLICATION" : "graydienttheme", "APPLICATION_MAIN_CLASS" : "${APPLICATION}.demo.Demo", - "QOOXDOO_PATH" : "../../qooxdoo/1.4.1", + "QOOXDOO_PATH" : "../../qooxdoo/1.6", "QXTHEME" : "graydienttheme.theme.Theme", "API_EXCLUDE" : ["qx.test.*", "graydienttheme.demo.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], Modified: trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/Manifest.json 2011-12-22 17:03:59 UTC (rev 21659) +++ trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/Manifest.json 2011-12-23 11:50:40 UTC (rev 21660) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/config.json 2011-12-22 17:03:59 UTC (rev 21659) +++ trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/config.json 2011-12-23 11:50:40 UTC (rev 21660) @@ -37,7 +37,7 @@ "let" : { "APPLICATION" : "graydienttheme.demo", - "QOOXDOO_PATH" : "../../../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../../../qooxdoo/1.6", "QXTHEME" : "graydienttheme.GraydientTheme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], Property changes on: trunk/qooxdoo-contrib/GraydientTheme/trunk/demo/default/source ___________________________________________________________________ Added: svn:ignore + script This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sc...@us...> - 2011-12-22 17:04:13
|
Revision: 21659 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21659&view=rev Author: scro34 Date: 2011-12-22 17:03:59 +0000 (Thu, 22 Dec 2011) Log Message: ----------- Updated to qx v1.6 & minor improvements Modified Paths: -------------- trunk/qooxdoo-contrib/DarkTheme/trunk/Manifest.json trunk/qooxdoo-contrib/DarkTheme/trunk/config.json trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/Manifest.json trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/config.json trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/Application.js trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/EditorWindow.js trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/DarkTheme.js trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Appearance.js trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Color.js trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Decoration.js Added Paths: ----------- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/migration.log trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/colorselector/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/cursors/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-disabled.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-focused-invalid.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-focused.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-hovered-invalid.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-hovered.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined-invalid.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/form/checkbox-undetermined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/group-item.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/pane/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/shadow/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/tree/Thumbs.db trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/Thumbs.db Removed Paths: ------------- trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/bar-background-selected.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-background.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-combined.meta trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-combined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane1.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-combined.meta trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-combined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane2.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-combined.meta trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-combined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane3.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-combined.meta trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-combined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menu-pane4.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-combined.meta trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-combined.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/menu/menubar.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/scrollbar/scrollbar-slider-horizontal.pspimage trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/scrollbar/scrollbar-slider-vertical.pspimage trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/button-hovered.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/button-pressed.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/button.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/caption-background-hovered.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/caption-background.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-b.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-bl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-br.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-c.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-l.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-r.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-t.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-tl.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window-tr.png trunk/qooxdoo-contrib/DarkTheme/trunk/source/resource/darktheme/decoration/window/window.png Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/Manifest.json 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/Manifest.json 2011-12-22 17:03:59 UTC (rev 21659) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/config.json =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/config.json 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/config.json 2011-12-22 17:03:59 UTC (rev 21659) @@ -29,7 +29,7 @@ { "APPLICATION" : "darktheme", "APPLICATION_MAIN_CLASS" : "${APPLICATION}.demo.Demo", - "QOOXDOO_PATH" : "../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../qooxdoo/1.6", "QXTHEME" : "qx.theme.Modern", "API_EXCLUDE" : ["qx.test.*", "darktheme.demo.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/Manifest.json =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/Manifest.json 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/Manifest.json 2011-12-22 17:03:59 UTC (rev 21659) @@ -18,7 +18,7 @@ ], "version" : "trunk", - "qooxdoo-versions": ["1.4", "1.5"] + "qooxdoo-versions": ["1.4", "1.5", "1.6"] }, "provides" : Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/config.json =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/config.json 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/config.json 2011-12-22 17:03:59 UTC (rev 21659) @@ -24,6 +24,7 @@ "profiling", "source", "source-all", + "source-hybrid", "test", "test-source", "translation" @@ -32,7 +33,7 @@ "let" : { "APPLICATION" : "darktheme.demo", - "QOOXDOO_PATH" : "../../../../qooxdoo/1.5", + "QOOXDOO_PATH" : "../../../../qooxdoo/1.6", "QXTHEME" : "darktheme.DarkTheme", "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"], "LOCALES" : [ "en" ], Added: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/migration.log =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/migration.log (rev 0) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/migration.log 2011-12-22 17:03:59 UTC (rev 21659) @@ -0,0 +1,66 @@ + +UPGRADE TO 1.6 +---------------------------------------------------------------------------- + * Number of script input files: 44 + * Number of HTML input files: 0 + * Update to version: 1.6 + * Searching for patch module... + * Searching for info expression data... + - D:\Stick\xampp\htdocs\qooxdoo-contrib\qooxdoo\1.6\tool\data\migration\1.6\info\01-main.dat + - Compiling expressions... + - 01-main.dat + - Number of infos: 3 + * Searching for patch expression data... + - D:\Stick\xampp\htdocs\qooxdoo-contrib\qooxdoo\1.6\tool\data\migration\1.6\patches\01-main.dat + - Compiling expressions... + - 01-main.dat + - Number of patches: 14 + + FILE PROCESSING: +---------------------------------------------------------------------------- + * Processing script files: + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\TreeColumns.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\CalculatorLogic.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Label.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Tooltip.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\ScrollBar.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Tree.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\CheckBox.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\MenuBar.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Slider.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\RadioButton.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\ColorPopup.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\StackContainer.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Desktop.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\RadioButtonGroup.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\DateField.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Window.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Popup.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\SlideBar.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\TextField.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\CalcWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\test\DemoTest.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\BrowserWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\HtmlEmbed.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\SelectBox.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\ColorWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\SplitPane.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\DateChooser.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\ToolBar.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Atom.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\EditorWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Button.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\List.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Resizer.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Spinner.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\TableWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\FormWindow.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Image.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\TabView.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Application.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\GroupBox.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Menu.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\Canvas.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\TreeVirtual.js + - File: D:\Stick\xampp\htdocs\qooxdoo-contrib\DarkTheme\trunk\demo\default\source\class\darktheme\demo\ComboBox.js + * Done Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/Application.js =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/Application.js 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/Application.js 2011-12-22 17:03:59 UTC (rev 21659) @@ -16,24 +16,24 @@ #asset(darktheme.demo/*) -#asset(qx/icon/Oxygen/16/actions/*) -#asset(qx/icon/Oxygen/16/apps/*) -#asset(qx/icon/Oxygen/16/categories/*) -#asset(qx/icon/Oxygen/16/devices/*) -#asset(qx/icon/Oxygen/16/mimetypes/*) -#asset(qx/icon/Oxygen/16/places/*) -#asset(qx/icon/Oxygen/16/status/*) -#asset(qx/icon/Oxygen/22/actions/*) -#asset(qx/icon/Oxygen/22/apps/*) -#asset(qx/icon/Oxygen/22/mimetypes/*) -#asset(qx/icon/Oxygen/22/places/*) -#asset(qx/icon/Oxygen/32/actions/*) -#asset(qx/icon/Oxygen/32/apps/*) -#asset(qx/icon/Oxygen/32/devices/*) -#asset(qx/icon/Oxygen/32/status/*) -#asset(qx/icon/Oxygen/48/actions/*) -#asset(qx/icon/Oxygen/48/devices/*) -#asset(qx/icon/Oxygen/48/places/*) +#asset(qx/icon/Tango/16/actions/*) +#asset(qx/icon/Tango/16/apps/*) +#asset(qx/icon/Tango/16/categories/*) +#asset(qx/icon/Tango/16/devices/*) +#asset(qx/icon/Tango/16/mimetypes/*) +#asset(qx/icon/Tango/16/places/*) +#asset(qx/icon/Tango/16/status/*) +#asset(qx/icon/Tango/22/actions/*) +#asset(qx/icon/Tango/22/apps/*) +#asset(qx/icon/Tango/22/mimetypes/*) +#asset(qx/icon/Tango/22/places/*) +#asset(qx/icon/Tango/32/actions/*) +#asset(qx/icon/Tango/32/apps/*) +#asset(qx/icon/Tango/32/devices/*) +#asset(qx/icon/Tango/32/status/*) +#asset(qx/icon/Tango/48/actions/*) +#asset(qx/icon/Tango/48/devices/*) +#asset(qx/icon/Tango/48/places/*) ************************************************************************ */ Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/EditorWindow.js =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/EditorWindow.js 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/EditorWindow.js 2011-12-22 17:03:59 UTC (rev 21659) @@ -281,22 +281,22 @@ return menu; }, - getToolbarEntries : function() + getToolbarEntries : function() { return [ { - bold: { text: "Format Bold", image: "qx/icon/Oxygen/16/actions/format-text-bold.png", action: this.editor.setBold }, - italic: { text: "Format Italic", image: "qx/icon/Oxygen/16/actions/format-text-italic.png", action: this.editor.setItalic }, - underline: { text: "Format Underline", image: "qx/icon/Oxygen/16/actions/format-text-underline.png", action: this.editor.setUnderline }, - strikethrough: { text: "Format Strikethrough", image: "qx/icon/Oxygen/16/actions/format-text-strikethrough.png", action: this.editor.setStrikeThrough }, - removeFormat: { text: "Remove Format", image: "qx/icon/Oxygen/16/actions/edit-clear.png", action: this.editor.removeFormat } + bold: { text: "Format Bold", image: "icon/16/actions/format-text-bold.png", action: this.editor.setBold }, + italic: { text: "Format Italic", image: "icon/16/actions/format-text-italic.png", action: this.editor.setItalic }, + underline: { text: "Format Underline", image: "icon/16/actions/format-text-underline.png", action: this.editor.setUnderline }, + strikethrough: { text: "Format Strikethrough", image: "icon/16/actions/format-text-strikethrough.png", action: this.editor.setStrikeThrough }, + removeFormat: { text: "Remove Format", image: "icon/16/actions/edit-clear.png", action: this.editor.removeFormat } }, { - alignLeft: { text: "Align Left", image: "qx/icon/Oxygen/16/actions/format-justify-left.png", action: this.editor.setJustifyLeft }, - alignCenter: { text: "Align Center", image: "qx/icon/Oxygen/16/actions/format-justify-center.png", action: this.editor.setJustifyCenter }, - alignRight: { text: "Align Right", image: "qx/icon/Oxygen/16/actions/format-justify-right.png", action: this.editor.setJustifyRight }, - alignJustify: { text: "Align Justify", image: "qx/icon/Oxygen/16/actions/format-justify-fill.png", action: this.editor.setJustifyFull } + alignLeft: { text: "Align Left", image: "icon/16/actions/format-justify-left.png", action: this.editor.setJustifyLeft }, + alignCenter: { text: "Align Center", image: "icon/16/actions/format-justify-center.png", action: this.editor.setJustifyCenter }, + alignRight: { text: "Align Right", image: "icon/16/actions/format-justify-right.png", action: this.editor.setJustifyRight }, + alignJustify: { text: "Align Justify", image: "icon/16/actions/format-justify-fill.png", action: this.editor.setJustifyFull } }, { @@ -307,15 +307,15 @@ }, { - indent: { text: "Indent More", image: "qx/icon/Oxygen/16/actions/format-indent-more.png", action: this.editor.insertIndent }, - outdent: { text: "Indent Less", image: "qx/icon/Oxygen/16/actions/format-indent-less.png", action: this.editor.insertOutdent } + indent: { text: "Indent More", image: "icon/16/actions/format-indent-more.png", action: this.editor.insertIndent }, + outdent: { text: "Indent Less", image: "icon/16/actions/format-indent-less.png", action: this.editor.insertOutdent } }, { - insertImage: { text: "Insert Image", image: "qx/icon/Oxygen/16/actions/insert-image.png", action: this.__insertImageHandler }, + insertImage: { text: "Insert Image", image: "icon/16/actions/insert-image.png", action: this.__insertImageHandler }, insertTable: { text: "Insert Table", image: "darktheme.demo/editor/insert-table.png", action: this.__insertTableHandler }, - insertLink: { text: "Insert Link", image: "qx/icon/Oxygen/16/actions/insert-link.png", action: this.__insertLinkHandler }, + insertLink: { text: "Insert Link", image: "icon/16/actions/insert-link.png", action: this.__insertLinkHandler }, insertHTML: { text: "Insert HTML Code", image: "darktheme.demo/editor/insert-text.png", action: this.__insertHTMLHandler }, insertHR: { text: "Insert Horizontal Ruler", image: "darktheme.demo/editor/insert-horizontal-rule.png", action: this.editor.insertHorizontalRuler } }, @@ -326,8 +326,8 @@ }, { - undo: { text: "Undo Last Change", image: "qx/icon/Oxygen/16/actions/edit-undo.png", action: this.editor.undo }, - redo: { text: "Redo Last Undo Step", image: "qx/icon/Oxygen/16/actions/edit-redo.png", action: this.editor.redo } + undo: { text: "Undo Last Change", image: "icon/16/actions/edit-undo.png", action: this.editor.undo }, + redo: { text: "Redo Last Undo Step", image: "icon/16/actions/edit-redo.png", action: this.editor.redo } } ]; }, @@ -553,18 +553,18 @@ { return [ { - bold: { text: "Format Bold", image: "qx/icon/Oxygen/16/actions/format-text-bold.png", action: this.editor.setBold }, - italic: { text: "Format Italic", image: "qx/icon/Oxygen/16/actions/format-text-italic.png", action: this.editor.setItalic }, - underline: { text: "Format Underline", image: "qx/icon/Oxygen/16/actions/format-text-underline.png", action: this.editor.setUnderline }, - strikethrough: { text: "Format Strikethrough", image: "qx/icon/Oxygen/16/actions/format-text-strikethrough.png", action: this.editor.setStrikeThrough }, - removeFormat: { text: "Remove Format", image: "qx/icon/Oxygen/16/actions/edit-clear.png", action: this.editor.removeFormat } + bold: { text: "Format Bold", image: "icon/16/actions/format-text-bold.png", action: this.editor.setBold }, + italic: { text: "Format Italic", image: "icon/16/actions/format-text-italic.png", action: this.editor.setItalic }, + underline: { text: "Format Underline", image: "icon/16/actions/format-text-underline.png", action: this.editor.setUnderline }, + strikethrough: { text: "Format Strikethrough", image: "icon/16/actions/format-text-strikethrough.png", action: this.editor.setStrikeThrough }, + removeFormat: { text: "Remove Format", image: "icon/16/actions/edit-clear.png", action: this.editor.removeFormat } }, { - alignLeft: { text: "Align Left", image: "qx/icon/Oxygen/16/actions/format-justify-left.png", action: this.editor.setJustifyLeft }, - alignCenter: { text: "Align Center", image: "qx/icon/Oxygen/16/actions/format-justify-center.png", action: this.editor.setJustifyCenter }, - alignRight: { text: "Align Right", image: "qx/icon/Oxygen/16/actions/format-justify-right.png", action: this.editor.setJustifyRight }, - alignJustify: { text: "Align Justify", image: "qx/icon/Oxygen/16/actions/format-justify-fill.png", action: this.editor.setJustifyFull } + alignLeft: { text: "Align Left", image: "icon/16/actions/format-justify-left.png", action: this.editor.setJustifyLeft }, + alignCenter: { text: "Align Center", image: "icon/16/actions/format-justify-center.png", action: this.editor.setJustifyCenter }, + alignRight: { text: "Align Right", image: "icon/16/actions/format-justify-right.png", action: this.editor.setJustifyRight }, + alignJustify: { text: "Align Justify", image: "icon/16/actions/format-justify-fill.png", action: this.editor.setJustifyFull } }, { @@ -575,15 +575,15 @@ }, { - indent: { text: "Indent More", image: "qx/icon/Oxygen/16/actions/format-indent-more.png", action: this.editor.insertIndent }, - outdent: { text: "Indent Less", image: "qx/icon/Oxygen/16/actions/format-indent-less.png", action: this.editor.insertOutdent } + indent: { text: "Indent More", image: "icon/16/actions/format-indent-more.png", action: this.editor.insertIndent }, + outdent: { text: "Indent Less", image: "icon/16/actions/format-indent-less.png", action: this.editor.insertOutdent } }, { - insertImage: { text: "Insert Image", image: "qx/icon/Oxygen/16/actions/insert-image.png", action: this.__insertImageHandler }, + insertImage: { text: "Insert Image", image: "icon/16/actions/insert-image.png", action: this.__insertImageHandler }, insertTable: { text: "Insert Table", image: "darktheme.demo/editor/insert-table.png", action: this.__insertTableHandler }, - insertLink: { text: "Insert Link", image: "qx/icon/Oxygen/16/actions/insert-link.png", action: this.__insertLinkHandler }, + insertLink: { text: "Insert Link", image: "icon/16/actions/insert-link.png", action: this.__insertLinkHandler }, insertHTML: { text: "Insert HTML Code", image: "darktheme.demo/editor/insert-text.png", action: this.__insertHTMLHandler }, insertHR: { text: "Insert Horizontal Ruler", image: "darktheme.demo/editor/insert-horizontal-rule.png", action: this.editor.insertHorizontalRuler } }, @@ -594,16 +594,16 @@ }, { - undo: { text: "Undo Last Change", image: "qx/icon/Oxygen/16/actions/edit-undo.png", action: this.editor.undo }, - redo: { text: "Redo Last Undo Step", image: "qx/icon/Oxygen/16/actions/edit-redo.png", action: this.editor.redo } + undo: { text: "Undo Last Change", image: "icon/16/actions/edit-undo.png", action: this.editor.undo }, + redo: { text: "Redo Last Undo Step", image: "icon/16/actions/edit-redo.png", action: this.editor.redo } } ]; }, - getToolBar : function() + getToolBar : function() { - var toolbar = new qx.ui.toolbar.ToolBar; - + var toolbar = new qx.ui.toolbar.ToolBar; + // Put together toolbar entries var button; var toolbarEntries = this.getToolbarEntries(); @@ -611,11 +611,11 @@ { var part = new qx.ui.toolbar.Part; toolbar.add(part); - + for (var entry in toolbarEntries[i]) { var infos = toolbarEntries[i][entry]; - + if(infos.custom) { button = infos.custom.call(this); } @@ -631,7 +631,7 @@ part.add(button); } } - return toolbar; + return toolbar; + } } - } }); \ No newline at end of file Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js 2011-12-22 17:03:59 UTC (rev 21659) @@ -6,7 +6,7 @@ { this.base(arguments); - this.setCaption("Form Widgets"); + this.setCaption("Form Widgets"); this._createControls(); }, @@ -18,10 +18,11 @@ members : { + _createControls: function() { - var layout = new qx.ui.layout.Grid(1, 5); - this.set({layout: layout, status: "Status text"}); + var layout = new qx.ui.layout.Grid(0, 0); + this.set({layout: layout, status: "Status text", contentPadding: [0, 5, 7, 5]}); this.add(this.getTextFieldBox(), {row: 0, column: 0}); this.add(this.getButtonBox(), {row: 0, column: 1}); @@ -63,11 +64,11 @@ var dfLabel1 = new qx.ui.basic.Label("DateField:"); var df1 = new qx.ui.form.DateField(); - var tfBoxLayout = new qx.ui.layout.Grid(5, 5); + var tfBoxLayout = new qx.ui.layout.Grid(5, 8); tfBoxLayout.setColumnAlign(0, "right", "middle"); var tfBox = new qx.ui.groupbox.GroupBox("Text"); - tfBox.set({layout: tfBoxLayout, margin: 5}); + tfBox.set({layout: tfBoxLayout, margin: 4}); tfBox.add(tfLabel1, {row: 0, column: 0}); tfBox.add(tf1, {row: 0, column: 1}); tfBox.add(tfLabel2, {row: 1, column: 0}); @@ -78,7 +79,7 @@ tfBox.add(combo1, {row: 3, column: 1}); tfBox.add(dfLabel1, {row: 4, column: 0}); tfBox.add(df1, {row: 4, column: 1}); - + return tfBox; }, @@ -88,32 +89,35 @@ var btn0 = new qx.ui.form.Button("Button"); btn0.set({width: 100}); - var btnLabel1 = new qx.ui.basic.Label("Red Button:"); - var btn1 = new qx.ui.form.Button("Red Button"); - btn1.setAppearance("button-red"); + var btnLabel1 = new qx.ui.basic.Label("ToggleButton:"); + var btn1 = this.btn1 = new qx.ui.form.ToggleButton("ToggleButton"); - var btnLabel2 = new qx.ui.basic.Label("ToggleButton:"); - var btn2 = this.btn2 = new qx.ui.form.ToggleButton("ToggleButton"); - - var btnLabel3 = new qx.ui.basic.Label("RepeatButton:"); - var btn3 = new qx.ui.form.RepeatButton("0"); - btn3.addListener("execute", function() + var btnLabel2 = new qx.ui.basic.Label("RepeatButton:"); + var btn2 = new qx.ui.form.RepeatButton("0"); + btn2.addListener("execute", function() { - var tempValue = parseInt(btn3.getLabel()) + 1; - btn3.setLabel(tempValue.toString()); + var tempValue = parseInt(btn2.getLabel()) + 1; + btn2.setLabel(tempValue.toString()); }); + + var btnLabel3 = new qx.ui.basic.Label("Hover Button:"); + var btn3 = new qx.ui.form.HoverButton("Hover Button"); var btnLabel4 = new qx.ui.basic.Label("MenuButton:"); var btn4 = new qx.ui.form.MenuButton("MenuButton", null, this.getViewMenu()); var btnLabel5 = new qx.ui.basic.Label("SplitButton:"); var btn5 = new qx.ui.form.SplitButton("SplitButton", null, this.getBackMenu()); + btn5.addListener("changeCommand", function(e) + { + this.debug("changeCommand"); + }, this); - var btnBoxLayout = new qx.ui.layout.Grid(5, 5); + var btnBoxLayout = new qx.ui.layout.Grid(3, 5); btnBoxLayout.setColumnAlign(0, "right", "middle"); var btnBox = new qx.ui.groupbox.GroupBox("Buttons"); - btnBox.set({layout: btnBoxLayout, margin: 5}); + btnBox.set({layout: btnBoxLayout, margin: 4}); btnBox.add(btnLabel0, {row: 0, column: 0}); btnBox.add(btn0, {row: 0, column: 1}); btnBox.add(btnLabel1, {row: 1, column: 0}); @@ -151,7 +155,7 @@ var selLabel2 = new qx.ui.basic.Label("List:"); var sel2 = new qx.ui.form.List(); - sel2.set({height: 60, textColor: "text-active"}); + sel2.set({height: 60/*, textColor: "text-active"*/}); var listItem = new qx.ui.form.ListItem("Item 1"); sel2.add(listItem); @@ -186,18 +190,18 @@ listItem = new qx.ui.form.RadioButton("Option 4"); sel3.add(listItem, {row: 1, column: 1}); - var selBoxLayout = new qx.ui.layout.Grid(5, 5); + var selBoxLayout = new qx.ui.layout.Grid(5, 10); selBoxLayout.setColumnAlign(0, "right", "middle"); var selBox = new qx.ui.groupbox.GroupBox("Selection"); - selBox.set({layout: selBoxLayout, margin: 5}); + selBox.set({layout: selBoxLayout, margin: 4}); selBox.add(selLabel1, {row: 0, column: 0}); selBox.add(sel1, {row: 0, column: 1}); selBox.add(selLabel2, {row: 1, column: 0}); selBox.add(sel2, {row: 1, column: 1}); selBox.add(selLabel3, {row: 2, column: 0}); selBox.add(sel3, {row: 2, column: 1}); - + return selBox; }, @@ -210,20 +214,26 @@ { var boolLabel1 = new qx.ui.basic.Label("CheckBox:"); var bool1 = new qx.ui.form.CheckBox("CheckBox"); + + var boolLabel2 = new qx.ui.basic.Label("Tri-State:"); + var bool2 = new qx.ui.form.CheckBox("CheckBox"); + bool2.set({triState: true, value: null}); - var boolLabel2 = new qx.ui.basic.Label("RadioButtons:"); - var bool2 = new qx.ui.form.RadioButton("RadioButton"); + var boolLabel3 = new qx.ui.basic.Label("RadioButton:"); + var bool3 = new qx.ui.form.RadioButton("RadioButton"); - var boolBoxLayout = new qx.ui.layout.Grid(5, 5); + var boolBoxLayout = new qx.ui.layout.Grid(5, 8); boolBoxLayout.setColumnAlign(0, "right", "middle"); var boolBox = new qx.ui.groupbox.GroupBox("Boolean"); - boolBox.set({layout: boolBoxLayout, margin: 5}); + boolBox.set({layout: boolBoxLayout, margin: 4}); boolBox.add(boolLabel1, {row: 0, column: 0}); boolBox.add(bool1, {row: 0, column: 1}); boolBox.add(boolLabel2, {row: 1, column: 0}); boolBox.add(bool2, {row: 1, column: 1}); - + boolBox.add(boolLabel3, {row: 2, column: 0}); + boolBox.add(bool3, {row: 2, column: 1}); + return boolBox; }, @@ -240,20 +250,20 @@ var numLabel2 = new qx.ui.basic.Label("Slider:"); var num2 = new qx.ui.form.Slider(); - var numBoxLayout = new qx.ui.layout.Grid(5, 5); + var numBoxLayout = new qx.ui.layout.Grid(5, 8); numBoxLayout.setColumnAlign(0, "right", "middle"); numBoxLayout.setColumnWidth(1, 130); var numBox = new qx.ui.groupbox.GroupBox("Number"); - numBox.set({layout: numBoxLayout, margin: 5}); + numBox.set({layout: numBoxLayout, margin: 4}); numBox.add(numLabel1, {row: 0, column: 0}); numBox.add(num1, {row: 0, column: 1}); numBox.add(numLabel2, {row: 1, column: 0}); numBox.add(num2, {row: 1, column: 1}); num1.bind("value", num2, "value"); - num2.bind("value", num1, "value"); - + num2.bind("value", num1, "value"); + return numBox; }, @@ -264,7 +274,7 @@ okButton.addListener("execute", this.close, this); var cancelButton = new qx.ui.form.Button("Cancel"); - cancelButton.set({width: 100, appearance: "button-red"}); + cancelButton.set({width: 100}); cancelButton.addListener("execute", this.close, this); var layout = new qx.ui.layout.HBox(10); Added: trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt (rev 0) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/demo/default/source/class/darktheme/demo/FormWindow.js.txt 2011-12-22 17:03:59 UTC (rev 21659) @@ -0,0 +1,389 @@ +qx.Class.define("darktheme.demo.FormWindow", +{ + extend: qx.ui.window.Window, + + construct: function() + { + this.base(arguments); + + this.setCaption("Form Widgets"); + this._createControls(); + }, + + /* + ***************************************************************************** + MEMBERS + ***************************************************************************** + */ + + members : + { + _createControls: function() + { + var layout = new qx.ui.layout.Grid(1, 5); + this.set({layout: layout, status: "Status text"}); + + this.add(this.getTextFieldBox(), {row: 0, column: 0}); + this.add(this.getButtonBox(), {row: 0, column: 1}); + this.add(this.getSelectionBox(), {row: 1, column: 0, rowSpan: 2}); + this.add(this.getBooleanBox(), {row: 1, column: 1}); + this.add(this.getNumBox(), {row: 2, column: 1}); + this.add(this.getBottomBox(), {row: 3, column: 0, colSpan: 2}); + + this.addListenerOnce("appear", function(e) + { + this.center(); + }, this); + }, + + getTextFieldBox: function() + { + var tfLabel1 = new qx.ui.basic.Label("TextField:"); + var tf1 = new qx.ui.form.TextField(); + tf1.setPlaceholder("placeholder"); + tf1.setReadOnly(false); + + var tfLabel2 = new qx.ui.basic.Label("PasswordField:"); + var tf2 = new qx.ui.form.PasswordField(); + tf2.setPlaceholder("placeholder"); + + var tfLabel3 = new qx.ui.basic.Label("TextArea:"); + var tf3 = new qx.ui.form.TextArea(); + tf3.setPlaceholder("placeholder"); + tf3.setAlignY("top"); + + var comboLabel1 = new qx.ui.basic.Label("ComboBox"); + var combo1 = new qx.ui.form.ComboBox(); + combo1.setPlaceholder("placeholder"); + combo1.add(new qx.ui.form.ListItem("Item 1")); + combo1.add(new qx.ui.form.ListItem("Item 2")); + combo1.add(new qx.ui.form.ListItem("Item 3")); + combo1.add(new qx.ui.form.ListItem("Item 4")); + + var dfLabel1 = new qx.ui.basic.Label("DateField:"); + var df1 = new qx.ui.form.DateField(); + + var tfBoxLayout = new qx.ui.layout.Grid(5, 5); + tfBoxLayout.setColumnAlign(0, "right", "middle"); + + var tfBox = new qx.ui.groupbox.GroupBox("Text"); + tfBox.set({layout: tfBoxLayout, margin: 5}); + tfBox.add(tfLabel1, {row: 0, column: 0}); + tfBox.add(tf1, {row: 0, column: 1}); + tfBox.add(tfLabel2, {row: 1, column: 0}); + tfBox.add(tf2, {row: 1, column: 1}); + tfBox.add(tfLabel3, {row: 2, column: 0}); + tfBox.add(tf3, {row: 2, column: 1}); + tfBox.add(comboLabel1, {row: 3, column: 0}); + tfBox.add(combo1, {row: 3, column: 1}); + tfBox.add(dfLabel1, {row: 4, column: 0}); + tfBox.add(df1, {row: 4, column: 1}); + + return tfBox; + }, + + getButtonBox: function() + { + var btnLabel0 = new qx.ui.basic.Label("Button:"); + var btn0 = new qx.ui.form.Button("Button"); + btn0.set({width: 100}); + + var btnLabel1 = new qx.ui.basic.Label("Red Button:"); + var btn1 = new qx.ui.form.Button("Red Button"); + btn1.setAppearance("button-red"); + + var btnLabel2 = new qx.ui.basic.Label("ToggleButton:"); + var btn2 = this.btn2 = new qx.ui.form.ToggleButton("ToggleButton"); + + var btnLabel3 = new qx.ui.basic.Label("RepeatButton:"); + var btn3 = new qx.ui.form.RepeatButton("0"); + btn3.addListener("execute", function() + { + var tempValue = parseInt(btn3.getLabel()) + 1; + btn3.setLabel(tempValue.toString()); + }); + + var btnLabel4 = new qx.ui.basic.Label("MenuButton:"); + var btn4 = new qx.ui.form.MenuButton("MenuButton", null, this.getViewMenu()); + + var btnLabel5 = new qx.ui.basic.Label("SplitButton:"); + var btn5 = new qx.ui.form.SplitButton("SplitButton", null, this.getBackMenu()); + + var btnBoxLayout = new qx.ui.layout.Grid(5, 5); + btnBoxLayout.setColumnAlign(0, "right", "middle"); + + var btnBox = new qx.ui.groupbox.GroupBox("Buttons"); + btnBox.set({layout: btnBoxLayout, margin: 5}); + btnBox.add(btnLabel0, {row: 0, column: 0}); + btnBox.add(btn0, {row: 0, column: 1}); + btnBox.add(btnLabel1, {row: 1, column: 0}); + btnBox.add(btn1, {row: 1, column: 1}); + btnBox.add(btnLabel2, {row: 2, column: 0}); + btnBox.add(btn2, {row: 2, column: 1}); + btnBox.add(btnLabel3, {row: 3, column: 0}); + btnBox.add(btn3, {row: 3, column: 1}); + btnBox.add(btnLabel4, {row: 4, column: 0}); + btnBox.add(btn4, {row: 4, column: 1}); + btnBox.add(btnLabel5, {row: 5, column: 0}); + btnBox.add(btn5, {row: 5, column: 1}); + + return btnBox; + }, + + /* + ------------------------------------------------------------------------- + Selection + ------------------------------------------------------------------------- + */ + getSelectionBox: function() + { + var selLabel1 = new qx.ui.basic.Label("SelectBox:"); + var sel1 = new qx.ui.form.SelectBox(); + + var listItem = new qx.ui.form.ListItem("Item 1"); + sel1.add(listItem); + listItem = new qx.ui.form.ListItem("Item 2"); + sel1.add(listItem); + listItem = new qx.ui.form.ListItem("Item 3"); + sel1.add(listItem); + listItem = new qx.ui.form.ListItem("Item 4"); + sel1.add(listItem); + + var selLabel2 = new qx.ui.basic.Label("List:"); + var sel2 = new qx.ui.form.List(); + sel2.set({height: 60, textColor: "text-active"}); + + var listItem = new qx.ui.form.ListItem("Item 1"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 2"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 3"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 4"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 5"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 6"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 7"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 8"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 9"); + sel2.add(listItem); + listItem = new qx.ui.form.ListItem("Item 10"); + sel2.add(listItem); + + var selLabel3 = new qx.ui.basic.Label("RadioButtonGroup:"); + var sel3 = new qx.ui.form.RadioButtonGroup(new qx.ui.layout.Grid(3, 3)); + + var listItem = new qx.ui.form.RadioButton("Option 1"); + sel3.add(listItem, {row: 0, column: 0}); + listItem = new qx.ui.form.RadioButton("Option 2"); + sel3.add(listItem, {row: 0, column: 1}); + listItem = new qx.ui.form.RadioButton("Option 3"); + sel3.add(listItem, {row: 1, column: 0}); + listItem = new qx.ui.form.RadioButton("Option 4"); + sel3.add(listItem, {row: 1, column: 1}); + + var selBoxLayout = new qx.ui.layout.Grid(5, 5); + selBoxLayout.setColumnAlign(0, "right", "middle"); + + var selBox = new qx.ui.groupbox.GroupBox("Selection"); + selBox.set({layout: selBoxLayout, margin: 5}); + selBox.add(selLabel1, {row: 0, column: 0}); + selBox.add(sel1, {row: 0, column: 1}); + selBox.add(selLabel2, {row: 1, column: 0}); + selBox.add(sel2, {row: 1, column: 1}); + selBox.add(selLabel3, {row: 2, column: 0}); + selBox.add(sel3, {row: 2, column: 1}); + + return selBox; + }, + + /* + ------------------------------------------------------------------------- + Boolean + ------------------------------------------------------------------------- + */ + getBooleanBox: function() + { + var boolLabel1 = new qx.ui.basic.Label("CheckBox:"); + var bool1 = new qx.ui.form.CheckBox("CheckBox"); + + var boolLabel2 = new qx.ui.basic.Label("RadioButtons:"); + var bool2 = new qx.ui.form.RadioButton("RadioButton"); + + var boolBoxLayout = new qx.ui.layout.Grid(5, 5); + boolBoxLayout.setColumnAlign(0, "right", "middle"); + + var boolBox = new qx.ui.groupbox.GroupBox("Boolean"); + boolBox.set({layout: boolBoxLayout, margin: 5}); + boolBox.add(boolLabel1, {row: 0, column: 0}); + boolBox.add(bool1, {row: 0, column: 1}); + boolBox.add(boolLabel2, {row: 1, column: 0}); + boolBox.add(bool2, {row: 1, column: 1}); + + return boolBox; + }, + + /* + ------------------------------------------------------------------------- + Number + ------------------------------------------------------------------------- + */ + getNumBox: function() + { + var numLabel1 = new qx.ui.basic.Label("Spinner:"); + var num1 = new qx.ui.form.Spinner(0, 0, 100); + + var numLabel2 = new qx.ui.basic.Label("Slider:"); + var num2 = new qx.ui.form.Slider(); + + var numBoxLayout = new qx.ui.layout.Grid(5, 5); + numBoxLayout.setColumnAlign(0, "right", "middle"); + numBoxLayout.setColumnWidth(1, 130); + + var numBox = new qx.ui.groupbox.GroupBox("Number"); + numBox.set({layout: numBoxLayout, margin: 5}); + numBox.add(numLabel1, {row: 0, column: 0}); + numBox.add(num1, {row: 0, column: 1}); + numBox.add(numLabel2, {row: 1, column: 0}); + numBox.add(num2, {row: 1, column: 1}); + + num1.bind("value", num2, "value"); + num2.bind("value", num1, "value"); + + return numBox; + }, + + getBottomBox: function() + { + var okButton = new qx.ui.form.Button("OK"); + okButton.set({width: 100}); + okButton.addListener("execute", this.close, this); + + var cancelButton = new qx.ui.form.Button("Cancel"); + cancelButton.set({width: 100, appearance: "button-red"}); + cancelButton.addListener("execute", this.close, this); + + var layout = new qx.ui.layout.HBox(10); + layout.set({alignX: "center"}); + + var bottomBox = new qx.ui.container.Composite(layout); + bottomBox.add(okButton); + bottomBox.add(cancelButton); + + return bottomBox; + }, + + getViewMenu: function() + { + var menu = new qx.ui.menu.Menu; + + var panesButton = new qx.ui.menu.Button("Panes", null, null, this.getPanesMenu()); + var syntaxButton = new qx.ui.menu.Button("Syntax", null, null, this.getSyntaxMenu()); + var rulerButton = new qx.ui.menu.CheckBox("Show ruler"); + var numbersButton = new qx.ui.menu.CheckBox("Show line numbers"); + var asciiButton = new qx.ui.menu.Button("ASCII table"); + + menu.add(panesButton); + menu.add(syntaxButton); + menu.addSeparator(); + menu.add(rulerButton); + menu.add(numbersButton); + menu.addSeparator(); + menu.add(asciiButton); + + return menu; + }, + + getPanesMenu : function() + { + var menu = new qx.ui.menu.Menu; + + var tabsCheckbox = new qx.ui.menu.CheckBox("Show tabs"); + var statusCheckbox = new qx.ui.menu.CheckBox("Show status bar"); + + var treeCheckbox = new qx.ui.menu.CheckBox("Show tree"); + var macroCheckbox = new qx.ui.menu.CheckBox("Show macros"); + var tagCheckbox = new qx.ui.menu.CheckBox("Show tags"); + var consoleCheckbox = new qx.ui.menu.CheckBox("Show console"); + + tabsCheckbox.setValue(true); + statusCheckbox.setValue(true); + macroCheckbox.setValue(true); + + menu.add(statusCheckbox); + menu.add(tabsCheckbox); + menu.addSeparator(); + menu.add(treeCheckbox); + menu.add(macroCheckbox); + menu.add(tagCheckbox); + menu.add(consoleCheckbox); + + return menu; + }, + + getSyntaxMenu : function() + { + var menu = new qx.ui.menu.Menu; + + var htmlButton = new qx.ui.menu.RadioButton("HTML"); + var xmlButton = new qx.ui.menu.RadioButton("XML"); + var jsButton = new qx.ui.menu.RadioButton("JavaScript"); + var cdialectButton = new qx.ui.menu.Button("C Dialect", null, null, this.getSyntaxCMenu()); + var perlButton = new qx.ui.menu.RadioButton("Perl"); + var pythonButton = new qx.ui.menu.RadioButton("Python"); + + menu.add(htmlButton); + menu.add(xmlButton); + menu.add(jsButton); + menu.add(cdialectButton); + menu.add(perlButton); + menu.add(pythonButton); + + // Configure and fill radio group + var langGroup = new qx.ui.form.RadioGroup; + langGroup.add(htmlButton, xmlButton, jsButton, perlButton, pythonButton); + langGroup.add.apply(langGroup, cdialectButton.getMenu().getChildren()); + + return menu; + }, + + getSyntaxCMenu : function() + { + var menu = new qx.ui.menu.Menu; + + var cButton = new qx.ui.menu.RadioButton("C"); + var csharpButton = new qx.ui.menu.RadioButton("C Sharp"); + var objcButton = new qx.ui.menu.RadioButton("Objective C"); + var cplusButton = new qx.ui.menu.RadioButton("C Plus Plus"); + + menu.add(cButton); + menu.add(csharpButton); + menu.add(objcButton); + menu.add(cplusButton); + + return menu; + }, + + getBackMenu : function() + { + var menu = new qx.ui.menu.Menu; + + var button1 = new qx.ui.menu.Button("Line 313"); + var button2 = new qx.ui.menu.Button("Line 1039"); + var button3 = new qx.ui.menu.Button("Line 12"); + var button4 = new qx.ui.menu.Button("Line 26"); + + menu.add(button1); + menu.add(button2); + menu.add(button3); + menu.add(button4); + + return menu; + } + + } +}); \ No newline at end of file Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/DarkTheme.js =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/DarkTheme.js 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/DarkTheme.js 2011-12-22 17:03:59 UTC (rev 21659) @@ -19,7 +19,7 @@ color : darktheme.theme.Color, decoration : darktheme.theme.Decoration, font : darktheme.theme.Font, - icon : qx.theme.icon.Oxygen, + icon : qx.theme.icon.Tango, appearance : darktheme.theme.Appearance } }); \ No newline at end of file Modified: trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Appearance.js =================================================================== --- trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Appearance.js 2011-12-18 16:37:12 UTC (rev 21658) +++ trunk/qooxdoo-contrib/DarkTheme/trunk/source/class/darktheme/theme/Appearance.js 2011-12-22 17:03:59 UTC (rev 21659) @@ -155,41 +155,95 @@ --------------------------------------------------------------------------- */ - "checkbox": - { - alias : "atom", + // "checkbox": + // { + // alias : "atom", - style : function(states) - { + // style : function(states) + // { // "disabled" state is not handled here with purpose. The image widget // does handle this already by replacing the current image with a // disabled version (if available). If no disabled image is found the // opacity style is used. + // var icon; + // if (states.checked && states.focused) { + // icon = "checkbox-checked-focused"; + // } else if (states.checked && states.disabled) { + // icon = "checkbox-checked-disabled"; + // } else if (states.checked && states.pressed) { + // icon = "checkbox-checked-pressed"; + // } else if (states.checked && states.hovered) { + // icon = "checkbox-checked-hovered"; + // } else if (states.checked) { + // icon = "checkbox-checked"; + // } else if (states.focused) { + // icon = "checkbox-focused"; + // } else if (states.pressed) { + // icon = "checkbox-pressed"; + // } else if (states.hovered) { + // icon = "checkbox-hovered"; + // } else { + // icon = "checkbox"; + // } + + // var invalid = states.invalid && !states.disabled ? "-invalid" : ""; + + // return { + // icon: "decoration/form/" + icon + invalid + ".png", + // gap: 6 + // }; + // } + // }, + + "checkbox": + { + alias: "atom", + + style: function(states) + { var icon; - if (states.checked && states.focused) { - icon = "checkbox-checked-focused"; - } else if (states.checked && states.disabled) { - icon = "checkbox-checked-disabled"; - } else if (states.checked && states.pressed) { - icon = "checkbox-checked-pressed"; - } else if (states.checked && states.hovered) { - icon = "checkbox-checked-hovered"; - } else if (states.checked) { - icon = "checkbox-checked"; - } else if (states.focused) { - icon = "checkbox-focused"; - } else if (states.pressed) { - icon = "checkbox-pressed"; - } else if (states.hovered) { - icon = "checkbox-hovered"; - } else { - icon = "checkbox"; + + // Checked + if (states.checked) { + if (states.disabled) { + icon = "checkbox-checked"; + } else if (states.focused) { + icon = states.hovered ? "checkbox-checked-hovered-focused" : "checkbox-checked-focused"; + } else if (states.hovered) { + icon = "checkbox-checked-hovered"; + } else { + icon = "checkbox-checked"; + } + + // Undetermined + } else if (states.undetermined) { + if (states.disabled) { + icon = "checkbox-undetermined"; + } else if (states.focused) { + icon = "checkbox-undetermined-focused"; + } else if (states.hovered) { + icon = "checkbox-undetermined-hovered"; + } else { + icon = "checkbox-undetermined"; + } + + // Focused & Hovered (when enabled) + } else if (!states.disabled) { + if (states.focused) { + icon = states.hovered ? "checkbox-hovered-focused" : "checkbox-focused"; + } else if (states.hovered ) { + icon = "checkbox-hovered"; + } } + // Unchecked + icon = icon || "checkbox"; + var invalid = states.invalid && !states.disabled ? "-invalid" : ""; + icon = "decoration/form/" + icon + invalid + ".png"; return { - icon: "decoration/form/" + icon + invalid + ".png", + icon: icon, gap: 6 }; } @@ -735,7 +789,7 @@ style : function(states) { return { - padding : [1, 0, 1, 4], + padding : [1, 0, 3, 4], textColor : states.invalid ? "invalid" : "text-title", font : "bold" }; @@ -1635,7 +1689,7 @@ } }, - "table-scroller" : "widget", + "table-scroller": "widget", "table-scroller/scrollbar-x": "scrollbar", "table-scroller/scrollbar-y": "scrollb... [truncated message content] |
From: <san...@us...> - 2011-12-18 16:37:19
|
Revision: 21658 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21658&view=rev Author: sandersson Date: 2011-12-18 16:37:12 +0000 (Sun, 18 Dec 2011) Log Message: ----------- Modified Paths: -------------- trunk/qooxdoo-contrib/qooxdoo-titanium/README.txt Removed Paths: ------------- trunk/qooxdoo-contrib/qooxdoo-titanium/trunk/ Modified: trunk/qooxdoo-contrib/qooxdoo-titanium/README.txt =================================================================== --- trunk/qooxdoo-contrib/qooxdoo-titanium/README.txt 2011-12-18 16:33:17 UTC (rev 21657) +++ trunk/qooxdoo-contrib/qooxdoo-titanium/README.txt 2011-12-18 16:37:12 UTC (rev 21658) @@ -10,20 +10,14 @@ The javascript framework following Titanium is very rudimentary and is not as complete as qooxdoo and therefore qooxdoo mechanics have been implemented for Titanium. -Additionally, qooxdoo mobile is only a desktop mobile framework and therefor hardware +Additionally, qooxdoo mobile is only a desktop mobile framework and therefore hardware native functions can not be called other than supported by CSS. Please follow the instructions below to manage setting up qooxdoo-titanium. +qooxdoo-titanium resides in github now. -==== Windows ==== +branch: master (trunk) +git clone -b master gi...@gi...:stefanand/qooxdoo-titanium.git - -==== Linux ==== - - -==== Mac ==== - -Link handling should be equivalent to Linux. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <san...@us...> - 2011-12-18 16:33:23
|
Revision: 21657 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21657&view=rev Author: sandersson Date: 2011-12-18 16:33:17 +0000 (Sun, 18 Dec 2011) Log Message: ----------- Added Paths: ----------- trunk/qooxdoo-contrib/qooxdoo-rtl/README.txt Added: trunk/qooxdoo-contrib/qooxdoo-rtl/README.txt =================================================================== --- trunk/qooxdoo-contrib/qooxdoo-rtl/README.txt (rev 0) +++ trunk/qooxdoo-contrib/qooxdoo-rtl/README.txt 2011-12-18 16:33:17 UTC (rev 21657) @@ -0,0 +1,14 @@ +===== qooxdoo-rtl ===== + +<note> +qooxodoo-rtl is developed against trunk and will be locked to different qooxdoo versions. +Regularly updates will be commited. +</note> + +qooxdoo-rtl is a fork of qooxdoo implementing rtl language support and it resides in github now. + +Please follow the instructions below to manage setting up qooxdoo-rtl. + +branch: master (trunk) + +git clone -b master gi...@gi...:stefanand/qooxdoo-rtl.git This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <san...@us...> - 2011-12-18 16:32:25
|
Revision: 21656 http://qooxdoo-contrib.svn.sourceforge.net/qooxdoo-contrib/?rev=21656&view=rev Author: sandersson Date: 2011-12-18 16:32:19 +0000 (Sun, 18 Dec 2011) Log Message: ----------- Removed Paths: ------------- trunk/qooxdoo-contrib/qooxdoo-rtl/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |