GitLab

at 2021-02-11T21:54:08+01:00

Revoir l'ordre des actions dans la popup **Actions** - Closes #1788

 observe.ui.action.test.remote.tip

 observe.ui.action.test.server

 observe.ui.action.test.server.tip

-observe.ui.choice.apply

 observe.ui.choice.cancel

 observe.ui.choice.cancel.tip

 observe.ui.choice.confirm.delete

+observe.ui.choice.confirm.move

 observe.ui.choice.confirm.replace

 observe.ui.choice.continue

 observe.ui.choice.doNotSave

     public static final KeyStroke KEY_STROKE_RESET_DATA = KeyStroke.getKeyStroke("pressed F4");

     public static final KeyStroke KEY_STROKE_SAVE_DATA = KeyStroke.getKeyStroke("pressed F5");

     public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6");

+    public static final KeyStroke KEY_STROKE_MOVE = KeyStroke.getKeyStroke("pressed F7");

     public static final KeyStroke KEY_STROKE_DUPLICATE = KeyStroke.getKeyStroke("pressed F7");

     public static final KeyStroke KEY_STROKE_GENERATE = KeyStroke.getKeyStroke("pressed F9");

+    public static final KeyStroke KEY_STROKE_CHANGE_ID = KeyStroke.getKeyStroke("pressed F9");

+    public static final KeyStroke KEY_STROKE_SHOW_TECHNICAL_INFORMATIONS = KeyStroke.getKeyStroke("pressed F10");

+    public static final KeyStroke KEY_STROKE_SHOW_USAGES = KeyStroke.getKeyStroke("pressed F11");

+    public static final KeyStroke KEY_STROKE_SHOW_UNIQUE_KEYS = KeyStroke.getKeyStroke("pressed F12");

     public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("ctrl pressed T");

 import org.nuiton.jaxx.runtime.swing.action.MenuAction;

 import javax.swing.JPopupMenu;

+import javax.swing.KeyStroke;

 /**

  * Created on 25/11/2020.

     default JPopupMenu getPopupMenu() {

         return getUi().getConfigurePopup();

     }

+

+    @Override

+    default KeyStroke getMenuKeyStroke() {

+        // always use the given key-stroke to avoid change between two content

+        // a same such action is unique on a form, so can be determine once for all

+        return (KeyStroke) getValue(ACCELERATOR_KEY);

+    }

+

 }

 import com.google.common.collect.ImmutableSet;

 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.ContentUI;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ContentUIActionSupport;

     }

     public ChangeId(ChangeIdRequest request, ChangeIdExecutor executor) {

-        super(t("observe.common.ReferentialDto.action.changeId.tip"), t("observe.common.ReferentialDto.action.changeId.tip"), "changeId", null);

+        super(t("observe.common.ReferentialDto.action.changeId.tip"), t("observe.common.ReferentialDto.action.changeId.tip"), "changeId", ObserveKeyStrokesEditorApi.KEY_STROKE_CHANGE_ID);

         this.request = Objects.requireNonNull(request);

         this.executor = Objects.requireNonNull(executor);

     }

  * #L%

  */

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.ContentMode;

 import fr.ird.observe.client.datasource.editor.api.content.ContentUI;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

     public ShowTechnicalInformations(ShowIdRequest request, ShowIdExecutor executor) {

         super(n("observe.ui.action.show.technical.information.tip"), n("observe.ui.action.show.technical.information.tip"),

-              "show-information", null);

+              "show-information", ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_TECHNICAL_INFORMATIONS);

         this.request = Objects.requireNonNull(request);

         this.executor = Objects.requireNonNull(executor);

     }

         selectTargetAction.putValue(Action.ACCELERATOR_KEY, keyStroke);

         selectTargetAction.putValue(Action.NAME, t);

         selectTarget.setFocusable(false);

-        keyStroke = ObserveKeyStrokesEditorApi.KEY_STROKE_APPLY;

-        t = ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(t("observe.ui.choice.apply"), keyStroke);

+        keyStroke = ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE;

+        t = ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(t("observe.ui.choice.confirm.move"), keyStroke);

         applyAction = new AbstractAction() {

             @Override

         };

         applyAction.putValue(Action.ACCELERATOR_KEY, keyStroke);

         applyAction.putValue(Action.NAME, t);

-//        selectTarget.setAction(selectTargetAction);

     }

     public MoveRequestBuilder setParentTargetReferenceType(Class<? extends DtoReference> parentTargetReferenceType) {

                 JLayeredPane parent = (JLayeredPane) optionPane.getParent().getParent();

-                InputMap inputMap = parent.getRootPane().getInputMap(2);

+                InputMap inputMap = parent.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);

                 inputMap.put(KeyStroke.getKeyStroke("pressed ENTER"), "none");

                 inputMap.put(KeyStroke.getKeyStroke("ctrl pressed ENTER"), "none");

             }

         };

         jButton = UsageUIHandlerSupport.findButton(optionPane, continueActionText);

+        jButton.setIcon(UIHelper.getUIManagerActionIcon("move"));

         Objects.requireNonNull(jButton);

         jButton.setEnabled(false);

         editor.getModel().addPropertyChangeListener("selectedItem", evt -> jButton.setEnabled(evt.getNewValue() != null));

  */

 import com.google.common.collect.ImmutableSet;

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveExecutor;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequest;

     }

     protected MoveEdit(Class<D> dataType, MoveExecutor executor) {

-        super(dataType, null, null, "move", null);

+        super(dataType, null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE);

         this.executor = executor;

         setText(ContentOpenableUII18nHelper.getActionMove(getDataType()));

         setTooltipText(ContentOpenableUII18nHelper.getActionMove(getDataType()));

     </row>

   </Table>

+  <JMenuItem id='move'/>

   <JMenuItem id='showTechnicalInformations'/>

-  <JMenuItem id='move' styleClass="ifOpen"/>

 </fr.ird.observe.client.datasource.editor.api.content.ContentUI>
         GotoOpenData.installAction(ui);

         GotoSelectedData.installAction(ui);

         installDeleteAction();

-        ShowTechnicalInformations.installAction(ui);

         installCreateNewAction();

         installMoveAction();

+        ShowTechnicalInformations.installAction(ui);

     }

     @Override

  */

 import com.google.common.collect.ImmutableSet;

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveExecutor;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequest;

     }

     protected MoveMultiple(Class<D> dataType, MoveExecutor executor) {

-        super(dataType, null, null, "move", null);

+        super(dataType, null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE);

         this.executor = executor;

         setText(ContentListUII18nHelper.getActionMove(getDataType()));

         setTooltipText(ContentListUII18nHelper.getActionMoveTip(getDataType()));

       </cell>

     </row>

   </Table>

+  <JMenuItem id='move'/>

   <JMenuItem id='showTechnicalInformations'/>

-  <JMenuItem id='move' styleClass="ifOpen"/>

 </fr.ird.observe.client.datasource.editor.api.content.ContentUI>
 }

 #delete {

-  visible:{states.isUpdatingMode()};

+  /*visible:{states.isUpdatingMode()};*/

+  enabled:{!states.isModified()};

+}

+

+#move {

   enabled:{!states.isModified()};

 }

         installCreateNewAction();

         installResetAction();

         installSaveAction();

-        installMoveAction();

         installDeleteAction();

+        installMoveAction();

         ShowTechnicalInformations.installAction(ui);

     }

  */

 import com.google.common.collect.ImmutableSet;

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveExecutor;

 import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequest;

     }

     protected MoveOpenable(Class<D> dataType, MoveExecutor executor) {

-        super(dataType, null, null, "move", null);

+        super(dataType, null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE);

         this.executor = executor;

         setText(ContentOpenableUII18nHelper.getActionMove(getDataType()));

         setTooltipText(ContentOpenableUII18nHelper.getActionMove(getDataType()));

         BackToListReferential.installAction(ui);

         DetailReferential.installAction(ui);

         DeleteReferential.installAction(ui);

+        ChangeId.installAction(ui);

         ShowTechnicalInformations.installAction(ui);

-        ShowUniqueKeysReferential.installAction(ui);

         ShowUsagesReferential.installAction(ui);

-        ChangeId.installAction(ui);

+        ShowUniqueKeysReferential.installAction(ui);

         installCreateAction();

         installModifyAction();

         installSaveAction();

  * #L%

  */

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUII18nHelper;

     }

     public ShowUniqueKeysReferential(Class<D> dataType) {

-        super(dataType, t("observe.referential.Referential.action.show.unique.keys.tip"), t("observe.referential.Referential.action.show.unique.keys.tip"), "show-keys", null);

+        super(dataType, t("observe.referential.Referential.action.show.unique.keys.tip"), t("observe.referential.Referential.action.show.unique.keys.tip"), "show-keys", ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_UNIQUE_KEYS);

     }

     @Override

  */

 import fr.ird.observe.client.ClientUIContext;

+import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel;

     }

     public ShowUsagesReferential(Class<D> dataType) {

-        super(dataType, t("observe.referential.Referential.action.show.usages.tip"), t("observe.referential.Referential.action.show.usages.tip"), "show-usages", null);

+        super(dataType, t("observe.referential.Referential.action.show.usages.tip"), t("observe.referential.Referential.action.show.usages.tip"), "show-usages", ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_USAGES);

     }

     @Override

             toolTipText = ObserveKeyStrokesSupport.removeKeyStroke(toolTipText);

             putValue(SHORT_DESCRIPTION, toolTipText);

             String name = (String) getValue(NAME);

-            if (name!=null && name.isEmpty()) {

+            if (name != null && name.isEmpty()) {

                 putValue(NAME, toolTipText);

             }

         }

         editor.setEnabled(action.isEnabled());

     }

-    @Override

-    public void initUI() {

-        if (!isWithKeyStroke()) {

-            KeyStroke keyStroke = getMenuKeyStroke();

-            setKeyStroke(keyStroke);

-        }

-        AbstractButton editor = getEditor();

-        getPopupMenu().add(editor);

-        initEditor();

-    }

-

     @Override

     public KeyStroke getMenuKeyStroke() {

+        if (isWithKeyStroke()) {

+            return (KeyStroke) getValue(ACCELERATOR_KEY);

+        }

         int usedCount = (int) Arrays.stream(getPopupMenu().getSubElements()).filter(p -> !((ContentUIMenuAction) ((AbstractButton) p).getAction()).isWithKeyStroke()).count();

         return getMenuKeyStroke(usedCount);

     }

             popup.addSeparator();

             length = popup.getSubElements().length;

         }

-        Arrays.stream(selectedContentUI.getInsertPopup().getSubElements()).forEach(a -> new ContentUIMenuAction(popup, (AbstractButton) a).init());

+        Arrays.stream(selectedContentUI.getConfigurePopup().getSubElements()).forEach(a -> ContentUIMenuAction.createWithKeyStroke(popup, (AbstractButton) a).init());

         if (popup.getSubElements().length > length) {

             popup.addSeparator();

         }

-        Arrays.stream(selectedContentUI.getConfigurePopup().getSubElements()).forEach(a -> new ContentUIMenuAction(popup, (AbstractButton) a).init());

         length = popup.getSubElements().length;

+        Arrays.stream(selectedContentUI.getInsertPopup().getSubElements()).forEach(a -> new ContentUIMenuAction(popup, (AbstractButton) a).init());

         if (length == 0) {

             popup.add(noAction);

         }

   enabled: true;

 }

-.ifOpen {

-  enabled:{states.isUpdatingMode()};

-}
   horizontalTextPosition:{BeanCheckBox.LEFT};

 }

-.ifOpen {

-  enabled:{states.isUpdatingMode() && !states.isModified()};

-}
 observe.ui.choice.cancel.tip=To cancel, press ESCAPE key. 

 observe.ui.choice.confirm.delete=Confirm delete

 observe.ui.choice.confirm.insert=Confirm to insert

+observe.ui.choice.confirm.move=Move

 observe.ui.choice.confirm.replace=Replace

 observe.ui.choice.continue=Continue

 observe.ui.choice.dcp.default=Other opérations or objects (FOB)

 observe.ui.choice.cancel.tip=To cancel, press ESCAPE key. \#TODO

 observe.ui.choice.confirm.delete=Eliminar

 observe.ui.choice.confirm.insert=Confirmer l'insertion \#TODO

+observe.ui.choice.confirm.move=Cambiar

 observe.ui.choice.confirm.replace=Reemplazar

 observe.ui.choice.continue=Continuar

 observe.ui.choice.dcp.default=Other opérations or objects (FOB) \#TODO

 observe.ui.choice.cancel.tip=Pour annuler, presser la touche ÉCHAP.

 observe.ui.choice.confirm.delete=Supprimer

 observe.ui.choice.confirm.insert=Confirmer l'insertion

+observe.ui.choice.confirm.move=Déplacer

 observe.ui.choice.confirm.replace=Remplacer

 observe.ui.choice.continue=Continuer

 observe.ui.choice.dcp.default=Autre opérations et types d'objets (FOB)

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

24 changed files:

Changes: