[simple-scan/gnome-40] Revert "Drop useless flatpak module and some accessibility fixes"

From: Bartosz <bkosiorek src gnome org>
To: commits-list gnome org
Cc:
Subject: [simple-scan/gnome-40] Revert "Drop useless flatpak module and some accessibility fixes"
Date: Tue, 2 Nov 2021 22:09:12 +0000 (UTC)
commit 2326ee12160819bc29e446239e5f04771d1085c4
Author: Bartosz Kosiorek <gang65 poczta onet pl>
Date:   Tue Nov 2 23:08:44 2021 +0100

    Revert "Drop useless flatpak module and some accessibility fixes"
    
    This reverts commit 2f9ee13c9e54dbe3662ff1c36f27175de632948f.

 build-aux/flatpak/org.gnome.SimpleScan.json | 41 +++++++++++++++++
 data/ui/app-window.ui                       | 68 +++++++++++++++++++++++++++++
 data/ui/preferences-dialog.ui               |  8 ++++
 src/app-window.vala                         | 22 +++++-----
 4 files changed, 128 insertions(+), 11 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.SimpleScan.json b/build-aux/flatpak/org.gnome.SimpleScan.json
index 4bb90d26..0b453dce 100644
--- a/build-aux/flatpak/org.gnome.SimpleScan.json
+++ b/build-aux/flatpak/org.gnome.SimpleScan.json
@@ -113,6 +113,47 @@
                 }
             ]
         },
+        {
+            "name" : "polkit",
+            "buildsystem" : "autotools",
+            "config-opts" : [
+                "--disable-polkitd",
+                "--disable-man-pages",
+                "--disable-introspection",
+                "--disable-examples",
+                "--disable-gtk-doc",
+                "--disable-libelogind",
+                "--disable-libsystemd-login",
+                "--with-systemdsystemunitdir=no",
+                "--with-authdb=dummy",
+                "--with-authfw=none"
+            ],
+            "rm-configure" : true,
+            "cleanup" : [
+                "/bin/*",
+                "/etc/pam.d",
+                "/etc/dbus-1",
+                "/share/dbus-1/system-services/*",
+                "/share/polkit-1",
+                "/lib/polkit-1"
+            ],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz";,
+                    "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "polkit-build-Add-option-to-build-without-polkitd.patch"
+                },
+                {
+                    "type" : "file",
+                    "path" : "polkit-autogen",
+                    "dest-filename" : "autogen.sh"
+                }
+            ]
+        },
         {
             "name" : "sane-backends",
             "buildsystem" : "autotools",
diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui
index 12bd83b1..5fd0a0a5 100644
--- a/data/ui/app-window.ui
+++ b/data/ui/app-window.ui
@@ -4,9 +4,11 @@
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkMenu" id="page_menu">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="rotate_left_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Menu item to rotate page to left 
(anti-clockwise)">Rotate _Left</property>
         <property name="use_underline">True</property>
         <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
@@ -16,6 +18,7 @@
     <child>
       <object class="GtkMenuItem" id="rotate_right_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Menu item to rotate page to right 
(clockwise)">Rotate _Right</property>
         <property name="use_underline">True</property>
         <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
@@ -25,14 +28,17 @@
     <child>
       <object class="GtkMenuItem" id="crop_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu" id="crop_menu">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkRadioMenuItem" id="no_crop_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for no 
crop">_None</property>
                 <property name="use_underline">True</property>
                 <property name="active">True</property>
@@ -43,6 +49,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="a4_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping page to A4 
size">A_4</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -53,6 +60,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="a5_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping page to A5 
size">A_5</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -63,6 +71,8 @@
             <child>
               <object class="GtkRadioMenuItem" id="a6_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to A6 
size">A_6</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
                 <property name="group">no_crop_menuitem</property>
@@ -72,6 +82,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="letter_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping page to US 
letter size">_Letter</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -82,6 +93,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="legal_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping to page to US 
legal size">Le_gal</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -92,6 +104,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="four_by_six_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 
inch">4×6</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -102,6 +115,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="a3_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping page to 
A3">A_3</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -112,6 +126,7 @@
             <child>
               <object class="GtkRadioMenuItem" id="custom_crop_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Radio button for cropping to custom page 
size">_Custom</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
@@ -122,12 +137,14 @@
             <child>
               <object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="crop_rotate_menuitem">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Menu item to rotate the crop 
area">_Rotate Crop</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
@@ -140,6 +157,7 @@
     <child>
       <object class="GtkMenuItem" id="page_move_left_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Menu item to move the selected page to the 
left">Move Left</property>
         <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
         <accelerator key="less" signal="activate"/>
@@ -148,6 +166,7 @@
     <child>
       <object class="GtkMenuItem" id="page_move_right_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Menu item to move the selected page to the 
right">Move Right</property>
         <property name="use_underline">True</property>
         <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
@@ -159,6 +178,7 @@
         <property name="label">gtk-copy</property>
         <property name="visible">True</property>
         <property name="sensitive">False</property>
+        <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
@@ -169,6 +189,7 @@
       <object class="GtkImageMenuItem" id="page_delete_menuitem">
         <property name="label">gtk-delete</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
@@ -185,9 +206,11 @@
     </columns>
   </object>
   <object class="GtkPopover" id="scan_options_popover">
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="margin_left">12</property>
         <property name="margin_right">12</property>
         <property name="margin_top">12</property>
@@ -197,12 +220,14 @@
         <child>
           <object class="GtkRadioButton" id="scan_single_radio">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="draw_indicator">False</property>
             <signal name="toggled" handler="scan_single_radio_toggled_cb" swapped="no"/>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="margin_end">12</property>
                 <property name="margin_top">6</property>
@@ -211,6 +236,7 @@
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">scanner-symbolic</property>
                   </object>
                   <packing>
@@ -222,6 +248,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Single Page</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -243,6 +270,7 @@
         <child>
           <object class="GtkRadioButton" id="scan_adf_radio">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="draw_indicator">False</property>
             <property name="group">scan_single_radio</property>
@@ -250,6 +278,7 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="margin_end">12</property>
                 <property name="margin_top">6</property>
@@ -258,6 +287,7 @@
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">scan-type-adf-symbolic</property>
                   </object>
                   <packing>
@@ -269,6 +299,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">All Pages From _Feeder</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -290,6 +321,7 @@
         <child>
           <object class="GtkRadioButton" id="scan_batch_radio">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="draw_indicator">False</property>
             <property name="group">scan_single_radio</property>
@@ -297,6 +329,7 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="margin_end">12</property>
                 <property name="margin_top">6</property>
@@ -305,6 +338,7 @@
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">scan-type-batch-symbolic</property>
                   </object>
                   <packing>
@@ -316,6 +350,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Multiple Pages From Flatbed</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -337,6 +372,7 @@
         <child>
           <object class="GtkRadioButton" id="text_radio">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="margin_top">12</property>
             <property name="draw_indicator">False</property>
@@ -344,6 +380,7 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="margin_end">12</property>
                 <property name="margin_top">6</property>
@@ -352,6 +389,7 @@
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">x-office-document-symbolic</property>
                   </object>
                   <packing>
@@ -363,6 +401,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Text</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -384,6 +423,7 @@
         <child>
           <object class="GtkRadioButton" id="photo_radio">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="draw_indicator">False</property>
             <property name="group">text_radio</property>
@@ -391,6 +431,7 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="margin_end">12</property>
                 <property name="margin_top">6</property>
@@ -399,6 +440,7 @@
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">image-x-generic-symbolic</property>
                   </object>
                   <packing>
@@ -410,6 +452,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Image</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -451,23 +494,28 @@
   <template class="AppWindow" parent="HdyApplicationWindow">
     <property name="width_request">320</property>
     <property name="height_request">480</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Document Scanner</property>
     <property name="icon_name">org.gnome.SimpleScan</property>
     <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="HdyHeaderBar" id="header_bar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="show_close_button">True</property>
             <child>
               <object class="GtkBox" id="open_box">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="valign">center</property>
                 <child>
                   <object class="GtkButton" id="stop_button">
+                    <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop 
the current scan</property>
                     <property name="use_underline">True</property>
@@ -475,10 +523,12 @@
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkSpinner" id="stop_button_spinner">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="active">True</property>
                           </object>
                           <packing>
@@ -490,6 +540,7 @@
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">S_top</property>
                             <property name="use_underline">True</property>
                             <property name="width_chars">6</property>
@@ -518,6 +569,7 @@
                   <object class="GtkButton" id="scan_button">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar 
button">Scan a single page from the scanner</property>
                     <property name="use_underline">True</property>
@@ -525,10 +577,12 @@
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="scan_options_image">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="icon_name">scanner-symbolic</property>
                           </object>
                           <packing>
@@ -540,6 +594,7 @@
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="margin_right">1</property>
                             <property name="label" translatable="yes">_Scan</property>
                             <property name="use_underline">True</property>
@@ -568,15 +623,18 @@
                 <child>
                   <object class="GtkMenuButton">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="popover">scan_options_popover</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="scan_hint_image">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="icon_name">x-office-document-symbolic</property>
                           </object>
                           <packing>
@@ -588,6 +646,7 @@
                         <child>
                           <object class="GtkImage">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="icon_name">pan-down-symbolic</property>
                           </object>
                           <packing>
@@ -613,12 +672,14 @@
             <child>
               <object class="GtkMenuButton" id="menu_button">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <accelerator key="F10" signal="activate"/>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">open-menu-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -636,6 +697,7 @@
               <object class="GtkButton" id="save_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar 
button">Save document to a file</property>
                 <property name="use_underline">True</property>
@@ -643,6 +705,7 @@
                 <child>
                   <object class="GtkImage" id="save_image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_name">document-save-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -664,6 +727,7 @@
         <child>
           <object class="GtkStack" id="stack">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <child>
               <object class="HdyStatusPage" id="status_page">
@@ -692,6 +756,7 @@
                     <child>
                       <object class="GtkBox" id="device_buttons_box">
                         <property name="visible">False</property>
+                        <property name="can_focus">False</property>
                         <property name="orientation">horizontal</property>
                         <property name="halign">center</property>
                         <property name="spacing">10</property>
@@ -716,6 +781,7 @@
                             <child>
                               <object class="GtkImage">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="icon_name">view-refresh-symbolic</property>
                                 <property name="icon_size">1</property>
                               </object>
@@ -740,10 +806,12 @@
             <child>
               <object class="GtkBox" id="main_vbox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkActionBar" id="action_bar">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/data/ui/preferences-dialog.ui b/data/ui/preferences-dialog.ui
index 4bc42d62..a54709c3 100644
--- a/data/ui/preferences-dialog.ui
+++ b/data/ui/preferences-dialog.ui
@@ -41,6 +41,7 @@
     </columns>
   </object>
   <template class="PreferencesDialog" parent="HdyPreferencesWindow">
+    <property name="can_focus">False</property>
     <property name="icon_name">org.gnome.SimpleScan</property>
     <property name="search_enabled">False</property>
     <child>
@@ -59,6 +60,7 @@
                 <child>
                   <object class="GtkBox" id="scan_side_box">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -107,6 +109,7 @@
                 <child>
                   <object class="GtkComboBox" id="paper_size_combo">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="valign">center</property>
                     <property name="model">paper_size_model</property>
@@ -124,6 +127,7 @@
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -202,6 +206,7 @@
                 <child>
                   <object class="GtkComboBox" id="text_dpi_combo">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="model">text_dpi_model</property>
                   </object>
@@ -217,6 +222,7 @@
                 <child>
                   <object class="GtkComboBox" id="photo_dpi_combo">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="model">photo_dpi_model</property>
                   </object>
@@ -226,6 +232,7 @@
             <child>
               <object class="HdyActionRow">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="title" translatable="yes" comments="Label beside brightness 
scale">_Brightness</property>
                 <property name="use_underline">True</property>
                 <property name="activatable_widget">brightness_scale</property>
@@ -244,6 +251,7 @@
             <child>
               <object class="HdyActionRow">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="title" translatable="yes" comments="Label beside contrast 
scale">_Contrast</property>
                 <property name="use_underline">True</property>
                 <property name="activatable_widget">contrast_scale</property>
diff --git a/src/app-window.vala b/src/app-window.vala
index dc28508a..c1d4ea31 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -793,7 +793,7 @@ public class AppWindow : Hdy.ApplicationWindow
         prompt_to_save_async.begin (/* Text in dialog warning when a document is about to be lost */
                                     _("Save current document?"),
                                     /* Button in dialog to create new document and discard unsaved document 
*/
-                                    _("_Discard Changes"), (obj, res) =>
+                                    _("Discard Changes"), (obj, res) =>
         {
             if (!prompt_to_save_async.end(res))
                 return;
@@ -1600,7 +1600,7 @@ public class AppWindow : Hdy.ApplicationWindow
         prompt_to_save_async.begin (/* Text in dialog warning when a document is about to be lost */
                                     _("Save document before quitting?"),
                                     /* Text in dialog warning when a document is about to be lost */
-                                    _("_Quit without Saving"), (obj, res) =>
+                                    _("Quit without Saving"), (obj, res) =>
         {
             if (!prompt_to_save_async.end(res))
                 return;
@@ -1882,23 +1882,23 @@ public class AppWindow : Hdy.ApplicationWindow
         var gear_menu = new Menu ();
         var section = new Menu ();
         gear_menu.append_section (null, section);
-        section.append (_("_Email"), "app.email");
-        section.append (_("Pri_nt"), "app.print");
-        section.append (C_("menu", "_Reorder Pages"), "app.reorder");
+        section.append (_("Email"), "app.email");
+        section.append (_("Print"), "app.print");
+        section.append (C_("menu", "Reorder Pages"), "app.reorder");
         section = new Menu ();
         gear_menu.append_section (null, section);
-        section.append (_("_Preferences"), "app.preferences");
-        section.append (_("_Keyboard Shortcuts"), "win.show-help-overlay");
-        section.append (_("_Help"), "app.help");
-        section.append (_("_About Document Scanner"), "app.about");
+        section.append (_("Preferences"), "app.preferences");
+        section.append (_("Keyboard Shortcuts"), "win.show-help-overlay");
+        section.append (_("Help"), "app.help");
+        section.append (_("About Document Scanner"), "app.about");
         menu_button.set_menu_model (gear_menu);
 
         app.add_window (this);
 
         /* Populate ActionBar (not supported in Glade) */
         /* https://bugzilla.gnome.org/show_bug.cgi?id=769966 */
-        var button = new Gtk.Button.with_mnemonic (/* Label on new document button */
-                                               _("_New Document"));
+        var button = new Gtk.Button.with_label (/* Label on new document button */
+                                               _("New Document"));
         button.visible = true;
         button.clicked.connect (new_document_cb);
         action_bar.pack_start (button);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]