Permalink
Browse files

new theme

reconfigured build script
new gui components
  • Loading branch information...
1 parent 3fd7f03 commit b8ee0b5688466fcd7327339461c37654efbf57b1 tomek committed Jul 17, 2012
View
@@ -2,4 +2,5 @@
/src/main/webapp/helenos/build/
/src/main/webapp/helenos/source/script/
/src/main/frontend/build/
-/src/main/frontend/source/script/
+/src/main/frontend/source/script/
+/src/main/webapp/helenos/
View
@@ -225,6 +225,7 @@
</resources>
</configuration>
</execution>
+ <!--
<execution>
<id>copy-frontend-resources</id>
<phase>prepare-package</phase>
@@ -246,6 +247,7 @@
</resources>
</configuration>
</execution>
+ -->
</executions>
</plugin>
</plugins>
@@ -39,10 +39,12 @@
"APPLICATION" : "helenos",
"QOOXDOO_PATH" : "../../../../../../tools/qooxdoo",
"QXTHEME" : "helenos.theme.Theme",
+ "QXICONTHEME" : ["Oxygen"],
"API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"],
"LOCALES" : [ "en" ],
"CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache",
- "ROOT" : "."
+ "ROOT" : ".",
+ "BUILD_PATH" : "../webapp/helenos"
},
"jobs" :
@@ -8,8 +8,8 @@ Authors:
************************************************************************ */
/*
-#asset(qx/icon/Tango/16/actions/view-refresh.png)
-#asset(qx/icon/Tango/16/devices/computer.png)
+#asset(qx/icon/${qx.icontheme}/16/actions/view-refresh.png)
+#asset(qx/icon/${qx.icontheme}/16/devices/computer.png)
#asset(helenos/keyspace.png)
#asset(helenos/supercf.png)
#asset(helenos/standardcf.png)
@@ -50,7 +50,7 @@ qx.Class.define("helenos.components.ClusterPane",
__createButtons : function() {
this.__btnToolbar = new qx.ui.toolbar.ToolBar();
- var refreshButton = new qx.ui.toolbar.Button("Refresh", "qx/icon/Tango/16/actions/view-refresh.png");
+ var refreshButton = new qx.ui.toolbar.Button("Refresh", "qx/icon/Oxygen/16/actions/view-refresh.png");
refreshButton.addListener('execute', this.refreshClusterTree);
this.__btnToolbar.add(refreshButton);
@@ -76,23 +76,23 @@ qx.Class.define("helenos.components.ClusterPane",
__renderKeyspaces : function(ksDefs) {
for (var i = 0; i < ksDefs.length; i++) {
- var def = ksDefs[i];
+ var ks = ksDefs[i];
- var ksItem = new qx.ui.tree.TreeFolder(def.name);
+ var ksItem = new qx.ui.tree.TreeFolder(ks.name);
ksItem.set({
- open: def.name != 'system',
+ open: ks.name != 'system',
icon : 'helenos/keyspace.png',
- contextMenu: new helenos.components.menu.KeyspaceContextMenu()
+ contextMenu: new helenos.components.menu.KeyspaceContextMenu(ks.name)
});
this.__clusterTree.getRoot().add(ksItem);
- for (var j = 0; j < def.cfDefs.length; j++) {
- var cf = def.cfDefs[j];
+ for (var j = 0; j < ks.cfDefs.length; j++) {
+ var cf = ks.cfDefs[j];
var cfItem = new qx.ui.tree.TreeFile(cf.name);
cfItem.set({
icon : cf.columnType == 'Super' ? 'helenos/supercf.png' : 'helenos/standardcf.png',
toolTip : this.__createColumnFamilyToolTip(cf),
- contextMenu: new helenos.components.menu.ColumnFamilyContextMenu()
+ contextMenu: new helenos.components.menu.ColumnFamilyContextMenu(ks.name, cf.name)
});
cfItem.setIcon(cf.columnType == 'Super' ? 'helenos/supercf.png' : 'helenos/standardcf.png');
cfItem.setToolTip(this.__createColumnFamilyToolTip(cf));
@@ -118,7 +118,7 @@ qx.Class.define("helenos.components.ClusterPane",
__setRootItem : function(clusterName) {
var rootItem = new qx.ui.tree.TreeFolder(clusterName);
rootItem.setOpen(true);
- rootItem.setIcon("qx/icon/Tango/16/devices/computer.png");
+ rootItem.setIcon("qx/icon/Oxygen/16/devices/computer.png");
this.__clusterTree.setRoot(rootItem);
}
}
@@ -8,7 +8,7 @@ Authors:
************************************************************************ */
/*
-#asset(qx/icon/Tango/32/status/dialog-warning.png)
+#asset(qx/icon/${qx.icontheme}/32/status/dialog-warning.png)
*/
qx.Class.define('helenos.components.ExceptionWindow',
{
@@ -20,7 +20,7 @@ qx.Class.define('helenos.components.ExceptionWindow',
caption: 'Error occured', modal: true});
this.setLayout(new qx.ui.layout.VBox(10, 'top'));
- this._label = new qx.ui.basic.Atom('<b>Remote server returned an error!', 'qx/icon/Tango/32/status/dialog-warning.png');
+ this._label = new qx.ui.basic.Atom('<b>Remote server returned an error!', 'qx/icon/Oxygen/32/status/dialog-warning.png');
this._textArea = new qx.ui.form.TextArea();
this._textArea.setMinHeight(200);
@@ -25,20 +25,21 @@ qx.Class.define("helenos.components.MainPane",
this.__createRightPane();
this.add(this.__treePane, 0);
- this.add(this.__contentPane, 1);
+ this.add(this.__rightPane, 1);
},
members :
{
__treePane : null,
- __contentPane : null,
+ __rightPane : null,
__createLeftPane : function() {
this.__treePane = new helenos.components.ClusterPane();
},
__createRightPane : function() {
- this.__contentPane = new helenos.components.RightContentPane();
+ this.__rightPane = new helenos.components.RightContentPane();
+ helenos.util.GuiObserver.registerTabbedPane(this.__rightPane);
}
}
});
@@ -21,11 +21,7 @@ qx.Class.define("helenos.components.RightContentPane",
{
this.base(arguments);
-
- },
-
- members :
- {
-
+ var welcomePage = new helenos.components.tab.WelcomePage();
+ this.add(welcomePage);
}
});
@@ -7,31 +7,41 @@ Authors:
Tomek Kuprowski (tomekkuprowski at gmail dot com)
************************************************************************ */
/*
-#asset(qx/icon/16/Tango/status/dialog-information.png)
-#asset(qx/icon/Tango/16/places/user-trash.png)
-#asset(qx/icon/Tango/16/apps/office-spreadsheet.png)
+#asset(qx/icon/${qx.icontheme}/16/status/dialog-information.png)
+#asset(qx/icon/${qx.icontheme}/16/places/user-trash.png)
+#asset(qx/icon/${qx.icontheme}/16/apps/office-spreadsheet.png)
*/
qx.Class.define("helenos.components.menu.ColumnFamilyContextMenu",
{
extend : qx.ui.menu.Menu,
-
- /*
- *****************************************************************************
- MEMBERS
- *****************************************************************************
- */
- construct : function()
+ construct : function(ksName, cfName)
{
this.base(arguments);
- var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Tango/16/status/dialog-information.png");
+ var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Oxygen/16/status/dialog-information.png");
+ propsButton.setUserData('KSNAME', ksName);
+ propsButton.setUserData('CFNAME', cfName);
+ propsButton.addListener("execute", this.__showProperties);
this.add(propsButton);
- var viewDataButton = new qx.ui.menu.Button("View data", "qx/icon/Tango/16/apps/office-spreadsheet.png");
+ var viewDataButton = new qx.ui.menu.Button("View data", "qx/icon/Oxygen/16/apps/office-spreadsheet.png");
+ viewDataButton.setUserData('KSNAME', ksName);
+ viewDataButton.setUserData('CFNAME', cfName);
this.add(viewDataButton);
- var removeButton = new qx.ui.menu.Button("Remove column family", "qx/icon/Tango/16/places/user-trash.png");
+ var removeButton = new qx.ui.menu.Button("Remove column family", "qx/icon/Oxygen/16/places/user-trash.png");
+ removeButton.setUserData('KSNAME', ksName);
+ removeButton.setUserData('CFNAME', cfName);
this.add(removeButton);
+ },
+
+ members : {
+ __showProperties : function(e) {
+ var ksName = e.getTarget().getUserData('KSNAME');
+ var cfName = e.getTarget().getUserData('CFNAME');
+
+ helenos.util.GuiObserver.showColumnFamilyInfoTab(ksName, cfName);
+ }
}
});
@@ -7,27 +7,30 @@ Authors:
Tomek Kuprowski (tomekkuprowski at gmail dot com)
************************************************************************ */
/*
-#asset(qx/icon/Tango/16/status/dialog-information.png)
-#asset(qx/icon/Tango/16/actions/list-add.png)
+#asset(qx/icon/${qx.icontheme}/16/status/dialog-information.png)
+#asset(qx/icon/${qx.icontheme}/16/actions/list-add.png)
*/
qx.Class.define("helenos.components.menu.KeyspaceContextMenu",
{
extend : qx.ui.menu.Menu,
-
- /*
- *****************************************************************************
- MEMBERS
- *****************************************************************************
- */
- construct : function()
+ construct : function(ksName)
{
this.base(arguments);
- var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Tango/16/status/dialog-information.png");
+ var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Oxygen/16/status/dialog-information.png");
+ propsButton.setUserData('KSNAME', ksName);
+ propsButton.addListener("execute", this.__showProperties);
this.add(propsButton);
- var addCFButton = new qx.ui.menu.Button("Add column family", "qx/icon/Tango/16/actions/list-add.png");
+ var addCFButton = new qx.ui.menu.Button("Add column family", "qx/icon/Oxygen/16/actions/list-add.png");
this.add(addCFButton);
+ },
+
+ members : {
+ __showProperties : function(e) {
+ var ksName = e.getTarget().getUserData('KSNAME');
+ helenos.util.GuiObserver.showKeyspaceInfoTab(ksName);
+ }
}
});
@@ -6,20 +6,15 @@ License:
Authors:
Tomek Kuprowski (tomekkuprowski at gmail dot com)
************************************************************************ */
-
qx.Class.define("helenos.components.tab.AbstractCloseablePage",
{
extend : qx.ui.tabview.Page,
-
- /*
- *****************************************************************************
- MEMBERS
- *****************************************************************************
- */
construct : function()
{
this.base(arguments);
- set({ showCloseButton: true });
+ this.set({
+ showCloseButton: true
+ });
}
});
@@ -0,0 +1,38 @@
+/* ************************************************************************
+Copyright:
+ 2012 Tomek Kuprowski
+License:
+ GPLv2: http://www.gnu.org/licences/gpl.html
+Authors:
+ Tomek Kuprowski (tomekkuprowski at gmail dot com)
+ ************************************************************************ */
+/*
+#asset(helenos/keyspace.png)
+#asset(qx/icon/${qx.icontheme}/64/status/dialog-information.png)
+*/
+qx.Class.define("helenos.components.tab.ColumnFamilyInfoPage",
+{
+ extend : helenos.components.tab.AbstractCloseablePage,
+
+ construct : function(ksName, cfName)
+ {
+ this.base(arguments);
+ this.set({
+ label: cfName,
+ icon: 'helenos/standardcf.png',
+ layout: new qx.ui.layout.VBox(3, 'top')
+ });
+
+ var rpc = new helenos.util.Rpc('Cluster');
+ var cfDef = rpc.callSync('describeColumnFamily', ksName, cfName);
+
+ //this.__addNameAtom(ksDef);
+ //this.__addBasicInfoGroup(ksDef);
+ //this.__addCFTable(ksDef);
+ },
+
+ members :
+ {
+
+ }
+});
Oops, something went wrong.

0 comments on commit b8ee0b5

Please sign in to comment.