Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#397] fix shortcuts box problems #398

Merged
merged 1 commit into from
Nov 30, 2016
Merged

[#397] fix shortcuts box problems #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ This is an overview of major changes. Refer to the git repository for a full log

Version 0.1.35
-------------
- #397 Couple of problems with keyboard shortcuts box
- #393 Warning from libpng when running tests
- #391 OpenCV3
- #389 PyQt4
Expand Down
4 changes: 2 additions & 2 deletions inselect/gui/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,13 +764,13 @@ def about(self, checked=False):
show_about_box(self)

@report_to_user
def show_shortcuts(self):
def show_shortcuts(self, checked=False):
"""Shows a modal QDialog of shortcuts.
"""
show_shortcuts(self)

@report_to_user
def show_shortcuts_post_startup(self):
def show_shortcuts_post_startup(self, checked=False):
"""Shows a modal QDialog of shortcuts, if this appropriate.
"""
show_shortcuts_post_startup(self)
Expand Down
16 changes: 8 additions & 8 deletions inselect/gui/prompts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
BOXES_VIEW_SHORTCUTS = [
('Create box', 'Right click & drag'),
('Move selected boxes', 'Arrow keys'),
('Adjust selected box', 'Shift / Alt+arrow keys'),
('Move between boxes', 'Ctrl+N / P'),
('Zoom', 'Ctrl+mouse wheel / trackpad swipe'),
('Adjust selected box', 'Shift / Alt + arrow keys'),
('Move between boxes', 'Ctrl + N / P'),
('Zoom', 'Ctrl + mouse wheel / trackpad swipe'),
]

BOXES_VIEW_TIP = ('Right click + drag to create box | '
'CTRL + N / P to move between boxes | '
'SHIFT / ALT + arrow keys to adjust selected box')
'Ctrl + N / P to move between boxes | '
'Shift / Alt + arrow keys to adjust selected box')

OBJECTS_VIEW_TIP = ('CTRL + N / P or arrow keys to move between objects | '
'CTRL + G to show objects in a grid | '
'CTRL + E to view a single object expanded')
OBJECTS_VIEW_TIP = ('Ctrl + N / P or arrow keys to move between objects | '
'Ctrl + G to show objects in a grid | '
'Ctrl + E to view a single object expanded')


def _format_action_shortcuts(action):
Expand Down