svn commit: r1522392 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LabelListView.java res/CssLabelListView.css

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:47:14 2013
New Revision: 1522392

URL: http://svn.apache.org/r1522392
Log:
add adjusted style to labels list in setting palce

Modified:
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java?rev=1522392&r1=1522391&r2=1522392&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
 Thu Sep 12 04:47:14 2013
@@ -224,6 +224,13 @@ public class LabelListView extends Compo
        @UiField Button add;
        @UiField Button delete;
 
+       public interface Resources extends CellList.Resources {
+
+               Resources INSTANCE = GWT.create(Resources.class);
+
+               @Source("res/CssLabelListView.css")
+               public CellList.Style cellListStyle();
+       }
        @UiHandler("add")
        public void handleAdd(ClickEvent e) {
                labelProperties.cascade(selectionModel.getSelectedObject(), 
data.getDataList(), CASCADE_TYPE_ADD);
@@ -235,7 +242,7 @@ public class LabelListView extends Compo
        public LabelListView(final HupaRequestFactory rf) {
                initWidget(binder.createAndBindUi(this));
                data = new ImapLabelListDataProvider(rf);
-               CellList<LabelNode> cellList = new CellList<LabelNode>(new 
LabelCell());
+               CellList<LabelNode> cellList = new CellList<LabelNode>(new 
LabelCell(), Resources.INSTANCE);
                cellList.setSelectionModel(selectionModel);
                selectionModel.addSelectionChangeHandler(new 
SelectionChangeEvent.Handler() {
                        public void onSelectionChange(SelectionChangeEvent 
event) {
@@ -307,6 +314,8 @@ public class LabelListView extends Compo
 
                        rf.fetchFoldersRequest().fetch(null, 
Boolean.TRUE).fire(new Receiver<List<ImapFolder>>() {
 
+                               private String INTENTS = 
"&nbsp;&nbsp;&nbsp;&nbsp;";
+
                                @Override
                                public void onSuccess(List<ImapFolder> 
response) {
                                        folderNodes.clear();
@@ -314,7 +323,7 @@ public class LabelListView extends Compo
                                                updateRowCount(-1, true);
                                        } else {
                                                for (ImapFolder folder : 
response) {
-                                                       
fillCellList(folderNodes, folder, LabelNode.ROOT, "&nbsp;&nbsp;&nbsp;&nbsp;");
+                                                       
fillCellList(folderNodes, folder, LabelNode.ROOT, INTENTS);
                                                }
                                                updateRowData(start, 
folderNodes);
                                        }
@@ -331,7 +340,7 @@ public class LabelListView extends Compo
                                        folderNodes.add(labelNode);
                                        if (curFolder.getHasChildren()) {
                                                for (ImapFolder subFolder : 
curFolder.getChildren()) {
-                                                       
fillCellList(folderNodes, subFolder, labelNode, intents + 
"&nbsp;&nbsp;&nbsp;&nbsp;");
+                                                       
fillCellList(folderNodes, subFolder, labelNode, intents + INTENTS);
                                                }
                                        }
                                }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css?rev=1522392&r1=1522391&r2=1522392&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 Thu Sep 12 04:47:14 2013
@@ -15,8 +15,11 @@
  */
 .cellListWidget {
        
+<<<<<<< HEAD
        cursor:default;
        
+=======
+>>>>>>> add adjusted style to labels list in setting palce
 }
 
 .cellListEvenItem {
@@ -52,11 +55,18 @@
 }
 
 .cellListKeyboardSelectedItem {
+<<<<<<< HEAD
     background:  #c7e3ef;
 }
 
 .cellListSelectedItem {
        background:  #c7e3ef;
+=======
+       background: #ffc;
+}
+
+.cellListSelectedItem {
+>>>>>>> add adjusted style to labels list in setting palce
     background-color: #c7e3ef;
     color: #004458;
     height: auto;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org