[Qsos-commits] qsos/apps/xuleditor Changes Makefile install.rd...

[Raphaël Semeteys]

CVSROOT:        /sources/qsos
Module name:    qsos
Changes by:     Raphaël Semeteys <rsemeteys>   07/09/25 21:39:22

Modified files:
        apps/xuleditor : Changes Makefile install.rdf 
        apps/xuleditor/chrome/content: load.js load.xul 
        apps/xuleditor/chrome/locale/en-US: about.dtd 
        apps/xuleditor/chrome/locale/fr-FR: about.dtd 

Log message:
        0.7 realease

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/Changes?cvsroot=qsos&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/Makefile?cvsroot=qsos&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/install.rdf?cvsroot=qsos&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/load.js?cvsroot=qsos&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/load.xul?cvsroot=qsos&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/locale/en-US/about.dtd?cvsroot=qsos&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/locale/fr-FR/about.dtd?cvsroot=qsos&r1=1.6&r2=1.7

Patches:
Index: Changes
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/Changes,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Changes     24 Feb 2007 23:37:46 -0000      1.10
+++ Changes     25 Sep 2007 21:39:22 -0000      1.11
@@ -29,5 +29,7 @@
       - UI redisign
       - Use of preferences
 
-0.7  2007/XX/XX
-      - Chat features: user can connect to QSOS chatroom
\ No newline at end of file
+0.7  2007/09/25
+      - XUL Editor is now XMPP oriented: user can connect a QSOS chatroom
+      - bugfix on author's list after remote evaluation loading
+      - better synchronization between hierchical and graph views
\ No newline at end of file

Index: Makefile
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Makefile    24 Feb 2007 23:37:46 -0000      1.10
+++ Makefile    25 Sep 2007 21:39:22 -0000      1.11
@@ -16,7 +16,7 @@
 #
 #
 # QSOS XUL Editor Makefile
-# $Id: Makefile,v 1.10 2007/02/24 23:37:46 rsemeteys Exp $
+# $Id: Makefile,v 1.11 2007/09/25 21:39:22 rsemeteys Exp $
 
 APPPACK=application.ini Changes chrome.manifest LICENSE README xuleditor 
xuleditor.bat
 
@@ -36,7 +36,7 @@
 
 PREFS_XULRUNNER=defaults/preferences/qsos-xuled-xulrunner.js
 
-VERSION=0.6
+VERSION=0.7
 
 ext:
        rm -f xuleditor-firefox-${VERSION}.xpi

Index: install.rdf
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/install.rdf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- install.rdf 9 Feb 2007 10:53:02 -0000       1.6
+++ install.rdf 25 Sep 2007 21:39:22 -0000      1.7
@@ -3,7 +3,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
        <Description about="urn:mozilla:install-manifest">
                <em:id>address@hidden</em:id>
-               <em:version>0.6</em:version>
+               <em:version>0.7</em:version>
                <em:type>2</em:type>
                <em:targetApplication>
                        <Description>

Index: chrome/content/load.js
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/load.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- chrome/content/load.js      23 Sep 2007 09:52:15 -0000      1.5
+++ chrome/content/load.js      25 Sep 2007 21:39:22 -0000      1.6
@@ -22,8 +22,10 @@
 ** load.js: functions associated with the load.xul file
 */
 
+//QSOS backend containing the list of available evaluations
 var xmlDoc;
         
+//Connection to QSOS backend and generation of the tree view
 function init() {
        try {
                
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -51,15 +53,7 @@
        evalTree.appendChild(treechildren);
 }
 
-function doOK() {
-       var evalTree = document.getElementById("evalTree");
-       var url = 
evalTree.view.getItemAtIndex(evalTree.currentIndex).firstChild.firstChild.getAttribute("id");
-
-       if (url.substr(0, 7) != "http://";) url = "";
-       //Call window opener callback function
-       window.arguments[1](url);
-}
-
+//Generates a XUL tree from QSOS backend's list
 function getcomplextree() {
        var criteria = new Array();
        var items = xmlDoc.evaluate("/children/item", xmlDoc, null, 
XPathResult.ANY_TYPE,null);
@@ -75,6 +69,7 @@
        return criteria;
 }
 
+//Recursive function used by getcomplextree()
 function getsubcriteria(id) {
        var subcriteria = new Array();
        var items = xmlDoc.evaluate("//address@hidden'"+id+"']/children/item", 
xmlDoc, null, XPathResult.ANY_TYPE,null);
@@ -87,10 +82,11 @@
                subcriteria.push(criterion);
                item = items.iterateNext();
        }
-       if (subcriteria.length > 0)
+  if (subcriteria.length > 0) {
                return subcriteria;
-       else
+  } else {
                return "null";
+  }
 }
 
 //XUL Tree recursive creation function
@@ -117,8 +113,7 @@
        treecell.setAttribute("label", criterion.label);
        treerow.appendChild(treecell);
        treeitem.appendChild(treerow);
-       if (criterion.children != "null")
-       treeitem.appendChild(buildsubtree(criterion.children));
+  if (criterion.children != "null") 
treeitem.appendChild(buildsubtree(criterion.children));
        return treeitem;
 }
 
@@ -131,3 +126,22 @@
        }
        return treechildren;
 }
\ No newline at end of file
+
+//Check if double click should fire something
+function checkLabel() {
+  var evalTree = document.getElementById("evalTree");
+  var label = 
evalTree.view.getItemAtIndex(evalTree.currentIndex).firstChild.firstChild.getAttribute("label");
+  if (label.substr(-5) == ".qsos") {
+    document.getElementById("Load").acceptDialog();
+  }
+}
+
+//Dialog's validation
+function doOK() {
+  var evalTree = document.getElementById("evalTree");
+  var url = 
evalTree.view.getItemAtIndex(evalTree.currentIndex).firstChild.firstChild.getAttribute("id");
+  
+  if (url.substr(0, 7) != "http://";) url = "";
+  //Call window opener callback function
+  window.arguments[1](url);
+}
\ No newline at end of file

Index: chrome/content/load.xul
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/load.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- chrome/content/load.xul     11 Dec 2006 22:55:12 -0000      1.2
+++ chrome/content/load.xul     25 Sep 2007 21:39:22 -0000      1.3
@@ -4,15 +4,16 @@
 
 <dialog id="Load" title="&load.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-       buttons="accept"
+       buttons="accept,cancel"
        width="300px"
        height="500px"
        ondialogaccept="return doOK();"
+        ondialogcancel="cancelDialog();"
        onload="init();">
 
 <script type="application/x-javascript" src="load.js"></script>
 
-<tree id="evalTree" flex="1">
+<tree id="evalTree" flex="1" ondblclick="checkLabel();">
        <treecols>
                <treecol id="name" width="300px" label="&label1.value;" 
primary="true" flex="1"/>
        </treecols>

Index: chrome/locale/en-US/about.dtd
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/locale/en-US/about.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- chrome/locale/en-US/about.dtd       9 Feb 2007 10:53:02 -0000       1.5
+++ chrome/locale/en-US/about.dtd       25 Sep 2007 21:39:22 -0000      1.6
@@ -1,6 +1,6 @@
 <!ENTITY about.label "About">
-<!ENTITY label1.value "QSOS XUL Editor v0.6">
-<!ENTITY label2.value "Software under the terms of the GNU Public License">
+<!ENTITY label1.value "QSOS XUL Editor v0.7">
+<!ENTITY label2.value "Software under the terms of the GNU Public License, 
using the LGPL JsJac library">
 <!ENTITY label3.value "Authors:">
 <!ENTITY label4.value "   . address@hidden">
 <!ENTITY label5.value "Source code available on 
http://savannah.nongnu.org/projects/qsos";>

Index: chrome/locale/fr-FR/about.dtd
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/locale/fr-FR/about.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- chrome/locale/fr-FR/about.dtd       9 Feb 2007 10:53:03 -0000       1.6
+++ chrome/locale/fr-FR/about.dtd       25 Sep 2007 21:39:22 -0000      1.7
@@ -1,6 +1,6 @@
 <!ENTITY about.label "A propos">
-<!ENTITY label1.value "Editeur XUL QSOS v0.6">
-<!ENTITY label2.value "Logiciel sous licence GNU Public License">
+<!ENTITY label1.value "Editeur XUL QSOS v0.7">
+<!ENTITY label2.value "Logiciel sous licence GNU Public License, utilisant la 
librairie JsJac sous licence LGPL">
 <!ENTITY label3.value "Auteurs:">
 <!ENTITY label4.value "   . address@hidden">
 <!ENTITY label5.value "Code source disponible sur 
http://savannah.nongnu.org/projects/qsos";>