rhbz853823 - add 5 page size option (to avoid scroll bar)

zanata · Sep 18, 2012 · 92e4099 · 92e4099
1 parent 7ebc40b
commit 92e4099
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
@@ -63,6 +63,8 @@ public class EditorOptionsView extends Composite implements EditorOptionsDisplay
    @UiField
    Label pageSizeHeader;
    @UiField
+   InlineLabel five;
+   @UiField
    InlineLabel ten;
    @UiField
    InlineLabel fifty;
@@ -72,9 +74,9 @@ public class EditorOptionsView extends Composite implements EditorOptionsDisplay
    Styles style;
    @UiField
    Label otherConfigHeader;
+
    @UiField
    CheckBox showErrorChk;
-
    @UiField
    CheckBox useCodeMirrorChk; // TODO this is disabled and invisible to user. If codemirror works fine then remove this option.
 
@@ -121,6 +123,21 @@ public HasValue<Boolean> getUntranslatedChk()
       return untranslatedChk;
    }
 
+   @UiHandler("five")
+   public void onPageSizeFiveClicked(ClickEvent event)
+   {
+      selectFive();
+      listener.onPageSizeClick(5);
+   }
+
+   private void selectFive()
+   {
+      five.setStyleName(style.selectedPageSize());
+      ten.removeStyleName(style.selectedPageSize());
+      twentyFive.removeStyleName(style.selectedPageSize());
+      fifty.removeStyleName(style.selectedPageSize());
+   }
+
    @UiHandler("ten")
    public void onPageSizeTenClicked(ClickEvent event)
    {
@@ -130,6 +147,7 @@ public void onPageSizeTenClicked(ClickEvent event)
 
    private void selectTen()
    {
+      five.removeStyleName(style.selectedPageSize());
       ten.setStyleName(style.selectedPageSize());
       twentyFive.removeStyleName(style.selectedPageSize());
       fifty.removeStyleName(style.selectedPageSize());
@@ -144,6 +162,7 @@ public void onPageSizeTwentyFiveClicked(ClickEvent event)
 
    private void selectTwentyFive()
    {
+      five.removeStyleName(style.selectedPageSize());
       ten.removeStyleName(style.selectedPageSize());
       twentyFive.setStyleName(style.selectedPageSize());
       fifty.removeStyleName(style.selectedPageSize());
@@ -158,6 +177,7 @@ public void onPageSizeFiftyClicked(ClickEvent event)
 
    private void selectFifty()
    {
+      five.removeStyleName(style.selectedPageSize());
       ten.removeStyleName(style.selectedPageSize());
       twentyFive.removeStyleName(style.selectedPageSize());
       fifty.setStyleName(style.selectedPageSize());
@@ -215,7 +235,11 @@ public void setOptionsState(UserConfigHolder.ConfigurationState state)
 
    private void selectPageSize(int pageSize)
    {
-      if (pageSize == 10)
+      if (pageSize == 5)
+      {
+         selectFive();
+      }
+      else if (pageSize == 10)
       {
          selectTen();
       }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
@@ -42,6 +42,12 @@
             padding: 3px;
             border: 1px solid #808080;
             cursor: pointer;
+            display: block;
+            height: 15px;
+            width: 15px;
+            text-align: center;
+            float: left;
+            margin-right: 3px;
         }
 
     </ui:style>
@@ -75,6 +81,7 @@
                     <g:VerticalPanel width="100%">
                         <g:Label ui:field="pageSizeHeader" styleName="sideMenuHeader"/>
                         <g:HTMLPanel styleName="{style.pageSizeContainer}">
+                            <g:InlineLabel ui:field="five" >5</g:InlineLabel>
                             <g:InlineLabel ui:field="ten" >10</g:InlineLabel>
                             <g:InlineLabel ui:field="twentyFive" >25</g:InlineLabel>
                             <g:InlineLabel ui:field="fifty" >50</g:InlineLabel>