diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-15 09:10:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-16 01:02:04 +0100 |
commit | d06f63db476c8b7e28688cd69124809718827aa1 (patch) | |
tree | e9573407e98f97737b8369ff925569f25a1849c2 /sw/uiconfig | |
parent | e3e6f43bc8c01ca6c3ad87180db2b3e623d8eed4 (diff) |
sync insert section and edit section
why do we have two of these that are ~identical
Change-Id: Ic10ad240055d93b0bfcef898dbe2be0fbab4c514
Reviewed-on: https://gerrit.libreoffice.org/69297
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/uiconfig')
-rw-r--r-- | sw/uiconfig/swriter/ui/sectionpage.ui | 337 |
1 files changed, 199 insertions, 138 deletions
diff --git a/sw/uiconfig/swriter/ui/sectionpage.ui b/sw/uiconfig/swriter/ui/sectionpage.ui index d28d3002ec38..c6de60a4304e 100644 --- a/sw/uiconfig/swriter/ui/sectionpage.ui +++ b/sw/uiconfig/swriter/ui/sectionpage.ui @@ -151,7 +151,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">3</property> </packing> </child> <child> @@ -168,91 +167,126 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">3</property> </packing> </child> <child> - <object class="GtkLabel" id="sectionlabel"> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sectionname</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="filename"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="width_chars">18</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="sectionname"> - <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="filelabel"> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filename</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="GtkLabel" id="ddelabel"> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filename</property> - <property name="xalign">0</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="filelabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filename</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="GtkLabel" id="ddelabel"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filename</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sectionlabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sectionname</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="selectfile"> + <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="filename"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">18</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="sectionname"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -260,23 +294,6 @@ <property name="top_attach">2</property> </packing> </child> - <child> - <object class="GtkButton" id="selectfile"> - <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> @@ -324,6 +341,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -331,33 +349,56 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="selectpassword"> - <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="withpassword"> - <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">12</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="withpassword"> + <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="selectpassword"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="selectpassword"> + <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <accessibility> + <relation type="labelled-by" target="withpassword"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -406,24 +447,12 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkEntry" id="withcond"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="width_chars">18</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="hide"> <property name="label" translatable="yes" context="sectionpage|hide">H_ide</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -431,18 +460,50 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="condlabel"> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">withcond</property> - <property name="xalign">0</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="condlabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">withcond</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="GtkEntry" id="withcond"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">18</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -521,9 +582,9 @@ </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> - <widget name="sectionlabel"/> <widget name="filelabel"/> <widget name="ddelabel"/> + <widget name="sectionlabel"/> <widget name="condlabel"/> </widgets> </object> |