Author: dongxu Date: Thu Sep 12 04:34:53 2013 New Revision: 1522364 URL: http://svn.apache.org/r1522364 Log: make tool bar's style work as expected
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522364&r1=1522363&r2=1522364&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 04:34:53 2013 @@ -204,6 +204,11 @@ public class ToolBarActivity extends App //FIXME messagesDisplay can not be injected into ToolBarView, why? private String folderName; + @Override + public void onStop(){ + //for tool bar work as expected, not to unbind event handlers + } + @Override public void start(AcceptsOneWidget container, EventBus eventBus) { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522364&r1=1522363&r2=1522364&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 04:34:53 2013 @@ -95,6 +95,7 @@ import com.google.gwt.resources.client.C import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.uibinder.client.UiHandler; <<<<<<< HEAD import com.google.gwt.user.client.ui.Anchor; @@ -389,6 +390,9 @@ import com.google.gwt.uibinder.client.Ui >>>>>>> composing composing panel ======= >>>>>>> fixed issue#57 - really disable the tools in toolbar +======= +import com.google.gwt.uibinder.client.UiHandler; +>>>>>>> make tool bar's style work as expected import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DecoratedPopupPanel; @@ -415,6 +419,9 @@ public class ToolBarView extends Composi @UiField Anchor delete; @UiField Anchor mark; @UiField Anchor more; + + @UiField HTMLPanel replyAllTip; + @UiField HTMLPanel forwardTip; HandlerRegistration replyReg; HandlerRegistration replyAllReg; @@ -546,7 +553,16 @@ public class ToolBarView extends Composi replyReg = reply.addClickHandler(replyHandler); replyAllReg = replyAll.addClickHandler(replyAllHandler); forwardReg = forward.addClickHandler(forwardHandler); +<<<<<<< HEAD >>>>>>> fixed issue#57 - really disable the tools in toolbar +======= + enableAllTools(false); + } + + @UiHandler("compose") + void handleClick(ClickEvent e) { + placeController.goTo(new ComposePlace("new").with(parameters)); +>>>>>>> make tool bar's style work as expected } private ClickHandler forwardHandler = new ClickHandler(){ @@ -660,6 +676,8 @@ public class ToolBarView extends Composi reply.addStyleName(style.disabledButton()); replyAllGroup.addStyleName(style.disabledButton()); forwardGroup.addStyleName(style.disabledButton()); + replyAllTip.addStyleName(style.disabledButton()); + forwardTip.addStyleName(style.disabledButton()); replyReg.removeHandler(); replyAllReg.removeHandler(); @@ -670,6 +688,8 @@ public class ToolBarView extends Composi reply.removeStyleName(style.disabledButton()); replyAllGroup.removeStyleName(style.disabledButton()); forwardGroup.removeStyleName(style.disabledButton()); + replyAllTip.removeStyleName(style.disabledButton()); + forwardTip.removeStyleName(style.disabledButton()); replyReg = reply.addClickHandler(replyHandler); replyAllReg = replyAll.addClickHandler(replyAllHandler); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522364&r1=1522363&r2=1522364&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Thu Sep 12 04:34:53 2013 @@ -91,6 +91,7 @@ border-radius: 4px; text-decoration: none; <<<<<<< HEAD +<<<<<<< HEAD } .checkMail { @@ -101,6 +102,8 @@ background-position: center -530px; ======= cursor: pointer; +======= +>>>>>>> make tool bar's style work as expected } .checkMail { @@ -171,6 +174,7 @@ <<<<<<< HEAD <<<<<<< HEAD background-position: 0 -1255px; +<<<<<<< HEAD } .handCursor{ @@ -250,8 +254,13 @@ background-position: 0 -1255px; >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers cursor: pointer; +======= +>>>>>>> make tool bar's style work as expected } + .handCursor{ + cursor: pointer; + } .forward { min-width: 64px; background-position: left -650px; @@ -331,6 +340,7 @@ <g:FlowPanel addStyleNames="{style.bar}" ui:field="ToolBar"> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <g:Anchor ui:field="refresh" addStyleNames="{style.button} {style.checkMail} {style.handCursor}">Refresh</g:Anchor> <g:Anchor ui:field="compose" addStyleNames="{style.button} {style.compose} {style.handCursor}">Compose</g:Anchor> <g:HTMLPanel tag="span" addStyleNames="{style.spacer}"></g:HTMLPanel> @@ -361,20 +371,24 @@ <g:Anchor ui:field="refresh" addStyleNames="{style.button} {style.checkMail}">Refresh</g:Anchor> <g:Anchor ui:field="compose" addStyleNames="{style.button} {style.compose}">Compose</g:Anchor> >>>>>>> add enable tool bar buttons toggling event, with being related to >>>>>>> issue #31 +======= + <g:Anchor ui:field="refresh" addStyleNames="{style.button} {style.checkMail} {style.handCursor}">Refresh</g:Anchor> + <g:Anchor ui:field="compose" addStyleNames="{style.button} {style.compose} {style.handCursor}">Compose</g:Anchor> +>>>>>>> make tool bar's style work as expected <g:HTMLPanel tag="span" addStyleNames="{style.spacer}"></g:HTMLPanel> <g:Anchor ui:field="reply" - addStyleNames="{style.button} {style.reply} {style.disabledButton}">Reply</g:Anchor> + addStyleNames="{style.button} {style.reply} {style.handCursor}">Reply</g:Anchor> <g:HTMLPanel ui:field="replyAllGroup" tag="span" - addStyleNames="{style.dropButton} {style.disabledButton}"> + addStyleNames="{style.dropButton} {style.handCursor}"> <g:Anchor ui:field="replyAll" addStyleNames="{style.button} {style.replyAll}">Reply all </g:Anchor> - <g:HTMLPanel tag="span" addStyleNames="{style.dropButtonTip}"></g:HTMLPanel> + <g:HTMLPanel ui:field="replyAllTip" tag="span" addStyleNames="{style.dropButtonTip}" /> </g:HTMLPanel> <g:HTMLPanel ui:field="forwardGroup" tag="span" - addStyleNames="{style.dropButton} {style.disabledButton}"> + addStyleNames="{style.dropButton} {style.handCursor}"> <g:Anchor ui:field="forward" addStyleNames="{style.button} {style.forward}">Forward </g:Anchor> - <g:HTMLPanel tag="span" addStyleNames="{style.dropButtonTip}"></g:HTMLPanel> + <g:HTMLPanel ui:field="forwardTip" tag="span" addStyleNames="{style.dropButtonTip}" /> </g:HTMLPanel> <<<<<<< HEAD <<<<<<< HEAD @@ -395,11 +409,15 @@ >>>>>>> add enable tool bar buttons toggling event, with being related to >>>>>>> issue #31 ======= <g:Anchor ui:field="delete" - addStyleNames="{style.button} {style.delete} {style.disabledButton}">Delete</g:Anchor> + addStyleNames="{style.button} {style.delete} {style.handCursor}">Delete</g:Anchor> <g:Anchor ui:field="mark" - addStyleNames="{style.button} {style.mark} {style.disabledButton}">Mark</g:Anchor> + addStyleNames="{style.button} {style.mark} {style.handCursor}">Mark</g:Anchor> <g:Anchor ui:field="more" +<<<<<<< HEAD addStyleNames="{style.button} {style.more} {style.disabledButton}">More</g:Anchor> >>>>>>> 1.do not select the message which is being focused on. 2.create the >>>>>>> mark popup menu +======= + addStyleNames="{style.button} {style.more} {style.handCursor}">More</g:Anchor> +>>>>>>> make tool bar's style work as expected </g:FlowPanel> </ui:UiBinder> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org