[simple-scan] Fix scan shortcut keys no longer working.
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [simple-scan] Fix scan shortcut keys no longer working.
- Date: Mon, 22 Jul 2019 22:04:53 +0000 (UTC)
commit 669ff1cf35c027e18fe75b243baac5b83e04f92f
Author: Robert Ancell <robert ancell canonical com>
Date: Tue Jul 23 09:43:54 2019 +1200
Fix scan shortcut keys no longer working.
Fixes #115
src/app-window.vala | 41 +++++++++++++++++++++++++++++++++++++----
1 file changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/src/app-window.vala b/src/app-window.vala
index efcaaf2..6434ff4 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -19,6 +19,9 @@ public class AppWindow : Gtk.ApplicationWindow
private const GLib.ActionEntry[] action_entries =
{
{ "new_document", new_document_cb },
+ { "scan_single", scan_single_cb },
+ { "scan_adf", scan_adf_cb },
+ { "scan_batch", scan_batch_cb },
{ "reorder", reorder_document_cb },
{ "save", save_document_activate_cb },
{ "email", email_document_cb },
@@ -607,7 +610,36 @@ public class AppWindow : Gtk.ApplicationWindow
private void new_document_cb ()
{
- new_document();
+ new_document ();
+ }
+
+ private void scan (ScanOptions options)
+ {
+ status_primary_label.set_text (/* Label shown when scan started */
+ _("Contacting scanner…"));
+ start_scan (selected_device, options);
+ }
+
+ private void scan_single_cb ()
+ {
+ var options = make_scan_options ();
+ options.type = ScanType.SINGLE;
+ scan (options);
+ }
+
+ private void scan_adf_cb ()
+ {
+ var options = make_scan_options ();
+ options.type = ScanType.ADF_BOTH;
+ options.type = preferences_dialog.get_page_side ();
+ scan (options);
+ }
+
+ private void scan_batch_cb ()
+ {
+ var options = make_scan_options ();
+ options.type = ScanType.BATCH;
+ scan (options);
}
private void set_scan_type (ScanType scan_type)
@@ -713,9 +745,7 @@ public class AppWindow : Gtk.ApplicationWindow
options.type = scan_type;
if (options.type == ScanType.ADF_BOTH)
options.type = preferences_dialog.get_page_side ();
- status_primary_label.set_text (/* Label shown when scan started */
- _("Contacting scanner…"));
- start_scan (selected_device, options);
+ scan (options);
}
[GtkCallback]
@@ -1522,6 +1552,9 @@ public class AppWindow : Gtk.ApplicationWindow
app.add_action_entries (action_entries, this);
app.set_accels_for_action ("app.new_document", { "<Ctrl>N" });
+ app.set_accels_for_action ("app.scan_single", { "<Ctrl>1" });
+ app.set_accels_for_action ("app.scan_adf", { "<Ctrl>F" });
+ app.set_accels_for_action ("app.scan_batch", { "<Ctrl>M" });
app.set_accels_for_action ("app.save", { "<Ctrl>S" });
app.set_accels_for_action ("app.email", { "<Ctrl>E" });
app.set_accels_for_action ("app.print", { "<Ctrl>P" });
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]