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

Commit

Permalink
User Story US3: Fuzzy to show in Italics and Yellow Highlights - TA4,…
Browse files Browse the repository at this point in the history 
… TA5
  • Loading branch information
Alex Eng committed Aug 4, 2011
1 parent 90e2ac1 commit b434a05
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 104 deletions.
17 changes: 0 additions & 17 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,6 @@ public TranslationEditorView(final WebTransMessages messages, final Resources re
this.transUnitCountBar = new TransUnitCountBar(messages);
this.pager = new Pager(messages, resources);
this.tmPanelContainer = new LayoutPanel();
// {
// public void onBrowserEvent(com.google.gwt.user.client.Event event)
// {
//
// super.onBrowserEvent(event);
// switch (event.getTypeInt())
// {
// case Event.ONMOUSEOVER:
// tmMinimize.setVisible(true);
// break;
// case Event.ONMOUSEOUT:
// tmMinimize.setVisible(false);
// break;
// }
// };
// };
// tmPanelContainer.sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT);

initWidget(uiBinder.createAndBindUi(this));
tmMinimize.setVisible(true);
Expand Down
23 changes: 16 additions & 7 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,17 @@
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;

public class SourcePanel extends Composite implements HasValue<TransUnit>, HasClickHandlers
{

private final FlowPanel panel;
private final HorizontalPanel panel;
private final HorizontalPanel rightPanel;
private final Label sourceLabel;
private TransUnit value;

Expand All @@ -47,22 +50,29 @@ public SourcePanel(TransUnit value, NavigationMessages messages)
{
this.value = value;
this.messages = messages;
panel = new FlowPanel();
panel = new HorizontalPanel();
panel.setSize("100%", "100%");

initWidget(panel);
setStylePrimaryName("TableEditorSource");

rightPanel = new HorizontalPanel();
rightPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
rightPanel.setSize("100%", "100%");

sourceLabel = new HighlightingLabel(value.getSource());
sourceLabel.setStylePrimaryName("TableEditorContent");
sourceLabel.setTitle(messages.sourceCommentLabel() + value.getSourceComment());

panel.add(sourceLabel);

refresh();
panel.add(rightPanel);
}

public void refresh()


public void add(Widget w)
{
rightPanel.add(w);
}

@Override
Expand All @@ -87,7 +97,6 @@ public void setValue(TransUnit value, boolean fireEvents)
{
ValueChangeEvent.fire(this, value);
}
refresh();
}
}

Expand Down
161 changes: 85 additions & 76 deletions ...war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,23 @@

import net.customware.gwt.presenter.client.EventBus;

import org.zanata.common.ContentState;
import org.zanata.webtrans.client.events.CopySourceEvent;
import org.zanata.webtrans.client.events.ToggleApprovedEvent;
import org.zanata.webtrans.client.ui.HighlightingLabel;
import org.zanata.webtrans.shared.model.TransUnit;

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.gen2.table.client.AbstractColumnDefinition;
import com.google.gwt.gen2.table.client.CellRenderer;
import com.google.gwt.gen2.table.client.ColumnDefinition;
import com.google.gwt.gen2.table.client.DefaultTableDefinition;
import com.google.gwt.gen2.table.client.RowRenderer;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;

public class TableEditorTableDefinition extends DefaultTableDefinition<TransUnit>
{
Expand Down Expand Up @@ -135,20 +129,14 @@ public void setCellValue(TransUnit rowValue, TransUnit cellValue)
private final CellRenderer<TransUnit, TransUnit> sourceCellRenderer = new CellRenderer<TransUnit, TransUnit>()
{
@Override
public void renderRowValue(TransUnit rowValue, ColumnDefinition<TransUnit, TransUnit> columnDef, AbstractCellView<TransUnit> view)
public void renderRowValue(final TransUnit rowValue, ColumnDefinition<TransUnit, TransUnit> columnDef, AbstractCellView<TransUnit> view)
{
view.setStyleName("TableEditorCell TableEditorCell-Source");
sourcePanel = new SourcePanel(rowValue, messages);
if (findMessage != null && !findMessage.isEmpty())
{
sourcePanel.highlightSearch(findMessage);
}
if (rowValue.getStatus() == ContentState.NeedReview)
{
String content = sourcePanel.getElement().getInnerHTML();
String highlight = "<font style='color:blue; background-color:yellow;'>" + content;
sourcePanel.getElement().setInnerHTML(highlight);
}
sourcePanel.sinkEvents(Event.ONCLICK);
sourcePanel.addClickHandler(new ClickHandler()
{
Expand All @@ -163,6 +151,24 @@ public void onClick(ClickEvent event)
}

});

TableResources images = GWT.create(TableResources.class);
Image copyButton = new Image(images.copySrcButton());
copyButton.setStyleName("gwt-Button");
copyButton.setTitle(messages.copySourcetoTarget());
copyButton.addClickHandler(new ClickHandler()
{

@Override
public void onClick(ClickEvent event)
{
rowValue.setTarget(rowValue.getSource());
eventBus.fireEvent(new CopySourceEvent(rowValue));
}

});
sourcePanel.add(copyButton);

view.setWidget(sourcePanel);
}
};
Expand All @@ -182,57 +188,60 @@ public void setCellValue(TransUnit rowValue, TransUnit cellValue)
}
};

private final CellRenderer<TransUnit, TransUnit> operationsCellRenderer = new CellRenderer<TransUnit, TransUnit>()
{
@Override
public void renderRowValue(final TransUnit rowValue, ColumnDefinition<TransUnit, TransUnit> columnDef, AbstractCellView<TransUnit> view)
{
view.setStyleName("TableEditorCell TableEditorCell-Middle");
VerticalPanel operationsPanel = new VerticalPanel();
operationsPanel.setWidth("100%");
operationsPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);

toggleApproved = new CheckBox();
if (rowValue.getStatus() == ContentState.Approved)
toggleApproved.setValue(true);
else
toggleApproved.setValue(false);
toggleApproved.addValueChangeHandler(new ValueChangeHandler<Boolean>()
{
@Override
public void onValueChange(ValueChangeEvent<Boolean> event)
{
if (event.getValue())
rowValue.setStatus(ContentState.Approved);
else
// change status to Fuzzy, if remove Approved mark
rowValue.setStatus(ContentState.NeedReview);

eventBus.fireEvent(new ToggleApprovedEvent(rowValue));
}

});
TableResources images = GWT.create(TableResources.class);
Image copyButton = new Image(images.copySrcButton());
copyButton.setStyleName("gwt-Button");
//copyButton.setText(messages.editClone());
copyButton.setTitle(messages.copySourcetoTarget());
copyButton.addClickHandler(new ClickHandler()
{

@Override
public void onClick(ClickEvent event)
{
rowValue.setTarget(rowValue.getSource());
eventBus.fireEvent(new CopySourceEvent(rowValue));
}

});
operationsPanel.add(copyButton);
operationsPanel.add(toggleApproved);
view.setWidget(operationsPanel);
}
};
// private final CellRenderer<TransUnit, TransUnit> operationsCellRenderer =
// new CellRenderer<TransUnit, TransUnit>()
// {
// @Override
// public void renderRowValue(final TransUnit rowValue,
// ColumnDefinition<TransUnit, TransUnit> columnDef,
// AbstractCellView<TransUnit> view)
// {
// view.setStyleName("TableEditorCell TableEditorCell-Middle");
// VerticalPanel operationsPanel = new VerticalPanel();
// // operationsPanel.setWidth("100%");
// operationsPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
//
// toggleApproved = new CheckBox();
// if (rowValue.getStatus() == ContentState.Approved)
// toggleApproved.setValue(true);
// else
// toggleApproved.setValue(false);
// toggleApproved.addValueChangeHandler(new ValueChangeHandler<Boolean>()
// {
// @Override
// public void onValueChange(ValueChangeEvent<Boolean> event)
// {
// if (event.getValue())
// rowValue.setStatus(ContentState.Approved);
// else
// // change status to Fuzzy, if remove Approved mark
// rowValue.setStatus(ContentState.NeedReview);
//
// eventBus.fireEvent(new ToggleApprovedEvent(rowValue));
// }
//
// });
// // TableResources images = GWT.create(TableResources.class);
// // Image copyButton = new Image(images.copySrcButton());
// // copyButton.setStyleName("gwt-Button");
// // // copyButton.setText(messages.editClone());
// // copyButton.setTitle(messages.copySourcetoTarget());
// // copyButton.addClickHandler(new ClickHandler()
// // {
// //
// // @Override
// // public void onClick(ClickEvent event)
// // {
// // rowValue.setTarget(rowValue.getSource());
// // eventBus.fireEvent(new CopySourceEvent(rowValue));
// // }
// //
// // });
// // operationsPanel.add(copyButton);
// operationsPanel.add(toggleApproved);
// view.setWidget(operationsPanel);
// }
// };

private final AbstractColumnDefinition<TransUnit, TransUnit> targetColumnDefinition = new AbstractColumnDefinition<TransUnit, TransUnit>()
{
Expand All @@ -248,7 +257,6 @@ public void setCellValue(TransUnit rowValue, TransUnit cellValue)
{
cellValue.setTarget(rowValue.getTarget());
}

};

private final CellRenderer<TransUnit, TransUnit> targetCellRenderer = new CellRenderer<TransUnit, TransUnit>()
Expand Down Expand Up @@ -283,12 +291,13 @@ public void renderRowValue(TransUnit rowValue, ColumnDefinition<TransUnit, Trans
((HighlightingLabel) label).highlightSearch(findMessage);
}

if (rowValue.getStatus() == ContentState.NeedReview)
{
String content = label.getElement().getInnerHTML();
String newHtml = "<font style='color:blue; background-color:yellow;'>" + content;
label.getElement().setInnerHTML(newHtml);
}
// if (rowValue.getStatus() == ContentState.NeedReview)
// {
// String content = label.getElement().getInnerHTML();
// String newHtml =
// "<font style='color:blue; background-color:#F9F9B3;'>" + content;
// label.getElement().setInnerHTML(newHtml);
// }

label.setTitle(messages.clickHere());

Expand Down Expand Up @@ -316,10 +325,10 @@ public TableEditorTableDefinition(final NavigationMessages messages, final Redir
// indicatorColumnDefinition.setMinimumColumnWidth(15);
// indicatorColumnDefinition.setCellRenderer(indicatorCellRenderer);
sourceColumnDefinition.setCellRenderer(sourceCellRenderer);
operationsColumnDefinition.setMaximumColumnWidth(60);
operationsColumnDefinition.setPreferredColumnWidth(60);
operationsColumnDefinition.setMinimumColumnWidth(60);
operationsColumnDefinition.setCellRenderer(operationsCellRenderer);
// operationsColumnDefinition.setMaximumColumnWidth(16);
// operationsColumnDefinition.setPreferredColumnWidth(16);
// operationsColumnDefinition.setMinimumColumnWidth(16);
// operationsColumnDefinition.setCellRenderer(operationsCellRenderer);
targetColumnDefinition.setCellRenderer(targetCellRenderer);
CancelCallback<TransUnit> cancelCallBack = new CancelCallback<TransUnit>()
{
Expand Down Expand Up @@ -361,7 +370,7 @@ public void gotoPrevFuzzy(int row)
// See _INDEX consts above if modifying!
// addColumnDefinition(indicatorColumnDefinition);
addColumnDefinition(sourceColumnDefinition);
addColumnDefinition(operationsColumnDefinition);
// addColumnDefinition(operationsColumnDefinition);
addColumnDefinition(targetColumnDefinition);
}

Expand Down
17 changes: 13 additions & 4 deletions server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Removes some of the styling on the page-level splitters

.TableEditor tr td.TableEditorCell-Middle {
vertical-align: middle;
width: 100%;
width: 16px;
}

.TableEditor tr.FuzzyStateDecoration td.TableEditorCell-Source {
Expand Down Expand Up @@ -223,7 +223,6 @@ Removes some of the styling on the page-level splitters
font-style: italic;
/* background: url(tu_bg_fuzzy_right.png) repeat-y right; */
border-right: 3px solid #cccccc;
border-left: none;
/* need to verify if #cccccc works for all borders first
border-right: 3px solid #f7dec3;
border-left: 3px solid #f7dec3;
Expand Down Expand Up @@ -269,7 +268,7 @@ td.TableEditorCell-Source {
}

td.TableEditorCell-Target {

padding-left:20px;
}

tr.TableEditorRow.highlighted td.TableEditorCell {
Expand Down Expand Up @@ -346,7 +345,17 @@ tr.TableEditorRow.selected td.TableEditorCell-Target {
}

.TableEditorContent-Edit {
border: 1px solid #666666;
border: 1px solid #BFBFBF;
}

tr.FuzzyStateDecoration td.TableEditorCell-Target .TableEditorContent {
border-left:3px solid #ffc000;
padding-left:5px;
}

tr.ApprovedStateDecoration td.TableEditorCell-Target .TableEditorContent {
border-left:3px solid #099b09;
padding-left:5px;
}

.TableEditorContent-Empty {
Expand Down

0 comments on commit b434a05

Please sign in to comment.