Keyboard shortcut editor enhancements #2523

goanpeca · 2015-07-09T07:27:22Z

Fix #2475
Fix some pending issues from #2367

"Fuzzy" string matching

Todo

Fix docstrings
Change toggle behavior in shortcut dialog
Add fuzzy sorting
Change information display for conflicting shortcuts
Handle sequences bigger than 4 keys
Relocate HTMLDelegate to widgets/helperwidgets.py

For another PR (when I have access to a Mac...)

Fix text color on selected text (in Mac)
Fix dead strokes input

goanpeca · 2015-07-10T16:36:41Z

@SylvainCorlay can you give me an example of what happens with the dead stroke issues?

What type of keyboard layout you have in your pc... OS.. etc..

Cheers

ccordoba12 · 2015-07-10T20:12:57Z

@goanpeca: One example that @SylvainCorlay showed me in person: pressing Ctrl + <tilde> + e where <tilde> is the key to get é on the screen. That's a dead key :-)

SylvainCorlay · 2015-07-10T22:59:09Z

@goanpeca if you use a US-international keyboard layout, the following key sequences do

``` then e -> `è`
`^` then `e` -> `ê`
`'` then `e` -> `é`

meaning that the first character is a dead key and does not do anything by itself. If you just want a quote, you need to press the space bar.

If you use a Spanish layout, I think that ^ is already a dead key.

I don't think that we really need to support dead keys for keyboard shortcuts. Although in the French layout, things like é are a single key stroke, and should not create any problem.

goanpeca · 2015-07-11T09:37:25Z

I cannot reproduce that behavior.

On ubuntu with US-International, if I press Control+' and (while holding control) press "e", I get
Ctrl+'; Ctrl+e

ccordoba12 · 2015-07-11T16:11:40Z

@goanpeca, do you have a Latin American keyboard to test? This is what I'm getting with Ctrl+<tilde>+e:

Ctrl+ោ

goanpeca · 2015-07-11T16:15:07Z

Not right now...

ccordoba12 · 2015-07-11T16:38:36Z

Ok, no prob. We can check it out week when we meet in Colombia :-)

goanpeca · 2015-07-11T16:43:45Z

Any comments on the search order screenshots... ?

ccordoba12 · 2015-07-11T19:58:22Z

spyderlib/plugins/shortcuts.py

 from spyderlib.utils.qthelpers import get_std_icon
+from spyderlib.utils.stringmatching import get_search_regex, get_search_scores
 from spyderlib.widgets.arraybuilder import HelperToolButton


This helper button should be moved to helperwidgets too. But this is just a reminder, let's leave it for another PR :-)

ccordoba12 · 2015-07-21T21:49:51Z

@goanpeca, let's leave the dead keystroke task for another PR.

@blink1073, would you mind to take a look at the fuzzy matching code introduced by @goanpeca in utils/stringmatching.py?

blink1073 · 2015-07-22T02:12:54Z

spyderlib/utils/stringmatching.py

+    Parameters
+    ----------
+    query : str
+        String with letters to seacrh in choice (in order of appearance).


blink1073 · 2015-07-22T02:19:33Z

spyderlib/utils/stringmatching.py

+        String with letters to seacrh in choice (in order of appearance).
+    choice : string 
+        Sentences/words in which to search for the 'query' letters.
+    ignore_case : True


ignore_case : boolean, optional Perform a case insensitive search (True by default).

ccordoba12 · 2015-07-23T16:54:32Z

@goanpeca, please address @blink1073 and my comments so that we can merge this for beta1. I think we need it because it has very important improvements.

goanpeca · 2015-07-26T23:40:23Z

@ccordoba12 I made the corrections, can you test on your side?

Cheers

ccordoba12 · 2015-07-27T19:45:22Z

@goanpeca, I have a patch (against your latest commit in this branch) that solves all issues I have right now with the ShortcutEditor dialog:

@@ -139,7 +139,8 @@ class ShortcutEditor(QDialog):
         self.text_new_sequence = CustomLineEdit(self)
         self.text_new_sequence.setPlaceholderText(sequence)
         self.helper_button = HelperToolButton()
-        self.label_warning = QLabel('<br>')
+        self.label_warning = QLabel()
+        self.label_warning.hide()

         bbox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.button_ok = bbox.button(QDialogButtonBox.Ok)
@@ -164,7 +165,7 @@ class ShortcutEditor(QDialog):
         self.label_warning.setFocusPolicy(Qt.NoFocus)

         # Layout
-        spacing = 24
+        spacing = 5
         layout_sequence = QGridLayout()
         layout_sequence.addWidget(self.label_info, 0, 0, 1, 3)
         layout_sequence.addItem(QSpacerItem(spacing, spacing), 1, 0, 1, 2)
@@ -267,8 +268,8 @@ class ShortcutEditor(QDialog):

             if len(self.keys) == 1 and key == Qt.Key_Escape:
                 self.set_sequence('')
-                self.toggle_state()
-                return
+                self.label_warning.setText(_("Please introduce a different "
+                                             "shortcut"))

             if len(self.keys) == 1 and key in [Qt.Key_Return, Qt.Key_Enter]:
                 self.toggle_state()
@@ -278,7 +279,7 @@ class ShortcutEditor(QDialog):
                 self.nonedit_keyrelease(e)
             else:
                 debug_print('keys: {}'.format(self.keys))
-                if self.keys:
+                if self.keys and key != Qt.Key_Escape:
                     self.validate_sequence()
                 self.keys = set()
                 self.key_modifiers = set()
@@ -304,13 +305,14 @@ class ShortcutEditor(QDialog):

         if warning_type == NO_WARNING:
             warn = False
-            tip = '<br><br>'
+            tip = ''
         elif warning_type == SEQUENCE_CONFLICT:
             template = '<i>{0}<b>{1}</b></i>'
             tip_title = _('The new shorcut conflicts with:') + '<br>'
             tip_body = ''
             for s in conflicts:
                 tip_body += ' - {0}: {1}<br>'.format(s.context, s.name)
+            tip_body = tip_body[:-4]  # Removing last <br>
             tip = template.format(tip_title, tip_body)
             warn = True
         elif warning_type == SEQUENCE_LENGTH:
@@ -326,6 +328,7 @@ class ShortcutEditor(QDialog):
             warn = True

         if warn:
+            widget_message.show()
             widget.setIcon(get_std_icon('MessageBoxWarning'))
         else:
             widget.setIcon(get_std_icon('DialogApplyButton'))

This patch:

Fixes the spacing issues in the dialog (i.e. a huge empty space between the shortcut line edit and the buttons).
Uses Esc to reset a conflicting shortcut, and let the user introduce a new one at the same time.

I'm fine with hidding label_warning at first and then showing it when a conflict appears.

ccordoba12 · 2015-07-27T19:52:50Z

Forget about my last patch, I have other improvements so I'll do a PR against yours :-)

goanpeca · 2015-07-27T19:53:45Z

Ok, please go ahead!

Should I make a new PR for the plugins (the pending @Nodd pr?)

ccordoba12 · 2015-07-27T19:57:21Z

Yes, please! ;-) We need to start moving on that front ASAP, but remember that that's work for beta2.

goanpeca · 2015-07-27T19:58:16Z

So what is missing for beta1 at this point?

ccordoba12 · 2015-07-27T19:59:08Z

Take a look at our shared Google doc. There is the list of missing things.

goanpeca · 2015-07-27T20:02:23Z

Got it...

… to show

Improvements to ShortcutEditor dialog

goanpeca · 2015-07-27T21:02:43Z

Ok, feel free to merge this one then :-)

Keyboard shortcut editor enhancements

ccordoba12 added this to the v3.0 milestone Jul 9, 2015

ccordoba12 added type:Enhancement component:Preferences labels Jul 9, 2015

goanpeca self-assigned this Jul 9, 2015

goanpeca added 2 commits July 10, 2015 14:26

Fix/add doctstrings

9734b68

Add 'fuzzy' sorting utilities and apply to shortcut finder

8d8429d

goanpeca mentioned this pull request Jul 10, 2015

Added sorting to Keyboard Shortcuts (Fixes #2475) #2476

Closed

Fix toggle behavior, max sequences allowed and display warning

9c4be67

Move HTML delegate to helper widgets file

cb99469

goanpeca changed the title ~~[WIP] Fix/add shortcut editor minor issues~~ Fix/add shortcut editor minor issues Jul 11, 2015

ccordoba12 reviewed Jul 11, 2015
View reviewed changes

blink1073 reviewed Jul 22, 2015
View reviewed changes

ccordoba12 changed the title ~~Fix/add shortcut editor minor issues~~ Keyboard shortcut editor enhancements Jul 23, 2015

goanpeca added 3 commits July 26, 2015 08:38

Fix typos and improve test code

1ec3895

Fix Qt5 sort error, move helper widget, add comments

9448a05

Change behavior of Esc in edit mode

e2bbeaa

ccordoba12 and others added 11 commits July 27, 2015 15:11

Hide label_warning by default and only show it when there's a warning…

773cb68

… to show

Make Esc key to correctly reset shortcut

8db9828

Fix spacing issues in ShortcutEditor dialog

23680bc

Hide helper_button by default and only show it on warnings

98c12f5

Show a message when a non-used shortcut is selected

c3040d4

Improve main label of ShortcutEditor a little bit

faacbc6

Disable Ok button of ShortcutEditor dialog on warnings

85f6a45

Always show helper_button after pressing a new shortcut

b2a1728

Remove unnecessary local vars

f1d3206

Remove left over comments

4058410

Merge pull request #4 from ccordoba12/patch-1

e3795da

Improvements to ShortcutEditor dialog

ccordoba12 added a commit that referenced this pull request Jul 27, 2015

Merge pull request #2523 from goanpeca/shortcut-editor

0a96c43

Keyboard shortcut editor enhancements

ccordoba12 merged commit 0a96c43 into spyder-ide:master Jul 27, 2015

goanpeca deleted the shortcut-editor branch August 3, 2015 04:35

csabella mentioned this pull request Nov 19, 2017

Add searching in preferences #1780

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keyboard shortcut editor enhancements #2523

Keyboard shortcut editor enhancements #2523

goanpeca commented Jul 9, 2015

goanpeca commented Jul 10, 2015

ccordoba12 commented Jul 10, 2015

SylvainCorlay commented Jul 10, 2015

goanpeca commented Jul 11, 2015

ccordoba12 commented Jul 11, 2015

goanpeca commented Jul 11, 2015

ccordoba12 commented Jul 11, 2015

goanpeca commented Jul 11, 2015

ccordoba12 Jul 11, 2015

ccordoba12 commented Jul 21, 2015

blink1073 Jul 22, 2015

blink1073 Jul 22, 2015

ccordoba12 commented Jul 23, 2015

goanpeca commented Jul 26, 2015

ccordoba12 commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

goanpeca commented Jul 27, 2015

Keyboard shortcut editor enhancements #2523

Keyboard shortcut editor enhancements #2523

Conversation

goanpeca commented Jul 9, 2015

"Fuzzy" string matching

Todo

For another PR (when I have access to a Mac...)

goanpeca commented Jul 10, 2015

ccordoba12 commented Jul 10, 2015

SylvainCorlay commented Jul 10, 2015

goanpeca commented Jul 11, 2015

ccordoba12 commented Jul 11, 2015

goanpeca commented Jul 11, 2015

ccordoba12 commented Jul 11, 2015

goanpeca commented Jul 11, 2015

ccordoba12 Jul 11, 2015

Choose a reason for hiding this comment

ccordoba12 commented Jul 21, 2015

blink1073 Jul 22, 2015

Choose a reason for hiding this comment

blink1073 Jul 22, 2015

Choose a reason for hiding this comment

ccordoba12 commented Jul 23, 2015

goanpeca commented Jul 26, 2015

ccordoba12 commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

ccordoba12 commented Jul 27, 2015

goanpeca commented Jul 27, 2015

goanpeca commented Jul 27, 2015