Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'DisableModalNavigation' into integration/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed May 17, 2012
2 parents 5bbea9f + 299370a commit ac05074
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 5 deletions.
Expand Up @@ -32,6 +32,7 @@
import org.zanata.webtrans.client.editor.HasPageNavigation;
import org.zanata.webtrans.client.events.DocumentSelectionEvent;
import org.zanata.webtrans.client.events.DocumentSelectionHandler;
import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
import org.zanata.webtrans.client.events.FilterViewEvent;
import org.zanata.webtrans.client.events.FilterViewEventHandler;
import org.zanata.webtrans.client.events.FindMessageEvent;
Expand Down Expand Up @@ -197,7 +198,18 @@ private void initialiseTransUnitList()
display.getTableModel().clearCache();
display.getTableModel().setRowCount(TableModel.UNKNOWN_ROW_COUNT);
display.gotoPage(0, true);
initialiseTransUnitsNavigation();

// modal navigation disabled if there's findMessage
if (findMessage == null || findMessage.isEmpty())
{
initialiseTransUnitsNavigation();
eventBus.fireEvent(new EnableModalNavigationEvent(true));
}
else
{
eventBus.fireEvent(new EnableModalNavigationEvent(false));
}

}

private void initialiseTransUnitsNavigation()
Expand Down
Expand Up @@ -49,7 +49,6 @@
import org.zanata.webtrans.client.presenter.UserConfigHolder;
import org.zanata.webtrans.client.presenter.WorkspaceUsersPresenter;
import org.zanata.webtrans.client.resources.TableEditorMessages;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.client.ui.ToggleEditor;
import org.zanata.webtrans.client.ui.ToggleEditor.ViewMode;
import org.zanata.webtrans.client.ui.ValidationMessagePanelDisplay;
Expand All @@ -59,15 +58,12 @@
import org.zanata.webtrans.shared.model.TransUnitId;
import org.zanata.webtrans.shared.model.UserPanelSessionItem;
import org.zanata.webtrans.shared.model.WorkspaceContext;
import org.zanata.webtrans.shared.rpc.TransUnitEditAction;
import org.zanata.webtrans.shared.rpc.TransUnitEditResult;

import com.allen_sauer.gwt.log.client.Log;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.event.dom.client.KeyDownEvent;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.Inject;
import com.google.inject.Singleton;

Expand Down
@@ -0,0 +1,57 @@
package org.zanata.webtrans.client.events;

import com.google.gwt.event.shared.GwtEvent;
import com.google.gwt.event.shared.GwtEvent.Type;

public class EnableModalNavigationEvent extends GwtEvent<EnableModalNavigationEventHandler>
{
/**
* Handler type.
*/
private static Type<EnableModalNavigationEventHandler> TYPE;

/**
* Gets the type associated with this event.
*
* @return returns the handler type
*/
public static Type<EnableModalNavigationEventHandler> getType()
{
if (TYPE == null)
{
TYPE = new Type<EnableModalNavigationEventHandler>();
}
return TYPE;
}

private boolean isEnable;

public EnableModalNavigationEvent(boolean isEnable)
{
this.isEnable = isEnable;
}

@Override
protected void dispatch(EnableModalNavigationEventHandler handler)
{
handler.onEnable(this);
}

@Override
public Type<EnableModalNavigationEventHandler> getAssociatedType()
{
return getType();
}

public boolean isEnable()
{
return isEnable;
}

public void setEnable(boolean isEnable)
{
this.isEnable = isEnable;
}


}
@@ -0,0 +1,8 @@
package org.zanata.webtrans.client.events;

import com.google.gwt.event.shared.EventHandler;

public interface EnableModalNavigationEventHandler extends EventHandler
{
void onEnable(EnableModalNavigationEvent event);
}
Expand Up @@ -24,6 +24,8 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;

import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
import org.zanata.webtrans.client.events.EnableModalNavigationEventHandler;
import org.zanata.webtrans.client.events.FilterViewEvent;
import org.zanata.webtrans.client.events.FilterViewEventHandler;
import org.zanata.webtrans.client.events.UserConfigChangeEvent;
Expand Down Expand Up @@ -196,6 +198,15 @@ public void onWorkspaceContextUpdated(WorkspaceContextUpdateEvent event)
setReadOnly(event.isReadOnly());
}
}));

registerHandler(eventBus.addHandler(EnableModalNavigationEvent.getType(), new EnableModalNavigationEventHandler()
{
@Override
public void onEnable(EnableModalNavigationEvent event)
{
display.setNavOptionVisible(event.isEnable());
}
}));
}

void setReadOnly(boolean readOnly)
Expand Down
Expand Up @@ -26,6 +26,8 @@

import org.zanata.webtrans.client.events.NavTransUnitEvent;
import org.zanata.webtrans.client.events.NavTransUnitEvent.NavigationType;
import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
import org.zanata.webtrans.client.events.EnableModalNavigationEventHandler;
import org.zanata.webtrans.client.events.NavTransUnitHandler;
import org.zanata.webtrans.client.events.UserConfigChangeEvent;
import org.zanata.webtrans.client.events.UserConfigChangeHandler;
Expand Down Expand Up @@ -133,6 +135,16 @@ public void onValueChanged(UserConfigChangeEvent event)
display.setNavModeTooltip(configHolder.isButtonFuzzy(), configHolder.isButtonUntranslated());
}
}));

registerHandler(eventBus.addHandler(EnableModalNavigationEvent.getType(), new EnableModalNavigationEventHandler()
{
@Override
public void onEnable(EnableModalNavigationEvent event)
{
display.setModalNavVisible(event.isEnable());
}
}));

}

@Override
Expand Down

0 comments on commit ac05074

Please sign in to comment.