Permalink
Browse files

gui modifications

  • Loading branch information...
1 parent b215884 commit 7710c1cf18a11eafe172020de2d3af5d7406837c tomek committed Sep 4, 2012
View
7 src/main/frontend/source/class/helenos/components/tab/browse/AbstractBrowsePage.js
@@ -46,9 +46,10 @@ qx.Class.define("helenos.components.tab.browse.AbstractBrowsePage",
_rajCB : null,
__getSearchActionPane : function() {
- var pane = new qx.ui.container.Composite(new qx.ui.layout.HBox(3, 'right'));
- pane.add(this._rajCB);
+ var pane = new qx.ui.container.Composite(new qx.ui.layout.HBox(3, 'left'));
pane.add(this._getSearchButton());
+ pane.add(this._rajCB);
+
return pane;
},
@@ -59,7 +60,9 @@ qx.Class.define("helenos.components.tab.browse.AbstractBrowsePage",
criteriaGB.setLayout(new qx.ui.layout.HBox(8).set({alignY : 'middle'}));
for (var i = 0; i < components.length; i++) {
criteriaGB.add(components[i]);
+ criteriaGB.add(new qx.ui.core.Spacer(3));
}
+
return criteriaGB;
},
View
15 src/main/frontend/source/class/helenos/components/tab/browse/GetSlicePage.js
@@ -55,22 +55,15 @@ qx.Class.define("helenos.components.tab.browse.GetSlicePage",
this._manager.add(this.__keyTF);
this._manager.add(this.__nameStartTF);
- ret.push(new qx.ui.basic.Label('Key:'));
- ret.push(this.__keyTF);
- ret.push(new qx.ui.core.Spacer(5));
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Key:'), this.__keyTF]));
if (this._cfDef.columnType == 'Super') {
this.__sNameTF = new helenos.ui.TextField(this._cfDef.subComparatorType.className);
- ret.push(new qx.ui.core.Spacer(5));
- ret.push(new qx.ui.basic.Label('Super column name:'));
- ret.push(this.__sNameTF);
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Super column name:'), this.__sNameTF]));
}
- ret.push(new qx.ui.basic.Label('Range from:'));
- ret.push(this.__nameStartTF);
- ret.push(new qx.ui.basic.Label('to:'));
- ret.push(this.__nameEndTF);
- ret.push(new qx.ui.core.Spacer(5));
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Range from:'), this.__nameStartTF]));
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Range to:'), this.__nameEndTF]));
ret.push(this.__reversedCB);
return ret;
}
View
14 src/main/frontend/source/class/helenos/components/tab/browse/SingleColumnPage.js
@@ -6,9 +6,6 @@ License:
Authors:
Tomek Kuprowski (tomekkuprowski at gmail dot com)
************************************************************************ */
-/*
-#asset(qx/icon/${qx.icontheme}/16/places/folder-open.png)
-*/
qx.Class.define("helenos.components.tab.browse.SingleColumnPage",
{
extend : helenos.components.tab.browse.AbstractBrowsePage,
@@ -49,20 +46,15 @@ qx.Class.define("helenos.components.tab.browse.SingleColumnPage",
this._manager.add(this.__nameTF);
//var searchButton = this._getSearchButton();
- ret.push(new qx.ui.basic.Label('Key:'));
- ret.push(this.__keyTF);
- ret.push(new qx.ui.core.Spacer(5));
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Key:'), this.__keyTF]));
if (this._cfDef.columnType == 'Super') {
this.__sNameTF = new helenos.ui.RequiredTextField(this._cfDef.subComparatorType.className);
this._manager.add(this.__sNameTF);
- ret.push(new qx.ui.core.Spacer(5));
- ret.push(new qx.ui.basic.Label('Super column name:'));
- ret.push(this.__sNameTF);
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Super column name:'), this.__sNameTF]));
}
- ret.push(new qx.ui.basic.Label('Column name:'));
- ret.push(this.__nameTF);
+ ret.push(new helenos.ui.CompositeV([new qx.ui.basic.Label('Column name:'), this.__nameTF]));
//filterGB.add(searchButton);
//filterGB.add(this._rajCB);
View
21 src/main/frontend/source/class/helenos/ui/CompositeV.js
@@ -0,0 +1,21 @@
+/* ************************************************************************
+Copyright:
+ 2012 Tomek Kuprowski
+License:
+ GPLv2: http://www.gnu.org/licences/gpl.html
+Authors:
+ Tomek Kuprowski (tomekkuprowski at gmail dot com)
+ ************************************************************************ */
+qx.Class.define('helenos.ui.CompositeV',
+{
+ extend : qx.ui.container.Composite,
+
+ construct : function(objects)
+ {
+ this.base(arguments);
+ this.setLayout(new qx.ui.layout.VBox(2));
+ for (var i = 0; i < objects.length; i++) {
+ this.add(objects[i]);
+ }
+ }
+});

0 comments on commit 7710c1c

Please sign in to comment.