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 45a846cafafa14aea3cbdd493bfc4d5a49445d55..79da0d275a51235c737f1107259b1530aeb7ad9c 100644 (file)
--- 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 @@
  \r
 /* ************************************************************************\r
 \r
+#assets(org.argeo.jcr.ria/*)\r
+\r
 ************************************************************************ */ \r
 qx.Class.define("org.argeo.jcr.ria.JcrBrowser",\r
 {\r
@@ -42,14 +44,19 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
                viewsManager.getViewPanesContainer().add(this._tBar);\r
                \r
                this._splitPane = new qx.ui.splitpane.Pane("horizontal");\r
-               var leftPane = new org.argeo.ria.components.TabbedViewPane("treeview", "Tree View");\r
-               this._splitPane.add(leftPane, 1);\r
+               this.leftPane = new org.argeo.ria.components.TabbedViewPane("treeview", "Tree View");\r
+               this._splitPane.add(this.leftPane, 1);\r
                var mainPane = new org.argeo.ria.components.TabbedViewPane("editor", "Editor View", true);\r
                this._splitPane.add(mainPane, 2);\r
                viewsManager.registerViewPane(this._tBar);\r
                viewsManager.registerViewPane(mainPane);      \r
-               viewsManager.registerViewPane(leftPane);   \r
-               viewsManager.getViewPanesContainer().add(this._splitPane, {flex:1});\r
+               viewsManager.registerViewPane(this.leftPane);   \r
+               viewsManager.getViewPanesContainer().add(this._splitPane, {flex:1000});\r
+               \r
+               new qx.util.DeferredCall(function(){\r
+                       this._tBar.setHeight(32);\r
+               }, this).schedule();\r
+               \r
                \r
        },\r
        \r
@@ -76,6 +83,9 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
                var queriesView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.QueriesView, "treeview", dataModel);\r
                queriesView.load();\r
                \r
+               var pages = this.leftPane.getSelectables();\r
+               this.leftPane.setSelection([pages[0]]);\r
+               \r
                dataModel.requireContextChange();\r
        },\r
        \r

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 bf01cefbc41d22c3c181d03d94a9588ad36980c7..bc373b08755c181e6f22f1624684fd1b4c26d1eb 100644 (file)
--- 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({\r
                                layout : new qx.ui.layout.HBox(),\r
                                dataModel : dataModel,\r
-                               padding: 5, \r
+                               paddingTop: 5, \r
+                               paddingLeft: 5, \r
                                decorator : 'toolbar'\r
                        });                     \r
                        \r

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 a991c802ee730cce3e96a381ba5f425204a00398..14c14275c228e3dfa6665836a7eff124b5b56644 100644 (file)
--- 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", {
                },\r
                \r
                _initListItem : function(jcrNode, label){\r
-                       var li = new qx.ui.form.ListItem((label?label:jcrNode.getName()));\r
+                       var li = new qx.ui.form.ListItem((label?label:jcrNode.getName()), "org.argeo.jcr.ria/folder.png");\r
                        li.setModel(jcrNode);\r
                        li.addListener("dblclick", function(){\r
                                this.getDataModel().setSelectionWithSource([jcrNode], this);\r

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 7b6c2d84f8cc0c163e18d7fd4796a079d90db8e0..9e66435418e0a8ff6583afb7d36198bf7b0bf32e 100644 (file)
--- 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 : {\r
                                "refresh_query" : {\r
                                        label : "Refresh",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/view-refresh.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Query",\r
@@ -31,7 +31,7 @@ qx.Class.define("org.argeo.jcr.ria.views.QueriesView", {
                                },\r
                                "remove_query" : {\r
                                        label : "Remove",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/edit-delete.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Query",\r
@@ -201,6 +201,7 @@ qx.Class.define("org.argeo.jcr.ria.views.QueriesView", {
                                var treeQuery = queryFolder;\r
                        }else{\r
                                var treeQuery = new qx.ui.tree.TreeFolder(label);\r
+                               treeQuery.setIcon("org.argeo.jcr.ria/system-search.png");\r
                                treeQuery.setModel({language:language, query:query});\r
                                this.treeBase.add(treeQuery);\r
                        }\r

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 8b055e06146d79d0a26afd671057853bacee2192..c40a000579e3ba6b04fecfc9e20c92cc398a56c3 100644 (file)
--- 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 : {\r
                                "zoom_in" : {\r
                                        label : "Zoom To Node",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/zoom-in.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Zoom",\r
@@ -35,7 +35,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                },\r
                                "zoom_out" : {\r
                                        label : "Zoom Out",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/zoom-out.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Zoom",\r
@@ -63,7 +63,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                                        var initLength = parts.length; \r
                                                        for(var i=0;i<initLength;i++){\r
                                                                var newPath = parts.join("/");\r
-                                                               pathes.push({label:newPath,icon:'', commandId:newPath});\r
+                                                               pathes.push({label:newPath,icon:'org.argeo.jcr.ria/folder_16.png', commandId:newPath});\r
                                                                parts.pop();\r
                                                        }\r
                                                }\r
@@ -72,7 +72,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                },\r
                                "refresh" : {\r
                                        label : "Refresh",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/view-refresh.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Selection",\r
@@ -97,7 +97,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                },\r
                                "open" : {\r
                                        label : "Open",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/document-open.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Selection",\r
@@ -120,7 +120,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                },\r
                                "dl" : {\r
                                        label : "Download",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org.argeo.jcr.ria/go-down.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Selection",\r
@@ -190,6 +190,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                var newRoot = new org.argeo.jcr.ria.views.JcrTreeFolder(contextNode);\r
                                this.tree.setRoot(newRoot);\r
                                this.tree.setSelection([newRoot]);\r
+                               newRoot.setOpen(true);\r
                        }, this);\r
                        this.tree.addListener("changeSelection", function(e){\r
                                var sel = this.tree.getSelection();\r
@@ -227,7 +228,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                \r
                        }, this);\r
                        this.tree.setContextMenu(org.argeo.ria.event.CommandsManager\r
-                                       .getInstance().createMenuFromIds(["open", "dl", "zoom_in", "zoom_out"]));                               \r
+                                       .getInstance().createMenuFromIds(["open", "dl", "refresh", "zoom_in", "zoom_out"]));                            \r
                },\r
                \r
                /**\r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/document-open.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/document-open.png
new file mode 100644 (file)
index 0000000..26f6795
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/document-open.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/edit-delete.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/edit-delete.png
new file mode 100644 (file)
index 0000000..9ff19b4
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/edit-delete.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder.png
new file mode 100644 (file)
index 0000000..92407eb
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder_16.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder_16.png
new file mode 100644 (file)
index 0000000..80d1244
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/folder_16.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/go-down.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/go-down.png
new file mode 100644 (file)
index 0000000..e48bf5b
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/go-down.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/system-search.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/system-search.png
new file mode 100644 (file)
index 0000000..783d0e2
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/system-search.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/view-refresh.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/view-refresh.png
new file mode 100644 (file)
index 0000000..65d6380
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/view-refresh.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-in.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-in.png
new file mode 100644 (file)
index 0000000..e7d4096
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-in.png differ

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-out.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-out.png
new file mode 100644 (file)
index 0000000..318e609
Binary files /dev/null and b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/resource/org.argeo.jcr.ria/zoom-out.png differ