[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qsos-commits] qsos/apps/xuleditor/chrome/content editor.js ed...
|
From: |
Raphaël Semeteys |
|
Subject: |
[Qsos-commits] qsos/apps/xuleditor/chrome/content editor.js ed... |
|
Date: |
Mon, 05 Feb 2007 07:26:21 +0000 |
CVSROOT: /sources/qsos
Module name: qsos
Changes by: Raphaël Semeteys <rsemeteys> 07/02/05 07:26:21
Modified files:
apps/xuleditor/chrome/content: editor.js editor.xul
Log message:
XUL redesign
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/editor.js?cvsroot=qsos&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/xuleditor/chrome/content/editor.xul?cvsroot=qsos&r1=1.13&r2=1.14
Patches:
Index: editor.js
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/editor.js,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- editor.js 31 Jan 2007 07:14:58 -0000 1.14
+++ editor.js 5 Feb 2007 07:26:21 -0000 1.15
@@ -32,6 +32,44 @@
//Localized strings bundle
var strbundle;
+function init() {
+
+}
+
+function changeAuthor(author) {
+ document.getElementById("f-a-name").value = author.label;
+ document.getElementById("f-a-email").value = author.value;
+}
+
+function addAuthor() {
+ var mylist = document.getElementById("f-a-list");
+ var listitem = document.createElement("listitem");
+ listitem.setAttribute("label",
document.getElementById("f-a-name").value);
+ listitem.setAttribute("value",
document.getElementById("f-a-email").value);
+ mylist.appendChild(listitem);
+ myDoc.addauthor(document.getElementById("f-a-name").value,
document.getElementById("f-a-email").value);
+ docChanged = "true";
+}
+
+function deleteAuthor() {
+ var mylist = document.getElementById("f-a-list");
+ mylist.removeChild(mylist.selectedItem);
+ alert(document.getElementById("f-a-name").value);
+ myDoc.delauthor(document.getElementById("f-a-name").value);
+ document.getElementById("f-a-name").value = "";
+ document.getElementById("f-a-email").value = "";
+ docChanged = "true";
+}
+
+function doOK() {
+ //Call window opener callback function
+ if (docChanged == "true")
+ window.arguments[1](myDoc);
+ else
+ window.arguments[1]("null");
+ return true;
+}
+
//Window initialization after loading
function init() {
strbundle = document.getElementById("properties");
@@ -132,6 +170,17 @@
document.getElementById("f-url").value = myDoc.geturl();
document.getElementById("f-demourl").value = myDoc.getdemourl();
+ //docChanged = "false";
+ //myDoc = window.arguments[0];
+ var authors = myDoc.getauthors();
+ var mylist = document.getElementById("f-a-list");
+ for(var i=0; i < authors.length; i++) {
+ var listitem = document.createElement("listitem");
+ listitem.setAttribute("label", authors[i].name);
+ listitem.setAttribute("value", authors[i].email);
+ mylist.appendChild(listitem);
+ }
+
freezeGeneric("");
//Menu management
document.getElementById("file-close").setAttribute("disabled",
"false");
@@ -370,29 +419,6 @@
}
////////////////////////////////////////////////////////////////////
-// Menu "Edit" function
-////////////////////////////////////////////////////////////////////
-
-function updateDoc(newDoc) {
- if (newDoc != "null") {
- myDoc = newDoc;
- docChanged = "true";
- document.getElementById("file-save").setAttribute("disabled",
"false");
- }
-}
-
-//Submenu "Edit/Authors"
-//Shows the authors.xul window in modal mode
-function authorsDialog() {
- try {
-
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- } catch (e) {
- alert("Permission to open file was denied.");
- }
-
window.openDialog('chrome://qsos-xuled/content/authors.xul','Properties','chrome,dialog,modal',myDoc,updateDoc);
-}
-
-////////////////////////////////////////////////////////////////////
// Menu "Tree" function
////////////////////////////////////////////////////////////////////
@@ -473,8 +499,8 @@
document.getElementById("mytree").focus();
if (tree.currentIndex != -1) {
id =
tree.view.getItemAtIndex(tree.currentIndex).firstChild.firstChild.getAttribute("id");
- document.getElementById("t").selectedIndex = 1;
- document.getElementById("t-c-title").setAttribute("label",
myDoc.getkeytitle(id));
+ //document.getElementById("t").selectedIndex = 1;
+ //document.getElementById("t-c-title").setAttribute("label",
myDoc.getkeytitle(id));
document.getElementById("f-c-desc0").setAttribute("label", "0:
"+myDoc.getkeydesc0(id));
document.getElementById("f-c-desc1").setAttribute("label", "1:
"+myDoc.getkeydesc1(id));
@@ -583,8 +609,8 @@
var myChart = document.getElementById("chart");
//var width = myChart.parentNode.width.animVal.value / 2;
//var height = myChart.parentNode.height.animVal.value / 2;
- var width = 300;
- var height = 300;
+ var width = 400;
+ var height = 250;
myChart.setAttribute("transform", "translate("+width+","+height+")");
//Collect charting data
Index: editor.xul
===================================================================
RCS file: /sources/qsos/qsos/apps/xuleditor/chrome/content/editor.xul,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- editor.xul 31 Jan 2007 07:16:38 -0000 1.13
+++ editor.xul 5 Feb 2007 07:26:21 -0000 1.14
@@ -2,17 +2,13 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://qsos-xuled/skin/classic.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://qsos-xuled/locale/editor.dtd">
-
<window id="QSOS" title="&QSOS.label;" width="800px" height="600px"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
onload="init();">
-
-<script type="application/x-javascript" src="Document.js"></script>
-<script type="application/x-javascript" src="editor.js"></script>
-
-<stringbundle id="properties"
src="chrome://qsos-xuled/locale/editor.properties"/>
-
-<vbox>
+ <script type="application/x-javascript" src="Document.js"></script>
+ <script type="application/x-javascript" src="editor.js"></script>
+ <stringbundle id="properties"
src="chrome://qsos-xuled/locale/editor.properties"/>
+ <vbox>
<toolbox>
<menubar id="mymenubar">
<menu id="file-menu" label="&file-menu.label;"
onclick="document.getElementById('file-menu').focus();">
@@ -28,11 +24,6 @@
<menuitem id="file-exit" label="&file-exit.label;"
onclick="checkexit();"/>
</menupopup>
</menu>
- <menu id="edit-menu" label="&edit-menu.label;"
onclick="document.getElementById('edit-menu').focus();">
- <menupopup id="edit-popup">
- <menuitem id="edit-authors"
label="&edit-authors.label;" onclick="authorsDialog();"/>
- </menupopup>
- </menu>
<menu id="tree-menu" label="&tree-menu.label;"
onclick="document.getElementById('tree-menu').focus();">
<menupopup id="tree-popup">
<menuitem id="tree-expand" label="&tree-expand.label;"
onclick="expandTree('true');"/>
@@ -46,36 +37,68 @@
</menu>
</menubar>
</toolbox>
-
<hbox>
- <tree id="mytree" width="300px" hidecolumnpicker="true"
onselect="treeselect(this);">
- <treecols>
- <treecol id="name" label="&name.label;" primary="true"
flex="1"/>
- </treecols>
- </tree>
- <splitter/>
<tabbox id = "t" flex = "1">
<tabs>
- <tab id = "t-software" label = "&t-software.label;"/>
+ <tab id = "t-software" label = "&t-header.label;"/>
<tab id = "t-c-title" label = "&t-c-title.label;"/>
<tab id = "t-chart" label = "&t-chart.label;"/>
</tabs>
<tabpanels flex = "1">
<tabpanel flex = "1">
- <vbox flex = "1">
+ <vbox flex="1">
+ <groupbox>
+ <caption><label value="&g-software.label;"/></caption>
+ <vbox flex="1">
+ <box>
+ <vbox flex="1">
<label control="f-software"
value="&f-software.value;"/><textbox id="f-software"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeAppName(this);"/>
<label control="f-release"
value="&f-release.value;"/><textbox id="f-release"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeRelease(this);"/>
<label control="f-sotwarefamily"
value="&f-sotwarefamily.value;"/><textbox id="f-sotwarefamily"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeSoftwareFamily(this);"/>
+ </vbox>
+ <vbox flex="1">
<label control="f-license"
value="&f-license.value;"/>
<menulist id="f-license"
oncommand="changeLicense(this, this.selectedIndex);">
<menupopup
id="f-license-popup"></menupopup>
</menulist>
- <label control="f-desc"
value="&f-desc.value;"/><textbox id="f-desc" multiline="true"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeDesc(this);"/>
<label control="f-url"
value="&f-url.value;"/><textbox id="f-url"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeUrl(this);"/>
<label control="f-demourl"
value="&f-demourl.value;"/><textbox id="f-demourl"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeDemoUrl(this);"/>
</vbox>
+ </box>
+ <label control="f-desc" value="&f-desc.value;"/><textbox
id="f-desc" multiline="true" oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeDesc(this);"/>
+ </vbox>
+ </groupbox>
+ <groupbox>
+ <caption><label value="&g-evaluation.label;"/></caption>
+ <hbox>
+ <vbox flex="1">
+ <label control="f-a-list" value="&f-a-list;"/>
+ <listbox id="f-a-list" rows="5"
onselect="changeAuthor(this.selectedItem);"></listbox>
+ </vbox>
+ <vbox flex="1">
+ <label control="f-a-name" value="&f-a-name.value;"/>
+ <textbox id="f-a-name"/>
+ <label control="f-a-email" value="&f-a-email.value;"/>
+ <textbox id="f-a-email"/>
+ <hbox flex="1">
+ <spacer flex="1"/>
+ <button label="&button1.label;" flex="1"
oncommand="addAuthor();"/>
+ <spacer flex="1"/>
+ <button label="&button2.label;" flex="1"
oncommand="deleteAuthor();"/>
+ <spacer flex="1"/>
+ </hbox>
+ </vbox>
+ </hbox>
+ </groupbox>
+ </vbox>
</tabpanel>
<tabpanel flex = "1">
+ <tree id="mytree" width="250px" hidecolumnpicker="true"
onselect="treeselect(this);">
+ <treecols>
+ <treecol id="name" label="&name.label;" primary="true" flex="1"/>
+ </treecols>
+ </tree>
+ <splitter/>
<vbox flex = "1">
<deck id="f-c-deck" selectedIndex="1">
<groupbox>
@@ -91,20 +114,20 @@
</radiogroup>
</groupbox>
</deck>
- <label control="f-c-comments"
value="&f-c-comments.value;"/><textbox id="f-c-comments" multiline="true"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeComments(this);"/>
+ <label control="f-c-comments" value="&f-c-comments.value;"/>
+ <textbox id="f-c-comments" multiline="true" rows="5"
oninput="this.setAttribute('class','inside');"
onchange="this.setAttribute('class','outside'); changeComments(this);"/>
</vbox>
</tabpanel>
- <tabpanel>
+ <tabpanel flex = "1">
<vbox id="chart-box" flex = "1">
<hbox id="chart-label" />
<svg xmlns="http://www.w3.org/2000/svg";
version="1.1">
- <g id="chart" />
+ <g id="chart"/>
</svg>
</vbox>
</tabpanel>
</tabpanels>
</tabbox>
</hbox>
-</vbox>
-
+ </vbox>
</window>
\ No newline at end of file
- [Qsos-commits] qsos/apps/xuleditor/chrome/content editor.js ed...,
Raphaël Semeteys <=