Implement update description for keyshortcut, improve explaination fo…

…r Alt+page up and down, https://bugzilla.redhat.com/show_bug.cgi?id=844200
zanata · Aug 2, 2012 · 3458e1d · 3458e1d
1 parent 5e6cb78
commit 3458e1d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java b/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
@@ -121,6 +121,9 @@ public class TargetContentsPresenter implements TargetContentsDisplay.Listener,
    private HandlerRegistration enterTriggersAutoSizeHandlerRegistration;
    private HandlerRegistration escClosesEditorHandlerRegistration;
 
+   private final KeyShortcut nextStateShortcut;
+   private final KeyShortcut prevStateShortcut;
+
    @Inject
    public TargetContentsPresenter(Provider<TargetContentsDisplay> displayProvider, final CachingDispatchAsync dispatcher, final Identity identity, final EventBus eventBus, final TableEditorMessages messages, final SourceContentsPresenter sourceContentsPresenter, final UserSessionService sessionService, final UserConfigHolder configHolder, UserWorkspaceContext userWorkspaceContext, Scheduler scheduler, ValidationMessagePanelDisplay validationMessagePanel, final KeyShortcutPresenter keyShortcutPresenter)
    {
@@ -200,7 +203,7 @@ public void onKeyShortcut(KeyShortcutEvent event)
 
       // Register shortcut ALT+(PageDown) to move next state entry - if modal
       // navigation is enabled
-      keyShortcutPresenter.register(new KeyShortcut(new Keys(Keys.ALT_KEY, KeyCodes.KEY_PAGEDOWN), ShortcutContext.Edit, messages.moveToNextStateRow(), new KeyShortcutEventHandler()
+      nextStateShortcut = new KeyShortcut(new Keys(Keys.ALT_KEY, KeyCodes.KEY_PAGEDOWN), ShortcutContext.Edit, messages.nextFuzzyOrUntranslated(), new KeyShortcutEventHandler()
       {
          @Override
          public void onKeyShortcut(KeyShortcutEvent event)
@@ -210,11 +213,12 @@ public void onKeyShortcut(KeyShortcutEvent event)
                moveToNextState(NavTransUnitEvent.NavigationType.NextEntry);
             }
          }
-      }));
+      });
+      keyShortcutPresenter.register(nextStateShortcut);
 
       // Register shortcut ALT+(PageUp) to move previous state entry - if modal
       // navigation is enabled
-      keyShortcutPresenter.register(new KeyShortcut(new Keys(Keys.ALT_KEY, KeyCodes.KEY_PAGEUP), ShortcutContext.Edit, messages.moveToPreviousStateRow(), new KeyShortcutEventHandler()
+      prevStateShortcut = new KeyShortcut(new Keys(Keys.ALT_KEY, KeyCodes.KEY_PAGEUP), ShortcutContext.Edit, messages.prevFuzzyOrUntranslated(), new KeyShortcutEventHandler()
       {
          @Override
          public void onKeyShortcut(KeyShortcutEvent event)
@@ -224,7 +228,8 @@ public void onKeyShortcut(KeyShortcutEvent event)
                moveToNextState(NavTransUnitEvent.NavigationType.PrevEntry);
             }
          }
-      }));
+      });
+      keyShortcutPresenter.register(prevStateShortcut);
 
       // Register shortcut CTRL+S to save as fuzzy
       keyShortcutPresenter.register(new KeyShortcut(new Keys(Keys.CTRL_KEY, 'S'), ShortcutContext.Edit, messages.saveAsFuzzy(), KeyEvent.KEY_DOWN, true, true, new KeyShortcutEventHandler()
@@ -312,7 +317,6 @@ public void onKeyShortcut(KeyShortcutEvent event)
             }
          }
       }));
-
    }
 
    private ToggleEditor getCurrentEditor()
@@ -684,6 +688,24 @@ public void onValueChanged(UserConfigChangeEvent event)
          }
          escClosesEditorRegistered = escClosesEditor;
       }
+
+
+      if (configHolder.isButtonFuzzy() && !configHolder.isButtonUntranslated())
+      {
+         nextStateShortcut.setDescription(messages.nextFuzzy());
+         prevStateShortcut.setDescription(messages.prevFuzzy());
+      }
+      else if (configHolder.isButtonUntranslated() && !configHolder.isButtonFuzzy())
+      {
+         nextStateShortcut.setDescription(messages.nextUntranslated());
+         prevStateShortcut.setDescription(messages.prevUntranslated());
+      }
+      else if (configHolder.isButtonUntranslated() && configHolder.isButtonFuzzy())
+      {
+         nextStateShortcut.setDescription(messages.nextFuzzyOrUntranslated());
+         prevStateShortcut.setDescription(messages.nextFuzzyOrUntranslated());
+      }
+
    }
 
    @Override

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java b/zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
@@ -212,4 +212,9 @@ public int compareTo(KeyShortcut o)
       return keys.iterator().next().compareTo(o.keys.iterator().next());
    }
 
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
@@ -55,11 +55,23 @@ String validationWarningsHeading(@PluralCount
    @DefaultMessage("Move to previous row")
    String moveToPreviousRow();
 
-   @DefaultMessage("Move to next state row")
-   String moveToNextStateRow();
-
-   @DefaultMessage("Move to previous state row")
-   String moveToPreviousStateRow();
+   @DefaultMessage("Move to next Fuzzy")
+   String nextFuzzy();
+
+   @DefaultMessage("Move to prev Fuzzy")
+   String prevFuzzy();
+
+   @DefaultMessage("Move to next Untranslated")
+   String nextUntranslated();
+
+   @DefaultMessage("Move to prev Untranslated")
+   String prevUntranslated();
+
+   @DefaultMessage("Move to next Fuzzy/Untranslated")
+   String nextFuzzyOrUntranslated();
+
+   @DefaultMessage("Move to prev Fuzzy/Untranslated")
+   String prevFuzzyOrUntranslated();
 
    @DefaultMessage("Save as fuzzy")
    String saveAsFuzzy();