From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 15 Jul 2010 09:16:18 +0000 (+0000)
Subject: QX 1.1 Migration
X-Git-Tag: argeo-commons-2.1.30~1587
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=24dbbfa4f2d4cbc321d23a6a3985037d5746d76c;p=lgpl%2Fargeo-commons.git

QX 1.1 Migration

git-svn-id: https://svn.argeo.org/commons/trunk@3692 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/runtime/org.argeo.security.ria/config.json b/security/runtime/org.argeo.security.ria/config.json
index 2cff0013c..45eb7eb23 100644
--- a/security/runtime/org.argeo.security.ria/config.json
+++ b/security/runtime/org.argeo.security.ria/config.json
@@ -35,13 +35,16 @@
       "library" :
       [
         {
-          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"
+          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json",
+          "uri"		 : "../qooxdoo-sdk/framework"
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",
+          "uri"		 : "${RIA_LIB_URI}/security"
         },
         {
-          "manifest" : "${ROOT}/Manifest.json"
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"		 : "."
         }
       ],
 
@@ -79,13 +82,22 @@
     {
       "extend" : ["common"],
 
-      "compile-source" :
+      "compile-options" :
       {
-        "file" : "${ROOT}/script/${APPLICATION}.js",
-        "locales" : "${LOCALES}",
-        "root" : "${ROOT}",
-        "gzip" : false
-      }
+      	"paths" : 
+      	{
+      		"file" : "${ROOT}/script/${APPLICATION}.js",
+      		"root" : "${ROOT}",
+      		"resource" : "resource",
+      		"gzip"	: false
+      	},
+      	"code" : 
+      	{
+      		"locales" :  "${LOCALES}"
+      	}
+      },
+      
+      "compile" : { "type" : "source" }
     },
 
 
@@ -108,7 +120,7 @@
         "qx.debug" : ["off"]
       },
 
-      "compile-dist" :
+      "compile-options" :
       {
 		  "paths" :
 		  {
@@ -126,16 +138,8 @@
 		    "locales"  : "${LOCALES}",
 		    "optimize" : ["variables", "basecalls", "privates", "strings"]
 		  }
-      /*
-      "file" : "${BUILD_PATH}/script/${APPLICATION}.js",
-        "target" : "${BUILD_PATH}",
-        "uri"  : "script/${APPLICATION}.js",
-        "root" : "${BUILD_PATH}",
-        "format" : "on",
-        "locales" : "${LOCALES}",
-        "optimize" : ["basecalls", "variables", "privates", "strings"]
-       */
-      }
+      },
+      "compile" : { "type" : "build" }
     },
 
 
diff --git a/security/runtime/org.argeo.security.ria/pom.xml b/security/runtime/org.argeo.security.ria/pom.xml
index 22be9cdb5..5d7786aca 100644
--- a/security/runtime/org.argeo.security.ria/pom.xml
+++ b/security/runtime/org.argeo.security.ria/pom.xml
@@ -26,7 +26,7 @@
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
 				<version>${version.maven-argeo-qooxdoo}</version>
 				<configuration>
-					<sdkVersion>0.8.3</sdkVersion>
+					<sdkVersion>1.1.0</sdkVersion>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
index 607653a9f..7309b45ff 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
@@ -4,7 +4,7 @@
  */
 /* ************************************************************************
 
-#asset(resource/org.argeo.security.ria/*)
+#asset(org/argeo/security/ria/*)
 
 ************************************************************************ */
 
@@ -18,7 +18,7 @@ qx.Class.define("org.argeo.security.ria.Perspective", {
 
 	statics : {
 	  	LABEL : "RIA Security",
-	  	ICON : "org.argeo.security.ria/preferences-security.png",
+	  	ICON : "org/argeo/security/ria/preferences-security.png",
 	  	ACCESS:"!ROLE_ANONYMOUS"
 	},
 	
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index 66d9fe9f3..9ae4eff77 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.ria.sample/window-close.png)
+#asset(org/argeo/ria/sample/window-close.png)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.RolesApplet",
 {
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		init : {
   			"reload" : {
   				label 		: "Reload Data",
-  				icon 		: "org.argeo.security.ria/view-refresh.png",
+  				icon 		: "org/argeo/security/ria/view-refresh.png",
   				shortcut	: "Control+h",
   				enabled 	: true,
   				menu		: "Roles",
@@ -42,7 +42,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			},  			
   			"new_role" : {
   				label	 	: "Create Role", 
-  				icon 		: "org.argeo.security.ria/list-add.png",
+  				icon 		: "org/argeo/security/ria/list-add.png",
   				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Roles",
@@ -63,7 +63,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			},   	
   			"delete_role" : {
   				label	 	: "Delete Role", 
-  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				icon 		: "org/argeo/security/ria/list-remove.png",
   				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Roles",
@@ -92,7 +92,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			},  			  			
   			"edit_role" : {
   				label	 	: "Edit Role", 
-  				icon 		: "org.argeo.security.ria/document-properties.png",
+  				icon 		: "org/argeo/security/ria/document-properties.png",
   				shortcut 	: "Control+r",
   				enabled  	: true,
   				menu	   	: "Roles",
@@ -162,7 +162,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		
   		this.rolesUsersStub = {"ROLE_ADMIN":["gandalf"],"ROLE_USER":["demo","frodo","gandalf"]};
   		  		  	
-  		this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org.argeo.security.ria/go-next.png");
+  		this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org/argeo/security/ria/go-next.png");
   		this.toggleButton.set({
   			show:"icon",
   			margin:2,
@@ -174,7 +174,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			this.setGuiMode(event.getData()?"filter":"clear");
   		}, this);
 		
-		this.saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");
+		this.saveButton = new qx.ui.form.Button("Save", "org/argeo/security/ria/document-save.png");
   		this.saveButton.set({
   			show:"icon",
   			margin:2,
@@ -182,7 +182,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			visibility : "excluded"
   		});
 		
-		this.cancelButton = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/window-close.png");
+		this.cancelButton = new qx.ui.form.Button("Cancel", "org/argeo/security/ria/window-close.png");
   		this.cancelButton.set({
   			show:"icon",
   			margin:2,
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
index 829822829..85de9ae01 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 {
@@ -29,7 +29,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		init : {
   			"save_user" : {
   				label	 	: "Save", 
-  				icon 		: "org.argeo.security.ria/document-save.png",
+  				icon 		: "org/argeo/security/ria/document-save.png",
   				shortcut 	: "Control+s",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -47,7 +47,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			},
   			"add_nature" : {
   				label	 	: "Add Nature ...", 
-  				icon 		: "org.argeo.security.ria/list-add.png",
+  				icon 		: "org/argeo/security/ria/list-add.png",
   				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Natures",
@@ -75,7 +75,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			},
   			"remove_nature" : {
   				label	 	: "Remove Nature", 
-  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				icon 		: "org/argeo/security/ria/list-remove.png",
   				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Natures",
@@ -96,7 +96,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			},
   			"close" : {
   				label	 	: "Close", 
-  				icon 		: "org.argeo.security.ria/window-close.png",
+  				icon 		: "org/argeo/security/ria/window-close.png",
   				shortcut 	: "Control+w",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -187,7 +187,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 	  				"commandId" : natures[key]
 	  				});
 	  		}
-	  		commands["add_nature"].command.setMenu(newMenu);  		
+	  		commands["add_nature"].command.setMenuDef(newMenu);  		
   		}, this);
   		
   		natureButton.setShow("icon");
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index 7f0c55335..1149cb7f2 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UsersApplet",
 {
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		init : {
   			"new_user" : {
   				label	 	: "New User", 
-  				icon 		: "org.argeo.security.ria/list-add.png",
+  				icon 		: "org/argeo/security/ria/list-add.png",
   				shortcut 	: "Control+n",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -49,7 +49,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   			},   	
   			"delete_user" : {
   				label	 	: "Delete User", 
-  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				icon 		: "org/argeo/security/ria/list-remove.png",
   				shortcut 	: "Control+d",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -99,7 +99,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   			},  			
   			"edit_user" : {
   				label	 	: "Edit User", 
-  				icon 		: "org.argeo.security.ria/document-properties.png",
+  				icon 		: "org/argeo/security/ria/document-properties.png",
   				shortcut 	: "Control+u",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -185,7 +185,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	},
   	
   	_applyGuiMode : function(newMode, oldMode){
-  		this.table.getSelectionModel().clearSelection();
+  		this.table.getSelectionModel().resetSelection();
 		this.resetHiddenRows();
   		if(newMode == "filter"){
   			this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
@@ -240,7 +240,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	
   	loadUsersList : function(){
   		var selectionModel = this.table.getSelectionModel();  		
-  		selectionModel.clearSelection();  		
+  		selectionModel.resetSelection();  		
   		var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
   		request.addListener("completed", function(response){
   			var jSon = response.getContent();
@@ -288,7 +288,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	  	
   	applySelection : function(selectionValue, target, ignoreCase){
   		var selectionModel = this.table.getSelectionModel();  		
-  		selectionModel.clearSelection();
+  		selectionModel.resetSelection();
   		if(!selectionValue){
   			return;
   		}
@@ -305,7 +305,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	},
   	
   	applyFilter : function(filterValues, target, ignoreCase){
-  		this.table.clearSelection();
+  		this.table.resetSelection();
   		this.resetHiddenRows();  		
   		for(var i=0;i<filterValues.length;i++){
 	  		this.tableModel.addRegex("^((?!"+filterValues[i]+").)*$", target, ignoreCase);
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
index 3aa2e2fd0..0af8bfdf5 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(resource/org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.components.UserEditor",
 {
@@ -116,12 +116,12 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
 		this.fakePane.setMarginTop(30);
 		this.add(this.fakePane, {flex:1});
   		
-  		title = new qx.ui.basic.Atom("User Details", "org.argeo.security.ria/preferences-users.png");
+  		title = new qx.ui.basic.Atom("User Details", "org/argeo/security/ria/preferences-users.png");
   		title.setFont(qx.bom.Font.fromString("16px sans-serif bold"));  		
   		this.buttonGB.add(title);
   		this.buttonGB.add(new qx.ui.core.Spacer(), {flex:1});
 
-  		var title2 = new qx.ui.basic.Atom("User Natures", "org.argeo.security.ria/identity.png");
+  		var title2 = new qx.ui.basic.Atom("User Natures", "org/argeo/security/ria/identity.png");
   		title2.setFont(qx.bom.Font.fromString("16px sans-serif bold"));  		
   		this.natureButtonGB.add(title2);
   		this.natureButtonGB.add(new qx.ui.core.Spacer(), {flex:1});  		
@@ -218,9 +218,9 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
   		page.add(new qx.ui.container.Scroll(newClass.getContainer()), {edge:"center"});
   		
   		buttons = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, "center"));
-  		var editB = new qx.ui.form.Button("Edit this Nature", "org.argeo.security.ria/document-properties-22.png");
-  		var saveB = new qx.ui.form.Button("Save", "org.argeo.security.ria/dialog-apply.png");
-  		var cancelB = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/dialog-cancel.png");
+  		var editB = new qx.ui.form.Button("Edit this Nature", "org/argeo/security/ria/document-properties-22.png");
+  		var saveB = new qx.ui.form.Button("Save", "org/argeo/security/ria/dialog-apply.png");
+  		var cancelB = new qx.ui.form.Button("Cancel", "org/argeo/security/ria/dialog-cancel.png");
   		buttons.add(editB);
   		buttons.add(saveB);
   		buttons.add(cancelB);
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
index 15bd3c088..382e99459 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
@@ -8,7 +8,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditorPrefPane", {
 		this.setSelfEdition(true);
 		this.initGUI();		
 		this.basicGB.setVisibility("excluded");
-		var saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");
+		var saveButton = new qx.ui.form.Button("Save", "org/argeo/security/ria/document-save.png");
 		saveButton.addListener("execute", this.saveUser, this);
 		this.buttonGB.add(saveButton);
 		var authService = org.argeo.ria.session.AuthService.getInstance();
@@ -33,7 +33,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditorPrefPane", {
 		},
 		
 		getPrefIcon : function(){
-			return "org.argeo.security.ria/preferences-users.png";
+			return "org/argeo/security/ria/preferences-users.png";
 		}  			
 	}
 });
\ No newline at end of file