Changeset 15015

Timestamp:

03/03/10 16:04:21 (2 years ago)

Author:

sam

Message:

stylage xul sc4 suite

Location:

trunk

Files:

• Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.css (modified) (5 diffs)
• Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.xml (modified) (1 diff)
• Xul_Core/content/scenariCore/widgets/matrix/slotContents.xbl.xml (modified) (1 diff)
• Xul_Wsp/content/scenariWsp/views/contentView/contentView.xbl.xml (modified) (2 diffs)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/img (added)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/img/asc-button.png (added)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/img/desc-button.png (added)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/treeItemnetView.xbl.css (modified) (1 diff)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/treeItemnetView.xbl.xml (modified) (1 diff)

trunk/Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.css

@@ -120 +120 @@
 }
 
+/* ======================== slotTabs ======================== */ 
 slotTab{
         -moz-binding: url(chrome://scenariCore/content/widgets/matrix/matrix.xbl.xml#slotTab);
@@ -127 +128 @@
 }
 
-/* ======================== slotTabs ======================== */ 
 slotTab,
 slotTabContent{
@@ -208 +208 @@
 }
 slotTabContent *[anonid=tabToolBar]{
-                padding: 1px 2px 1px 2px;
+        padding: 1px 2px 1px 2px;
+        margin: 0px 0px 0px 23px;
         -moz-border-radius-bottomleft: 10px;
         opacity:0.4;
@@ -243 +244 @@
 }
 
-
-
 /* ======================== closeBtn ======================== */ 
 toolbarbutton.closeBtn {
@@ -255 +254 @@
         height: 16px;
 }
-slotTabContent.selectedTab toolbarbutton.closeBtn{
+slotTab.selectedTab toolbarbutton.closeBtn,
+slotTabContent.selectedTab toolbarbutton.closeBtn       {
         -moz-image-region: rect(0px, 16px, 16px, 0px);
-        visibility:visible;
-}
-toolbarbutton.closeBtn:hover,
-slotTabContent.selectedTab toolbarbutton.closeBtn:hover {
-        -moz-image-region: rect(0px, 32px, 16px, 16px);
-        visibility:visible;
-}
-toolbarbutton.closeBtn:active,
-slotTabContent.selectedTab toolbarbutton.closeBtn:active {
-        -moz-image-region: rect(0px, 48px, 16px, 32px);
-        visibility:visible;
+}
+toolbarbutton.closeBtn:hover {
+        -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
+}
+toolbarbutton.closeBtn:active {
+        -moz-image-region: rect(0px, 48px, 16px, 32px) !important;
 }
 

trunk/Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.xml

@@ -639 +639 @@
                                 <xul:label class="tabLabelTxt small-margin" xbl:inherits="value=label"/>
                                         </xul:hbox>
-                            <xul:toolbarbutton anonid="closeBtn" class="closeBtn" hidden="true" xbl:inherits="hidden=notClosable" oncommand="document.getBindingParent(this).closeTab();"/>
+                            <xul:toolbarbutton anonid="closeBtn" class="closeBtn" hidden="true" xbl:inherits="hidden=notClosable" oncommand="document.getBindingParent(this).closeTab();" tooltiptext="Fermer cet onglet"/>
             </children>
                 </content>

trunk/Xul_Core/content/scenariCore/widgets/matrix/slotContents.xbl.xml

@@ -112 +112 @@
                                                 <xul:hbox class="tabTools" pack="end" align="top">
                                                         <xul:hbox anonid="tabToolBar">
-                                                                <xul:toolbarbutton anonid="optionBtn" class="optionBtn" onmousedown="document.getBindingParent(this).showOptionMnu(this)"/>
-                                                <xul:toolbarbutton anonid="closeBtn" class="closeBtn" oncommand="document.getBindingParent(this).closeTab();"/>
+                                                                <xul:toolbarbutton anonid="optionBtn" class="optionBtn" onmousedown="document.getBindingParent(this).showOptionMnu(this)" tooltiptext="Options..."/>
+                                                <xul:toolbarbutton anonid="closeBtn" class="closeBtn" oncommand="document.getBindingParent(this).closeTab();" tooltiptext="Fermer cet onglet"/>
                                                         </xul:hbox>
                                                 </xul:hbox>
                                                 <xul:popup anonid="optionMnu">
-                                                        <xul:menuitem disabled="true" anonid="ctxMenu.refresh" label="Actualiser" oncommand=""/>
-                                <xul:menuitem disabled="true" label="Recharger cet onglet" oncommand=""/>
+                                <xul:menuitem disabled="true" anonid="optionMnu.refresh" label="Recharger cet onglet" oncommand="" tooltiptext=""/>
                                 <xul:menuseparator/>
-                                <xul:menuitem disabled="true" anonid="mnuCloseTab" label="Fermer cet onglet" oncommand=""/>
-                                <xul:menuitem disabled="true" anonid="mnuCloseOtherTabs" label="Fermer les autres onglets" oncommand=""/>
-                                <xul:menuitem disabled="true" anonid="mnuCloseAllTab" label="Fermer tous les onglets" oncommand=""/>
+                                <xul:menuitem anonid="optionMnu.closeTab" label="Fermer cet onglet" oncommand="document.getBindingParent(this).closeTab();" tooltiptext=""/>
+                                <xul:menuitem disabled="true" anonid="optionMnu.CloseOtherTabs" label="Fermer les autres onglets" oncommand="" tooltiptext=""/>
+                                <xul:menuitem disabled="true" anonid="optionMnu.closeAllTab" label="Fermer tous les onglets" oncommand="" tooltiptext=""/>
                                                 </xul:popup>
                                         </xul:stack>

trunk/Xul_Wsp/content/scenariWsp/views/contentView/contentView.xbl.xml

@@ -282 +282 @@
                                                 if(vIsUriVisible) {
                                                         pView.setAttribute("label", src.getLeafFromUri(vShortDesc.srcUri));
-                                                        pView.setAttribute("longDesc", vShortDesc.itTi || "");
+                                                        pView.setAttribute("longDesc", (vShortDesc.itTi ? vShortDesc.itTi+" - " : "") + vShortDesc.srcUri);
                                                 } else {
                                                         var vPack = packMgr.getPack(vShortDesc.itPack);
                                                         if(vShortDesc.itTi) {
                                                                 pView.setAttribute("label", vShortDesc.itTi);
-                                                                pView.setAttribute("longDesc", vPack.getTitle(vItem.itModel));
+                                                                pView.setAttribute("longDesc", vPack.getTitle(vShortDesc.itModel));
                                                         } else {
-                                                                pView.setAttribute("label", vPack.getTitle(vItem.itModel));
+                                                                pView.setAttribute("label", vPack.getTitle(vShortDesc.itModel));
                                                                 pView.setAttribute("longDesc", "");
                                                         }
@@ -298 +298 @@
                                                         pView.setAttribute("iconUrl", item.getUrlIcon(vIconUrl, vShortDesc.itSt));
                                                 } else {
-                                                        pView.setAttribute("iconUrl", "");
+                                                        var vWspTypeUi = pUriObject.getWsp().getWspTypeUi();
+                                                        var vIcon;
+                                                        if(vWspTypeUi) vIcon = vWspTypeUi.getSpaceFolderIconUrl();
+                                                        if(!vIcon) vIcon = "chrome://scenariCms/content/icon/icspace";
+                                                        pView.setAttribute("iconUrl", item.getUrlIcon(vIcon, 1));
                                                 }
                                         }catch(e) {

trunk/Xul_Wsp/content/scenariWsp/views/treeItemnetView/treeItemnetView.xbl.css

@@ -60 +60 @@
         background-color: Highlight;
 }
+
+toolbarbutton.ascBtn{
+        list-style-image: url("chrome://scenariWsp/content/views/treeItemnetView/img/asc-button.png");
+}
+toolbarbutton.descBtn{
+        list-style-image: url("chrome://scenariWsp/content/views/treeItemnetView/img/desc-button.png");
+}
+
+
+toolbarbutton.ascBtn,
+toolbarbutton.descBtn{
+        -moz-appearance: none;
+        -moz-image-region: rect(0px, 16px, 16px, 0px);
+        padding: 0px 0px 0px 0px;
+        border: none !important;
+  border-right: 0px;
+  border-left: 0px;
+        width: 16px;
+        height: 16px;
+}
+toolbarbutton.ascBtn:hover,
+toolbarbutton.descBtn:hover{
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+toolbarbutton.ascBtn:active,
+toolbarbutton.descBtn:active{
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+toolbarbutton.ascBtn .toolbarbutton-text,
+toolbarbutton.descBtn .toolbarbutton-text{
+        display:none;
+}
+toolbarbutton.ascBtn[checked=true],
+toolbarbutton.descBtn[checked=true]{
+        -moz-image-region: rect(16px, 16px, 32px, 0px);
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+  -moz-padding-start: 0px !important;
+  -moz-padding-end: 0px !important;
+  background-image:none;
+}
+toolbarbutton.ascBtn[checked=true]:hover,
+toolbarbutton.descBtn[checked=true]:hover{
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+toolbarbutton.ascBtn[checked=true]:active,
+toolbarbutton.descBtn[checked=true]:active{
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}

trunk/Xul_Wsp/content/scenariWsp/views/treeItemnetView/treeItemnetView.xbl.xml

@@ -904 +904 @@
                 </resources>
                 <content orient="horizontal">
-                        <xul:toolbarbutton anonid="ascBtn" label="Asc." tooltiptext="Arbre des items ascendants" oncommand="document.getBindingParent(this).setViewAsc(true);"/>
-                        <xul:toolbarbutton anonid="descBtn" label="Desc." tooltiptext="Arbre des items descendants" oncommand="document.getBindingParent(this).setViewAsc(false);"/>
+                        <xul:toolbarbutton anonid="ascBtn" class="ascBtn" label="Asc." tooltiptext="Arbre des items ascendants" oncommand="document.getBindingParent(this).setViewAsc(true);"/>
+                        <xul:toolbarbutton anonid="descBtn" class="descBtn" label="Desc." tooltiptext="Arbre des items descendants" oncommand="document.getBindingParent(this).setViewAsc(false);"/>
                 </content>
                 <implementation>