Commit cd581c9e authored by Matthias Clasen's avatar Matthias Clasen

Simplify our templates

This is applying the new property name simplification.
parent 3c097830
......@@ -3,12 +3,12 @@
<!-- interface-requires gtk+ 3.10 -->
<object class="GtkImage" id="image1">
<property name="visible">1</property>
<property name="icon_name">help-about</property>
<property name="icon-name">help-about</property>
</object>
<template class="GtkAboutDialog" parent="GtkDialog">
<property name="border_width">5</property>
<property name="border-width">5</property>
<property name="resizable">0</property>
<property name="type_hint">dialog</property>
<property name="type-hint">dialog</property>
<child internal-child="headerbar">
<object class="GtkHeaderBar" id="headerbar1">
<property name="visible">1</property>
......@@ -28,13 +28,13 @@
<child>
<object class="GtkBox" id="box">
<property name="visible">1</property>
<property name="border_width">5</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="logo_image">
<property name="visible">1</property>
<property name="icon_name">image-missing</property>
<property name="icon-name">image-missing</property>
</object>
<packing>
<property name="fill">0</property>
......@@ -54,8 +54,8 @@
</child>
<child>
<object class="GtkStack" id="stack">
<property name="width_request">400</property>
<property name="height_request">100</property>
<property name="width-request">400</property>
<property name="height-request">100</property>
<property name="visible">1</property>
<property name="transition-type">over-up-down</property>
<property name="transition-duration">600</property>
......@@ -96,7 +96,7 @@
<property name="homogeneous">1</property>
<child>
<object class="GtkLabel" id="website_label">
<property name="no_show_all">1</property>
<property name="no-show-all">1</property>
<property name="label">http://website.com</property>
<property name="selectable">1</property>
<signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
......@@ -114,16 +114,16 @@
<child>
<object class="GtkLabel" id="license_label">
<property name="label">license</property>
<property name="use_markup">1</property>
<property name="use-markup">1</property>
<property name="justify">center</property>
<property name="wrap">1</property>
<property name="selectable">1</property>
<property name="no_show_all">1</property>
<property name="no-show-all">1</property>
<property name="max-width-chars">60</property>
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">3</property>
</packing>
</child>
......@@ -138,7 +138,7 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">4</property>
</packing>
</child>
......@@ -156,8 +156,8 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">1</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">1</property>
......@@ -169,10 +169,10 @@
<property name="visible">1</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="border_width">5</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="row_spacing">2</property>
<property name="column_spacing">8</property>
<property name="row-spacing">2</property>
<property name="column-spacing">8</property>
</object>
</child>
</object>
......@@ -196,15 +196,15 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">1</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTextView" id="license_view">
<property name="visible">1</property>
<property name="editable">0</property>
<property name="left_margin">8</property>
<property name="right_margin">8</property>
<property name="cursor_visible">0</property>
<property name="left-margin">8</property>
<property name="right-margin">8</property>
<property name="cursor-visible">0</property>
<signal name="event-after" handler="text_view_event_after" swapped="no"/>
<signal name="key-press-event" handler="text_view_key_press_event" swapped="no"/>
<signal name="motion-notify-event" handler="text_view_motion_notify_event" swapped="no"/>
......
......@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.10 -->
<template class="GtkAppChooserDialog" parent="GtkDialog">
<property name="title" translatable="yes">Select Application</property>
<property name="type_hint">dialog</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="orientation">vertical</property>
......@@ -22,10 +22,10 @@
</child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="layout_style">end</property>
<property name="layout-style">end</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
......@@ -57,7 +57,7 @@
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="visible">1</property>
<property name="use_underline">1</property>
<property name="use-underline">1</property>
<property name="label" translatable="yes">_Cancel</property>
</object>
</child>
......@@ -65,8 +65,8 @@
<object class="GtkButton" id="ok_button">
<property name="visible">1</property>
<property name="label" translatable="yes">_Select</property>
<property name="use_underline">1</property>
<property name="can_default">1</property>
<property name="use-underline">1</property>
<property name="can-default">1</property>
</object>
</child>
<action-widgets>
......@@ -77,17 +77,17 @@
<object class="GtkButton" id="show_more_button">
<property name="label" translatable="yes">_View All Applications</property>
<property name="visible">1</property>
<property name="use_underline">1</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="use-underline">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
</object>
<object class="GtkButton" id="software_button">
<property name="label" translatable="yes">_Find New Applications</property>
<property name="visible">1</property>
<property name="use_underline">1</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="use-underline">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
</object>
<object class="GtkSizeGroup" id="buttons">
......
......@@ -35,18 +35,18 @@
<property name="visible">1</property>
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
<property name="width_request">400</property>
<property name="height_request">300</property>
<property name="width-request">400</property>
<property name="height-request">300</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="can-focus">1</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="program_list">
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="can-focus">1</property>
<property name="model">program_list_sort</property>
<property name="headers_visible">0</property>
<property name="headers-visible">0</property>
<signal name="button-press-event" handler="widget_button_press_event_cb" swapped="no"/>
<signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
<child internal-child="selection">
......@@ -63,8 +63,8 @@
<child>
<object class="GtkCellRendererText" id="heading">
<property name="ypad">6</property>
<property name="wrap_mode">word</property>
<property name="wrap_width">350</property>
<property name="wrap-mode">word</property>
<property name="wrap-width">350</property>
</object>
<attributes>
<attribute name="visible">6</attribute>
......@@ -97,7 +97,7 @@
<child type="overlay">
<object class="GtkBox" id="no_apps">
<property name="orientation">vertical</property>
<property name="no-show-all">True</property>
<property name="no-show-all">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
......
......@@ -29,9 +29,9 @@
<child>
<object class="GtkNotebook" id="content">
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="show_tabs">0</property>
<property name="show_border">0</property>
<property name="can-focus">1</property>
<property name="show-tabs">0</property>
<property name="show-border">0</property>
<signal name="remove" handler="assistant_remove_page_cb" swapped="no"/>
<child type="tab"/>
</object>
......@@ -48,11 +48,11 @@
<child>
<object class="GtkButton" id="apply">
<property name="label" translatable="yes">_Apply</property>
<property name="can_focus">1</property>
<property name="can_default">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="can-default">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -60,18 +60,18 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkButton" id="forward">
<property name="label" translatable="yes">_Next</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="can_default">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="can-default">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -79,7 +79,7 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
......@@ -87,10 +87,10 @@
<object class="GtkButton" id="back">
<property name="label" translatable="yes">_Back</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -98,17 +98,17 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="last">
<property name="label" translatable="yes">_Finish</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -116,7 +116,7 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">3</property>
</packing>
</child>
......@@ -124,10 +124,10 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -135,18 +135,18 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="close">
<property name="label" translatable="yes">_Close</property>
<property name="can_focus">1</property>
<property name="can_default">1</property>
<property name="receives_default">1</property>
<property name="no_show_all">1</property>
<property name="use_underline">1</property>
<property name="can-focus">1</property>
<property name="can-default">1</property>
<property name="receives-default">1</property>
<property name="no-show-all">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
......@@ -154,7 +154,7 @@
</object>
<packing>
<property name="fill">0</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">5</property>
</packing>
</child>
......
......@@ -2,9 +2,9 @@
<interface domain="gtk30">
<!-- interface-requires gtk+ 3.10 -->
<template class="GtkColorChooserDialog" parent="GtkDialog">
<property name="border_width">5</property>
<property name="border-width">5</property>
<property name="title" translatable="yes">Select a Color</property>
<property name="type_hint">dialog</property>
<property name="type-hint">dialog</property>
<property name="resizable">0</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
......@@ -13,7 +13,7 @@
<child>
<object class="GtkColorChooserWidget" id="chooser">
<property name="visible">1</property>
<property name="border_width">5</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="rgba">rgb(255,255,255)</property>
<signal name="color-activated" handler="color_activated_cb" swapped="no"/>
......@@ -30,7 +30,7 @@
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="visible">1</property>
<property name="use_underline">1</property>
<property name="use-underline">1</property>
<property name="label" translatable="yes">_Cancel</property>
</object>
</child>
......@@ -38,8 +38,8 @@
<object class="GtkButton" id="ok_button">
<property name="visible">1</property>
<property name="label" translatable="yes">_Select</property>
<property name="use_underline">1</property>
<property name="can_default">1</property>
<property name="use-underline">1</property>
<property name="can-default">1</property>
</object>
</child>
<action-widgets>
......
......@@ -4,30 +4,30 @@
<!-- interface-requires gtk+ 3.10 -->
<object class="GtkAdjustment" id="a_adj">
<property name="upper">1</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
<property name="step-increment">0.01</property>
<property name="page-increment">0.10000000000000001</property>
<signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
</object>
<object class="GtkAdjustment" id="h_adj">
<property name="upper">1</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
<property name="step-increment">0.01</property>
<property name="page-increment">0.10000000000000001</property>
<signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
</object>
<object class="GtkAdjustment" id="s_adj">
<property name="upper">1</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
<property name="step-increment">0.01</property>
<property name="page-increment">0.10000000000000001</property>
<signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
</object>
<object class="GtkAdjustment" id="v_adj">
<property name="upper">1</property>
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
<property name="step-increment">0.01</property>
<property name="page-increment">0.10000000000000001</property>
<signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
</object>
<template class="GtkColorEditor" parent="GtkBox">
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<signal name="notify::visible" handler="dismiss_current_popup" swapped="no"/>
<child>
<object class="GtkOverlay" id="overlay">
......@@ -36,29 +36,29 @@
<child>
<object class="GtkGrid" id="grid">
<property name="visible">1</property>
<property name="margin_start">30</property>
<property name="margin_end">30</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<property name="margin-start">30</property>
<property name="margin-end">30</property>
<property name="row-spacing">12</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkColorSwatch" id="swatch">
<property name="visible">True</property>
<property name="name">editor-color-sample</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="rgba">rgb(255,255,255)</property>
<property name="selectable">False</property>
<property name="has_menu">False</property>
<property name="has-menu">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry">
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="invisible_char"></property>
<property name="can-focus">1</property>
<property name="invisible-char"></property>
<child internal-child="accessible">
<object class="AtkObject" id="entry-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
......@@ -69,58 +69,58 @@
<signal name="notify::text" handler="entry_text_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkColorScale" id="h_slider">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="orientation">vertical</property>
<property name="adjustment">h_adj</property>
<property name="draw_value">False</property>
<property name="has_origin">False</property>
<property name="draw-value">False</property>
<property name="has-origin">False</property>
<signal name="popup-menu" handler="popup_edit" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkColorScale" id="a_slider">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="adjustment">a_adj</property>
<property name="draw_value">False</property>
<property name="scale_type">1</property>
<property name="has_origin">False</property>
<property name="draw-value">False</property>
<property name="scale-type">1</property>
<property name="has-origin">False</property>
<style>
<class name="scale-has-marks-above"/>
</style>
<signal name="popup-menu" handler="popup_edit" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkColorPlane" id="sv_plane">
<property name="width_request">300</property>
<property name="height_request">300</property>
<property name="width-request">300</property>
<property name="height-request">300</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="h_adjustment">h_adj</property>
<property name="s_adjustment">s_adj</property>
<property name="v_adjustment">v_adj</property>
<property name="can-focus">True</property>
<property name="h-adjustment">h_adj</property>
<property name="s-adjustment">s_adj</property>
<property name="v-adjustment">v_adj</property>
<signal name="popup-menu" handler="popup_edit" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
......@@ -135,7 +135,7 @@
</child>
</template>
<object class="GtkBox" id="a_popup">
<property name="no_show_all">1</property>
<property name="no-show-all">1</property>
<style>
<class name="popover"/>
<class name="osd"/>
......@@ -144,28 +144,28 @@
<child>
<object class="GtkGrid" id="grid4">
<property name="visible">1</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">6</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">1</property>
<property name="label" translatable="yes" context="Color channel">A</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="a_entry">
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="can-focus">1</property>
<property name="width-chars">2</property>
<property name="max-width-chars">2</property>
<property name="climb_rate">1</property>
<property name="climb-rate">1</property>
<child internal-child="accessible">
<object class="AtkObject" id="a_entry-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
......@@ -174,15 +174,15 @@
<signal name="key-press-event" handler="popup_key_press" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkBox" id="h_popup">
<property name="no_show_all">1</property>
<property name="no-show-all">1</property>
<style>
<class name="popover"/>
<class name="osd"/>
......@@ -191,28 +191,28 @@
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">1</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">6</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">1</property>
<property name="label" translatable="yes" context="Color channel">H</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="h_entry">
<property name="visible">1</property>
<property name="can_focus">1</property>
<property name="can-focus">1</property>
<property name="width-chars">2</property>
<property name="max-width-chars">2</property>
<property name="climb_rate">1</property>
<property name="climb-rate">1</property>
<child internal-child="accessible">
<object class="AtkObject" id="h_entry-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Hue</property>
......@@ -221,15 +221,15 @@
<signal name="key-press-event" handler="popup_key_press" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkBox" id="sv_popup">
<property name="no_show_all">1</property>
<property name="no-show-all">1</property>
<style>
<class name="popover"/>
<class name="osd"/>
......@@ -238,20 +238,20 @@
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">1</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name=