From 37282cbbf05c4715edfbc11a06a7956e7934b8f6 Mon Sep 17 00:00:00 2001 From: "Romain F. T" Date: Wed, 11 Nov 2020 22:22:51 +0100 Subject: [PATCH] Add kbd shortcuts for "copy image to clipboard" & "apply transformation" --- src/optionsbars/transform/optionsbar-crop.ui | 2 +- src/optionsbars/transform/optionsbar-filters.ui | 2 +- src/optionsbars/transform/optionsbar-rotate.ui | 2 +- src/optionsbars/transform/optionsbar-scale.ui | 2 +- src/optionsbars/transform/optionsbar-skew.ui | 2 +- src/tools/abstract_tool.py | 3 +++ src/tools/ui/tool-crop.ui | 2 +- src/tools/ui/tool-filters.ui | 2 +- src/tools/ui/tool-rotate.ui | 2 +- src/tools/ui/tool-scale.ui | 2 +- src/tools/ui/tool-skew.ui | 2 +- src/ui/shortcuts.ui | 17 +++++++++++++++++ src/window.py | 6 +++--- 13 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/optionsbars/transform/optionsbar-crop.ui b/src/optionsbars/transform/optionsbar-crop.ui index 300ee39c..b7d09e97 100644 --- a/src/optionsbars/transform/optionsbar-crop.ui +++ b/src/optionsbars/transform/optionsbar-crop.ui @@ -98,7 +98,7 @@ - win.apply_transform_tool + win.apply_transform Apply True center diff --git a/src/optionsbars/transform/optionsbar-filters.ui b/src/optionsbars/transform/optionsbar-filters.ui index f52f23cd..33d81c32 100644 --- a/src/optionsbars/transform/optionsbar-filters.ui +++ b/src/optionsbars/transform/optionsbar-filters.ui @@ -131,7 +131,7 @@ - win.apply_transform_tool + win.apply_transform Apply True center diff --git a/src/optionsbars/transform/optionsbar-rotate.ui b/src/optionsbars/transform/optionsbar-rotate.ui index 5e2cf1f3..4a92c42b 100644 --- a/src/optionsbars/transform/optionsbar-rotate.ui +++ b/src/optionsbars/transform/optionsbar-rotate.ui @@ -148,7 +148,7 @@ - win.apply_transform_tool + win.apply_transform Apply True center diff --git a/src/optionsbars/transform/optionsbar-scale.ui b/src/optionsbars/transform/optionsbar-scale.ui index 74504f65..24e50d5c 100644 --- a/src/optionsbars/transform/optionsbar-scale.ui +++ b/src/optionsbars/transform/optionsbar-scale.ui @@ -99,7 +99,7 @@ - win.apply_transform_tool + win.apply_transform Apply True center diff --git a/src/optionsbars/transform/optionsbar-skew.ui b/src/optionsbars/transform/optionsbar-skew.ui index 938f50c7..c2e7675b 100644 --- a/src/optionsbars/transform/optionsbar-skew.ui +++ b/src/optionsbars/transform/optionsbar-skew.ui @@ -97,7 +97,7 @@ - win.apply_transform_tool + win.apply_transform Apply True center diff --git a/src/tools/abstract_tool.py b/src/tools/abstract_tool.py index 4ae697b9..fec2af61 100644 --- a/src/tools/abstract_tool.py +++ b/src/tools/abstract_tool.py @@ -93,6 +93,9 @@ def try_build_pane(self): def build_bottom_pane(self): return None + def on_apply_temp_pixbuf_tool_operation(self, *args): + pass # implemented only by transform tools + def add_item_to_menu(self, tools_menu): tools_menu.append(self.label, 'win.active_tool::' + self.id) diff --git a/src/tools/ui/tool-crop.ui b/src/tools/ui/tool-crop.ui index 6d184fad..ae9b2a78 100644 --- a/src/tools/ui/tool-crop.ui +++ b/src/tools/ui/tool-crop.ui @@ -26,7 +26,7 @@ Apply - win.apply_transform_tool + win.apply_transform diff --git a/src/tools/ui/tool-filters.ui b/src/tools/ui/tool-filters.ui index 2d0535eb..cde23338 100644 --- a/src/tools/ui/tool-filters.ui +++ b/src/tools/ui/tool-filters.ui @@ -77,7 +77,7 @@ Apply - win.apply_transform_tool + win.apply_transform diff --git a/src/tools/ui/tool-rotate.ui b/src/tools/ui/tool-rotate.ui index b50c50cd..b99d2102 100644 --- a/src/tools/ui/tool-rotate.ui +++ b/src/tools/ui/tool-rotate.ui @@ -35,7 +35,7 @@ Apply - win.apply_transform_tool + win.apply_transform diff --git a/src/tools/ui/tool-scale.ui b/src/tools/ui/tool-scale.ui index 8504244a..d67bc0be 100644 --- a/src/tools/ui/tool-scale.ui +++ b/src/tools/ui/tool-scale.ui @@ -42,7 +42,7 @@ Apply - win.apply_transform_tool + win.apply_transform diff --git a/src/tools/ui/tool-skew.ui b/src/tools/ui/tool-skew.ui index b9759333..bfb98be2 100644 --- a/src/tools/ui/tool-skew.ui +++ b/src/tools/ui/tool-skew.ui @@ -9,7 +9,7 @@ Apply - win.apply_transform_tool + win.apply_transform diff --git a/src/ui/shortcuts.ui b/src/ui/shortcuts.ui index 7a2613ee..d89edb75 100644 --- a/src/ui/shortcuts.ui +++ b/src/ui/shortcuts.ui @@ -114,6 +114,13 @@ <Primary><Shift>s + + + True + Copy to clipboard + <Primary><Shift>c + + True @@ -183,6 +190,16 @@ <Primary><Shift>Down + + + True + Apply a transformation + <Primary>Return + + + + + diff --git a/src/window.py b/src/window.py index 8e6110cd..2b156851 100644 --- a/src/window.py +++ b/src/window.py @@ -466,7 +466,7 @@ def add_all_win_actions(self): self.add_action_simple('save_alphaless', self.action_save_alphaless, None) self.add_action_simple('save_as', self.action_save_as, ['s']) self.add_action_simple('export_as', self.action_export_as, None) - self.add_action_simple('to_clipboard', self.action_export_cb, None) + self.add_action_simple('to_clipboard', self.action_export_cb, ['c']) self.add_action_simple('print', self.action_print, None) self.add_action_simple('import', self.action_import, ['i']) @@ -480,7 +480,7 @@ def add_all_win_actions(self): self.add_action_simple('back_to_previous', self.back_to_previous, ['b']) self.add_action_simple('force_selection', self.force_selection, None) - self.add_action_simple('apply_transform_tool', self.action_apply_transformation, None) + self.add_action_simple('apply_transform', self.action_apply_transform, ['Return']) self.add_action_enum('active_tool', DEFAULT_TOOL_ID, self.on_change_active_tool) @@ -1052,7 +1052,7 @@ def get_selection_tool(self): def force_selection(self, *args): self.get_selection_tool().row.set_active(True) # XXX not enable_tool? - def action_apply_transformation(self, *args): + def action_apply_transform(self, *args): self.active_tool().on_apply_temp_pixbuf_tool_operation() ############################################################################