Update of /cvsroot/qooxdoo/qooxdoo/source/script/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22549/source/script/widgets Modified Files: Tag: renderer QxAtom.js QxBarView.js QxBarViewBar.js QxBarViewButton.js QxBarViewPage.js QxBarViewPane.js QxBoxLayout.js QxButton.js QxClientDocument.js QxComboBox.js QxCommonView.js QxCommonViewButton.js QxCommonViewPage.js QxFieldSet.js QxHorizontalSpacer.js QxIframe.js QxImage.js QxInline.js QxLabel.js QxLabelCore.js QxList.js QxListItem.js QxListView.js QxListViewContentCellHtml.js QxListViewContentCellIconHtml.js QxListViewContentCellImage.js QxListViewContentCellLink.js QxListViewContentCellText.js QxListViewHeader.js QxListViewHeaderCell.js QxListViewHeaderSeparator.js QxListViewPane.js QxMenu.js QxMenuButton.js QxMenuCheckBox.js QxMenuLayout.js QxMenuRadioButton.js QxMenuSeparator.js QxPopup.js QxTabView.js QxTabViewBar.js QxTabViewButton.js QxTabViewPage.js QxTabViewPane.js QxTextArea.js QxTextField.js QxToolBar.js QxToolBarButton.js QxToolBarPart.js QxToolBarPartHandle.js QxToolBarSeparator.js QxToolTip.js QxTree.js QxTreeElement.js QxTreeFile.js QxTreeFolder.js QxVerticalSpacer.js QxWindow.js Log Message: Added support for new appearance layer Index: QxListViewHeader.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewHeader.js,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** QxListViewHeader.js 19 Dec 2005 15:23:07 -0000 1.1.2.13 --- QxListViewHeader.js 13 Jan 2006 10:50:26 -0000 1.1.2.14 *************** *** 77,81 **** QxListViewHeader.extend(QxHorizontalBoxLayout, "QxListViewHeader"); ! --- 77,81 ---- QxListViewHeader.extend(QxHorizontalBoxLayout, "QxListViewHeader"); ! QxListViewHeader.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-header" }); *************** *** 115,146 **** - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - QxListViewHeader.BOTTOM_BORDER = new QxBorder; - QxListViewHeader.BOTTOM_BORDER.setBottom(1, "solid", "#e2e2e2"); - - proto._applyInitialStyle = function() - { - this.setWidth(null); - this.setHeight(QxConst.CORE_AUTO); - this.setBorder(QxListViewHeader.BOTTOM_BORDER); - this.setBackgroundColor("#f2f2f2"); - this.setOverflow(QxConst.OVERFLOW_VALUE_HIDDEN); - - // This fixes the innerWidth calculation difference between the grid(pane) - // and the head. - this.setPaddingRight(QxWidget.SCROLLBAR_SIZE); - }; - - - - - - /* ------------------------------------------------------------------------------------ --- 115,118 ---- Index: QxBarViewBar.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxBarViewBar.js,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** QxBarViewBar.js 31 Oct 2005 18:28:06 -0000 1.1.2.2 --- QxBarViewBar.js 13 Jan 2006 10:50:26 -0000 1.1.2.3 *************** *** 36,112 **** QxBarViewBar.extend(QxCommonViewBar, "QxBarViewBar"); ! ! ! ! ! /* ! ------------------------------------------------------------------------------------ ! STYLES & BEHAVIOR ! ------------------------------------------------------------------------------------ ! */ ! ! QxBarViewBar.BACKGROUND_COLOR = new QxColorObject("#E1EEFF"); ! ! QxBarViewBar.BORDER_COLOR = new QxColorObject("threedshadow"); ! ! QxBarViewBar.BORDER_TOP = new QxBorderObject; ! QxBarViewBar.BORDER_TOP.setBottom(1, QxConst.BORDER_STYLE_SOLID, QxBarViewBar.BORDER_COLOR); ! ! QxBarViewBar.BORDER_BOTTOM = new QxBorderObject; ! QxBarViewBar.BORDER_BOTTOM.setTop(1, QxConst.BORDER_STYLE_SOLID, QxBarViewBar.BORDER_COLOR); ! ! QxBarViewBar.BORDER_LEFT = new QxBorderObject; ! QxBarViewBar.BORDER_LEFT.setRight(1, QxConst.BORDER_STYLE_SOLID, QxBarViewBar.BORDER_COLOR); ! ! QxBarViewBar.BORDER_RIGHT = new QxBorderObject; ! QxBarViewBar.BORDER_RIGHT.setLeft(1, QxConst.BORDER_STYLE_SOLID, QxBarViewBar.BORDER_COLOR); ! ! proto._applyInitialStyle = function() ! { ! this.setBackgroundColor(QxBarViewBar.BACKGROUND_COLOR); ! }; ! ! proto._applyStateStyleDesign = function(vStates) ! { ! var vBarPosition = this.getParent().getBarPosition(); ! ! switch(vBarPosition) ! { ! case QxConst.ALIGN_TOP: ! this.setPadding(1, 0); ! this.setBorder(QxBarViewBar.BORDER_TOP); ! this.setHeight(QxConst.CORE_AUTO); ! this.setWidth(null); ! this.setOrientation(QxConst.ORIENTATION_HORIZONTAL); ! break; ! ! case QxConst.ALIGN_BOTTOM: ! this.setPadding(1, 0); ! this.setBorder(QxBarViewBar.BORDER_BOTTOM); ! this.setHeight(QxConst.CORE_AUTO); ! this.setWidth(null); ! this.setOrientation(QxConst.ORIENTATION_HORIZONTAL); ! break; ! ! case QxConst.ALIGN_LEFT: ! this.setPadding(0, 1); ! this.setBorder(QxBarViewBar.BORDER_LEFT); ! this.setWidth(QxConst.CORE_AUTO); ! this.setHeight(null); ! this.setOrientation(QxConst.ORIENTATION_VERTICAL); ! break; ! ! case QxConst.ALIGN_RIGHT: ! this.setPadding(0, 1); ! this.setBorder(QxBarViewBar.BORDER_RIGHT); ! this.setWidth(QxConst.CORE_AUTO); ! this.setHeight(null); ! this.setOrientation(QxConst.ORIENTATION_VERTICAL); ! break; ! }; ! }; ! ! ! --- 36,40 ---- QxBarViewBar.extend(QxCommonViewBar, "QxBarViewBar"); ! QxBarViewBar.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "bar-view-bar" }); Index: QxMenuButton.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxMenuButton.js,v retrieving revision 1.14.2.30 retrieving revision 1.14.2.31 diff -C2 -d -r1.14.2.30 -r1.14.2.31 *** QxMenuButton.js 18 Nov 2005 15:58:09 -0000 1.14.2.30 --- QxMenuButton.js 13 Jan 2006 10:50:26 -0000 1.14.2.31 *************** *** 36,52 **** // *********************************************************************** - // STYLE - // *********************************************************************** - - this.setWidth(null); - this.setMinWidth(QxConst.CORE_AUTO); - this.setSpacing(2); - this.setPadding(2, 4); - this.setCursor(QxConst.CORE_DEFAULT); - this.setVerticalChildrenAlign(QxConst.ALIGN_MIDDLE); - this.setAllowStretchX(true); - - - // *********************************************************************** // LAYOUT // *********************************************************************** --- 36,39 ---- *************** *** 63,67 **** so.setSelectable(false); ! var ao = this._arrowObject = new QxImage(QxMenuButton.ARROW_IMG); ao.setAnonymous(true); --- 50,54 ---- so.setSelectable(false); ! var ao = this._arrowObject = new QxImage("widgets/arrows/next.gif"); ao.setAnonymous(true); *************** *** 94,97 **** --- 81,86 ---- */ + QxMenuButton.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "menu-button" }); + QxMenuButton.addProperty({ name : "icon", type : QxConst.TYPEOF_STRING }); QxMenuButton.addProperty({ name : "label", type : QxConst.TYPEOF_STRING }); *************** *** 316,345 **** /* ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - QxMenuButton.BGCOLOR_OVER = new QxColorObject("highlight"); - QxMenuButton.BGCOLOR_OUT = null; - - QxMenuButton.COLOR_OVER = new QxColorObject("highlighttext"); - QxMenuButton.COLOR_OUT = null; - - QxMenuButton.ARROW_IMG = "widgets/arrows/next.gif"; - - proto._applyStateStyleDesign = function(vStates) - { - this.setBackgroundColor(vStates.over ? QxMenuButton.BGCOLOR_OVER : QxMenuButton.BGCOLOR_OUT); - this.setColor(vStates.over ? QxMenuButton.COLOR_OVER : QxMenuButton.COLOR_OUT); - }; - - - - - - - - /* - ------------------------------------------------------------------------------------ DISPOSER ------------------------------------------------------------------------------------ --- 305,308 ---- Index: QxListViewContentCellImage.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewContentCellImage.js,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** QxListViewContentCellImage.js 20 Dec 2005 08:17:05 -0000 1.1.2.8 --- QxListViewContentCellImage.js 13 Jan 2006 10:50:26 -0000 1.1.2.9 *************** *** 36,39 **** --- 36,41 ---- QxListViewContentCellImage.extend(QxImage, "QxListViewContentCellImage"); + QxListViewContentCellImage.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-content-cell-image" }); + QxListViewContentCellImage.empty = { source : QxImageManager.getBlank() *************** *** 44,62 **** /* ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() { - this.setPadding(0, 6); - }; - - - - - - - /* - ------------------------------------------------------------------------------------ CUSTOM SETTER ------------------------------------------------------------------------------------ --- 46,49 ---- Index: QxListViewContentCellText.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewContentCellText.js,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** QxListViewContentCellText.js 12 Dec 2005 15:15:33 -0000 1.1.2.9 --- QxListViewContentCellText.js 13 Jan 2006 10:50:26 -0000 1.1.2.10 *************** *** 30,61 **** **************************************************************************** */ ! function QxListViewContentCellText(vText) { QxText.call(this, vText); }; QxListViewContentCellText.extend(QxText, "QxListViewContentCellText"); QxListViewContentCellText.empty = { text : QxConst.CORE_EMPTY }; - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialHtml = function() - { - this.setSelectable(false); - }; - - proto._applyInitialStyle = function() - { - this.setStyleProperty(QxConst.PROPERTY_PADDING, "0 6px"); - this.setStyleProperty(QxConst.PROPERTY_WHITESPACE, "nowrap"); - this.setStyleProperty(QxConst.PROPERTY_OVERFLOW_BOTH, QxConst.OVERFLOW_VALUE_HIDDEN); - this.setStyleProperty(QxConst.PROPERTY_OVERFLOW_TEXT, QxConst.OVERFLOW_VALUE_ELLIPSIS); - }; --- 30,45 ---- **************************************************************************** */ ! function QxListViewContentCellText(vText) ! { QxText.call(this, vText); + + this.setSelectable(false); }; QxListViewContentCellText.extend(QxText, "QxListViewContentCellText"); + QxListViewContentCellText.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-content-cell-text" }); + QxListViewContentCellText.empty = { text : QxConst.CORE_EMPTY }; Index: QxListViewContentCellLink.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewContentCellLink.js,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** QxListViewContentCellLink.js 12 Dec 2005 15:15:33 -0000 1.1.2.5 --- QxListViewContentCellLink.js 13 Jan 2006 10:50:26 -0000 1.1.2.6 *************** *** 30,39 **** **************************************************************************** */ ! function QxListViewContentCellLink(vHtml) { QxLink.call(this, vHtml); }; QxListViewContentCellLink.extend(QxLink, "QxListViewContentCellLink"); QxListViewContentCellLink.empty = { --- 30,45 ---- **************************************************************************** */ ! function QxListViewContentCellLink(vHtml) ! { QxLink.call(this, vHtml); + + // selectable = false will break links in gecko based browsers + this.setSelectable(true); }; QxListViewContentCellLink.extend(QxLink, "QxListViewContentCellLink"); + QxListViewContentCellLink.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-content-cell-link" }); + QxListViewContentCellLink.empty = { *************** *** 41,52 **** uri : QxConst.CORE_HASH }; - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - // setSelectable = false will break links in gecko based browsers - proto._applyInitialHtml = QxUtil.returnTrue; --- 47,48 ---- Index: QxFieldSet.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxFieldSet.js,v retrieving revision 1.3.2.18 retrieving revision 1.3.2.19 diff -C2 -d -r1.3.2.18 -r1.3.2.19 *** QxFieldSet.js 8 Nov 2005 11:04:49 -0000 1.3.2.18 --- QxFieldSet.js 13 Jan 2006 10:50:26 -0000 1.3.2.19 *************** *** 27,30 **** --- 27,31 ---- #package(form) + #require(QxAtom) **************************************************************************** */ Index: QxBarView.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxBarView.js,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** QxBarView.js 19 Dec 2005 12:34:59 -0000 1.1.2.3 --- QxBarView.js 13 Jan 2006 10:50:26 -0000 1.1.2.4 *************** *** 51,54 **** --- 51,55 ---- QxBarView.addProperty({ name : "barPosition", type : QxConst.TYPEOF_STRING, defaultValue : QxConst.ALIGN_TOP, possibleValues : [ QxConst.ALIGN_TOP, QxConst.ALIGN_RIGHT, QxConst.ALIGN_BOTTOM, QxConst.ALIGN_LEFT ] }); + QxBarView.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "bar-view" }); *************** *** 98,118 **** return true; }; - - - - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - QxBarView.BACKGROUND_COLOR = new QxColorObject("#FAFBFE"); - - proto._applyInitialStyle = function() - { - this.setBackgroundColor(QxBarView.BACKGROUND_COLOR); - this.setBorder(QxBorderObject.presets.shadow); - }; --- 99,100 ---- Index: QxTextField.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTextField.js,v retrieving revision 1.5.2.38 retrieving revision 1.5.2.39 diff -C2 -d -r1.5.2.38 -r1.5.2.39 *** QxTextField.js 6 Jan 2006 10:33:29 -0000 1.5.2.38 --- QxTextField.js 13 Jan 2006 10:50:26 -0000 1.5.2.39 *************** *** 43,47 **** // *********************************************************************** ! // HTML // *********************************************************************** this.setTagName("INPUT"); --- 43,47 ---- // *********************************************************************** ! // BEHAVIOR // *********************************************************************** this.setTagName("INPUT"); *************** *** 50,62 **** this.setTabIndex(1); this.setSelectable(true); - this.setHideFocus(true); - - - // *********************************************************************** - // STYLING - // *********************************************************************** - this.setBorder(QxBorderObject.presets.thinInset); - this.setPadding(2, 4); - this.setStyleProperty("fontSize", "11px"); --- 50,53 ---- *************** *** 81,84 **** --- 72,78 ---- */ + + QxTextField.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "text-field" }); + QxTextField.addProperty({ name : "value", type : QxConst.TYPEOF_STRING, defaultValue : QxConst.CORE_EMPTY }); QxTextField.addProperty({ name : "maxLength", type : QxConst.TYPEOF_NUMBER }); Index: QxTabView.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxTabView.js,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** QxTabView.js 19 Dec 2005 12:34:59 -0000 1.1.2.4 --- QxTabView.js 13 Jan 2006 10:50:26 -0000 1.1.2.5 *************** *** 46,49 **** --- 46,51 ---- */ + QxTabView.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "tab-view" }); + QxTabView.addProperty({ name : "alignTabsToLeft", type : QxConst.TYPEOF_BOOLEAN, defaultValue : true }); QxTabView.addProperty({ name : "placeBarOnTop", type : QxConst.TYPEOF_BOOLEAN, defaultValue : true }); *************** *** 91,107 **** return true; }; - - - - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() { - this.setSpacing(-1); - }; --- 93,94 ---- Index: QxListViewHeaderSeparator.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewHeaderSeparator.js,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** QxListViewHeaderSeparator.js 12 Dec 2005 15:15:33 -0000 1.1.2.6 --- QxListViewHeaderSeparator.js 13 Jan 2006 10:50:26 -0000 1.1.2.7 *************** *** 36,53 **** QxListViewHeaderSeparator.extend(QxTerminator, "QxListViewHeaderSeparator"); ! ! ! ! /* ! ------------------------------------------------------------------------------------ ! STYLES & BEHAVIOR ! ------------------------------------------------------------------------------------ ! */ ! ! proto._applyInitialStyle = function() ! { ! this.setBackgroundColor("#D6D5D9"); ! this.setWidth(1); ! this.setMarginTop(1); ! this.setMarginBottom(1); ! }; --- 36,38 ---- QxListViewHeaderSeparator.extend(QxTerminator, "QxListViewHeaderSeparator"); ! QxListViewHeaderSeparator.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-header-separator" }); Index: QxTreeFile.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTreeFile.js,v retrieving revision 1.3.2.25 retrieving revision 1.3.2.26 diff -C2 -d -r1.3.2.25 -r1.3.2.26 *** QxTreeFile.js 19 Dec 2005 14:29:20 -0000 1.3.2.25 --- QxTreeFile.js 13 Jan 2006 10:50:26 -0000 1.3.2.26 *************** *** 40,64 **** - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - QxTreeFile.IMG_URI = "icons/16/file-new.png"; - - proto._applyInitialStyle = function() - { - this._iconObject.setSource(QxTreeFile.IMG_URI); - - QxTreeElement.prototype._applyInitialStyle.call(this); - }; - - - - - - /* ------------------------------------------------------------------------------------ --- 40,43 ---- *************** *** 90,92 **** proto.getItems = function() { return [this]; ! }; \ No newline at end of file --- 69,71 ---- proto.getItems = function() { return [this]; ! }; Index: QxTree.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTree.js,v retrieving revision 1.2.2.31 retrieving revision 1.2.2.32 diff -C2 -d -r1.2.2.31 -r1.2.2.32 *** QxTree.js 19 Dec 2005 14:29:20 -0000 1.2.2.31 --- QxTree.js 13 Jan 2006 10:50:26 -0000 1.2.2.32 *************** *** 40,43 **** --- 40,47 ---- + this._iconObject.setAppearance("tree-icon"); + this._labelObject.setAppearance("tree-label"); + + // *********************************************************************** // DEFAULT STATE *************** *** 321,329 **** var vNewItem = this.getManager().getSelectedItem(); ! vOldItem.setSelectedState(vStates[1]); ! vOldItem.setSelectedState(vStates[0]); ! ! vNewItem.setSelectedState(vStates[0]); ! vNewItem.setSelectedState(vStates[1]); delete this._fastUpdate; --- 325,330 ---- var vNewItem = this.getManager().getSelectedItem(); ! //vOldItem.getIconObject().setSelectedState(vStates[0]); ! vNewItem.getIconObject().setSelectedState(vStates[1]); delete this._fastUpdate; *************** *** 358,360 **** vManager.setSelectedItem(vElement); vManager.setLeadItem(vElement); ! }; \ No newline at end of file --- 359,361 ---- vManager.setSelectedItem(vElement); vManager.setLeadItem(vElement); ! }; Index: QxTabViewButton.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxTabViewButton.js,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** QxTabViewButton.js 31 Oct 2005 19:14:19 -0000 1.1.2.3 --- QxTabViewButton.js 13 Jan 2006 10:50:26 -0000 1.1.2.4 *************** *** 30,35 **** **************************************************************************** */ ! function QxTabViewButton(vText, vIcon, vIconWidth, vIconHeight, vFlash) ! { QxCommonViewButton.call(this, vText, vIcon, vIconWidth, vIconHeight, vFlash); }; --- 30,34 ---- **************************************************************************** */ ! function QxTabViewButton(vText, vIcon, vIconWidth, vIconHeight, vFlash) { QxCommonViewButton.call(this, vText, vIcon, vIconWidth, vIconHeight, vFlash); }; *************** *** 37,130 **** QxTabViewButton.extend(QxCommonViewButton, "QxTabViewButton"); ! ! ! ! ! ! /* ! ------------------------------------------------------------------------------------ ! STYLES & BEHAVIOR ! ------------------------------------------------------------------------------------ ! */ ! ! QxTabViewButton.BGCOLOR_NORMAL = new QxColorObject("#E1EEFF"); ! QxTabViewButton.BGCOLOR_CHECKED = new QxColorObject("#FAFBFE"); ! ! QxTabViewButton.BORDER_TOP_NORMAL = new QxBorder(1, QxConst.BORDER_STYLE_SOLID, QxTabViewPane.BORDER_COLOR); ! QxTabViewButton.BORDER_TOP_NORMAL.setBottomWidth(0); ! ! QxTabViewButton.BORDER_TOP_CHECKED = new QxBorder(1, QxConst.BORDER_STYLE_SOLID, QxTabViewPane.BORDER_COLOR); ! QxTabViewButton.BORDER_TOP_CHECKED.setBottomWidth(0); ! QxTabViewButton.BORDER_TOP_CHECKED.setTop(3, QxConst.BORDER_STYLE_SOLID, "#FEC83C"); ! ! QxTabViewButton.BORDER_BOTTOM_NORMAL = new QxBorder(1, QxConst.BORDER_STYLE_SOLID, QxTabViewPane.BORDER_COLOR); ! QxTabViewButton.BORDER_BOTTOM_NORMAL.setTopWidth(0); ! ! QxTabViewButton.BORDER_BOTTOM_CHECKED = new QxBorder(1, QxConst.BORDER_STYLE_SOLID, QxTabViewPane.BORDER_COLOR); ! QxTabViewButton.BORDER_BOTTOM_CHECKED.setTopWidth(0); ! QxTabViewButton.BORDER_BOTTOM_CHECKED.setBottom(3, QxConst.BORDER_STYLE_SOLID, "#FEC83C"); ! ! proto._applyStateStyleDesign = function(vStates) ! { ! var vFrame = this.getView(); ! var vAlignLeft = vFrame.getAlignTabsToLeft(); ! var vBarTop = vFrame.getPlaceBarOnTop(); ! ! if (vStates.checked) ! { ! this.setBackgroundColor(QxTabViewButton.BGCOLOR_CHECKED); ! this.setZIndex(1); ! this.setPadding(3, 8); ! this.setBorder(vBarTop ? QxTabViewButton.BORDER_TOP_CHECKED : QxTabViewButton.BORDER_BOTTOM_CHECKED); ! this.setMarginTop(0); ! this.setMarginBottom(0); ! ! if (vAlignLeft) ! { ! this.setMarginLeft(this.getParent().getFirstVisibleChild() == this ? 0 : -3); ! this.setMarginRight(-3); ! } ! else ! { ! this.setMarginLeft(-3); ! this.setMarginRight(this.getParent().getLastVisibleChild() == this ? 0 : -3); ! }; ! } ! else ! { ! this.setBackgroundColor(vStates.over ? QxTabViewButton.BGCOLOR_CHECKED : QxTabViewButton.BGCOLOR_NORMAL); ! this.setZIndex(0); ! this.setPadding(2, 6); ! ! if (vAlignLeft) ! { ! this.setMarginRight(1); ! this.setMarginLeft(0); ! } ! else ! { ! this.setMarginRight(0); ! this.setMarginLeft(1); ! }; ! ! if (vBarTop) ! { ! this.setBorder(QxTabViewButton.BORDER_TOP_NORMAL); ! this.setMarginTop(3); ! this.setMarginBottom(1); ! } ! else ! { ! this.setBorder(QxTabViewButton.BORDER_BOTTOM_NORMAL); ! this.setMarginTop(1); ! this.setMarginBottom(3); ! }; ! }; ! }; ! ! proto._applyInitialHtml = function() { ! this.setTabIndex(1); ! }; ! --- 36,40 ---- QxTabViewButton.extend(QxCommonViewButton, "QxTabViewButton"); ! QxTabViewButton.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "tab-view-button" }); Index: QxMenuLayout.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxMenuLayout.js,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** QxMenuLayout.js 28 Oct 2005 20:39:38 -0000 1.1.2.3 --- QxMenuLayout.js 13 Jan 2006 10:50:26 -0000 1.1.2.4 *************** *** 33,38 **** A small helper class to create a special layout handler for QxMenus */ ! function QxMenuLayout() { QxVerticalBoxLayout.call(this); }; --- 33,41 ---- A small helper class to create a special layout handler for QxMenus */ ! function QxMenuLayout() ! { QxVerticalBoxLayout.call(this); + + this.setAnonymous(true); }; *************** *** 40,43 **** --- 43,51 ---- + /*! + Appearance of the widget + */ + QxMenuLayout.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "menu-layout" }); + Index: QxToolBarPart.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarPart.js,v retrieving revision 1.2.2.19 retrieving revision 1.2.2.20 diff -C2 -d -r1.2.2.19 -r1.2.2.20 *** QxToolBarPart.js 19 Dec 2005 12:34:59 -0000 1.2.2.19 --- QxToolBarPart.js 13 Jan 2006 10:50:26 -0000 1.2.2.20 *************** *** 40,58 **** QxToolBarPart.extend(QxHorizontalBoxLayout, "QxToolBarPart"); ! ! ! ! ! ! /* ! ------------------------------------------------------------------------------------ ! STYLES & BEHAVIOR ! ------------------------------------------------------------------------------------ ! */ ! ! proto._applyInitialStyle = function() { ! this.setWidth(QxConst.CORE_AUTO); ! }; ! --- 40,44 ---- QxToolBarPart.extend(QxHorizontalBoxLayout, "QxToolBarPart"); ! QxToolBarPart.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "toolbar-part" }); *************** *** 82,85 **** --- 68,72 ---- + /* ------------------------------------------------------------------------------------ *************** *** 94,99 **** }; - QxHorizontalBoxLayout.prototype.dispose.call(this); - if (this._handle) { --- 81,84 ---- *************** *** 102,105 **** }; ! return true; }; --- 87,90 ---- }; ! return QxHorizontalBoxLayout.prototype.dispose.call(this); }; Index: QxTextArea.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTextArea.js,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** QxTextArea.js 19 Dec 2005 15:23:07 -0000 1.1.2.15 --- QxTextArea.js 13 Jan 2006 10:50:26 -0000 1.1.2.16 *************** *** 34,48 **** QxTextField.call(this, sText); - this.setOverflow(QxConst.CORE_AUTO); - - this.removeHtmlProperty("type"); - - this.setHeight(50); this.setTagName("textarea"); ! this.setSelectable(true); }; QxTextArea.extend(QxTextField, "QxTextArea"); QxTextArea.addProperty({ name : "wrap", type : QxConst.TYPEOF_BOOLEAN }); --- 34,45 ---- QxTextField.call(this, sText); this.setTagName("textarea"); ! this.removeHtmlProperty("type"); }; QxTextArea.extend(QxTextField, "QxTextArea"); + QxTextArea.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "text-area" }); + QxTextArea.addProperty({ name : "wrap", type : QxConst.TYPEOF_BOOLEAN }); Index: QxToolBarSeparator.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarSeparator.js,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** QxToolBarSeparator.js 29 Oct 2005 21:33:00 -0000 1.1.2.16 --- QxToolBarSeparator.js 13 Jan 2006 10:50:26 -0000 1.1.2.17 *************** *** 32,73 **** function QxToolBarSeparator() { - this._line = new QxTerminator; - QxCanvasLayout.call(this); ! this.add(this._line); }; QxToolBarSeparator.extend(QxCanvasLayout, "QxToolBarSeparator"); ! QxToolBarSeparator.init = function() ! { ! var b = QxToolBarSeparator.BORDER = new QxBorder; ! ! b.setLeftColor("ThreeDShadow"); ! b.setRightColor("ThreeDHighlight"); ! ! b.setLeftStyle(QxConst.BORDER_STYLE_SOLID); ! b.setRightStyle(QxConst.BORDER_STYLE_SOLID); ! ! b.setLeftWidth(1); ! b.setRightWidth(1); ! b.setTopWidth(0); ! b.setBottomWidth(0); ! }; ! ! QxToolBarSeparator.init(); ! ! proto._applyInitialStyle = function() ! { ! this.setWidth(8); ! ! var l = this._line; ! ! l.setTop(2); ! l.setLeft(3); ! l.setWidth(2); ! l.setBottom(2); ! ! l.setBorder(QxToolBarSeparator.BORDER); ! }; --- 32,43 ---- function QxToolBarSeparator() { QxCanvasLayout.call(this); ! var l = new QxTerminator; ! l.setAppearance("toolbar-separator-line"); ! this.add(l); }; QxToolBarSeparator.extend(QxCanvasLayout, "QxToolBarSeparator"); ! QxToolBarSeparator.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "toolbar-separator" }); Index: QxListViewContentCellIconHtml.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewContentCellIconHtml.js,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** QxListViewContentCellIconHtml.js 12 Dec 2005 15:15:32 -0000 1.1.2.2 --- QxListViewContentCellIconHtml.js 13 Jan 2006 10:50:26 -0000 1.1.2.3 *************** *** 30,39 **** **************************************************************************** */ ! function QxListViewContentCellIconHtml(vHtml, vIcon, vIconWidth, vIconHeight) { QxIconHtml.call(this, vHtml, vIcon, vIconWidth, vIconHeight); }; QxListViewContentCellIconHtml.extend(QxIconHtml, "QxListViewContentCellIconHtml"); QxListViewContentCellIconHtml.empty = { --- 30,44 ---- **************************************************************************** */ ! function QxListViewContentCellIconHtml(vHtml, vIcon, vIconWidth, vIconHeight) ! { QxIconHtml.call(this, vHtml, vIcon, vIconWidth, vIconHeight); + + this.setSelectable(false); }; QxListViewContentCellIconHtml.extend(QxIconHtml, "QxListViewContentCellIconHtml"); + QxListViewContentCellIconHtml.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "list-view-content-cell-icon-html" }); + QxListViewContentCellIconHtml.empty = { *************** *** 41,67 **** html : QxConst.CORE_HASH }; - - - - - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialHtml = function() - { - this.setSelectable(false); - }; - - proto._applyInitialStyle = function() - { - this.setStyleProperty(QxConst.PROPERTY_PADDING, "0 6px"); - this.setStyleProperty(QxConst.PROPERTY_WHITESPACE, "nowrap"); - this.setStyleProperty(QxConst.PROPERTY_OVERFLOW_BOTH, QxConst.OVERFLOW_VALUE_HIDDEN); - this.setStyleProperty(QxConst.PROPERTY_OVERFLOW_TEXT, QxConst.OVERFLOW_VALUE_ELLIPSIS); - }; --- 46,47 ---- Index: QxLabel.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxLabel.js,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** QxLabel.js 19 Dec 2005 15:23:07 -0000 1.1.2.4 --- QxLabel.js 13 Jan 2006 10:50:26 -0000 1.1.2.5 *************** *** 28,35 **** #package(guicore) #require(QxEmu) **************************************************************************** */ ! function QxLabel(vHtml, vWidth, vHeight, vSelectable, vMnemonic) { QxTerminator.call(this); --- 28,38 ---- #package(guicore) #require(QxEmu) + #require(QxFontObject) + #require(QxFontCache) + #post(QxLabelCore) **************************************************************************** */ ! function QxLabel(vHtml, vMnemonic) { QxTerminator.call(this); *************** *** 44,59 **** }; - if (vSelectable == false) - { - this.setSelectable(false); - this.setCursor(QxConst.CORE_DEFAULT); - }; - // Prohibit stretching through layout handler this.setAllowStretchX(false); this.setAllowStretchY(false); ! ! this.setWidth(QxUtil.isValid(vWidth) ? vWidth : QxConst.CORE_AUTO); ! this.setHeight(QxUtil.isValid(vHeight) ? vHeight : QxConst.CORE_AUTO); }; --- 47,56 ---- }; // Prohibit stretching through layout handler this.setAllowStretchX(false); this.setAllowStretchY(false); ! ! // Auto Sized ! this.auto(); }; *************** *** 186,190 **** proto._modifyFont = function(propValue, propOldValue, propData) { ! this._invalidatePreferredInnerDimensions(); if (propValue) { --- 183,187 ---- proto._modifyFont = function(propValue, propOldValue, propData) { ! this._invalidatePreferredInnerDimensions(); if (propValue) { *************** *** 207,233 **** */ - QxLabel.init = function() - { - QxLabel._measureNodes = {}; - QxLabel.createMeasureNode(QxConst.CORE_DEFAULT); - }; - - QxLabel.createMeasureNode = function(vId) - { - var vNode = QxLabel._measureNodes[vId] = document.createElement(QxConst.CORE_DIV); - var vStyle = vNode.style; - - vStyle.width = vStyle.height = QxConst.CORE_AUTO; - vStyle.visibility = QxConst.CORE_HIDDEN; - vStyle.position = QxConst.CORE_ABSOLUTE; - vStyle.zIndex = "-1"; - - document.body.appendChild(vNode); - }; - - if (typeof window.application != QxConst.TYPEOF_UNDEFINED) { - window.application.addEventListener(QxConst.EVENT_TYPE_PRE, QxLabel.init); - }; - proto._computeObjectNeededDimensions = function() { --- 204,207 ---- *************** *** 245,249 **** // apply html vNode.innerHTML = vHtml; ! // store values this._cachedPreferredInnerWidth = vNode.scrollWidth; --- 219,223 ---- // apply html vNode.innerHTML = vHtml; ! // store values this._cachedPreferredInnerWidth = vNode.scrollWidth; Index: QxVerticalSpacer.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxVerticalSpacer.js,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** QxVerticalSpacer.js 29 Oct 2005 21:33:00 -0000 1.1.2.3 --- QxVerticalSpacer.js 13 Jan 2006 10:50:26 -0000 1.1.2.4 *************** *** 30,48 **** **************************************************************************** */ ! function QxVerticalSpacer() { QxTerminator.call(this); - }; - QxVerticalSpacer.extend(QxTerminator, "QxVerticalSpacer"); - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() { this.setHeight(QxConst.CORE_FLEX); }; --- 30,39 ---- **************************************************************************** */ ! function QxVerticalSpacer() ! { QxTerminator.call(this); this.setHeight(QxConst.CORE_FLEX); }; + + QxVerticalSpacer.extend(QxTerminator, "QxVerticalSpacer"); Index: QxToolBarButton.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarButton.js,v retrieving revision 1.4.2.26 retrieving revision 1.4.2.27 diff -C2 -d -r1.4.2.26 -r1.4.2.27 *** QxToolBarButton.js 19 Dec 2005 12:34:59 -0000 1.4.2.26 --- QxToolBarButton.js 13 Jan 2006 10:50:26 -0000 1.4.2.27 *************** *** 36,122 **** QxToolBarButton.extend(QxButton, "QxToolBarButton"); ! ! ! ! ! /* ! ------------------------------------------------------------------------------------ ! STYLES & BEHAVIOR ! ------------------------------------------------------------------------------------ ! */ ! ! QxToolBarButton.BGCOLOR_DEFAULT = new QxColorObject("buttonface"); ! QxToolBarButton.BGCOLOR_LEFT = new QxColor("#FFF0C9"); ! ! QxToolBarButton.BORDER_PRESSED = QxBorderObject.presets.thinInset; ! QxToolBarButton.BORDER_OVER = QxBorderObject.presets.thinOutset; ! QxToolBarButton.BORDER_DEFAULT = null; ! ! QxToolBarButton.CHECKED_BACKGROUND = "core/dotted_white.gif"; ! ! proto._applyInitialHtml = function() ! { ! QxAtom.prototype._applyInitialHtml.call(this); ! ! this.setSelectable(false); ! this.setTabIndex(-1); ! }; ! ! proto._applyInitialStyle = function() ! { ! this.setCursor(QxConst.CORE_DEFAULT); ! this.setSpacing(4); ! this.setWidth(QxConst.CORE_AUTO); ! this.setVerticalChildrenAlign(QxConst.ALIGN_MIDDLE); ! }; ! ! proto._applyStateStyleDesign = function(vStates) ! { ! var vBackgroundColor, vBackgroundImage, vBorder; ! var vPaddingTop, vPaddingRight, vPaddingBottom, vPaddingLeft; ! ! if (vStates.left) { ! vBackgroundColor = QxToolBarButton.BGCOLOR_LEFT; ! } else { ! vBackgroundColor = QxToolBarButton.BGCOLOR_DEFAULT; ! }; ! ! if (vStates.checked && !vStates.over) { ! vBackgroundImage = QxToolBarButton.CHECKED_BACKGROUND; ! } else { ! vBackgroundImage = null; ! }; ! ! if (vStates.pressed || vStates.checked || vStates.left) { ! vBorder = QxToolBarButton.BORDER_PRESSED; ! } else if (vStates.over) { ! vBorder = QxToolBarButton.BORDER_OVER; ! } else { ! vBorder = QxToolBarButton.BORDER_DEFAULT; ! }; ! ! if (vStates.pressed || vStates.checked || vStates.left) ! { ! vPaddingTop = 3; ! vPaddingRight = 2; ! vPaddingBottom = 1; ! vPaddingLeft = 4; ! } ! else if (vStates.over) ! { ! vPaddingTop = vPaddingBottom = 2; ! vPaddingLeft = vPaddingRight = 3; ! } ! else ! { ! vPaddingTop = vPaddingBottom = 3; ! vPaddingLeft = vPaddingRight = 4; ! }; ! ! this.setBackgroundColor(vBackgroundColor); ! this.setBackgroundImage(vBackgroundImage); ! this.setBorder(vBorder); ! this.setPadding(vPaddingTop, vPaddingRight, vPaddingBottom, vPaddingLeft); ! }; --- 36,40 ---- QxToolBarButton.extend(QxButton, "QxToolBarButton"); ! QxToolBarButton.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "toolbar-button" }); Index: QxMenuRadioButton.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxMenuRadioButton.js,v retrieving revision 1.5.2.11 retrieving revision 1.5.2.12 diff -C2 -d -r1.5.2.11 -r1.5.2.12 *** QxMenuRadioButton.js 31 Oct 2005 15:38:11 -0000 1.5.2.11 --- QxMenuRadioButton.js 13 Jan 2006 10:50:26 -0000 1.5.2.12 *************** *** 31,36 **** **************************************************************************** */ ! function QxMenuRadioButton(vLabel, vCommand, vChecked) { QxMenuCheckBox.call(this, vLabel, vCommand, vChecked); }; --- 31,39 ---- **************************************************************************** */ ! function QxMenuRadioButton(vLabel, vCommand, vChecked) ! { QxMenuCheckBox.call(this, vLabel, vCommand, vChecked); + + this._iconObject.setAppearance("menu-radio-button-icon"); }; *************** *** 44,47 **** --- 47,51 ---- */ + QxMenuRadioButton.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "menu-radio-button" }); /*! *************** *** 54,67 **** - /* - ------------------------------------------------------------------------------------ - ICON HANDLING - ------------------------------------------------------------------------------------ - */ - - proto._source = "widgets/menu/radiobutton.gif"; - - - /* --- 58,61 ---- Index: QxToolBar.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBar.js,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -C2 -d -r1.1.2.20 -r1.1.2.21 *** QxToolBar.js 19 Dec 2005 16:07:39 -0000 1.1.2.20 --- QxToolBar.js 13 Jan 2006 10:50:26 -0000 1.1.2.21 *************** *** 47,66 **** */ ! QxToolBar.addProperty({ name : "openMenu", type : QxConst.TYPEOF_OBJECT, instance : QxMenu }); - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - proto._applyInitialStyle = function() - { - this.setBorder(QxBorderObject.presets.thinOutset); - this.setHeight(QxConst.CORE_AUTO); - }; --- 47,60 ---- */ ! QxToolBar.addProperty({ name : "openMenu", type : QxConst.TYPEOF_OBJECT, instance : "QxMenu" }); + /*! + Appearance of the widget + */ + QxToolBar.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "toolbar" }); Index: QxPopup.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxPopup.js,v retrieving revision 1.3.2.27 retrieving revision 1.3.2.28 diff -C2 -d -r1.3.2.27 -r1.3.2.28 *** QxPopup.js 19 Dec 2005 15:54:09 -0000 1.3.2.27 --- QxPopup.js 13 Jan 2006 10:50:26 -0000 1.3.2.28 *************** *** 30,39 **** **************************************************************************** */ ! function QxPopup() { QxCanvasLayout.call(this); }; QxPopup.extend(QxCanvasLayout, "QxPopup"); /*! Whether to let the system decide when to hide the popup. Setting --- 30,44 ---- **************************************************************************** */ ! function QxPopup() ! { QxCanvasLayout.call(this); + + this.setZIndex(this._minZindex); }; QxPopup.extend(QxCanvasLayout, "QxPopup"); + QxPopup.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "popup" }); + /*! Whether to let the system decide when to hide the popup. Setting *************** *** 62,82 **** /* ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() - { - this.setWidth(QxConst.CORE_AUTO); - this.setHeight(QxConst.CORE_AUTO); - - this.setZIndex(this._minZindex); - }; - - - - - /* - ------------------------------------------------------------------------------------ APPEAR/DISAPPEAR ------------------------------------------------------------------------------------ --- 67,70 ---- Index: QxCommonViewButton.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxCommonViewButton.js,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** QxCommonViewButton.js 31 Oct 2005 20:08:56 -0000 1.1.2.2 --- QxCommonViewButton.js 13 Jan 2006 10:50:26 -0000 1.1.2.3 *************** *** 34,37 **** --- 34,38 ---- QxAtom.call(this, vText, vIcon, vIconWidth, vIconHeight, vFlash); + this.setTabIndex(1); // *********************************************************************** Index: QxCommonViewPage.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxCommonViewPage.js,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** QxCommonViewPage.js 19 Dec 2005 12:34:59 -0000 1.1.2.4 --- QxCommonViewPage.js 13 Jan 2006 10:50:26 -0000 1.1.2.5 *************** *** 34,39 **** QxCanvasLayout.call(this); - this.setEdge(10); - if (QxUtil.isValid(vButton)) { this.setButton(vButton); --- 34,37 ---- Index: QxClientDocument.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxClientDocument.js,v retrieving revision 1.7.2.63 retrieving revision 1.7.2.64 diff -C2 -d -r1.7.2.63 -r1.7.2.64 *** QxClientDocument.js 19 Dec 2005 15:54:09 -0000 1.7.2.63 --- QxClientDocument.js 13 Jan 2006 10:50:26 -0000 1.7.2.64 *************** *** 27,30 **** --- 27,32 ---- #package(guicore) + #post(QxBlocker) + #post(QxFocusManager) **************************************************************************** */ *************** *** 38,41 **** --- 40,47 ---- this.setElement(this._document.body); + // Needed hard-coded because otherwise the client document + // would not be added initially to the state queue + this._addToGlobalStateQueue(); + QxCanvasLayout.call(this); *************** *** 75,78 **** --- 81,85 ---- QxClientDocument.addProperty({ name : "globalCursor", type : QxConst.TYPEOF_STRING }); + QxClientDocument.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "client-document" }); *************** *** 122,142 **** - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() - { - this.setBackgroundColor("threedface"); - this.setColor("windowtext"); - this.setHideFocus(true); - this.setEnableElementFocus(false); - }; - - - - /* --- 129,132 ---- Index: QxCommonView.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxCommonView.js,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** QxCommonView.js 19 Dec 2005 12:34:59 -0000 1.1.2.4 --- QxCommonView.js 13 Jan 2006 10:50:26 -0000 1.1.2.5 *************** *** 47,51 **** - /* ------------------------------------------------------------------------------------ --- 47,50 ---- Index: QxToolBarPartHandle.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarPartHandle.js,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** QxToolBarPartHandle.js 28 Oct 2005 20:39:38 -0000 1.1.2.12 --- QxToolBarPartHandle.js 13 Jan 2006 10:50:26 -0000 1.1.2.13 *************** *** 32,55 **** function QxToolBarPartHandle() { - this._line = new QxTerminator; - QxCanvasLayout.call(this); ! ! this.add(this._line); }; QxToolBarPartHandle.extend(QxCanvasLayout, "QxToolBarPartHandle"); ! proto._applyInitialStyle = function() ! { ! this.setWidth(10); ! ! var l = this._line; ! ! l.setTop(2); ! l.setLeft(3); ! l.setBottom(2); ! l.setWidth(4); ! ! l.setBorder(QxBorderObject.presets.thinOutset); ! }; \ No newline at end of file --- 32,44 ---- function QxToolBarPartHandle() { QxCanvasLayout.call(this); ! ! var l = new QxTerminator; ! l.setAppearance("toolbar-part-handle-line"); ! this.add(l); }; QxToolBarPartHandle.extend(QxCanvasLayout, "QxToolBarPartHandle"); ! QxToolBarPartHandle.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "toolbar-part-handle" }); ! // QxToolBarPartHandle.changePropertyDefaultValue("appearance", "toolbar-part-handle"); Index: QxInline.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxInline.js,v retrieving revision 1.2.2.16 retrieving revision 1.2.2.17 diff -C2 -d -r1.2.2.16 -r1.2.2.17 *** QxInline.js 19 Dec 2005 14:29:19 -0000 1.2.2.16 --- QxInline.js 13 Jan 2006 10:50:26 -0000 1.2.2.17 *************** *** 42,58 **** QxInline.addProperty({ name : "inlineNodeId", type : QxConst.TYPEOF_STRING }); - - - - - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - proto._applyInitialStyle = function() - { - this.setHeight(QxConst.CORE_AUTO); - this.setWidth(QxConst.CORE_AUTO); - }; --- 42,43 ---- Index: QxTreeElement.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTreeElement.js,v retrieving revision 1.3.2.43 retrieving revision 1.3.2.44 diff -C2 -d -r1.3.2.43 -r1.3.2.44 *** QxTreeElement.js 20 Dec 2005 08:17:05 -0000 1.3.2.43 --- QxTreeElement.js 13 Jan 2006 10:50:26 -0000 1.3.2.44 *************** *** 45,49 **** this._iconObject.setAnonymous(true); this._labelObject.setAnonymous(true); ! QxBoxLayout.call(this, QxConst.ORIENTATION_HORIZONTAL); --- 45,53 ---- this._iconObject.setAnonymous(true); this._labelObject.setAnonymous(true); ! ! // Behaviour and Hard Styling ! this._labelObject.setSelectable(false); ! this._labelObject.setStyleProperty(QxConst.PROPERTY_LINEHEIGHT, QxConst.CORE_HUNDREDPERCENT); ! QxBoxLayout.call(this, QxConst.ORIENTATION_HORIZONTAL); *************** *** 52,55 **** --- 56,62 ---- }; + // Prohibit selection + this.setSelectable(false); + // Base URL used for indent images this.BASE_URI = QxImageManager.buildURI("widgets/tree/"); *************** *** 58,61 **** --- 65,72 ---- this.add(this._indentObject, this._iconObject, this._labelObject); + // Set Appearance + this._iconObject.setAppearance("tree-element-icon"); + this._labelObject.setAppearance("tree-element-label"); + // Register event listeners this.addEventListener(QxConst.EVENT_TYPE_MOUSEDOWN, this._onmousedown); *************** *** 65,68 **** --- 76,80 ---- QxTreeElement.extend(QxBoxLayout, "QxTreeElement"); + QxTreeElement.OMIT_CLASS = "QxTreeElement"; *************** *** 75,78 **** --- 87,92 ---- */ + QxTreeElement.changeProperty({ name : "appearance", type : QxConst.TYPEOF_STRING, defaultValue : "tree-element" }); + /*! The label/caption/text of the QxAtom instance *************** *** 80,84 **** QxTreeElement.addProperty({ name : "label", type : QxConst.TYPEOF_STRING }); ! QxTreeElement.OMIT_CLASS = "QxTreeElement"; --- 94,103 ---- QxTreeElement.addProperty({ name : "label", type : QxConst.TYPEOF_STRING }); ! /*! ! Selected property ! */ ! QxTreeElement.addProperty({ name : "selected", type : QxConst.TYPEOF_BOOLEAN, defaultValue : false }); ! ! *************** *** 102,105 **** --- 121,151 ---- }; + proto._modifySelected = function(propValue, propOldValue, propData) + { + var vState = QxWidget.states.selected[propValue ? 1 : 0]; + + this.setSelectedState(vState); + + var vTree = this.getTree(); + if (!vTree._fastUpdate || (propOldValue && vTree._oldItem == this)) { + this._iconObject.setSelectedState(vState); + }; + + this._labelObject.setSelectedState(vState); + + var vManager = this.getTree().getManager(); + + if (propOldValue && vManager.getSelectedItem() == this) + { + vManager.deselectAll(); + } + else if (propValue && vManager.getSelectedItem() != this) + { + vManager.setSelectedItem(this); + }; + + return true; + }; + *************** *** 122,126 **** }; ! proto.getLevel = function() { var vParentFolder = this.getParentFolder(); --- 168,172 ---- }; ! proto.getLevel = function() { var vParentFolder = this.getParentFolder(); *************** *** 128,132 **** }; ! proto.getTree = function() { var vParentFolder = this.getParentFolder(); --- 174,178 ---- }; ! proto.getTree = function() { var vParentFolder = this.getParentFolder(); *************** *** 191,241 **** - /* - ------------------------------------------------------------------------------------ - STYLES & BEHAVIOR - ------------------------------------------------------------------------------------ - */ - - QxTreeElement.HIGHLIGHT_BGCOLOR = "highlight"; - QxTreeElement.HIGHLIGHT_FGCOLOR = "highlighttext"; - - proto._applyInitialStyle = function() - { - // Configure myself - this.setSelectable(false); - this.setHeight(16); - this.setVerticalChildrenAlign(QxConst.ALIGN_MIDDLE); - - // Configure icon object - this._iconObject.setWidth(16); - this._iconObject.setHeight(16); - - // Configure label object - this._labelObject.setSelectable(false); - this._labelObject.setCursor(QxConst.CORE_DEFAULT); - this._labelObject.setMarginLeft(3); - this._labelObject.setWidth(null); - this._labelObject.setHeight(15); - this._labelObject.setPadding(2); - this._labelObject.setStyleProperty(QxConst.PROPERTY_LINEHEIGHT, QxConst.CORE_HUNDREDPERCENT); - this._labelObject.setAllowStretchY(false); - }; - - proto._applyStateStyleDesign = function(vStates) - { - if (vStates.selected) - { - this._labelObject.setBackgroundColor(QxTreeElement.HIGHLIGHT_BGCOLOR); - this._labelObject.setColor(QxTreeElement.HIGHLIGHT_FGCOLOR); - } - else - { - this._labelObject.setBackgroundColor(null); - this._labelObject.setColor(null); - }; - }; - - - --- 237,240 ---- *************** *** 250,259 **** { QxBoxLayout.prototype._modifyParent.call(this, propValue, propOldValue, propData); ! // Be sure to update previous folder also if it is closed currently (plus/minus symbol) if (propOldValue && !propOldValue.isDisplayable() && propOldValue.getParent().isDisplayable()) { propOldValue.getParent().addToTreeQueue(); }; ! // Be sure to update new folder also if it is closed currently (plus/minus symbol) if (propValue && !propValue.isDisplayable() && propValue.getParent().isDisplayable()) { --- 249,258 ---- { QxBoxLayout.prototype._modifyParent.call(this, propValue, propOldValue, propData); ! // Be sure to update previous folder also if it is closed currently (plus/minus symbol) if (propOldValue && !propOldValue.isDisplayable() && propOldValue.getParent().isDisplayable()) { propOldValue.getParent().addToTreeQueue(); }; ! // Be sure to update new folder also if it is closed currently (plus/minus symbol) if (propValue && !propValue.isDisplayable() && propValue.getParent().isDisplayable()) { *************** *** 261,265 **** }; ! return true; }; --- 260,264 ---- }; ! return true; }; *************** *** 267,276 **** { QxBoxLayout.prototype._handleDisplayableCustom.call(this, vDisplayable, vParent, vHint); ! if (vHint) { var vParentFolder = this.getParentFolder(); var vPreviousParentFolder = this._previousParentFolder; ! if (vPreviousParentFolder) { --- 266,275 ---- { QxBoxLayout.prototype._handleDisplayableCustom.call(this, vDisplayable, vParent, vHint); ! if (vHint) { var vParentFolder = this.getParentFolder(); var vPreviousParentFolder = this._previousParentFolder; ! if (vPreviousParentFolder) { *************** *** 282,305 **** { vPreviousParentFolder.addToTreeQueue(); ! }; }; ! if (vParentFolder && vParentFolder.isDisplayable() && vParentFolder._initialLayoutDone) { vParentFolder.addToTreeQueue(); }; ! if (this.isLastVisibleChild()) { var vPrev = this.getPreviousVisibleSibling(); ! if (vPrev && vPrev instanceof QxTreeElement) { ! vPrev._updateIndent(); }; }; ! if (vDisplayable) { this._updateIndent(); }; ! }; }; --- 281,304 ---- { vPreviousParentFolder.addToTreeQueue(); ! }; }; ! if (vParentFolder && vParentFolder.isDisplayable() && vParentFolder._initialLayoutDone) { vParentFolder.addToTreeQueue(); }; ! if (this.isLastVisibleChild()) { var vPrev = this.getPreviousVisibleSibling(); ! if (vPrev && vPrev instanceof QxTreeElement) { ! vPrev._updateIndent(); }; }; ! if (vDisplayable) { this._updateIndent(); }; ! }; }; *************** *** 322,328 **** }; ! proto._onmouseup = function(e) { ! ! }; --- 321,325 ---- }; ! proto._onmouseup = QxUtil.returnTrue; *************** *** 348,352 **** this._wasLastVisibleChild = this.isLastVisibleChild(); ! // generate html for indent area var vLevel = this.getLevel(); var vTree = this.getTree(); --- 345,349 ---- this._wasLastVisibleChild = this.isLastVisibleChild(); ! // generate html for indent area var vLevel = this.getLevel(); var vTree = this.getTree(); Index: QxWindow.js =================================================================== RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxWindow.js,v retrieving revision 1.25.2.59 retrieving revision 1.25.2.60 diff -C2 -d -r1.25.2.59 -r1.25.2.60 *** QxWindow.js 20 Dec 2005 08:42:26 -0000 1.25.2.59 --- QxWindow.js 13 Jan 2006 10:50:26 -0000 1.25.2.60 *************** *** 35,49 **** // *********************************************************************** ! // STYLE // *********************************************************************** this.setMinWidth(QxConst.CORE_AUTO); this.setMinHeight(QxConst.CORE_AUTO); - - this.setBackgroundColor("threedface"); - this.setColor("windowtext"); - this.setBorder(QxBorderObject.presets.outset); this.setAutoHide(false); ! this.setPadding(1); --- 35,45 ---- // *********************************************************************** ! // FUNCTIONAL STYLE // *********************************************************************** this.setMinWidth(QxConst.CORE_AUTO); this.setMinHeight(QxConst.CORE_AUTO); this.setAutoHide(false); ! *************** *** 61,66 **** var f = this._frame = new QxTerminator; ! ! f.setBorder(QxBorderObject.presets.shadow); --- 57,61 ---- var f = this._frame = new QxTerminator; ! f.setAppearance("window-resize-frame"); *************** *** 70,78 **** var l = this._layout = new QxVerticalBoxLayout; - - l.setWidth(null); - l.setHeight(null); l.setEdge(0); - this.add(l); --- 65,69 ---- *************** *** 83,91 **** var cb = this._captionBar = new QxHorizontalBoxLayout; ! ! cb.setWidth(null); ! cb.setPadding(1, 2, 2); ! cb.setVerticalChildrenAlign("middle"); ! l.add(cb); --- 74,78 ---- var cb = this._captionBar = new QxHorizontalBoxLayout; ! cb.setAppearance("window-captionbar"); l.add(cb); *************** *** 96,116 **** var ci = this._captionIcon = new QxImage(vIcon); ! ! ci.setMargi... [truncated message content] |
