From 1ffa51f6c680cd0ab4049762d75ddf9b98c3bd23 Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Mon, 18 Jun 2007 11:10:59 +0000 Subject: [PATCH] CustomLayout for featurebrowser svn changeset:1759/svn branch:trunk --- .../layout/featurebrowser-mainlayout.html | 376 ++++++++++-------- WebContent/theme/demo/layout/img/header.png | Bin 2598 -> 2389 bytes WebContent/theme/demo/layout/img/m_bg.png | Bin 5287 -> 4071 bytes WebContent/theme/demo/style.css | 15 - .../itmill/toolkit/demo/features/Feature.java | 6 +- .../toolkit/demo/features/FeatureBrowser.java | 50 +-- .../terminal/gwt/client/ui/ICustomLayout.java | 2 +- 7 files changed, 226 insertions(+), 223 deletions(-) diff --git a/WebContent/theme/demo/layout/featurebrowser-mainlayout.html b/WebContent/theme/demo/layout/featurebrowser-mainlayout.html index 69e9072bb8..d39d9cd3e6 100644 --- a/WebContent/theme/demo/layout/featurebrowser-mainlayout.html +++ b/WebContent/theme/demo/layout/featurebrowser-mainlayout.html @@ -4,15 +4,14 @@ -
-
-
+
+ +
+
puu
+
+ style="overflow: auto; position: absolute; top: 62px; left: 215px; "> @@ -22,192 +21,231 @@ - - -
-
- - - - - - -
-
-
-
Welcome to the IT Mill - Toolkit feature tour!
-
-
- - - - - - -
-
-
-
This - application lets you view and play with some features of IT - Mill Toolkit. Use menu on the left to select component.
-
- Note the Properties selection on the top right - corner. Click it open to access component properties and - feel free to edit properties at any time.
-
- The area that you are now reading is the component demo - area. Lower area from here contains component description, - API documentation and optional code sample. Note that not - all selections contain demo, only description and API - documentation is shown.
-
- You may also change application's theme from below the menu. - This example application is designed to work best with Demo - theme, other themes are for demonstration purposes only.
-
- IT Mill Toolkit enables you to construct complex Web - applications using plain Java, no knowledge of other Web - technologies such as XML, HTML, DOM, JavaScript or browser - differences is required.
-
- For more information, point your browser to www.itmill.com.
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
- - - - - - - - - - - - - - -
DescriptionPropertiesJavadocCode - Sample
-
-
-
- - - - - - -
-
- - - - -
-
- 		-
-
-
-

Welcome

-
-
-
+ +
demo
+
-
-
-
-
-
This - area contains the selected component's description, list of - properties, javadoc and optional code sample. Start your tour now by - selecting features from the list on the left and remember to - experiment with the Properties panel located at the top right - corner area.
-
- IT Mill Toolkit version: 4.0.2
- Browser: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; - rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4
-
-
+ +
+
tabs
-
-
-
-
- - + + + +
+
properties
+
+
+ style="overflow: hidden; position: absolute; bottom: 10px; left: 0pt; width: 200px; height: 50px;">
-
+ id="featurebrowser-control-left"> +
themes
 - +
restart
+ +
+
+ style="overflow: hidden; position: absolute; width: 137px; height: 17px;" />
+ + + \ No newline at end of file diff --git a/WebContent/theme/demo/layout/img/header.png b/WebContent/theme/demo/layout/img/header.png index fa2582205ce524296b3fcee94c47e848fdc7634f..bf64ac4e176699b155720e847d1b596d6147d278 100644 GIT binary patch delta 2063 zcmV+q2=Mo&6x9-tBe7UM0e=7ibW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*9H;^F9FLO7H=3{o51^fB=xtR}d z=FN;P3j_jzKp+qZ1OkCTAP@)y0)apv5C{YUfj}S-2m}IwKp+qZ1OokZYTj>Fu^tOG zXp8rvt@}|XQG0R;E%F|8($45AK%1<8sy=3>)M?JWrPe-~&gkam12pF9Q0-(=)K<9G zv@6pVp$FRt-GABZ7JtdXOJLjkgFZJG2WRB8DBQBPs&osxQ8Q&`W{fGT^@BpqsEd3z$XH+Ye+=#jzWV-}jEjPZfms~yWt)m-TtcPm4B5qf3bKb5e*c^31*@z z&Z?hS20HpAVcG57;@ki79762i4}^4#2$j~H>b*kM;QFZgZAvGsNhZ@&eiSv)m&(S@ z-f)_GTF3dauboQ&z~F54jSg7HJ(%(5oL=Xa{?qReI-&<3O^p2f_yDbI7u;5<8eG*G zY(cA#tHNK!YJYWYEr&#w(lIrm+s)G6)Xc@~)NnZiYj*CqiqP^{^9beBvy-2f(7IwR z=u|OR1#5K<*4q@Ud-jzYo1r`Ft7i#FmbLqx;E*P_-`ABIt4!)=AY$!8+Ef zm_X}i+30y@45q7zRnT2mtTmPDNug%Ub_%nw8U@$ysei$BtR|-a1?$IrK5xx3s967c zS6B-QRa_LcDW=XSr5B!u^`W>zSg$vTSgE^%h_3IF+E+8ESpQ}R#|H<``0L={iDNw= zdRoibO-GixTbSsHD0}(R!$PbN_9|gzBF7&P+QEeJ8KZ0(RII0ybRU{d!?|R=JTwh-9S66L;i*L%%(xbN-tb+stVR)qG#m+vCC9` zQ@fYHN08ZK@I-#f!f7-$#hHoq!Coz_Vr)Hz;h1HEbZy1x2()TYnG9)d%{1qwa0b#yXK$n}TX*>rzxqou3Bl^#(fJwO)m_;ds8^tKjx- zwT8amB8locEzfIkC;HiQTK+JUzB*Q~uDf_n!?GO0vgNeMb^PH~@J|H?RUQ~Qy`ev+ zUy$8x=02f{$5(Ef{4`jxUW=8Di@juYB!4t`C#+y)08L-7we4ehQE0f-EBFX!dF<33 ze63Zt%7nD>Kz~8st*!tUYJzGq=H9Ln)_{dF9mjU?T{_`^6s~izdQ|1ILwiBLBIYb} zu$sO&18Itzc5>|d}ItJQJ>VG80 zp!j({R$K@tT<2o-sbWqr!Yv&7^%kD3%*Lwt>YZ>@33V6pMed7QR>fz=mQ(k)LoLWc ztj#p4&2}=MT^+20bgV^N+ctW`1m{9>U8WOu#nh8DeB`^~T&#(&jx{8yXksP*dP9=5 zG(zZmJqM4dN|1$EjdZlZs!^ORA;uhm^RSB{f>(&1tuhaW`-Kz0}ZM?S+Rc{e6g{PK`SUW@%*av+de(S485Q^DpfAdw;gwRiC+o zPQ~Fhy8b9~^EAzXzdmU{2F#UBauE8;u|Cf(nP|bPOjb3lp_r61GKsH&)lIO5%!S_R z)f@QBb;=cAy+H<9j8#(P^>9s`%P#n`uqoh=CbAzMXZOT=NoO}^X)3SnXX&YUJ7RD8 zw3r=8=PV1oufC(!<$Xd?Mt>zQvz?hg1+wOVHgdVs4@Z`Dw1d#+TrNiz_}OxzX`n0r zYL4$Bwj^;*wr+NU*UdY}19L;SoPh64*4{k$t)&wd;PuTnXN9Y~SYTkh-6z zVhtlY)R75gg$#KfnQ2CBxp+vfw8{xq>8q^?_o7(3P@5Oha+pxWLpDj>a!=T0kY%tM z`8rJ%XR9hDTUD9as()Xads>_dq=%m2$ko>$e1!AylQ_O3Cm)rIhQZimm*U$t7f+>9 zX?Iq`g~=WaJ)rACWo8P^?U``#eogGU@eF&obP#pme0=3g{h;+wt*SyDoj{Ac6I~WK t+3Ex`^}VqLq970m1OkCTp!cT#0LHPsk7R=@IsgCw07*qoL;22alB$ws0RRBG zXj^2oOL$;(oKI8$z{)?|H{gU_s83J;G{DCn8`&RV-f+@#AMRj+-9;-{{LI%`VfW`( zjsm<-*xY@rc1SIVcq2G7l=XqV&RJ_+c~&3X>HiAue=P(py0s%uceFUkKFKBR@!X3XkLV`o>8{^<{`r|^ zGds+p_wqKqnzYXR@yd|JMxKyo<-U+%w{^;Tc(jPpLonkUVjhepDUxBj?6!j6?=aUg zk)qWUg=-$OSD9&}RE5SOu1B^~b7IHC+|Yh1uTx6;Kuo1RZXz9CHzL1O%S!&o?gy}X zMHx--@mOP0cR$*^j?c0#d8YD?!hT;){~a<&of*lK@(MR#yAG%}z4{H|mN-0I;{Hzf z^sr5>XlR&1l|>VT%9nVubk9Pn)3Xc~ssV{pRY!N!P`@qGc!}t5+b_m{o_9{yi!F*g z=0XP5RoILiHr+aB(oW#-Ac%mwA-@CwBL^)5d*QlA;hkLKJNM0eZ&BX{&F__`KTboB z896rlSyU1g&`fM||Hj_Gs7{o}Nx7tQdN(*)kLM&MO)V3w&o-*Pc&U{^6$+$@)Z(b5 zWUaPj$0&o9j$kWw#iM6ZBV*!~6#!R$rPRA?-}H=H;)d zU#=fzKkdjK>X9kk+qp-%5wNKrlf5$6Cvl%Jg| zRwr5S8{8A*VTQy#1h53DTAD(hR4OeJ6k)*&UNHqYsg#*;YOjevPU-TAIlfMFY; z@np_`0)*R-B-HX-j8f!SA8hpv*9tTUrEZg0Q|E1aL7`*hJ)HP0V;H9=*tlxC=4tMG zeaCUVvt&P1n(yKzB&SQsNluZnOE=f5&9<{5z$ie)?lDNWwcV-l#;C8ljg+W4e?6=idst4|^uY#fe`smDxS@om@%r{bE6+OSX)nHKIiECo*fy4k}3a*JuWYK=3 z%UIf58n`M?gv@c&aDQ7u@_Psq#MyASQGlvW)`>zdwF@v(A;|-|=P{puLgy)!psX0PR!$ei*mo?_< zKkpXyImvp!!-p&s`iamd1z-n~l=M$Go|Wkmjv+UdOHsq4otW)U32{@}D##x62Z6{_ z;6YjFBW?*)-+6GToa9}aHaGy&$FrV%Z=L5T--I;0c;M^!5;8C|(HMyIePov5@%CV5 z-DN62cCiibPm6$6KNYO24fzrtz6h3no+x;23&bS!yEW16dtc!Y z-7s=YxP@8C-+?-q^e~Z(8`+5=JB%a7>xJoW*s7)VOJ^*`QscC{75mp$w<(6fnaWyw zQ=Dg)vM}{J)S7Nd!b^W`@+f))$+{E~1wQw^9o z^SZcEQW)uly?!uSqr%eLwpsio8|P1vZFNp5cE%2USpN*9?5gI1WD(x!B8l$0H3Cd{ zRo)gQ%VH}xn=DU0FrJXC+0Ik&Az^elsp)?F+xO4aUCO6^eBe5(nuGbNBZ`cD+8g$i9SM`%b>wbbicCj-M9j7>~6s!2(qY0lNpR_%YrH|uL3D) z%;0>PTU98{ZV8)_RUO`b#$WOqu10x>5TTmSyF2|u!DV3 zIVo&&IVjS%Q|it45nR0{`|ezxv1Lx!B*ER-;!a_INc*9HnC%FlpRU5S3V*GLB;QwK9;&^_b^oUmTzsuA^5;g9!b7op=oe>Qtka8g4nQ|-vwSMrM#LES6m-W*3U^Zm##T?JgTiF3qKL1NPaRnFCAtE zx*$|oWLPGyVr%UGys8+}wtDAOem!slTn%*BQt*_R%b}iZLhuhWw2nF61PPIO;uYPQ zuDfq=3QbJcTHLb94Bc0JTgYL^hIgR_W34oMY{6f@i0gA?m{-=hD0a*1^ySQut*r+Z ze5_;7SxuXPjSMXx;bC@S`^1HNe^mUEcTrt&9a%!Mv}Uro8Jw$N+iPqOo$m79!7*}S z@ZWa1hIo>ni$5IBK$JyZA@3PN33~ht*mF6T3VE@UHM#3SSr>vPRxa#207$C-q4m04 SM*Z)70od6(U97eCPW}%oTXe1f diff --git a/WebContent/theme/demo/layout/img/m_bg.png b/WebContent/theme/demo/layout/img/m_bg.png index 35b0f3e3c84697312ba12c0273e16149d8a4f4b6..2d37f7ffae2b2f01efc54eee1fde1cf98e5b5c04 100644 GIT binary patch delta 4020 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 VCf#2Q?Dty6lW=fft!r@V{{hITz77BY literal 5287 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 diff --git a/WebContent/theme/demo/style.css b/WebContent/theme/demo/style.css index 460eb4caad..5a6d60f81b 100644 --- a/WebContent/theme/demo/style.css +++ b/WebContent/theme/demo/style.css @@ -6,31 +6,16 @@ border: 0; } -#featurebrowser-properties { - width: 0px; - background: #f5f5f5; -} - #featurebrowser-divider { background-image: url(layout/img/tab_handle.png); } #featurebrowser-mainlayout { - background-color: white; background-image: url(layout/img/m_bg.png); background-repeat: no-repeat; } -#featurebrowser-tabs { - background: white; -} - -#featurebrowser-properties-toggler { - position: absolute; - top: 15px; -} - #featurebrowser-features { position: absolute; overflow: auto; diff --git a/src/com/itmill/toolkit/demo/features/Feature.java b/src/com/itmill/toolkit/demo/features/Feature.java index 1a8caeeabf..482ad724a8 100644 --- a/src/com/itmill/toolkit/demo/features/Feature.java +++ b/src/com/itmill/toolkit/demo/features/Feature.java @@ -139,8 +139,6 @@ public abstract class Feature extends CustomComponent { ts.addTab(l, "Code Sample", null); } - layout.addComponent(ts); - } /** Get the desctiption of the feature as XHTML fragment */ @@ -153,6 +151,10 @@ public abstract class Feature extends CustomComponent { return this.getClass().getName(); } + public TabSheet getTabSheet() { + return ts; + } + /** Get the name of the image file that will be put on description page */ protected String getImage() { return null; diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java index de29dc9522..4c279d681a 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java +++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java @@ -43,11 +43,7 @@ public class FeatureBrowser extends CustomComponent implements private Feature currentFeature = null; - private OrderedLayout layout; - - private Button propertiesSelect; - - private OrderedLayout right; + private CustomLayout mainlayout; private PropertyPanel properties; @@ -71,16 +67,12 @@ public class FeatureBrowser extends CustomComponent implements features.setStyle("menu"); // Configure component layout - layout = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL); - layout.setStyle("featurebrowser-mainlayout"); - setCompositionRoot(layout); - OrderedLayout left = new OrderedLayout( - OrderedLayout.ORIENTATION_VERTICAL); - left.addComponent(features); - layout.addComponent(left); + mainlayout = new CustomLayout("featurebrowser-mainlayout"); + setCompositionRoot(mainlayout); + mainlayout.addComponent(features, "tree"); // Theme selector - left.addComponent(themeSelector); + mainlayout.addComponent(themeSelector, "themes"); themeSelector.addItem("demo"); themeSelector.addItem("corporate"); themeSelector.addItem("base"); @@ -91,7 +83,7 @@ public class FeatureBrowser extends CustomComponent implements // Restart button Button close = new Button("restart", getApplication(), "close"); close.setStyle("link"); - left.addComponent(close); + mainlayout.addComponent(close,"restart"); // Test component registerFeature("/Welcome", new IntroWelcome()); @@ -148,18 +140,12 @@ public class FeatureBrowser extends CustomComponent implements // Add demo component and tabs currentFeature = new IntroWelcome(); - layout.addComponent(currentFeature); + mainlayout.addComponent(currentFeature, "demo"); + mainlayout.addComponent(currentFeature.getTabSheet(), "tabsheet"); // Add properties - right = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); - layout.addComponent(right); - - propertiesSelect = new Button("Show properties", this); - propertiesSelect.setSwitchMode(true); - right.addComponent(propertiesSelect); properties = currentFeature.getPropertyPanel(); - properties.setVisible(false); - right.addComponent(properties); + mainlayout.addComponent(properties, "properties"); } public void registerFeature(String path, Feature feature) { @@ -211,19 +197,14 @@ public class FeatureBrowser extends CustomComponent implements Property p = features.getContainerProperty(id, "feature"); Feature feature = p != null ? ((Feature) p.getValue()) : null; if (feature != null) { - layout.replaceComponent(currentFeature, feature); + mainlayout.removeComponent(currentFeature); + mainlayout.removeComponent(currentFeature.getTabSheet()); + mainlayout.addComponent(feature,"demo"); + mainlayout.addComponent(feature.getTabSheet(),"tabsheet"); currentFeature = feature; properties = feature.getPropertyPanel(); if (properties != null) { - Iterator i = right.getComponentIterator(); - i.next(); - PropertyPanel oldProps = (PropertyPanel) i.next(); - if (oldProps != null) - right.replaceComponent(oldProps, properties); - else - right.addComponent(properties); - properties.setVisible(((Boolean) propertiesSelect - .getValue()).booleanValue()); + mainlayout.addComponent(properties,"properties"); } getWindow() .setCaption( @@ -248,9 +229,6 @@ public class FeatureBrowser extends CustomComponent implements // ignored, should never happen } - if (properties != null) - properties.setVisible(((Boolean) propertiesSelect.getValue()) - .booleanValue()); } public void addComponent(Component c) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java index b2063972db..10279afd91 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java @@ -33,7 +33,7 @@ public class ICustomLayout extends SimplePanel implements Paintable, Layout { updateHTML(uidl, client); componentToWrapper.clear(); - + html.clear(); for (Iterator i = uidl.getChildIterator(); i.hasNext();) { UIDL uidlForChild = (UIDL) i.next(); if (uidlForChild.getTag().equals("location")) { -- 2.39.5