Skip to content

Commit

Permalink
delete key removes screenshot (#225)
Browse files Browse the repository at this point in the history
* delete key removes screenshot

* unused var

* missed commit

* test

* test?

* test?

* fine
  • Loading branch information
thenaterhood authored Feb 8, 2025
1 parent 6d94c0b commit a452359
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/gscreenshot/frontend/gtk/dialogs/confirm_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def __init__(self, message, parent=None):
label = Gtk.Label(label=message)
label.set_line_wrap(True)
label.set_max_width_chars(60)
label.set_padding(20, 20)
label.set_margin_end(20)
label.set_margin_start(20)
label.set_margin_top(20)

box = self.get_content_area()
box.add(label)
Expand Down
2 changes: 2 additions & 0 deletions src/gscreenshot/frontend/gtk/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ def main(app: typing.Optional[Gscreenshot] = None):
presenter.on_preview_next_clicked,
Gdk.keyval_to_lower(Gdk.keyval_from_name('Left')):
presenter.on_preview_prev_clicked,
Gdk.keyval_to_lower(Gdk.keyval_from_name('Delete')):
presenter.on_delete,
# Handled in Glade - just here for reference
#Gtk.gdk.keyval_to_lower(Gtk.gdk.keyval_from_name('Insert')):
# presenter.overwrite_mode_toggled
Expand Down
22 changes: 18 additions & 4 deletions src/gscreenshot/frontend/gtk/presenter.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,20 @@ def on_preview_drag(self, _widget, _drag_context, data, _info, _time):

data.set_uris([f"file://{fname}"])

def on_delete(self, *_):
"""
remove the current screenshot
"""
screenshots = self._app.get_screenshot_collection()
current = screenshots.cursor_current()
if current:
screenshots.remove(current)

self._view.update_gallery_controls(screenshots)
self._show_preview()

return True

def on_use_last_region_clicked(self, *_):
'''
Take a screenshot with the same region as the
Expand Down Expand Up @@ -491,16 +505,16 @@ def quit(self, *_, skip_warning=False):
return # not strictly needed most of the time

screenshot_collection = self._app.get_screenshot_collection()
if len(screenshot_collection) > 1 and self._app.get_screenshot_collection().has_unsaved():

if len(screenshot_collection) > 1 and screenshot_collection.has_unsaved():
confirm_dialogue = ConfirmationDialog(
message=i18n("There are unsaved screenshots. Quit without saving?")
)

self._view.run_dialog(confirm_dialogue)

if confirm_dialogue.confirmed:
self._app.quit()
return
if not confirm_dialogue.confirmed:
return

self._app.quit()

Expand Down

0 comments on commit a452359

Please sign in to comment.