diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2022-03-20 09:13:50 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2022-03-20 09:13:50 +0100 |
commit | aafaa7c3ff1f88dadbad34559adab7b35be8542b (patch) | |
tree | 11f3ff35af220dd659d42e5f87d29b5d5ca073cb /data/ui | |
parent | 055f6f3e01bb718bfdd61331e1b13b0cdba6d718 (diff) | |
parent | e01ac9786891513c1cb628ca0a0374436057cc3b (diff) |
Merge branch 'release/debian/42.0-1'debian/42.0-1
Diffstat (limited to 'data/ui')
-rw-r--r-- | data/ui/app-window.ui | 70 | ||||
-rw-r--r-- | data/ui/preferences-dialog.ui | 106 |
2 files changed, 99 insertions, 77 deletions
diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui index 5fd0a0a..744b8c2 100644 --- a/data/ui/app-window.ui +++ b/data/ui/app-window.ui @@ -4,11 +4,9 @@ <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"/> @@ -18,7 +16,6 @@ <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"/> @@ -28,17 +25,14 @@ <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> @@ -49,7 +43,6 @@ <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> @@ -60,7 +53,6 @@ <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> @@ -71,8 +63,6 @@ <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> @@ -82,7 +72,6 @@ <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> @@ -93,7 +82,6 @@ <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> @@ -104,7 +92,6 @@ <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> @@ -115,7 +102,6 @@ <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> @@ -126,7 +112,6 @@ <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> @@ -137,14 +122,12 @@ <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"/> @@ -157,7 +140,6 @@ <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"/> @@ -166,7 +148,6 @@ <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"/> @@ -178,7 +159,6 @@ <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"/> @@ -189,7 +169,6 @@ <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"/> @@ -206,11 +185,9 @@ </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> @@ -220,14 +197,12 @@ <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> @@ -236,7 +211,6 @@ <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="icon_name">scanner-symbolic</property> </object> <packing> @@ -248,7 +222,6 @@ <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> @@ -270,7 +243,6 @@ <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> @@ -278,7 +250,6 @@ <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> @@ -287,7 +258,6 @@ <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> @@ -299,7 +269,6 @@ <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> @@ -321,7 +290,6 @@ <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> @@ -329,7 +297,6 @@ <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> @@ -338,7 +305,6 @@ <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> @@ -350,7 +316,6 @@ <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> @@ -372,7 +337,6 @@ <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> @@ -380,7 +344,6 @@ <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> @@ -389,7 +352,6 @@ <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> @@ -401,7 +363,6 @@ <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> @@ -423,7 +384,6 @@ <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> @@ -431,7 +391,6 @@ <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> @@ -440,7 +399,6 @@ <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> @@ -452,7 +410,6 @@ <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> @@ -494,28 +451,23 @@ <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> @@ -523,12 +475,10 @@ <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> @@ -540,7 +490,6 @@ <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> @@ -569,20 +518,17 @@ <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="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button. Replaced by text associated with each scan type."></property> <property name="use_underline">True</property> <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/> <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> @@ -594,7 +540,6 @@ <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> @@ -623,18 +568,15 @@ <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> @@ -646,7 +588,6 @@ <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> @@ -672,14 +613,12 @@ <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> @@ -697,7 +636,6 @@ <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> @@ -705,7 +643,6 @@ <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> @@ -727,7 +664,6 @@ <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"> @@ -756,7 +692,6 @@ <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> @@ -781,7 +716,6 @@ <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> @@ -806,12 +740,10 @@ <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 a54709c..fe63150 100644 --- a/data/ui/preferences-dialog.ui +++ b/data/ui/preferences-dialog.ui @@ -41,7 +41,6 @@ </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> @@ -60,7 +59,6 @@ <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> @@ -109,7 +107,6 @@ <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> @@ -127,7 +124,6 @@ <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> @@ -206,7 +202,6 @@ <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> @@ -222,7 +217,6 @@ <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> @@ -232,7 +226,6 @@ <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> @@ -251,7 +244,6 @@ <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> @@ -269,6 +261,104 @@ </child> </object> </child> + <child> + <object class="HdyPreferencesGroup"> + <property name="visible">True</property> + <property name="title" translatable="yes" comments="Preferences Dialog: Section label for postprocessing settings">Postprocessing</property> + <child> + <object class="HdyActionRow"> + <property name="visible">True</property> + <property name="title" translatable="yes" comments="Switch to enable postprocessing">_Enable Postprocessing</property> + <property name="use_underline">True</property> + <property name="activatable_widget">postproc_enable_box</property> + <child> + <object class="GtkBox" id="postproc_enable_box"> + <property name="visible">True</property> + <property name="valign">center</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkSwitch" id="postproc_enable_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">False</property> + <property name="active">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="HdyActionRow"> + <property name="visible">True</property> + <property name="title" translatable="yes" comments="Label beside postprocesing script name entry">_Script</property> + <property name="use_underline">True</property> + <property name="activatable_widget">postproc_script_entry</property> + <child> + <object class="GtkBox" id="postproc_script_box"> + <property name="visible">True</property> + <property name="valign">center</property> + <property name="homogeneous">True</property> + + <child> + <object class="GtkEntry" id="postproc_script_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="HdyActionRow"> + <property name="visible">True</property> + <property name="title" translatable="yes" comments="Label beside postprocesing arguments entry">_Script arguments</property> + <property name="use_underline">True</property> + <property name="activatable_widget">postproc_args_entry</property> + <child> + <object class="GtkBox" id="postproc_args_box"> + <property name="visible">True</property> + <property name="valign">center</property> + <property name="homogeneous">True</property> + + <child> + <object class="GtkEntry" id="postproc_args_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="HdyActionRow"> + <property name="visible">True</property> + <property name="title" translatable="yes" comments="Label beside keep keep original file radio">_Keep original file</property> + <property name="use_underline">True</property> + <property name="activatable_widget">postproc_keep_original_box</property> + <child> + <object class="GtkBox" id="postproc_keep_original_box"> + <property name="visible">True</property> + <property name="valign">center</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkSwitch" id="postproc_keep_original_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">False</property> + <property name="active">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + </child> </object> </child> </template> |