From e56be452553121b159c271e8ff3e0911ce524adc Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Fri, 20 Apr 2012 18:14:34 +0300 Subject: [PATCH] Finished files section of the new left pane --- src/gr/grnet/pithos/web/client/Pithos.java | 53 +++++++++++--------- .../pithos/web/client/PithosDisclosurePanel.css | 7 +++ .../pithos/web/client/PithosDisclosurePanel.java | 6 ++- .../web/client/foldertree/FolderTreeView.java | 25 +++++++-- .../grnet/pithos/web/public/images/separator.png | Bin 0 -> 568 bytes src/gr/grnet/pithos/web/public/pithos.css | 25 ++++++--- 6 files changed, 81 insertions(+), 35 deletions(-) create mode 100644 src/gr/grnet/pithos/web/public/images/separator.png diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java index b39939b..f2f967a 100644 --- a/src/gr/grnet/pithos/web/client/Pithos.java +++ b/src/gr/grnet/pithos/web/client/Pithos.java @@ -371,34 +371,41 @@ public class Pithos implements EntryPoint, ResizeHandler { trees = new VerticalPanel(); trees.setWidth("100%"); - + trees.setSpacing(5); - HorizontalPanel treeHeader = new HorizontalPanel(); - treeHeader.addStyleName("pithos-treeHeader"); - treeHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); - treeHeader.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); - HorizontalPanel statistics = new HorizontalPanel(); - statistics.addStyleName("pithos-statistics"); - statistics.add(new HTML("Used: ")); - usedBytes = new HTML(); - statistics.add(usedBytes); - statistics.add(new HTML(" of ")); - totalBytes = new HTML(); - statistics.add(totalBytes); - statistics.add(new HTML(" (")); - usedPercent = new HTML(); - statistics.add(usedPercent); - statistics.add(new HTML(")")); - treeHeader.add(statistics); - treeHeader.setCellHorizontalAlignment(statistics, HasHorizontalAlignment.ALIGN_LEFT); - trees.add(treeHeader); +// HorizontalPanel treeHeader = new HorizontalPanel(); +// treeHeader.addStyleName("pithos-treeHeader"); +// treeHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); +// treeHeader.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); +// treeHeader.add(statistics); +// treeHeader.setCellHorizontalAlignment(statistics, HasHorizontalAlignment.ALIGN_LEFT); +// trees.add(treeHeader); trees.add(folderTreeView); + + HorizontalPanel separator = new HorizontalPanel(); + separator.addStyleName("pithos-statisticsSeparator"); + trees.add(separator); + + HorizontalPanel statistics = new HorizontalPanel(); + statistics.addStyleName("pithos-statistics"); + statistics.add(new HTML("Used: ")); + usedBytes = new HTML(); + statistics.add(usedBytes); + statistics.add(new HTML(" of ")); + totalBytes = new HTML(); + statistics.add(totalBytes); + statistics.add(new HTML(" (")); + usedPercent = new HTML(); + statistics.add(usedPercent); + statistics.add(new HTML(")")); + trees.add(statistics); + trees.add(groupTreeView); // Add the left and right panels to the split panel. splitPanel.setLeftWidget(trees); splitPanel.setRightWidget(inner); - splitPanel.setSplitPosition("35%"); + splitPanel.setSplitPosition("219px"); splitPanel.setSize("100%", "100%"); splitPanel.addStyleName("pithos-splitPanel"); splitPanel.setWidth(contentWidth); @@ -1145,7 +1152,7 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void execute() { mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel); - trees.insert(mysharedTreeView, 2); + trees.insert(mysharedTreeView, 4); treeViews.add(mysharedTreeView); createOtherSharedTree(); } @@ -1179,7 +1186,7 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void execute() { otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel); - trees.insert(otherSharedTreeView, 2); + trees.insert(otherSharedTreeView, 4); treeViews.add(otherSharedTreeView); } }); diff --git a/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.css b/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.css index 4978d7f..9313fab 100644 --- a/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.css +++ b/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.css @@ -35,6 +35,13 @@ .disclosurePanel { padding-left: 10px; + width: 100%; +} + +.header { + background-color: #74aec9; + height: 25px; + width: 100%; } .content { diff --git a/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.java b/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.java index a7c8b01..345fe4a 100644 --- a/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.java +++ b/src/gr/grnet/pithos/web/client/PithosDisclosurePanel.java @@ -59,6 +59,8 @@ public class PithosDisclosurePanel extends Composite { public interface Style extends CssResource { String disclosurePanel(); + String header(); + String content(); } @@ -111,7 +113,9 @@ public class PithosDisclosurePanel extends Composite { sb.appendHtmlConstant(AbstractImagePrototype.create(resources.icon()).getHTML()); sb.append(Templates.INSTANCE.nameSpan(title)); sb.appendHtmlConstant(AbstractImagePrototype.create(open ? resources.open() : resources.closed()).getHTML()); - return new HTML(sb.toSafeHtml()); + HTML header = new HTML(sb.toSafeHtml()); + header.addStyleName(resources.pithosDisclosurePanelCss().header()); + return header; } public void add(IsWidget widget) { diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java index 4383acf..0c95e8a 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java +++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java @@ -53,7 +53,11 @@ import com.google.gwt.user.cellview.client.TreeNode; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HasVerticalAlignment; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Tree; import com.google.gwt.user.client.ui.VerticalPanel; @@ -172,10 +176,23 @@ public class FolderTreeView extends Composite implements TreeView { VerticalPanel panel = new VerticalPanel(); panel.addStyleName("pithos-folderTreeSection"); Resources resources = GWT.create(Resources.class); - SafeHtmlBuilder sb = new SafeHtmlBuilder(); - sb.appendHtmlConstant(AbstractImagePrototype.create(resources.icon()).getHTML()); - sb.append(Templates.INSTANCE.nameSpan("My Files")); - panel.add(new HTML(sb.toSafeHtml())); + + HorizontalPanel header = new HorizontalPanel(); + +// SafeHtmlBuilder sb = new SafeHtmlBuilder(); + Image img = new Image(resources.icon()); + header.add(img); + header.setCellVerticalAlignment(img, HasVerticalAlignment.ALIGN_MIDDLE); + header.setCellWidth(img, "32px"); + HTML title = new HTML("My Files"); + header.add(title); + header.setCellVerticalAlignment(title, HasVerticalAlignment.ALIGN_MIDDLE); + +// sb.appendHtmlConstant(AbstractImagePrototype.create(resources.icon()).getHTML()); + // sb.append(Templates.INSTANCE.nameSpan("My Files")); +// HTML header = new HTML(sb.toSafeHtml()); + header.addStyleName("pithos-folderTreeSectionHeader"); + panel.add(header); /* diff --git a/src/gr/grnet/pithos/web/public/images/separator.png b/src/gr/grnet/pithos/web/public/images/separator.png new file mode 100644 index 0000000000000000000000000000000000000000..e0c13c38620b896b3150ca8b2f665cbe485cce00 GIT binary patch literal 568 zcmV-80>}M{P)~>oPjmOyPkghT@ zoj?1ilhr^m2+#g~Hf$dQr^fqT0bBa5X8yvEegN^{ysRB14gSfB&Bstv>(o$wON9ft zeiI6g@t+vw#6J1D>QN*RXP=&9tlqO~pYADnI_ClRJQUK6=4;0DMT#N*c9YuLF27?( ziQC1T`pAYoqzR#$$N<|`6L*hzLeg!gt2VYyZi=yOAz>2?MwUyQ8mu;BL&gqPmq=1O z7(!6Rf}XH4zErfo`a=Zwhg7><}JoT)1s7jp@G+>4`N^~Doxp-AH#qG5+Pq6tfVrs%)!8T>S#E3M&o<3fH=@F3p)k3W?`wc02$) z{dC`b-gxh2bKgBp$RaKLf7$+Y{If4x$EzjsH(s{K9litnytAiNo)OIe0000