Changeset 14986

Timestamp:

03/01/10 18:12:34 (2 years ago)

Author:

sam

Message:

stylage matrix & views

Location:

trunk

Files:

• Xul_Core/content/scenariCore/widgets/matrix/img/bkMax.png (added)
• Xul_Core/content/scenariCore/widgets/matrix/img/bkNorm.png (added)
• Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.css (modified) (6 diffs)
• Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.xml (modified) (4 diffs)
• Xul_Core/content/scenariCore/widgets/matrix/slotContents.xbl.xml (modified) (2 diffs)
• Xul_Wsp/content/scenariWsp/desks/wspDesk/wspDesk.css (modified) (1 diff)
• Xul_Wsp/content/scenariWsp/views/treeItemnetView/treeItemnetView.xbl.css (modified) (1 diff)
• Xul_Wsp/content/scenariWsp/views/wspNavView/wspNavView.xbl.css (modified) (1 diff)

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

@@ -43 +43 @@
 slot,
 slotContents{
-        border: 1px solid grey;
+        border: 1px solid ThreeDShadow;
         -moz-border-radius: 5px 5px 0 0;
 }
@@ -60 +60 @@
 
 slotResizer[state="collapsed"] {
-        background-color: red;
-        min-width: 4px;
-        min-height: 4px;
+        background: -moz-linear-gradient(left, threedface,ThreeDShadow,threedface);
+        min-width: 5px;
+        min-height: 5px;
+}
+slotResizer[orient="vertical"][state="collapsed"] {
+        background: -moz-linear-gradient(top, threedface,ThreeDShadow,threedface);
 }
 
+hbox[anonid=header]{
+        min-height:25px;
+}
+hbox[anonid=tabsContainer]{
+}
+deck[anonid=slotDeck]{
+}
+
+arrowscrollbox[anonid=tabsBar]{
+}
+
+arrowscrollbox[anonid=tabsBar] autorepeatbutton{
+        border: 0px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
+    border-bottom: 1px solid ThreeDShadow;
+    border-right: 1px solid ThreeDShadow;
+    min-width:8px;
+}
+        
+        
 slotTab{
         -moz-binding: url(chrome://scenariCore/content/widgets/matrix/matrix.xbl.xml#slotTab);
@@ -74 +100 @@
 slotTab,
 slotTabContent{
-        margin: 2px 0px;
-        border-top: 1px solid transparent;
-        border-bottom: 1px solid transparent;
-        border-right: 1px solid grey;
-        border-left: 1px solid grey;
-        padding: 1px 4px 2px 4px;
+        margin: 0px 0px;
+        border-top: 0px;
+        border-bottom: 1px solid ThreeDShadow;
+        border-right: 1px solid ThreeDShadow;
+        border-left: 0px;
+        padding: 3px 4px 2px 4px;
         max-width: -moz-min-content;
+}
+
+slotTab.selectedTab:FIRST-CHILD,
+slotTabContent.selectedTab:FIRST-CHILD{
+        -moz-border-radius-topleft: 3px;
 }
 
@@ -86 +117 @@
 slotTabContent.selectedTab{
         -moz-user-focus: normal;
-        background-color: white;
+        background: -moz-linear-gradient(top, white,threedface);
+        border-bottom: 1px solid threedface;
 }
 
@@ -99 +131 @@
 }
 
+
+arrowscrollbox[anonid=tabsBar]{
+}
+hbox[anonid=buttonsBar]{
+        border-bottom: 1px solid ThreeDShadow;
+}
+spacer[anonid=tabsBarSpace]{
+        border-bottom: 1px solid ThreeDShadow;
+        min-width: 5px;
+}
+toolbar[anonid=buttonsBarBody]{
+        -moz-appearance: none;
+}
+toolbar[anonid=buttonsBar2]{
+        -moz-appearance: none;
+        border: 1px solid ThreeDShadow;
+}
+toolbarbutton[anonid=maxBtn] toolbarbutton-icon{
+        margin:left:3px;
+}
+toolbarbutton[anonid=maxBtn] {
+                -moz-appearance: none;
+        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/bkMax.png");
+        -moz-image-region: rect(0px, 16px, 16px, 0px);
+        padding: 0px;
+        border: none;
+        border-bottom: 1px solid ThreeDShadow;
+        width: 20px;
+}
+toolbarbutton[anonid=maxBtn]:hover {
+        -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+toolbarbutton[anonid=maxBtn]:active {
+        -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+*[BlockMax=true] toolbarbutton[anonid=maxBtn] {
+        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/bkNorm.png");
+}
+
 toolbarbutton[anonid=closeBtn] {
         list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/close-button.png");
@@ -107 +179 @@
         width: 16px;
         height: 16px;
+        visibility:hidden;
+}
+slotTab:hover toolbarbutton[anonid=closeBtn],
+slotTabContent:hover toolbarbutton[anonid=closeBtn] {
+        visibility:visible;
 }
 .selectedTab>toolbarbutton[anonid=closeBtn]{
         -moz-image-region: rect(0px, 16px, 16px, 0px);
+        visibility:visible;
 }
 toolbarbutton[anonid=closeBtn]:hover {
         -moz-image-region: rect(0px, 32px, 16px, 16px);
+        visibility:visible;
 }
 toolbarbutton[anonid=closeBtn]:active {
         -moz-image-region: rect(0px, 48px, 16px, 32px);
+        visibility:visible;
 }

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

@@ -497 +497 @@
                                 <xul:arrowscrollbox anonid="tabsBar" flex="1" style="min-width:1px; width: -moz-available;" orient="horizontal">
                                         <xul:hbox anonid="tabsContainer"/>
+                                        <xul:spacer anonid="tabsBarSpace" flex="100"/>
                                 </xul:arrowscrollbox>
                                 <xul:hbox anonid="buttonsBar" flex="1" style="min-width:1px; overflow: hidden;" onoverflow="document.getBindingParent(this).onButtonsBarOverflow(true);" onunderflow="document.getBindingParent(this).onButtonsBarOverflow(false);">
@@ -502 +503 @@
                                         <xul:toolbar anonid="buttonsBarBody"/>
                                 </xul:hbox>
-                                <xul:toolbarbutton label="M" oncommand="document.getBindingParent(this).toggleMaximizeBlock();"/>               
+                                <xul:toolbarbutton anonid="maxBtn" oncommand="document.getBindingParent(this).toggleMaximizeBlock();"/>         
                         </xul:hbox>
                         <xul:toolbar anonid="buttonsBar2" style="display:none; text-align: right;"/>
@@ -521 +522 @@
                                         this.clearButtonsBars();
                                         this.fButtonsBar2.style.display = "none";
-                                        this.fButtonsBar.style.visibility = "visible";
+//                                      this.fButtonsBar.style.visibility = "visible";
                                         this.fButtonsBar.style.width = "";
                                         this.fButtonsBar.flex = 1;
@@ -560 +561 @@
                                                         this.fButtonsBarBody.style.minWidth = vFixWidth;
                                                         this.fButtonsBarBody.style.maxWidth = vFixWidth;
-                                                        this.fButtonsBar.style.visibility = "hidden";
+//                                                      this.fButtonsBar.style.visibility = "hidden";
                                                         this.fButtonsBar.style.width = "0";
                                                         this.fButtonsBar.flex = 1000;

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

@@ -52 +52 @@
                                 <xul:arrowscrollbox anonid="tabsBar" flex="1" orient="horizontal">
                                         <xul:hbox anonid="tabsContainer" flex="1"/>
-                                        <xul:spacer flex="100"/>
+                                        <xul:spacer anonid="tabsBarSpace" flex="100"/>
                                 </xul:arrowscrollbox>
                                 <!-- TODO Historique
@@ -58 +58 @@
                                 <xul:toolbarbutton label="&gt;" oncommand=""/>
                                 -->
-                                <xul:toolbarbutton label="M" oncommand="document.getBindingParent(this).toggleMaximizeBlock();"/>
+                                <xul:toolbarbutton anonid="maxBtn" oncommand="document.getBindingParent(this).toggleMaximizeBlock();"/>
                         </xul:hbox>
                         <xul:deck anonid="slotDeck" flex="1" onselect="document.getBindingParent(this).onSelectedView(event)">

trunk/Xul_Wsp/content/scenariWsp/desks/wspDesk/wspDesk.css

@@ -49 +49 @@
         border: none;
 }
+matrix {
+        margin:3px 0 1px 0;
+}
+statusbar {
+}

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

@@ -43 +43 @@
         min-height: 30px;
         -moz-appearance: none; 
-        margin:0px;
+        margin:2px;
         border: 0px;
         -moz-border-radius-bottomleft: 2px;

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

@@ -43 +43 @@
   min-height: 30px;
   -moz-appearance: none; 
-  margin:0px;
+  margin:2px;
   border: 0px;
         -moz-border-radius-bottomleft: 2px;