Key mapping capabilities for terminal in Shortcuts prefs #973

pskowronek · 2023-06-07T18:52:03Z

Key mapping capabilities for terminal in Shortcuts prefs.

A lot of changes to achieve that - should be carefully reviewed and tested for backward compatibility especially as it comes to preferences stored in xml (action_keymap.xml, command_bar etc).

By default, no keybindings are set - this means default key binding are being used as set by JediTerm.
Terminal keybindings have different "scope" i.e. it is possible to use existing key bindings from other shortcuts.

ahadas

partial review (147 out of 181)

ahadas · 2023-06-24T09:08:18Z

mucommander-core/src/main/java/com/mucommander/ui/action/ActionId.java

+        if (o == null || getClass() != o.getClass())
+            return false;
+        ActionId actionId1 = (ActionId) o;
+        return Objects.equals(actionId, actionId1.actionId);


shouldn't we also compare the type here?

I saw later on that in order to distinguish between, let's say 'find' for terminal and 'find' for the file table, there's code that checks the scope of the action that we look for - in case of checking a terminal action we filter out the non-terminal actions and vice versa. I would prefer to get that logic here - to say that "this" ActionId is with with terminal scope then it doesn't equal any other command that is not with terminal scope, and vice versa

I will try to think about later (after fixing other remarks).

So, you're right that it would be better, however I guess I don't want to refactor more with this PR :/

In ActionManager#getActionInstance line 382 - this will return null if we were to check type, because this is being used in context of toolbar via ToolBar:110 that is using ToolBarAttributes#DEFAULT_TOOLBAR_ACTIONS set as Toolbar.

ok, let's leave this one out of this PR

mucommander-core/src/main/java/com/mucommander/ui/dialog/customization/CommandBarDialog.java

mucommander-core/src/main/java/com/mucommander/ui/dialog/pref/general/ShortcutsTable.java

ahadas

still didn't review everything (175 / 181)

ahadas · 2023-06-24T16:16:23Z

mucommander-core/src/main/java/com/mucommander/ui/action/ActionId.java

+        if (o == null || getClass() != o.getClass())
+            return false;
+        ActionId actionId1 = (ActionId) o;
+        return Objects.equals(actionId, actionId1.actionId);


I saw later on that in order to distinguish between, let's say 'find' for terminal and 'find' for the file table, there's code that checks the scope of the action that we look for - in case of checking a terminal action we filter out the non-terminal actions and vice versa. I would prefer to get that logic here - to say that "this" ActionId is with with terminal scope then it doesn't equal any other command that is not with terminal scope, and vice versa

mucommander-core/src/main/java/com/mucommander/ui/action/ActionCategory.java

mucommander-core/src/main/java/com/mucommander/ui/action/AcceleratorMap.java

mucommander-core/src/main/java/com/mucommander/ui/terminal/TerminalSettingsProvider.java

mucommander-translator/src/main/resources/dictionary.properties

package/readme.txt

mucommander-core/src/main/java/com/mucommander/ui/main/commandbar/CommandBarReader.java

pskowronek · 2023-06-24T18:44:50Z

PR updated with fixes after review

ahadas

complete review (so many changes..), also resolved some of the previous comments that were handled, looks good overall!

mucommander-translator/src/main/resources/dictionary.properties

mucommander-core/src/main/java/com/mucommander/ui/action/ActionKeymap.java

mucommander-core/src/main/java/com/mucommander/ui/action/ActionKeymapIO.java

mucommander-core/src/main/java/com/mucommander/ui/action/ActionKeymapWriter.java

mucommander-core/src/main/java/com/mucommander/ui/action/ActionManager.java

pskowronek · 2023-06-24T23:02:25Z

PR updated, what is left is #973 (comment) - as in the comment

ahadas

one minor comment, besides that lgtm

mucommander-core/src/main/java/com/mucommander/ui/terminal/TerminalSettingsProvider.java

ahadas · 2023-06-25T18:57:39Z

mucommander-core/src/main/java/com/mucommander/ui/action/ActionId.java

+        if (o == null || getClass() != o.getClass())
+            return false;
+        ActionId actionId1 = (ActionId) o;
+        return Objects.equals(actionId, actionId1.actionId);


ok, let's leave this one out of this PR

…erminal and muC

pskowronek · 2023-06-25T20:14:43Z

PR updated

pskowronek requested a review from ahadas as a code owner June 7, 2023 18:52

pskowronek marked this pull request as draft June 8, 2023 11:50

pskowronek marked this pull request as ready for review June 8, 2023 14:34

pskowronek force-pushed the key-bind-term-pref branch from e4d4da6 to e86dee8 Compare June 23, 2023 20:34

ahadas force-pushed the key-bind-term-pref branch from e86dee8 to 81b715b Compare June 24, 2023 09:02

ahadas reviewed Jun 24, 2023

View reviewed changes

pskowronek force-pushed the key-bind-term-pref branch from 81b715b to bded831 Compare June 24, 2023 18:44

ahadas reviewed Jun 24, 2023

View reviewed changes

pskowronek force-pushed the key-bind-term-pref branch from 51af32e to 385c6b6 Compare June 24, 2023 23:00

ahadas reviewed Jun 25, 2023

View reviewed changes

pskowronek added 14 commits June 25, 2023 22:11

Shortcuts/Action related classes - reformat

a886d7e

Shortcuts/Actions - refactor String actionId to ActionId

87eea85

Shortcuts/Actions -actionId as class, added terminal key bindings

935af64

Shortcuts/Actions - terminal using Shortcuts if set

b9f67c9

Shortcuts - added Terminal key bindings mucommander#952

fd1f4e9

Shortcuts Terminal - updated readme.txt

285194a

Shortcuts Terminal - addressed the problem with shared keys between T…

34949eb

…erminal and muC

Shortcuts Terminal - reverted suspend y -> n

db56f9c

Shortcuts Terminal - fix for the same keys for term and muC

65dea11

Shortcuts Terminal - fixes after PR review

7334ac5

Shortcuts Terminal - fixes after PR review 2

83ba401

Shortcuts Terminal - cosmetic fixes

4c66bc0

Shortcuts Terminal - fixes after PR review 3

24cb4e2

Shortcuts Terminal - fixes after PR review 4

5e66328

pskowronek force-pushed the key-bind-term-pref branch from 385c6b6 to 5e66328 Compare June 25, 2023 20:14

ahadas approved these changes Jun 25, 2023

View reviewed changes

ahadas merged commit 781c081 into mucommander:master Jun 25, 2023

ahadas linked an issue Jul 2, 2023 that may be closed by this pull request

Please provide key mapping capabilities for terminal like in iTerm2 #952

Closed

Uh oh!

Key mapping capabilities for terminal in Shortcuts prefs #973

Key mapping capabilities for terminal in Shortcuts prefs #973

Uh oh!

Conversation

pskowronek commented Jun 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahadas left a comment

Choose a reason for hiding this comment

Uh oh!

ahadas Jun 24, 2023

Choose a reason for hiding this comment

Uh oh!

pskowronek Jun 24, 2023

Choose a reason for hiding this comment

Uh oh!

ahadas Jun 24, 2023

Choose a reason for hiding this comment

Uh oh!

pskowronek Jun 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pskowronek Jun 24, 2023

Choose a reason for hiding this comment

Uh oh!

ahadas Jun 25, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ahadas left a comment

Choose a reason for hiding this comment

Uh oh!

ahadas Jun 24, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pskowronek commented Jun 24, 2023

Uh oh!

ahadas left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pskowronek commented Jun 24, 2023

Uh oh!

ahadas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ahadas Jun 25, 2023

Choose a reason for hiding this comment

Uh oh!

pskowronek commented Jun 25, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

pskowronek commented Jun 7, 2023 •

edited

Loading

pskowronek Jun 24, 2023 •

edited

Loading

ahadas left a comment •

edited

Loading