[Qsos-commits] qsos/apps/xuleditor chrome/content/editor.js ch...

[Raphaël Semeteys]

CVSROOT:        /sources/qsos
Module name:    qsos
Changes by:     Raphaël Semeteys <rsemeteys>   07/09/19 06:57:36

Modified files:
        apps/xuleditor/chrome/content: editor.js editor.xul 
        apps/xuleditor/chrome/locale/en-US: editor.dtd 
        apps/xuleditor/chrome/locale/fr-FR: editor.dtd 
        apps/xuleditor/defaults/preferences: qsos-xuled.js 
                                             qsos-xuled-xulrunner.js 

Log message:
        Chat modifis and improvemrnts :
        - login in address@hidden chatroom
        - New menu entries Chat/Disconnect ans Chat/Nickname

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/editor.js?cvsroot=qsos&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/editor.xul?cvsroot=qsos&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/locale/en-US/editor.dtd?cvsroot=qsos&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/locale/fr-FR/editor.dtd?cvsroot=qsos&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/defaults/preferences/qsos-xuled.js?cvsroot=qsos&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/defaults/preferences/qsos-xuled-xulrunner.js?cvsroot=qsos&r1=1.2&r2=1.3

Patches:
Index: chrome/content/editor.js
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/editor.js,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- chrome/content/editor.js    25 Feb 2007 09:59:25 -0000      1.22
+++ chrome/content/editor.js    19 Sep 2007 06:57:36 -0000      1.23
@@ -23,7 +23,6 @@
 **
 ** TODO:
 **    - Chat: remove unavailable users from roster
-**    - Chat: let user change it's nickname
 **    - Chat: smileys replacement
 */
 
@@ -76,6 +75,8 @@
     prefManager.setCharPref("extensions.qsos-xuled.nick", nick);
   }
   document.getElementById("chat-start").setAttribute("disabled", "true");
+  document.getElementById("chat-end").setAttribute("disabled", "false");
+  document.getElementById("chat-nick").setAttribute("disabled", "true");
   document.getElementById('t-s').selectedIndex = 3;
   doLogin();
 }
@@ -110,10 +111,15 @@
 }
 
 //JSJaC IQ event handler (debug)
-//Remoce the hidden attribute in "err" textbox in editor.xul file to visualize 
messages
+//Remove the "hidden" attribute in "err" textbox in editor.xul file to 
visualize debug messages
 function handleEvent(aJSJaCPacket) {
-  document.getElementById('err').value += 
-    "IN (raw): " + aJSJaCPacket.xml() + '\n';
+  document.getElementById('err').value += "IN (raw): " + aJSJaCPacket.xml() + 
'\n';
+}
+
+//JSJaC error handler (debug)
+//Remove the "hidden" attribute in "err" textbox in editor.xul file to 
visualize error messages
+function handleError(e) {
+  document.getElementById('err').value = "An error occured: Code: " + 
e.getAttribute('code') + "\nType:" + e.getAttribute('type') + "\nCondition: " + 
e.firstChild.nodeName; 
 }
 
 //JSJaC message handler
@@ -153,18 +159,19 @@
 
 //JSJaC presence handler
 function handlePresence(aJSJaCPacket) {
-  var item = ''; //Text to be inserted in roster
+  //Text to be inserted in roster
+  var item = '';
   if (!aJSJaCPacket.getType() && !aJSJaCPacket.getShow()) {
-    item += getUserNick(aJSJaCPacket.getFrom())+' (available';
+    item += getUserNick(aJSJaCPacket.getFrom()) + ' (available';
   } else {
-    item += getUserNick(aJSJaCPacket.getFrom())+' (';
+    item += getUserNick(aJSJaCPacket.getFrom()) + ' (';
     if (aJSJaCPacket.getType()) {
       item += aJSJaCPacket.getType();
     } else {
       item += aJSJaCPacket.getShow();
     }
     if (aJSJaCPacket.getStatus()) {
-      item += ' '+htmlEnc(aJSJaCPacket.getStatus());
+      item += ' ' + htmlEnc(aJSJaCPacket.getStatus());
     }
   }
   item += ')';
@@ -190,7 +197,7 @@
   //Must send special Presence message before entering the chatroom
   var aPresence = new JSJaCPresence();
   aPresence.setTo(chatroom + '/' + nick);
-  aPresence.setFrom('address@hidden');
+  aPresence.setFrom('address@hidden');
   
   var x = aPresence.getDoc().createElement('x');
   x.setAttribute('xmlns','http://jabber.org/protocol/muc');
@@ -198,13 +205,7 @@
   con.send(aPresence);
 }
 
-//JSJaC error handler (debug)
-//Remoce the hidden attribute in "err" textbox in editor.xul file to visualize 
messages
-function handleError(e) {
-  document.getElementById('err').value = "An error occured: Code: " + 
e.getAttribute('code') + "\nType:" + e.getAttribute('type') + "\nCondition: " + 
e.firstChild.nodeName; 
-}
-
-//JSJaC status change handler (TODO)
+//JSJaC status change handler (TODO: decide if it sould be used)
 function handleStatusChange(status) {
 }
 
@@ -213,7 +214,7 @@
   try {
     //Setup args for contructor
     oArgs = new Object();
-    oArgs.httpbase = 'http://88.191.44.3/chat/http-poll/';
+    oArgs.httpbase = 'http://www.semeteys.org/chat/http-poll/';
     oArgs.timerval = 2000;
 
     //Events handlers
@@ -227,7 +228,7 @@
 
     //Setup args for connect method
     oArgs = new Object();
-    oArgs.domain = 'garous.org';
+    oArgs.domain = 'semeteys.org';
     oArgs.username = 'muckl';
     oArgs.resource = 'xuleditor';
     oArgs.pass = 'muckl';
@@ -261,6 +262,28 @@
 function doLogout() {
   if (con && con.connected()) {
     con.disconnect();
+    document.getElementById('input').value = '';
+    document.getElementById('conversation').innerHTML = '';
+    var myRoster = document.getElementById('roster');
+    while (myRoster.firstChild) {
+      myRoster.removeChild(myRoster.firstChild);
+    }
+    document.getElementById("chat-start").setAttribute("disabled", "false");
+    document.getElementById("chat-end").setAttribute("disabled", "true");
+    document.getElementById("chat-nick").setAttribute("disabled", "false");
+  }
+}
+
+//Let user chances it's nickname
+function changeNick() {
+  var prefManager = Components.classes["@mozilla.org/preferences-service;1"]
+            .getService(Components.interfaces.nsIPrefBranch);
+  var currentnick = prefManager.getCharPref("extensions.qsos-xuled.nick", "_");
+  
+  var newnick = window.prompt(strbundle.getString("nick"), currentnick);
+  if (newnick != currentnick) {
+    nick = newnick
+    prefManager.setCharPref("extensions.qsos-xuled.nick", nick);
   }
 }
 
@@ -276,8 +299,7 @@
        if (myDoc) {
                if (docChanged == "true") {
                        confirmDialog(strbundle.getString("closeAnyway"), 
closeFile);
-               }
-               else {
+    } else {
                        closeFile();
                }
        }
@@ -371,8 +393,7 @@
        if (myDoc) {
                if (docChanged == "true") {
                        confirmDialog(strbundle.getString("closeAnyway"), 
closeFile);
-               }
-               else {
+    } else {
                        closeFile();
                }
        }
@@ -441,8 +462,7 @@
        if (myDoc) {
                if (docChanged == "true") {
                        confirmDialog(strbundle.getString("closeAnyway"), 
closeFile);
-               }
-               else {
+    } else {
                        closeFile();
                }
        }
@@ -702,8 +722,7 @@
                        document.getElementById("f-c-deck").selectedIndex = "0";
                        document.getElementById("f-c-desc").value = 
myDoc.getkeydesc(id);
                        freezeScore("true");
-               }
-               else {
+    } else {
                        document.getElementById("f-c-score").selectedIndex = 
score;
                        document.getElementById("f-c-deck").selectedIndex = "1";
                        freezeScore("");
@@ -737,7 +756,6 @@
         }
 }
 
-
 //Triggered when software name is modified
 function changeAppName(xulelement) {
        docChanged = "true";
@@ -909,8 +927,7 @@
 
        if (marker) {
                label.insertBefore(newLabel, marker);
-       }
-       else {
+  } else {
                label.appendChild(newLabel);
        }
 
@@ -927,8 +944,7 @@
 
        if (marker) {
                label.insertBefore(newLabel, marker);
-       }
-       else {
+  } else {
                label.appendChild(newLabel);
        }
 
@@ -1005,9 +1021,11 @@
        myText.setAttribute("font-size", FONT_SIZE);
 
        if (myScore.score) {
+    myText.setAttribute("font-size", FONT_SIZE);
+  
+    if (myScore.score) {
                myText.setAttribute("fill", "green");
-       }
-       else {
+    } else {
                myText.setAttribute("fill", "red");
        }
        
@@ -1018,9 +1036,27 @@
         }      
        myText.style.cursor = "pointer";
 
-
        myText.appendChild(document.createTextNode(myScore.title));
+    myChart.appendChild(myText);
 
+    //text position is ajusted to be outside the circle shape
+    myTextLength = myText.getComputedTextLength();
+    myX = (Math.abs(x)==x)?x:x-myTextLength;
+    myY = (Math.abs(y)==y)?y+FONT_SIZE:y;
+    myText.setAttribute("x", myX);
+    myText.setAttribute("y", myY);myText.setAttribute("fill", "green");
+  } else {
+    myText.setAttribute("fill", "red");
+  }
+  
+  if (myScore.children) {
+    myText.setAttribute("onclick", "selectItem(\"" + myScore.name + "\"); 
drawChart(\"" + myScore.name + "\")");       
+  } else {
+    myText.setAttribute("onclick", "selectItem(\"" + myScore.name + "\"); 
document.getElementById('t-s').selectedIndex = 1");
+  }    
+  myText.style.cursor = "pointer";
+
+  myText.appendChild(document.createTextNode(myScore.title));
        myChart.appendChild(myText);
        
        //text position is ajusted to be outside the circle shape

Index: chrome/content/editor.xul
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/editor.xul,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- chrome/content/editor.xul   25 Feb 2007 09:59:25 -0000      1.20
+++ chrome/content/editor.xul   19 Sep 2007 06:57:36 -0000      1.21
@@ -41,6 +41,8 @@
         <menu id="chat-menu" label="&chat-menu.label;" 
onclick="document.getElementById('chat-menu').focus();">
           <menupopup id="chat-popup">
             <menuitem id="chat-start" label="&chat-start.label;" 
onclick="startChat();"/>
+            <menuitem id="chat-end" label="&chat-end.label;" 
onclick="doLogout();" disabled="true"/>
+            <menuitem id="chat-nick" label="&chat-nick.label;" 
onclick="changeNick();"/>
           </menupopup>
         </menu>
         <menu id="help-menu" label="&help-menu.label;" 
onclick="document.getElementById('help-menu').focus();">

Index: chrome/locale/en-US/editor.dtd
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/locale/en-US/editor.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- chrome/locale/en-US/editor.dtd      24 Feb 2007 23:03:05 -0000      1.6
+++ chrome/locale/en-US/editor.dtd      19 Sep 2007 06:57:36 -0000      1.7
@@ -12,7 +12,9 @@
 <!ENTITY tree-expand.label "Expand all">
 <!ENTITY tree-collapse.label "Collapse all">
 <!ENTITY chat-menu.label "Chat">
-<!ENTITY chat-start.label "Start">
+<!ENTITY chat-start.label "Connect">
+<!ENTITY chat-nick.label "Nickname">
+<!ENTITY chat-end.label "Disconnect">
 <!ENTITY help-menu.label "Help">
 <!ENTITY help-about.label "About">
 <!ENTITY name.label "Criteria">

Index: chrome/locale/fr-FR/editor.dtd
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/locale/fr-FR/editor.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- chrome/locale/fr-FR/editor.dtd      24 Feb 2007 23:03:05 -0000      1.7
+++ chrome/locale/fr-FR/editor.dtd      19 Sep 2007 06:57:36 -0000      1.8
@@ -12,7 +12,9 @@
 <!ENTITY tree-expand.label "Exploser">
 <!ENTITY tree-collapse.label "Aplatir">
 <!ENTITY chat-menu.label "Chat">
-<!ENTITY chat-start.label "Démarrer">
+<!ENTITY chat-start.label "Se connecter">
+<!ENTITY chat-end.label "Se déconnecter">
+<!ENTITY chat-nick.label "Pseudonyme">
 <!ENTITY help-menu.label "Aide">
 <!ENTITY help-about.label "A propos">
 <!ENTITY name.label "Critères">

Index: defaults/preferences/qsos-xuled.js
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/defaults/preferences/qsos-xuled.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- defaults/preferences/qsos-xuled.js  24 Feb 2007 23:04:58 -0000      1.5
+++ defaults/preferences/qsos-xuled.js  19 Sep 2007 06:57:36 -0000      1.6
@@ -2,5 +2,5 @@
 pref("extensions.qsos-xuled.loadremote-tpl", 
"http://www.qsos.org/o3s/loadremote.php?tpl=yes";);
 pref("extensions.qsos-xuled.loadremote", 
"http://www.qsos.org/o3s/loadremote.php";);
 pref("extensions.qsos-xuled.saveremote", 
"http://www.qsos.org/o3s/writeremote.php";);
-pref("extensions.qsos-xuled.chatroom", "address@hidden");
+pref("extensions.qsos-xuled.chatroom", "address@hidden");
 pref("extensions.qsos-xuled.nick", "_");
\ No newline at end of file

Index: defaults/preferences/qsos-xuled-xulrunner.js
===================================================================
RCS file: 
/sources/qsos/qsos/apps/xuleditor/defaults/preferences/qsos-xuled-xulrunner.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- defaults/preferences/qsos-xuled-xulrunner.js        24 Feb 2007 23:04:58 
-0000      1.2
+++ defaults/preferences/qsos-xuled-xulrunner.js        19 Sep 2007 06:57:36 
-0000      1.3
@@ -2,5 +2,5 @@
 pref("extensions.qsos-xuled.loadremote-tpl", 
"http://www.qsos.org/o3s/loadremote.php?tpl=yes";);
 pref("extensions.qsos-xuled.loadremote", 
"http://www.qsos.org/o3s/loadremote.php";);
 pref("extensions.qsos-xuled.saveremote", 
"http://www.qsos.org/o3s/writeremote.php";);
-pref("extensions.qsos-xuled.chatroom", "address@hidden");
+pref("extensions.qsos-xuled.chatroom", "address@hidden");
 pref("extensions.qsos-xuled.nick", "_");
\ No newline at end of file