Changeset 15021

Timestamp:

03/03/10 21:19:13 (2 years ago)

Author:

sam

Message:

stylage xul sc4 suite

Location:

trunk/Xul_Core/content/scenariCore/widgets/matrix

Files:

• img/dirty-flag.png (added)
• img/locked-flag.png (added)
• matrix.xbl.css (modified) (1 diff)
• slotContents.xbl.xml (modified) (7 diffs)

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

@@ -244 +244 @@
 }
 
+slotTabContent .tabLabelFlags image{
+        display:none;
+}
+slotTabContent[dirty] .tabLabelFlags .tabLabelFlagDirty{
+        display:inline;
+}
+slotTabContent[locked] .tabLabelFlags .tabLabelFlagLocked{
+        display:inline;
+}
 /* ======================== closeBtn ======================== */ 
 toolbarbutton.closeBtn {

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

@@ -86 +86 @@
                                                 pTab.removeAttribute("dirty");
                                         }
+                                        if(pView.getAttribute("locked")=="true") {
+                                                pTab.setAttribute("locked", "true");
+                                                if(pTab.fOptionMnuPinTab) pTab.fOptionMnuPinTab.setAttribute("checked", true);
+                                        } else {
+                                                pTab.removeAttribute("locked");
+                                                if(pTab.fOptionMnuPinTab) pTab.fOptionMnuPinTab.setAttribute("checked", false);
+                                        }
                                 } catch(e) {
                                         log.debug("slot.fillTab::"+e);
@@ -104 +111 @@
                                 try {
                                         var vTab = this.fTabsContainer.firstElementChild;
+                                        while(vTab && vTab.fView.getAttribute("locked")) vTab = vTab.nextElementSibling;
                                         while(vTab) {
                                                 if( ! vTab.closeTab()) return;
                                                 vTab = this.fTabsContainer.firstElementChild;
+                                                while(vTab && vTab.fView.getAttribute("locked")) vTab = vTab.nextElementSibling;
                                         }
                                 }catch(e){
@@ -120 +129 @@
                                         log.info("closing all exept: "+pCurrentTab.label);
                                         var vTab = pCurrentTab.nextElementSibling;
+                                        while(vTab && vTab.fView.getAttribute("locked")) vTab = vTab.nextElementSibling;
                                         while(vTab) {
                                                 if( ! vTab.closeTab()) return;
                                                 vTab = pCurrentTab.nextElementSibling;
+                                                while(vTab && vTab.fView.getAttribute("locked")) vTab = vTab.nextElementSibling;
                                         }
                                         vTab = pCurrentTab.previousElementSibling;
+                                        while(vTab && vTab.fView.getAttribute("locked")) vTab = vTab.previousElementSibling;
                                         while(vTab) {
                                                 var vPrvTab = vTab.previousElementSibling;
+                                                while(vPrvTab && vPrvTab.fView.getAttribute("locked")) vPrvTab = vPrvTab.previousElementSibling;
                                                 if( ! vTab.closeTab()) return;
                                                 vTab = vPrvTab;
@@ -144 +157 @@
                                 <children>
                                         <xul:stack>
-                                                <xul:hbox class="tabLabel" align="center">
+                                                <xul:hbox anonid="tabLabel" class="tabLabel" align="center">
                                 <xul:image class="tabLabelIco" xbl:inherits="src=image"/>
                                         <xul:label class="tabLabelTxt small-margin" xbl:inherits="value=label" minwidth="20" crop="end"/>
+                                        <xul:hbox class="tabLabelFlags">
+                                        <xul:image class="tabLabelFlagDirty" src="chrome://scenariCore/content/widgets/matrix/img/dirty-flag.png"/>
+                                        <xul:image class="tabLabelFlagLocked" src="chrome://scenariCore/content/widgets/matrix/img/locked-flag.png"/>
+                                        </xul:hbox>
                                                 </xul:hbox>
-                                                <xul:hbox class="tabTools" pack="end" align="top">
+                                                <xul:hbox anonid="tabTools" class="tabTools" pack="end" align="top">
                                                         <xul:hbox anonid="tabToolBar">
                                                                 <xul:toolbarbutton anonid="optionBtn" class="optionBtn" onmousedown="document.getBindingParent(this).showOptionMnu(this)" tooltiptext="Options..."/>
@@ -155 +172 @@
                                                 </xul:hbox>
                                                 <xul:popup anonid="optionMnu">
-                                <xul:menuitem anonid="optionMnu.closeTab" label="Fermer cet onglet" oncommand="document.getBindingParent(this).closeTab();" tooltiptext=""/>
+                                <xul:menuitem anonid="optionMnu.pinTab" label="Figer cet onglet" type="checkbox" oncommand="document.getBindingParent(this).pinTab();" tooltiptext=""/>
+                                <xul:menuseparator anonid="optionMnu.closeSep"/>
                                 <xul:menuitem anonid="optionMnu.closeOtherTabs" label="Fermer les autres onglets" oncommand="document.getBindingParent(this).fSlot.closeOtherTabs(document.getBindingParent(this));" tooltiptext=""/>
                                 <xul:menuitem anonid="optionMnu.closeAllTabs" label="Fermer tous les onglets" oncommand="document.getBindingParent(this).fSlot.closeAllTabs();" tooltiptext=""/>
@@ -164 +182 @@
                 <implementation>
                         <field name="fOptionMnu">document.getAnonymousElementByAttribute(this, "anonid", "optionMnu")</field>
+                        <field name="fOptionMnuPinTab">document.getAnonymousElementByAttribute(this, "anonid", "optionMnu.pinTab")</field>
+                        <field name="fOptionMnuCloseSep">document.getAnonymousElementByAttribute(this, "anonid", "optionMnu.closeSep")</field>
                         <field name="fOptionMnuCloseOtherTabs">document.getAnonymousElementByAttribute(this, "anonid", "optionMnu.closeOtherTabs")</field>
                         <field name="fOptionMnuCloseAllTabs">document.getAnonymousElementByAttribute(this, "anonid", "optionMnu.closeAllTabs")</field>
@@ -170 +190 @@
                                 <body><![CDATA[
                                 try{
-                                        this.fOptionMnuCloseOtherTabs.hidden = this.fSlot.fTabsContainer.childElementCount > 1 ? false : true;
-                                        this.fOptionMnuCloseAllTabs.hidden = this.fSlot.fTabsContainer.childElementCount > 1 ? false : true;
+                                        var vHasTabs = this.fSlot.fTabsContainer.childElementCount > 1;
+                                        this.fOptionMnuCloseSep.hidden = !vHasTabs;
+                                        this.fOptionMnuCloseOtherTabs.hidden = !vHasTabs;
+                                        this.fOptionMnuCloseAllTabs.hidden = !vHasTabs;
                                         this.fOptionMnu.openPopup(document.getAnonymousElementByAttribute(this, "anonid", "optionBtn"), 'after_start', 0, 1, true, false);
                                 }catch(e){log.debug("slotTabContent.showOptionMnu : "+e);}
                                 ]]></body>
                         </method>
+                        <method name="pinTab">
+                                <body><![CDATA[
+                                try{
+                                        var vPinned = this.fView.getAttribute("locked") || false;
+                                        vPinned = !vPinned;
+                                        this.fOptionMnuPinTab.setAttribute("checked", vPinned);
+                                        this.fView.setAttribute("locked", vPinned);
+                                        if (vPinned) {
+                                                this.setAttribute("locked", "true");
+                                                this.fView.setAttribute("locked", "true");
+                                        } else {
+                                                this.removeAttribute("locked");
+                                                this.fView.removeAttribute("locked");
+                                        }
+                                }catch(e){log.debug("slotTabContent.pinTab : "+e);}
+                                ]]></body>
+                        </method>
                 </implementation>
+    <handlers>
+      <handler event="mousedown" button="2" phase="capturing"><![CDATA[
+      if (event.originalTarget.getAttribute("anonid") == "tabTools") {
+        event.stopPropagation();
+        this.showOptionMnu();
+      }
+            ]]></handler>
+    </handlers>
+                
         </binding>
 </bindings>