Author: dongxu
Date: Thu Sep 12 04:36:35 2013
New Revision: 1522369
URL: http://svn.apache.org/r1522369
Log:
make delete label in label setting work(backend now)
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
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/LabelListView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/webapp/styles.css
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
Thu Sep 12 04:36:35 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.activity;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.rf.DeleteFolderRequest;
import org.apache.hupa.client.ui.LabelNode;
@@ -119,17 +120,54 @@ import org.apache.hupa.client.ui.LabelNo
>>>>>>> add rename RF to label setting feature
=======
>>>>>>> fixed issue#57 - really disable the tools in toolbar
+=======
+import org.apache.hupa.client.HupaController;
+import org.apache.hupa.client.rf.DeleteFolderRequest;
+import org.apache.hupa.client.ui.LabelNode;
+>>>>>>> make delete label in label setting work(backend now)
import org.apache.hupa.client.ui.WidgetDisplayable;
+import org.apache.hupa.shared.domain.DeleteFolderAction;
+import org.apache.hupa.shared.domain.GenericResult;
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.events.DeleteFolderEvent;
+import org.apache.hupa.shared.events.DeleteFolderEventHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.view.client.SingleSelectionModel;
import com.google.inject.Inject;
+import com.google.web.bindery.requestfactory.shared.Receiver;
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class LabelListActivity extends AppBaseActivity {
+ @Inject HupaController hupaController;
+
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
+ bindTo(eventBus);
+ }
+
+ private void bindTo(final EventBus eventBus) {
+ this.registerHandler(display.getDelete().addClickHandler(new
ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ if (Window.confirm("Are you sure?")) {
+ eventBus.fireEvent(new
DeleteFolderEvent());
+ }
+ }
+ }));
+ eventBus.addHandler(DeleteFolderEvent.TYPE, new
DeleteFolderEventHandler() {
+ @Override
+ public void onDeleteFolderEvent(DeleteFolderEvent
event) {
+ deleteSelected();
+ }
+ });
}
@Inject private Displayable display;
@@ -140,6 +178,34 @@ public class LabelListActivity extends A
=======
public interface Displayable extends WidgetDisplayable {
+ SingleSelectionModel<LabelNode> getSelectionModel();
+ HasClickHandlers getAdd();
+ HasClickHandlers getDelete();
+ }
+
+ public void deleteSelected() {
+ hupaController.showTopLoading("Deleting");
+ SingleSelectionModel<LabelNode> selectionModel =
display.getSelectionModel();
+ LabelNode labelNode = selectionModel.getSelectedObject();
+ DeleteFolderRequest req = requestFactory.deleteFolderRequest();
+ DeleteFolderAction action =
req.create(DeleteFolderAction.class);
+ final ImapFolder f = req.create(ImapFolder.class);
+ f.setFullName(labelNode.getFolder().getFullName());
+ action.setFolder(f);
+ req.delete(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ hupaController.hideTopLoading();
+ hupaController.showNotice("The label \"" +
f.getFullName() + "\" was deleted.", 10000);
+ }
+ @Override
+ public void onFailure(ServerFailure error) {
+ hupaController.hideTopLoading();
+ hupaController.showNotice(error.getMessage(),
10000);
+ }
+
+ });
+
}
>>>>>>> add rename RF to label setting feature
}
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=1522369&r1=1522368&r2=1522369&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:36:35 2013
@@ -197,11 +197,14 @@ import org.apache.hupa.shared.domain.Ima
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.cellview.client.CellList;
+import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.view.client.AsyncDataProvider;
import com.google.gwt.view.client.HasData;
@@ -216,6 +219,9 @@ public class LabelListView extends Compo
@UiField SimplePanel thisView;
+ @UiField Button add;
+ @UiField Button delete;
+
@Inject
public LabelListView(HupaRequestFactory rf, final
LabelPropertiesActivity.Displayable labelProperties) {
initWidget(binder.createAndBindUi(this));
@@ -230,6 +236,11 @@ public class LabelListView extends Compo
data.addDataDisplay(cellList);
thisView.setWidget(cellList);
}
+
+ @Override
+ public SingleSelectionModel<LabelNode> getSelectionModel(){
+ return this.selectionModel;
+ }
public final SingleSelectionModel<LabelNode> selectionModel = new
SingleSelectionModel<LabelNode>(
new ProvidesKey<LabelNode>() {
@@ -320,13 +331,20 @@ public class LabelListView extends Compo
}
+<<<<<<< HEAD
interface LabelListUiBinder extends UiBinder<SimplePanel,
LabelListView> {
>>>>>>> make label settings prototype
+=======
+ interface LabelListUiBinder extends UiBinder<DockLayoutPanel,
LabelListView> {
+>>>>>>> make delete label in label setting work(backend now)
}
private static LabelListUiBinder binder =
GWT.create(LabelListUiBinder.class);
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> make delete label in label setting work(backend now)
@Override
public HasClickHandlers getAdd() {
return add;
@@ -337,6 +355,7 @@ public class LabelListView extends Compo
return delete;
}
+<<<<<<< HEAD
@Override
public void refresh() {
data.refresh();
@@ -344,4 +363,6 @@ public class LabelListView extends Compo
=======
>>>>>>> make label settings prototype
+=======
+>>>>>>> make delete label in label setting work(backend now)
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml
Thu Sep 12 04:36:35 2013
@@ -12,9 +12,15 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<<<<<<< HEAD
+<<<<<<< HEAD
<g:DockLayoutPanel>
<g:center>
<g:ScrollPanel ui:field="thisView" />
+=======
+ <g:DockLayoutPanel>
+ <g:center>
+ <g:SimplePanel ui:field="thisView" />
+>>>>>>> make delete label in label setting work(backend now)
</g:center>
<g:south size="43">
<g:FlowPanel ui:field="folderOpButtons">
@@ -23,7 +29,10 @@
</g:FlowPanel>
</g:south>
</g:DockLayoutPanel>
+<<<<<<< HEAD
=======
<g:SimplePanel ui:field="thisView" />
>>>>>>> make label settings prototype
+=======
+>>>>>>> make delete label in label setting work(backend now)
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
Thu Sep 12 04:36:35 2013
@@ -169,6 +169,7 @@ public class NavigationView extends Comp
settingOuter.removeStyleName(style.selected());
mail.addStyleName(style.mailInnerSelected());
setting.removeStyleName(style.settingsInnerSelected());
+ //FIXME need the default one
placeController.goTo(new MailFolderPlace("Mock-Inbox"));
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
Thu Sep 12 04:36:35 2013
@@ -103,7 +103,6 @@ import com.google.gwt.user.cellview.clie
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.SimpleLayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.SplitLayoutPanel;
@@ -117,9 +116,9 @@ public class _CenterSettingPanel extends
@UiField SimpleLayoutPanel settingsTab;
- @UiField ScrollPanel labelListContainer;
+ @UiField SimpleLayoutPanel labelListContainer;
@UiField SimplePanel labelPropertiesContainer;
-
+
public _CenterSettingPanel() {
initWidget(binder.createAndBindUi(this));
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
Thu Sep 12 04:36:35 2013
@@ -253,14 +253,8 @@
</g:HTML>
</g:north>
<g:center>
- <g:ScrollPanel
ui:field="labelListContainer" />
+ <g:SimpleLayoutPanel
ui:field="labelListContainer" />
</g:center>
- <g:south size="43">
- <g:FlowPanel
ui:field="folderOpButtons">
- <g:Button
ui:field="add">Add</g:Button>
- <g:Button
ui:field="delete">Delete</g:Button>
- </g:FlowPanel>
- </g:south>
</g:DockLayoutPanel>
</g:west>
<g:center>
Modified: james/hupa/trunk/client/src/main/webapp/styles.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/styles.css?rev=1522369&r1=1522368&r2=1522369&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/styles.css (original)
+++ james/hupa/trunk/client/src/main/webapp/styles.css Thu Sep 12 04:36:35 2013
@@ -3,10 +3,14 @@
*
* Copyright (c) 2012, The Roundcube Dev Team
<<<<<<< HEAD
+<<<<<<< HEAD
* Screendesign by FLINT / B�ro f�r Gestaltung, bueroflint.com
=======
* Screendesign by FLINT / Bro fr Gestaltung, bueroflint.com
>>>>>>> refactoring theme 1 - login page
+=======
+ * Screendesign by FLINT / B�ro f�r Gestaltung, bueroflint.com
+>>>>>>> make delete label in label setting work(backend now)
*
* The contents are subject to the Creative Commons Attribution-ShareAlike
* License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -2697,7 +2701,7 @@ a.button.disabled,input.button.disabled,
a.button.disabled span.inner {
opacity: 0.4;
- filter: alpha(opacity = 40);
+ filter: alpha(opacity = 40);
}
a.button.pressed,a.button:active,input.button:active {
@@ -2811,7 +2815,7 @@ a.iconbutton {
a.iconbutton.disabled {
opacity: 0.4;
- filter: alpha(opacity = 40);
+ filter: alpha(opacity = 40);
cursor: default;
}
@@ -3334,7 +3338,7 @@ table.layout td {
.boxfooter .listbutton.disabled .inner {
opacity: 0.4;
- filter: alpha(opacity = 40);
+ filter: alpha(opacity = 40);
}
.boxfooter .countdisplay {
@@ -3377,7 +3381,7 @@ table.layout td {
.boxpagenav a.icon.disabled {
opacity: 0.4;
- filter: alpha(opacity = 40);
+ filter: alpha(opacity = 40);
}
.centerbox {
@@ -3811,7 +3815,7 @@ ul.proplist li {
.toolbar a.button.disabled {
opacity: 0.4;
- filter: alpha(opacity = 40);
+ filter: alpha(opacity = 40);
}
.dropbutton {
@@ -3836,7 +3840,7 @@ ul.proplist li {
.dropbutton a.button.disabled+.dropbuttontip {
opacity: 0.5;
- filter: alpha(opacity = 50);
+ filter: alpha(opacity = 50);
}
.dropbutton a.button.disabled+.dropbuttontip:hover {
@@ -3974,7 +3978,7 @@ select.decorated {
opacity: 0;
height: 22px;
cursor: pointer;
- filter: alpha(opacity = 0);
+ filter: alpha(opacity = 0);
-khtml-appearance: none;
-webkit-appearance: none;
}
@@ -4110,12 +4114,12 @@ ul.toolbarmenu li span.icon {
background-position: -100px 0;
background-repeat: no-repeat;
opacity: 0.2;
- filter: alpha(opacity = 20);
+ filter: alpha(opacity = 20);
}
ul.toolbarmenu li a.active span.icon {
opacity: 0.99;
- filter: alpha(opacity = 100);
+ filter: alpha(opacity = 100);
}
ul.toolbarmenu li span.read {
@@ -4248,7 +4252,7 @@ ul.toolbarmenu li span.conversation {
color: #ccc;
white-space: nowrap;
opacity: 0.92;
- filter: alpha(opacity = 92);
+ filter: alpha(opacity = 92);
text-shadow: 0px 1px 1px #333;
}
@@ -4466,14 +4470,21 @@ fieldset.tab {
}
.gwt-SplitLayoutPanel-HDragger {
- cursor: col-resize;
+ user-select: none;
+ -moz-user-select: none;
+ -khtml-user-select: none;
position: absolute;
background: url(images/splitter.png) center no-repeat;
+ width: 10px;
+ height: 100%;
+ cursor: e-resize;
+ cursor: col-resize;
background-position: 0 center;
}
.gwt-SplitLayoutPanel-VDragger {
<<<<<<< HEAD
+<<<<<<< HEAD
cursor: row-resize;
position: absolute;
background: url(images/splitter.png) center no-repeat;
@@ -4484,6 +4495,18 @@ fieldset.tab {
position: absolute;
background: url(images/splitter.png) center no-repeat;
background-position: center 0;
+=======
+ user-select: none;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ position: absolute;
+ background: url(images/splitter.png) center no-repeat;
+ height: 10px;
+ width: 100%;
+ cursor: n-resize;
+ cursor: row-resize;
+ background-position: center 0;
+>>>>>>> make delete label in label setting work(backend now)
}
.GWTUpld,table.GWTUpld td {
@@ -4627,6 +4650,11 @@ fieldset.tab {
.gwt-PopupPanelGlass {
background-color: #d4e4ff;
opacity: 0.3;
+<<<<<<< HEAD
filter: alpha(opacity = 30);
}
>>>>>>> beautify the multiuploader
+=======
+ filter: alpha(opacity = 30);
+}
+>>>>>>> make delete label in label setting work(backend now)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
