diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-01-03 21:26:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-06 20:33:20 +0100 |
commit | bd14c414082236c4be8fef8eb488afbd3dd481c6 (patch) | |
tree | 9b57a395f4f20eb916caf74fa72c337e9323632b /cui/uiconfig/ui/positionpage.ui | |
parent | replace only use of deprecated gtk-connect (diff) | |
download | core-bd14c414082236c4be8fef8eb488afbd3dd481c6.tar.gz core-bd14c414082236c4be8fef8eb488afbd3dd481c6.zip |
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for cui part c
git show -w is recommended to view these changesets
Change-Id: I8c37b4904b528b5afe01c26b83c8df27b251909f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108688
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/uiconfig/ui/positionpage.ui')
-rw-r--r-- | cui/uiconfig/ui/positionpage.ui | 616 |
1 files changed, 296 insertions, 320 deletions
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 070b16ea48c6..2398f39eac3f 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -43,75 +43,30 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="margin_bottom">4</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkRadioButton" id="normal"> + <property name="label" translatable="yes" context="positionpage|normal">Normal</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">4</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkRadioButton" id="normal"> - <property name="label" translatable="yes" context="positionpage|normal">Normal</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="superscript"> - <property name="label" translatable="yes" context="positionpage|superscript">Superscript</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">normal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="subscript"> - <property name="label" translatable="yes" context="positionpage|subscript">Subscript</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">normal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -120,81 +75,15 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkRadioButton" id="superscript"> + <property name="label" translatable="yes" context="positionpage|superscript">Superscript</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="raiselower"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="positionpage|raiselower">Raise/lower by</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">raiselowersb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="raiselowersb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="fontsizesb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment4</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="automatic"> - <property name="label" translatable="yes" context="positionpage|automatic">Automatic</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="relativefontsize"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="positionpage|relativefontsize">Relative font size</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fontsizesb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">normal</property> </object> <packing> <property name="expand">False</property> @@ -202,7 +91,112 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkRadioButton" id="subscript"> + <property name="label" translatable="yes" context="positionpage|subscript">Subscript</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">normal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="raiselower"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="positionpage|raiselower">Raise/lower by</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">raiselowersb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="raiselowersb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="fontsizesb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment4</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="automatic"> + <property name="label" translatable="yes" context="positionpage|automatic">Automatic</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="relativefontsize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="positionpage|relativefontsize">Relative font size</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fontsizesb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -230,72 +224,89 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="rotationcontainer"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="0deg"> + <property name="label" translatable="yes" context="positionpage|0deg">0 degrees</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="90deg"> + <property name="label" translatable="yes" context="positionpage|90deg">90 degrees</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">0deg</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="270deg"> + <property name="label" translatable="yes" context="positionpage|270deg">270 degrees</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">0deg</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="rotationcontainer"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="0deg"> - <property name="label" translatable="yes" context="positionpage|0deg">0 degrees</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="90deg"> - <property name="label" translatable="yes" context="positionpage|90deg">90 degrees</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">0deg</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="270deg"> - <property name="label" translatable="yes" context="positionpage|270deg">270 degrees</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">0deg</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="positionpage|label24">Scale width</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">scalewidthsb</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -304,54 +315,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box7"> + <object class="GtkSpinButton" id="scalewidthsb"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="positionpage|label24">Scale width</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">scalewidthsb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="scalewidthsb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment2</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fittoline"> - <property name="label" translatable="yes" context="positionpage|fittoline">Fit to line</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="adjustment">adjustment2</property> </object> <packing> <property name="expand">False</property> @@ -359,7 +326,28 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="fittoline"> + <property name="label" translatable="yes" context="positionpage|fittoline">Fit to line</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -415,74 +403,68 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment7"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box4"> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="positionpage|label7">Character spacing</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">kerningsb</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="positionpage|label7">Character spacing</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">kerningsb</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <child> - <object class="GtkSpinButton" id="kerningsb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pairkerning"> - <property name="label" translatable="yes" context="positionpage|pairkerning">Pair kerning</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> + <placeholder/> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="kerningsb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pairkerning"> + <property name="label" translatable="yes" context="positionpage|pairkerning">Pair kerning</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> @@ -504,35 +486,29 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment13"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="valign">end</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-end">12</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="preview"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="preview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="preview-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="positionpage|preview-atkobject">Preview</property> - </object> - </child> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="positionpage|preview-atkobject">Preview</property> </object> </child> </object> |