From bd9145417e34ebc4fc553daaa7eaa7a17a691d91 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 4 Feb 2009 15:52:11 +0000
Subject: [PATCH] Sampler theme fixes and additions. Unnecessary layouts and
 panels removed.

svn changeset:6733/svn branch:trunk
---
 .../ITMILL/themes/sampler/sampler/grid.png    | Bin 0 -> 203 bytes
 .../ITMILL/themes/sampler/sampler/list.png    | Bin 0 -> 379 bytes
 .../ITMILL/themes/sampler/sampler/styles.css  |  24 ++++++++++++++++--
 .../ITMILL/themes/sampler/sampler/tree-bg.png | Bin 0 -> 508 bytes
 .../ITMILL/themes/sampler/sampler/tree.png    | Bin 994 -> 255 bytes
 .../toolkit/demo/sampler/FeatureView.java     |  15 +++++------
 .../demo/sampler/SamplerApplication.java      |   6 ++---
 7 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 WebContent/ITMILL/themes/sampler/sampler/grid.png
 create mode 100644 WebContent/ITMILL/themes/sampler/sampler/list.png
 create mode 100644 WebContent/ITMILL/themes/sampler/sampler/tree-bg.png

diff --git a/WebContent/ITMILL/themes/sampler/sampler/grid.png b/WebContent/ITMILL/themes/sampler/sampler/grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a24c8f1886a289a69dc11114ab149ce95c5dbcf
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JilhU4LR=p`daQ3~bo1t|J$v^aKXFn^Tj%<X8)wd(Q3;%}
z-*v@OkijKEe!>5tfFanwLI@~m=;`7ZQgO@WuqW362La}dukQY@|M(=K!@;FxPXC;{
sQ!n2w`jVXXBxTv0-IIeuKdB#Jh`hsi_2+yJO`v85Pgg&ebxsLQ00kvcYXATM

literal 0
HcmV?d00001

diff --git a/WebContent/ITMILL/themes/sampler/sampler/list.png b/WebContent/ITMILL/themes/sampler/sampler/list.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bcdeb2f63ba0bd67025475ce0c327ab77e2caf
GIT binary patch
literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_2!3-oTqJ08@lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlqPhT|5LX8$XE%3GPjBDA;E+|T*Sfg6`v(MV+Pr1k_8r@I
z>|D2gqqm>GorBZHO<P>uJl3w;uyxz^4VyOa*tI(#D0s)tUF$b)vUhaey?5XG4V%1u
z{aoEWH*eXxdF!^opb&3g|J{4`u3ocl!^TZ3R<2&NcD<vsi;o{rU#Odh*Osl@RRU*d
zued!4=n}1xAiv=M!~zDR6(3@Nx?(+D978H@#hh{#YH$!>*>LRc-N^WV{~cF7W3yzx
z#m(=#XT#+UAE!hJ#jid3nQ`jQ<w`SmYiw9?U!rr;tiPKJo309|Yw)^cr8{2QEAU@u
pqO;JG#Vp@v&lav<@k9Fn!{3=gi4SzeLx2`Bc)I$ztaD0e0ssP_wGaRR

literal 0
HcmV?d00001

diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/ITMILL/themes/sampler/sampler/styles.css
index 9dbfc76917..2008704faa 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/styles.css
+++ b/WebContent/ITMILL/themes/sampler/sampler/styles.css
@@ -10,8 +10,8 @@
 	background: #5c5d60 url(top-bg.png) repeat-x;
 }
 
-.i-app-SamplerApplication .main-split {
-	background: transparent url(main-bg.png) repeat-x;
+.i-app-SamplerApplication .i-horizontallayout-sample-view {
+	background: #fff url(main-bg.png) repeat-x;
 }
 
 .i-app-SamplerApplication .topbar .logo {
@@ -142,12 +142,32 @@
 	border: none;
 }
 
+.i-app-SamplerApplication .main-split .i-splitpanel-first-container {
+	background: #eaebec url(tree-bg.png) repeat-x fixed;
+}
+
+.i-app-SamplerApplication .main-split .i-splitpanel-hsplitter {
+	width: 1px;
+	background: #aeb0b5;
+}
+.i-app-SamplerApplication .main-split .i-splitpanel-hsplitter div {
+	width: 3px;
+	background: transparent;
+	border: none;
+	margin: 0 -1px;
+	padding: 0;
+}
+
 .i-app-SamplerApplication .i-tree-menu {
 	font-family: helvetica, arial, verdana, sans-serif;
 	font-size: 12px;
 	line-height: 17px;
 	padding: 13px 0;
 }
+.i-app-SamplerApplication .i-tree-menu .i-tree-node-selected span {
+	background: #7d8490;
+	padding: 1px;
+}
 
 .i-app-SamplerApplication .i-label-section {
 	font-family: "Helvetica Neue", helvetica, arial, verdana, sans-serif;
diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png b/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebca8ef5f62dc089864641a564c4cf815c29b995
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq00031008?40{{R3oWc&o0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy@K8)tMcv=w=;`a{=<4a}?9|rT($v`7
z-QdpA)X~(}%+J%}<L2h)>Dt`i;p64k+1%CG+tJh3($(16+ur5p>EGbv&(hV;(bdh+
z)8gdj<>u(j&(hG+*2&D!)z{k7)!EqE-RJ1(=<4j$*V^9T;@;rn%gxc*+}_vN+|JR}
z%g)lz($?JG;p64!&Ck=^-QeHh<JQ>Q<>%<v+T7aQ-re8g<K^b&=;_?v;NRio%FNKz
z*V*Uk>)hYr;o{`u<mTk&=giL1%FWQ#*W1(8*xB0N+TGyG&e6`$)Y;nI*xKCZ=<DR=
z=jiI|;Ns-U&C%-X>|q&8WdHyGqDe$SRCwCF!3kD@0T>0)SCPn^sF0xy5oO3+DikI5
zzZ=gx-}$2jbT3la?&A%sKMVYUJATELdTosp`U#IMb6n50!buJ5iFMnEPH@dGJ3yY(
z`i_u3a*2c5<OMQ3#}rX5a*O>s!?CS%7gZkNR~t8c%Q1c69)9*dBcMKep)YvCJ%8^U
y<5C-Zrl+=pEFU_*FvNj#xiiN{&h>xX2rvLJ$SKn!AFa>;0000<MNUMnLSTaDAU8h%

literal 0
HcmV?d00001

diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree.png b/WebContent/ITMILL/themes/sampler/sampler/tree.png
index 6e7ce5122c14c3968a5a5f7791a2c64b25414ba9..f82f1fadbd65dce06399edf54dfdf838d88eae11 100644
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3-p0EYEHRQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jiqr#qLR|MBJaXvh@%@L6?Am+a@UauS_Z{4K;PAmC$M)<$
zv~$mXBO{X|$4;mO&Pd)Yc@e0Ew<O3f_&*Y0uzjJ_29yZ(ba4!+xMg#~TZloCgZZLD
zT|n{w&wM_iZ;nQr_#ORxXl+IO3l;0r`}w?kmnBBLd~_)yBQyDOh69%q^Ng2IuFU8#
sk&tSf$j8^q=s$Pe!yBUCUkfKNu-;~GpFdqG4QK&_r>mdKI;Vst03!2i;{X5v

literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq000sI000aK0{{R3Sj-)c00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFS-v9u6eE<OUcmM!|)c^o#QUCzxk^lfX>Hq*0#>b5Y
zQUCx008mU+MMg+UQd3oKadUBVb#ZfcZ*X#+prL?*gH~8tPf=4`USIC+?nz5cNlHwY
znVX%TplfY#XK8G?xw(vvkdl;^hKP!^wYOGTTxo1>SzKObX=|*luduPQsHv+#LqtqY
zP+nnVVPj@<b$D!Uaa>+uWM*k5CMG8*CnzW=DJdx`Dk>{0D=aK5EiElBE-o)GFEB7L
zF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6
zLPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>
zQ&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAx
zWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--i
zc6N7ncX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fS
zhlq%XiHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbEC
znVFfInwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|
zs;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&
zyS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo
z&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z
z-rnEe-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ
z@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}|DF=z
z#Q*>R19VbOQ~&<}*UAk+0000@Nkl<Zc-nl+#|nT@5JS;1JbSMj+yDQiiv&hRJe$CU
zSYLN|vUG@nhzh2;On`-2rV#KxYEQ{LZPIx9I2z@*w9<s%;~|x&T}I#<0Je_@26q|V
QE&u=k07*qoM6N<$f^cy3RsaA1

diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureView.java b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
index 2827af1ec0..699f1b1c4b 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureView.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
@@ -21,7 +21,7 @@ public class FeatureView extends HorizontalLayout {
     private static final String MSG_HIDE_SRC = "Hide Java™ source";
 
     private Panel right;
-    private Panel left;
+    private VerticalLayout left;
 
     private VerticalLayout controls;
 
@@ -34,18 +34,16 @@ public class FeatureView extends HorizontalLayout {
     private Feature currentFeature;
 
     public FeatureView() {
-        setSizeFull();
+
         setWidth("100%");
         setMargin(true);
         setSpacing(true);
         setStyleName("sample-view");
 
-        left = new Panel();
-        left.setStyleName(Panel.STYLE_LIGHT);
-        left.addStyleName("feature-main");
-
-        ((VerticalLayout) left.getLayout()).setSpacing(true);
-        ((VerticalLayout) left.getLayout()).setMargin(false);
+        left = new VerticalLayout();
+        left.setWidth("100%");
+        left.setSpacing(true);
+        left.setMargin(false);
         addComponent(left);
         setExpandRatio(left, 1);
 
@@ -53,7 +51,6 @@ public class FeatureView extends HorizontalLayout {
         right.setStyleName(Panel.STYLE_LIGHT);
         right.addStyleName("feature-info");
         right.setWidth("369px");
-        right.setHeight("100%");
         addComponent(right);
 
         controls = new VerticalLayout();
diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index 7bc9ff3d53..01d19397cf 100644
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -408,13 +408,13 @@ public class SamplerApplication extends Application {
         private ModeSwitch createModeSwitch() {
             ModeSwitch m = new ModeSwitch();
             m.addMode(currentList, "", "View as Icons", new ThemeResource(
-                    "sampler/grid.gif"));
+                    "sampler/grid.png"));
             /*- no CoverFlow yet
             m.addMode(coverFlow, "", "View as Icons", new ThemeResource(
                     "sampler/flow.gif"));
              */
             m.addMode(new FeatureTable(), "", "View as List",
-                    new ThemeResource("sampler/list.gif"));
+                    new ThemeResource("sampler/list.png"));
             m.addListener(new ModeSwitch.ModeSwitchListener() {
                 public void componentEvent(Event event) {
                     if (event instanceof ModeSwitchEvent) {
@@ -483,7 +483,7 @@ public class SamplerApplication extends Application {
      */
     private class MainArea extends CustomComponent {
         MainArea() {
-            setSizeFull();
+            setWidth("100%");
             setCompositionRoot(new Label());
         }
 
-- 
2.39.5