Attach diff files instead.

Kent

On Tue, 2006-02-07 at 07:22 +0100, Sebastian Werner wrote:
> Hi Kent,
> 
> can you please send your patches again in a zip file (as attachment). 
> Thank you.
> 
> Sebastian
> 
> 
> Kent Olsson schrieb:
> > addition to QxColorCore.js in function QxColor.namedThemes structure:
> > 
> >   statusbar : 1
> > 
> > addition to theme.js:
> > 
> > /*
> > ---------------------------------------------------------------------------
> >   STATUSBAR
> > ---------------------------------------------------------------------------
> > */
> > 
> > theme.registerAppearance("statusbar",
> > {
> >   setup : function()
> >   {
> >     this.bgcolor = new QxColorObject("statusbar");
> >   },
> > 
> >   initial : function(vWidget, vTheme)
> >   {
> >     return {
> >       width : null,
> >       height : 24,
> >       overflow : QxConst.OVERFLOW_VALUE_HIDDEN,
> >       backgroundColor : this.bgcolor,
> >       border : QxBorderObject.presets.thinOutset,
> >       paddingTop : 1,
> >       paddingRight : 1,
> >       paddingBottom : 1,
> >       paddingLeft : 1
> >     };
> >   }
> > });
> > 
> > theme.registerAppearance("statusbar-pane",
> > {
> >   initial : function(vWidget,vTheme)
> >   {
> >     return{
> >       width : QxConst.CORE_AUTO,
> >       height : null,
> >       border : QxBorderObject.presets.thinInset,
> >       verticalChildrenAlign : QxConst.ALIGN_MIDDLE
> >     };
> >   }
> > });
> > 
> > theme.registerAppearance("statusbar-component",
> > {
> >   initial : function(vWidget,vTheme)
> >   {
> >     return{
> >       paddingRight : 1,
> >       paddingLeft : 1
> >     };
> >   }
> > });
> > 
> > 
> > 
> > 
> > -------------------------------------------------------
> > This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
> > for problems?  Stop!  Download the new AJAX search engine that makes
> > searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
> > _______________________________________________
> > Qooxdoo-devel mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
> 
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
> _______________________________________________
> Qooxdoo-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
Index: QxColorCore.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/gui/Attic/QxColorCore.js,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 QxColorCore.js
--- QxColorCore.js	16 Jan 2006 16:11:55 -0000	1.1.2.7
+++ QxColorCore.js	7 Feb 2006 08:55:57 -0000
@@ -165,5 +165,6 @@
   threedshadow : 1,
   window : 1,
   windowframe : 1,
-  windowtext : 1
+  windowtext : 1,
+  statusbar : 1
 };
Index: QxStatusBar.js
===================================================================
RCS file: /home/cvsroot/qooxdoo_3rd_party/source/script/widgets/QxStatusBar.js,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- QxStatusBar.js	7 Feb 2006 01:01:50 -0000	1.1.2.2
+++ QxStatusBar.js	7 Feb 2006 01:02:31 -0000	1.1.2.3
@@ -3,7 +3,7 @@
    qooxdoo - the new era of web interface development
 
    Version:
-     $Id: QxStatusBar.js,v 1.1.2.2 2006/02/07 01:01:50 kols Exp $
+     $Id: QxStatusBar.js,v 1.1.2.3 2006/02/07 01:02:31 kols Exp $
 
    Copyright:
      (C) 2004-2005 by Schlund + Partner AG, Germany
@@ -30,9 +30,7 @@
 function QxStatusBar() {
   QxHorizontalBoxLayout.call(this);
 
-  this.setHeight(24);
-  this.setWidth(null);// Can not use this QxConst.CORE_AUTO); -> gets an error "It is not allowed to define any horizontal dimension for 'vertical' placed children" when the QxStatusBar is layed out by QxDockLayout : potential bug
-  this.setOverflow(QxConst.CORE_HIDDEN);
+  this.setAppearance("statusbar");
 };
 
 QxStatusBar.extend(QxHorizontalBoxLayout, "QxStatusBar");
@@ -40,19 +38,6 @@
 
 /*
 ------------------------------------------------------------------------------------
-  STYLES & BEHAVIOR
-------------------------------------------------------------------------------------
-*/
-
-proto._applyInitialStyle = function()
-{
-  this.setBorder(QxBorderObject.presets.thinOutset);
-  this.setColor("windowtext");
-  this.setBackgroundColor("threedface");
-};
-
-/*
-------------------------------------------------------------------------------------
   DISPOSER
 ------------------------------------------------------------------------------------
 */
@@ -63,13 +48,5 @@
     return true;
   };
 
-  var children = this.getChildren();
-
-//  if (this._statusText)
-//  {
-//    this._statusText.dispose();
-//    this._statusText = null;
-//  };
-
   return QxHorizontalBoxLayout.prototype.dispose.call(this);
 };
Index: QxStatusBarPane.js
===================================================================
RCS file: /home/cvsroot/qooxdoo_3rd_party/source/script/widgets/QxStatusBarPane.js,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- QxStatusBarPane.js	7 Feb 2006 01:08:13 -0000	1.1.2.2
+++ QxStatusBarPane.js	7 Feb 2006 01:08:49 -0000	1.1.2.3
@@ -3,7 +3,7 @@
    qooxdoo - the new era of web interface development
 
    Version:
-     $Id: QxStatusBarPane.js,v 1.1.2.2 2006/02/07 01:08:13 kols Exp $
+     $Id: QxStatusBarPane.js,v 1.1.2.3 2006/02/07 01:08:49 kols Exp $
 
    Copyright:
      (C) 2004-2005 by Schlund + Partner AG, Germany
@@ -30,31 +30,47 @@
 function QxStatusBarPane(vComponent) {
   QxCanvasLayout.call(this);
 
-  this.setWidth(QxConst.CORE_AUTO);
+  this.setAppearance("statusbar-pane");
 
-  this._component = vComponent;
-  vComponent.setPaddingLeft(1);
-  vComponent.setPaddingRight(1);
-
-  this.add(vComponent);
+  if(QxUtil.isValidObject(vComponent)) {
+    this.setComponent(vComponent);
+  };
 };
 
 QxStatusBarPane.extend(QxCanvasLayout, "QxStatusBarPane");
 
 
+/*
+------------------------------------------------------------------------------------
+  PROPERTIES
+------------------------------------------------------------------------------------
+*/
+
+/*!
+  The main menu bar if any.
+*/
+QxStatusBarPane.addProperty({ name : "component", type : QxConst.TYPEOF_OBJECT, allowNull : true });
+
 
 /*
 ------------------------------------------------------------------------------------
-  STYLES & BEHAVIOR
+  MODIFIERS
 ------------------------------------------------------------------------------------
 */
 
-proto._applyInitialStyle = function()
+proto._modifyComponent = function(propValue, propOldValue, propData)
 {
-  this.setBorder(QxBorderObject.presets.inset);
-  this.setColor("windowtext");
-  this.setBackgroundColor("threedface");
-//  this.setBorder(1, QxConst.BORDER_STYLE_INSET, "windowtext");
+  if(propOldValue != null) {
+    this.remove(propOldValue);
+    propOldValue.dispose();
+    propOldValue = null;
+  };
+
+  this.add(propValue);
+
+  propValue.setAppearance("statusbar-component");
+
+  return true;
 };
 
 
@@ -70,10 +86,12 @@
     return true;
   };
 
-  if (this._component)
+  var component = this.getComponent();
+
+  if (component)
   {
-    this._component.dispose();
-    this._component = null;
+    component.dispose();
+    component = null;
   };
 
   return QxCanvasLayout.prototype.dispose.call(this);
Index: theme.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/themes/appearance/default/Attic/theme.js,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 theme.js
--- theme.js	3 Feb 2006 14:57:50 -0000	1.1.2.2
+++ theme.js	7 Feb 2006 08:57:25 -0000
@@ -846,12 +846,6 @@
 
 
 
-
-
-
-
-
-
 /*
 ---------------------------------------------------------------------------
   MENU
@@ -1961,3 +1955,57 @@
     return vTheme.stateFrom(vWidget, "button");
   }  
 });
+
+
+/*
+---------------------------------------------------------------------------
+  STATUSBAR
+---------------------------------------------------------------------------
+*/
+
+theme.registerAppearance("statusbar",
+{
+  setup : function()
+  {
+    this.bgcolor = new QxColorObject("statusbar");
+  },
+
+  initial : function(vWidget, vTheme)
+  {
+    return {
+      width : null,
+      height : 24,
+      overflow : QxConst.OVERFLOW_VALUE_HIDDEN,
+      backgroundColor : this.bgcolor,
+      border : QxBorderObject.presets.thinOutset,
+      paddingTop : 1,
+      paddingRight : 1,
+      paddingBottom : 1,
+      paddingLeft : 1 
+    };
+  }
+});
+
+theme.registerAppearance("statusbar-pane",
+{
+  initial : function(vWidget,vTheme)
+  {
+    return{
+      width : QxConst.CORE_AUTO,
+      height : null,
+      border : QxBorderObject.presets.thinInset,
+      verticalChildrenAlign : QxConst.ALIGN_MIDDLE 
+    };
+  }
+});
+
+theme.registerAppearance("statusbar-component",
+{
+  initial : function(vWidget,vTheme)
+  {
+    return{
+      paddingRight : 1,
+      paddingLeft : 1 
+    };
+  }
+});

Reply via email to