Changeset 15053

Timestamp:

03/05/10 20:39:28 (2 years ago)

Author:

sys

Message:

déclaration de l'overlay pour la matrix de l'itemSelector avec définition par défaut dans Xul_Wsp.

Location:

trunk

Files:

• Wsp_Modeling/es/content/wspDesk.extPoints.js (modified) (1 diff)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_extDef/export.wsptypeui.xsl (modified) (1 diff)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef.xml (modified) (1 diff)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/export.wsptypeui.xsl (modified) (1 diff)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/selItem.overlay.xul.xsl (added)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/wspDesk.extPoints.js.txt (modified) (1 diff)
• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/wspDesk.overlay.xul.xsl (modified) (1 diff)
• Xul_Wsp/content/scenariWsp/windows/itemSelector/default_selItem.overlay.xul (added)
• Xul_Wsp/content/scenariWsp/windows/itemSelector/selItem.js (modified) (1 diff)

trunk/Wsp_Modeling/es/content/wspDesk.extPoints.js

@@ -1 +1 @@
 //wspDesk Matrix
-extPoints.addToList('xmlOverlay:wspDesk.xul', 'deskMatrix', 1, 'chrome://sm_modeling/content/wspDesk.overlay.xul', -10);
+extPoints.addToList('xmlOverlay:wspDesk.xul', 'deskMatrix', 2, 'chrome://sm_modeling/content/wspDesk.overlay.xul', -10);

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_extDef/export.wsptypeui.xsl

@@ -129 +129 @@
                         </generators>
                         <!-- Lorsqu'une option surchargera le wspDesk...
-                        <uiOverlay onUriKey="chrome://scenariWsp/content/desks/wspDesk/extPoint.js" src="{resultatAgent('//wspDesk.extPoints.js', 'act:')}"/>
+                        <uiOverlay onUriKey="chrome://scenariWsp/content/desks/wspDesk/extPoint.js" src="..."/>
                          -->
                 </wspOptionUi>

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef.xml

@@ -167 +167 @@
         </affichage>
     
+    <!-- -->
+        <affichage code="selItem.overlay.xul">
+                <urlPage>content/selItem.overlay.xul</urlPage>
+                <page>
+                        <zone cle="mainZone" type="xslOnSrc-dynamique" href="bs:selItem.overlay.xul.xsl"/>
+                </page>
+        </affichage>
 </structure>

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/export.wsptypeui.xsl

@@ -113 +113 @@
                         </generators>
                         <uiOverlay onUriKey="chrome://scenariWsp/content/desks/wspDesk/extPoint.js" src="{resultatAgent('//wspDesk.extPoints.js', 'act:')}"/>
+                        <!-- A activer lorsqu'on voudra le rendre paramétrable...
+                        <uiOverlay onUriKey="chrome://scenariWsp/content/windows/itemSelector/extPoint.js" src="javascript:extPoints.addToList('xmlOverlay:selItem.xul', 'deskMatrix', 2, '{resultatAgent('//selItem.overlay.xul', 'act:')}', -10);"/>
+                        -->
                 </wspTypeUi>
                 

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/wspDesk.extPoints.js.txt

@@ -1 +1 @@
 //wspDesk Matrix
-extPoints.addToList("xmlOverlay:wspDesk.xul", "deskMatrix", 1, "[![agent=//wspDesk.overlay.xul;arguments=act:]!]", -10);
+extPoints.addToList("xmlOverlay:wspDesk.xul", "deskMatrix", 2, "[![agent=//wspDesk.overlay.xul;arguments=act:]!]", -10);

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_wspDef/wspDesk.overlay.xul.xsl

@@ -57 +57 @@
                 <so:overlay>
                         <so:insertElements fromId="matrix">
-                                <slot width="150" minwidth="100">
-                                        <vbox style="-moz-binding: url(chrome://scenariWsp/content/views/wspNavView/wspNavView.xbl.xml#wspNavView);"/>
+                                <slot id="leftSlot" width="150" minwidth="100">
+                                        <vbox id="wspNavView" style="-moz-binding: url(chrome://scenariWsp/content/views/wspNavView/wspNavView.xbl.xml#wspNavView);"/>
                                 </slot>
-                                <slotSet width="700" orient="vertical">
-                                        <slotContents height="500"/>
-                                        <slot height="60">
-                                                <box closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/searchView/searchView.xbl.xml#simpleSearchView)"/>
+                                <slotSet id="middleSlotSet" width="700" orient="vertical">
+                                        <slotContents id="contentsSlot" height="500"/>
+                                        <slot id="bottomSlot" height="60">
+                                                <box id="simpleSearchView" closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/searchView/searchView.xbl.xml#simpleSearchView)"/>
                                         </slot>
                                 </slotSet>
-                                <slot width="150" minwidth="100">
-                                        <box label="Liens" closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/treeItemnetView/treeItemnetView.xbl.xml#treeItemnetView)"/>
-                                        <box label="Plan" closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/outlineView/outlineView.xbl.xml#outlineView)"/>
+                                <slot id="rightSlot" width="150" minwidth="100">
+                                        <box id="treeItemnetView" label="Liens" closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/treeItemnetView/treeItemnetView.xbl.xml#treeItemnetView)"/>
+                                        <box id="outlineView" label="Plan" closable="true" closed="true" style="-moz-binding: url(chrome://scenariWsp/content/views/outlineView/outlineView.xbl.xml#outlineView)"/>
                                 </slot>
                         </so:insertElements>

trunk/Xul_Wsp/content/scenariWsp/windows/itemSelector/selItem.js

@@ -48 +48 @@
          */
         initDefaultExtPoints : function(){
+                
+                //matrix par défaut.
+                extPoints.addToList("xmlOverlay:selItem.xul", "deskMatrix", 1, "chrome://scenariWsp/content/windows/itemSelector/default_selItem.overlay.xul", -10);            
                 
                 //Actions : actions génériques du Core.