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

Commit

Permalink
Moved shortcut config option to right side panel
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Dec 15, 2011
1 parent 5c9bab1 commit d3759d7
Show file tree
Hide file tree
Showing 12 changed files with 66 additions and 165 deletions.
16 changes: 0 additions & 16 deletions ...-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
View file
Expand Up @@ -29,7 +29,6 @@
import org.zanata.webtrans.client.events.NavTransUnitEvent;
import org.zanata.webtrans.client.events.NavTransUnitEvent.NavigationType;
import org.zanata.webtrans.client.events.NavTransUnitHandler;
import org.zanata.webtrans.client.ui.ShortcutConfigPanel;

import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
Expand All @@ -56,10 +55,6 @@ public interface Display extends WidgetDisplay

HasClickHandlers getNextStateButton();

HasClickHandlers getConfigureButton();

Widget getConfigureButtonObject();

void setNavModeTooltip(Map<String, Boolean> configMap);
}

Expand All @@ -69,8 +64,6 @@ public TransUnitNavigationPresenter(Display display, EventBus eventBus)
super(display, eventBus);
}

final ShortcutConfigPanel shortcutConfigPanel = new ShortcutConfigPanel(true, eventBus);

@Override
protected void onBind()
{
Expand Down Expand Up @@ -128,15 +121,6 @@ public void onClick(ClickEvent event)
}
});

display.getConfigureButton().addClickHandler(new ClickHandler()
{
@Override
public void onClick(ClickEvent event)
{
shortcutConfigPanel.toggleDisplay(display.getConfigureButtonObject());
}
});

}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...r/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
View file
Expand Up @@ -176,12 +176,14 @@ public void onClick(ClickEvent event)
if (display.getToogleOptionsButton().isDown())
{
display.setSidePanelViewVisible(true);
display.getToogleOptionsButton().setTitle(messages.showEditorOptions());
display.getToogleOptionsButton().setTitle(messages.hideEditorOptions());
display.getToogleOptionsButton().setText(messages.showEditorOptionsLabel());
}
else
{
display.setSidePanelViewVisible(false);
display.getToogleOptionsButton().setTitle(messages.hideEditorOptions());
display.getToogleOptionsButton().setTitle(messages.showEditorOptions());
display.getToogleOptionsButton().setText(messages.hideEditorOptionsLabel());
}
}
}));
Expand Down
3 changes: 0 additions & 3 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
View file
Expand Up @@ -81,9 +81,6 @@ public interface NavigationMessages extends Messages
@DefaultMessage("Cancel")
String editCancelShortcut();

@DefaultMessage("Configure key/button behaviour")
String configurationButton();

// @DefaultMessage("Copy")
// String editClone();

Expand Down
6 changes: 6 additions & 0 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
View file
Expand Up @@ -65,6 +65,12 @@ public interface WebTransMessages extends Messages
@DefaultMessage("Hide Editor Options")
String hideEditorOptions();

@DefaultMessage("Options >>")
String showEditorOptionsLabel();

@DefaultMessage("<< Options")
String hideEditorOptionsLabel();

@DefaultMessage("Find")
String findButton();

Expand Down
2 changes: 1 addition & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorConfigConstants.java
View file
Expand Up @@ -34,7 +34,7 @@ public class EditorConfigConstants

public static final String LABEL_ENTER_BUTTON_SAVE = "'Enter' key saves immediately";
public static final String LABEL_ESC_KEY_CLOSE = "'Esc' key closes editor";
public static final String LABEL_NAV_OPTION = "Navigation key/button options:";
public static final String LABEL_NAV_OPTION = "Navigation key/button:";
public static final String LABEL_EDITOR_BUTTONS = "Editor Buttons";
public static final String LABEL_EDITOR_OPTIONS = "Editor Options";

Expand Down
42 changes: 41 additions & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
View file
Expand Up @@ -30,13 +30,16 @@

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
Expand All @@ -58,11 +61,14 @@ interface EditorOptionsUiBinder extends UiBinder<Widget, EditorOptionsPanel>
VerticalPanel contentPanel;

@UiField
Label header;
Label header, navOptionHeader;

@UiField
CheckBox enterChk, escChk, editorButtonsChk;

@UiField
ListBox optionsList;

private Map<String, Boolean> configMap = new HashMap<String, Boolean>();

public EditorOptionsPanel(final EventBus eventBus)
Expand All @@ -73,13 +79,22 @@ public EditorOptionsPanel(final EventBus eventBus)
enterChk.setText(EditorConfigConstants.LABEL_ENTER_BUTTON_SAVE);
escChk.setText(EditorConfigConstants.LABEL_ESC_KEY_CLOSE);
editorButtonsChk.setText(EditorConfigConstants.LABEL_EDITOR_BUTTONS);
navOptionHeader.setText(EditorConfigConstants.LABEL_NAV_OPTION);

enterChk.setValue(false);
escChk.setValue(false);
editorButtonsChk.setValue(true);

optionsList.addItem(EditorConfigConstants.OPTION_FUZZY_UNTRANSLATED);
optionsList.addItem(EditorConfigConstants.OPTION_FUZZY);
optionsList.addItem(EditorConfigConstants.OPTION_UNTRANSLATED);

optionsList.setSelectedIndex(0);

configMap.put(EditorConfigConstants.BUTTON_ENTER, false);
configMap.put(EditorConfigConstants.BUTTON_ESC, false);
configMap.put(EditorConfigConstants.BUTTON_FUZZY, true);
configMap.put(EditorConfigConstants.BUTTON_UNTRANSLATED, true);

enterChk.addValueChangeHandler(new ValueChangeHandler<Boolean>()
{
Expand Down Expand Up @@ -112,6 +127,31 @@ public void onValueChange(ValueChangeEvent<Boolean> event)
eventBus.fireEvent(new UserConfigChangeEvent(configMap));
}
});

optionsList.addChangeHandler(new ChangeHandler()
{
@Override
public void onChange(ChangeEvent event)
{
String selectedOption = optionsList.getItemText(optionsList.getSelectedIndex());
if (selectedOption.equals(EditorConfigConstants.OPTION_FUZZY_UNTRANSLATED))
{
configMap.put(EditorConfigConstants.BUTTON_UNTRANSLATED, true);
configMap.put(EditorConfigConstants.BUTTON_FUZZY, true);
}
else if (selectedOption.equals(EditorConfigConstants.OPTION_FUZZY))
{
configMap.put(EditorConfigConstants.BUTTON_FUZZY, true);
configMap.put(EditorConfigConstants.BUTTON_UNTRANSLATED, false);
}
else if (selectedOption.equals(EditorConfigConstants.OPTION_UNTRANSLATED))
{
configMap.put(EditorConfigConstants.BUTTON_FUZZY, false);
configMap.put(EditorConfigConstants.BUTTON_UNTRANSLATED, true);
}
eventBus.fireEvent(new UserConfigChangeEvent(configMap));
}
});
}

@Override
Expand Down
11 changes: 11 additions & 0 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
View file
Expand Up @@ -15,6 +15,12 @@
border-radius:3px;
height:17px;
}

.subheader{
padding-top:10px;
font-weight:bold;
}

</ui:style>

<g:ScrollPanel>
Expand All @@ -24,6 +30,11 @@
<g:CheckBox ui:field="editorButtonsChk"/>
<g:CheckBox ui:field="enterChk"/>
<g:CheckBox ui:field="escChk"/>

<g:Label ui:field="navOptionHeader" styleName="{style.subheader}"/>
<g:cell horizontalAlignment="ALIGN_CENTER">
<g:ListBox ui:field="optionsList"/>
</g:cell>
</g:VerticalPanel>
</g:VerticalPanel>
</g:ScrollPanel>
Expand Down
124 changes: 0 additions & 124 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
View file

This file was deleted.

16 changes: 1 addition & 15 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
View file
Expand Up @@ -46,7 +46,7 @@ interface TransUnitNavigationViewUiBinder extends UiBinder<Widget, TransUnitNavi
}

@UiField
Image nextEntry, prevEntry, prevState, nextState, configure, firstEntry, lastEntry;
Image nextEntry, prevEntry, prevState, nextState, firstEntry, lastEntry;

private final NavigationMessages messages;

Expand All @@ -65,7 +65,6 @@ public TransUnitNavigationView(final NavigationMessages messages, final Resource
firstEntry.setTitle(messages.firstEntry());
lastEntry.setTitle(messages.lastEntry());
setFuzzyUntranslatedModeTooltip();
configure.setTitle(messages.configurationButton());
}

public void setNavModeTooltip(Map<String, Boolean> configMap)
Expand Down Expand Up @@ -149,17 +148,4 @@ public Widget asWidget()
{
return this;
}

@Override
public HasClickHandlers getConfigureButton()
{
return configure;
}

@Override
public Widget getConfigureButtonObject()
{
return configure;
}

}
1 change: 0 additions & 1 deletion ...r/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
View file
Expand Up @@ -18,6 +18,5 @@
<g:Image resource="{resources.nextEntry}" ui:field="nextEntry" styleName="{style.imageAnchor}"/>
<g:Image resource="{resources.nextState}" ui:field="nextState" styleName="{style.imageAnchor}"/>
<g:Image resource="{resources.lastEntry}" ui:field="lastEntry" styleName="{style.imageAnchor}"/>
<g:Image resource="{resources.configureButton}" ui:field="configure" styleName="{style.configButton}"/>
</g:HTMLPanel>
</ui:UiBinder>
2 changes: 1 addition & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
View file
Expand Up @@ -111,7 +111,7 @@ public TranslationView(Resources resources, WebTransMessages messages)
mainSplitPanel.setWidgetMinSize(sidePanelOuterContainer, (int) panelWidth);
mainSplitPanel.setWidgetMinSize(southPanelContainer, (int) southHeight);

toogleOptionsButton.setText("Options");
toogleOptionsButton.setText(messages.showEditorOptionsLabel());
toogleOptionsButton.setTitle(messages.showEditorOptions());
toogleOptionsButton.setDown(true);

Expand Down
2 changes: 1 addition & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
View file
Expand Up @@ -34,7 +34,7 @@
<g:LayoutPanel ui:field="editorContainer" />
</g:layer>

<g:layer height="100%" width="60px" right="5px" top="2px">
<g:layer height="100%" width="80px" right="5px" top="2px">
<g:FlowPanel>
<g:ToggleButton ui:field="toogleOptionsButton"/>
</g:FlowPanel>
Expand Down

0 comments on commit d3759d7

Please sign in to comment.