From: Charles du Jeu Date: Thu, 29 Apr 2010 14:08:58 +0000 (+0000) Subject: JCR Icons X-Git-Tag: argeo-slc-2.1.7~1325 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3b0e1624f19ae115fbd4be1f23559e62dfc65e5f;p=gpl%2Fargeo-slc.git JCR Icons git-svn-id: https://svn.argeo.org/slc/trunk@3529 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js index 45a846caf..79da0d275 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js @@ -4,6 +4,8 @@ /* ************************************************************************ +#assets(org.argeo.jcr.ria/*) + ************************************************************************ */ qx.Class.define("org.argeo.jcr.ria.JcrBrowser", { @@ -42,14 +44,19 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser", viewsManager.getViewPanesContainer().add(this._tBar); this._splitPane = new qx.ui.splitpane.Pane("horizontal"); - var leftPane = new org.argeo.ria.components.TabbedViewPane("treeview", "Tree View"); - this._splitPane.add(leftPane, 1); + this.leftPane = new org.argeo.ria.components.TabbedViewPane("treeview", "Tree View"); + this._splitPane.add(this.leftPane, 1); var mainPane = new org.argeo.ria.components.TabbedViewPane("editor", "Editor View", true); this._splitPane.add(mainPane, 2); viewsManager.registerViewPane(this._tBar); viewsManager.registerViewPane(mainPane); - viewsManager.registerViewPane(leftPane); - viewsManager.getViewPanesContainer().add(this._splitPane, {flex:1}); + viewsManager.registerViewPane(this.leftPane); + viewsManager.getViewPanesContainer().add(this._splitPane, {flex:1000}); + + new qx.util.DeferredCall(function(){ + this._tBar.setHeight(32); + }, this).schedule(); + }, @@ -76,6 +83,9 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser", var queriesView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.QueriesView, "treeview", dataModel); queriesView.load(); + var pages = this.leftPane.getSelectables(); + this.leftPane.setSelection([pages[0]]); + dataModel.requireContextChange(); }, diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js index bf01cefbc..bc373b087 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js @@ -45,7 +45,8 @@ qx.Class.define("org.argeo.jcr.ria.views.ContextNodeInputView", { this.set({ layout : new qx.ui.layout.HBox(), dataModel : dataModel, - padding: 5, + paddingTop: 5, + paddingLeft: 5, decorator : 'toolbar' }); diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js index a991c802e..14c14275c 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js @@ -110,7 +110,7 @@ qx.Class.define("org.argeo.jcr.ria.views.ListView", { }, _initListItem : function(jcrNode, label){ - var li = new qx.ui.form.ListItem((label?label:jcrNode.getName())); + var li = new qx.ui.form.ListItem((label?label:jcrNode.getName()), "org.argeo.jcr.ria/folder.png"); li.setModel(jcrNode); li.addListener("dblclick", function(){ this.getDataModel().setSelectionWithSource([jcrNode], this); diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/QueriesView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/QueriesView.js index 7b6c2d84f..9e6643541 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/QueriesView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/QueriesView.js @@ -11,7 +11,7 @@ qx.Class.define("org.argeo.jcr.ria.views.QueriesView", { init : { "refresh_query" : { label : "Refresh", - icon : "org.argeo.slc.ria/media-playback-start.png", + icon : "org.argeo.jcr.ria/view-refresh.png", shortcut : null, enabled : true, menu : "Query", @@ -31,7 +31,7 @@ qx.Class.define("org.argeo.jcr.ria.views.QueriesView", { }, "remove_query" : { label : "Remove", - icon : "org.argeo.slc.ria/media-playback-start.png", + icon : "org.argeo.jcr.ria/edit-delete.png", shortcut : null, enabled : true, menu : "Query", @@ -201,6 +201,7 @@ qx.Class.define("org.argeo.jcr.ria.views.QueriesView", { var treeQuery = queryFolder; }else{ var treeQuery = new qx.ui.tree.TreeFolder(label); + treeQuery.setIcon("org.argeo.jcr.ria/system-search.png"); treeQuery.setModel({language:language, query:query}); this.treeBase.add(treeQuery); } diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js index 8b055e061..c40a00057 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js @@ -11,7 +11,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", { init : { "zoom_in" : { label : "Zoom To Node", - icon : "org.argeo.slc.ria/media-playback-start.png", + icon : "org.argeo.jcr.ria/zoom-in.png", shortcut : null, enabled : true, menu : "Zoom", @@ -35,7 +35,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", { }, "zoom_out" : { label : "Zoom Out", - icon : "org.argeo.slc.ria/media-playback-start.png", + icon : "org.argeo.jcr.ria/zoom-out.png", shortcut : null, enabled : true, menu : "Zoom", @@ -63,7 +63,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", { var initLength = parts.length; for(var i=0;i