add selector for source and/or target in project-wide search

zanata · May 9, 2012 · 4077910 · 4077910
1 parent f2e64ce
commit 4077910
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 5 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java b/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
@@ -187,12 +187,12 @@ else if (value.equals(VALUE_SEARCH_PROJECT_FIELD_BOTH))
    }
 
 
-   private void setProjectSearchInSource(boolean searchInSource)
+   public void setProjectSearchInSource(boolean searchInSource)
    {
       projectSearchInSource = searchInSource;
    }
 
-   private void setProjectSearchInTarget(boolean searchInTarget)
+   public void setProjectSearchInTarget(boolean searchInTarget)
    {
       projectSearchInTarget = searchInTarget;
    }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
@@ -46,8 +46,11 @@
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.cell.client.ActionCell.Delegate;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.HasChangeHandlers;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
@@ -86,6 +89,10 @@ public interface Display extends WidgetDisplay
 
       HasValue<Boolean> getCaseSensitiveChk();
 
+      HasChangeHandlers getSearchFieldSelector();
+
+      String getSelectedSearchField();
+
       HasClickHandlers getReplaceAllButton();
 
       void clearAll();
@@ -178,6 +185,22 @@ public void onValueChange(ValueChangeEvent<Boolean> event)
          }
       }));
 
+      registerHandler(display.getSearchFieldSelector().addChangeHandler(new ChangeHandler()
+      {
+
+         @Override
+         public void onChange(ChangeEvent event)
+         {
+            HistoryToken token = HistoryToken.fromTokenString(history.getToken());
+            String selected = display.getSelectedSearchField();
+            boolean searchSource = selected.equals("source") || selected.equals("both");
+            boolean searchTarget = selected.equals("target") || selected.equals("both");
+            token.setProjectSearchInSource(searchSource);
+            token.setProjectSearchInTarget(searchTarget);
+            history.newItem(token.toTokenString());
+         }
+      }));
+
       registerHandler(display.getReplaceAllButton().addClickHandler(new ClickHandler()
       {
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
@@ -43,6 +43,7 @@
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.event.dom.client.HasChangeHandlers;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
@@ -65,6 +66,7 @@
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.LayoutPanel;
+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.gwt.view.client.DefaultSelectionEventManager;
@@ -101,6 +103,9 @@ interface SearchResultsViewUiBinder extends UiBinder<LayoutPanel, SearchResultsV
    @UiField
    Button replaceAllButton;
 
+   @UiField
+   ListBox searchFieldsSelect;
+
    private String highlightString;
 
    @Inject
@@ -404,4 +409,16 @@ public TransUnit getValue(TransUnit tu)
       }
    }
 
+   @Override
+   public HasChangeHandlers getSearchFieldSelector()
+   {
+      return searchFieldsSelect;
+   }
+
+   @Override
+   public String getSelectedSearchField()
+   {
+      return searchFieldsSelect.getValue(searchFieldsSelect.getSelectedIndex());
+   }
+
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
@@ -34,13 +34,20 @@
                         <g:layer top="0px" height="26px" left="250px" width="150px">
                             <g:CheckBox ui:field="caseSensitiveChk"><ui:msg>Case sensitive</ui:msg></g:CheckBox>
                         </g:layer>
-                        <g:layer top="0px" height="20px" left="400px" width="250px">
+                        <g:layer top="0px" height="26px" left="400px" width="125px">
+                            <g:ListBox ui:field="searchFieldsSelect" selectedIndex="0">
+                                <g:item value="target"><ui:msg>search target</ui:msg></g:item>
+                                <g:item value="source"><ui:msg>search source</ui:msg></g:item>
+                                <g:item value="both"><ui:msg>search both</ui:msg></g:item>
+                            </g:ListBox>
+                        </g:layer>
+                        <g:layer top="0px" height="20px" left="550px" width="250px">
                             <fui:ClearableTextBox ui:field='replacementTextBox'/>
                         </g:layer>
-                        <g:layer top="0px" height="26px" left="675px" width="200px">
+                        <g:layer top="0px" height="26px" left="825px" width="200px">
                             <g:Button ui:field='replaceAllButton'><ui:msg>Replace All Selected</ui:msg></g:Button>
                         </g:layer>
-                        <g:layer top="0px" height="26px" left="900px" right="0px">
+                        <g:layer top="0px" height="26px" left="1050px" right="0px">
                             <g:Label ui:field="testLabel"></g:Label>
                         </g:layer>
                     </g:LayoutPanel>