sw/uiconfig/swriter/ui/outlinenumbering.ui | 5 sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 62 ++----- sw/uiconfig/swriter/ui/outlinepositionpage.ui | 195 +++++++++---------------- 3 files changed, 96 insertions(+), 166 deletions(-)
New commits: commit 9aba60c0f0f99d0a7c31bf291040f21bdd0e5b18 Author: Adolfo Jayme Barrientos <[email protected]> Date: Wed Oct 1 22:49:16 2014 -0500 HIG: Spacing and labeling fixes for Outline Numbering dialog * Missing colons in labels that precede controls (fdo#78826) * Sentence capitalization for non-headings * Make dialog modal and non-resizable for users * Standardize spacing values to 6 and 12 * Remove extraneous 10-px paddings in tabpages * Tweak a label to remove a silly â<->â Change-Id: I4dabad2ec4a610ff3f55e31e078f465a7e42c8f2 Reviewed-on: https://gerrit.libreoffice.org/11756 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui b/sw/uiconfig/swriter/ui/outlinenumbering.ui index d90a99a..4a0e90d 100644 --- a/sw/uiconfig/swriter/ui/outlinenumbering.ui +++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="OutlineNumberingDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Outline Numbering</property> + <property name="resizable">False</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index 9447f27..398da89 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">999</property> <property name="step_increment">1</property> @@ -16,9 +18,8 @@ <object class="GtkBox" id="OutlineNumberingPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> <property name="border_width">6</property> + <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -77,12 +78,12 @@ <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">10</property> + <property name="spacing">12</property> <child> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">12</property> + <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="label3"> @@ -90,13 +91,12 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Paragraph Style</property> + <property name="label" translatable="yes">Paragraph style:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -108,7 +108,6 @@ <property name="left_attach">0</property> <property name="top_attach">1</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -116,13 +115,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Number</property> + <property name="label" translatable="yes">Number:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -130,13 +127,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Character Style</property> + <property name="label" translatable="yes">Character style:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -144,13 +139,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Show sublevels</property> + <property name="label" translatable="yes">Show sublevels:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -164,7 +157,6 @@ <property name="left_attach">0</property> <property name="top_attach">5</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -176,8 +168,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -188,8 +178,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -198,14 +186,11 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustment2</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -213,13 +198,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">6</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -227,13 +209,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -241,56 +220,49 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustment1</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">20</property> + <property name="left_padding">12</property> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Before</property> + <property name="label" translatable="yes">Before:</property> </object> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">6</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">20</property> + <property name="left_padding">12</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">After</property> + <property name="label" translatable="yes">After:</property> </object> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -298,13 +270,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Start at</property> + <property name="label" translatable="yes">Start at:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -317,7 +287,7 @@ <child> <object class="swuilo-NumberingPreview" id="preview"> <property name="width_request">150</property> - <property name="height_request">300</property> + <property name="height_request">260</property> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 1ecdfdb..ced31ba 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">19.989999999999998</property> <property name="step_increment">0.050000000000000003</property> @@ -12,14 +14,47 @@ <property name="step_increment">0.050000000000000003</property> <property name="page_increment">10</property> </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Left</col> + </row> + <row> + <col id="0" translatable="yes">Centered</col> + </row> + <row> + <col id="0" translatable="yes">Right</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Tab stop</col> + </row> + <row> + <col id="0" translatable="yes">Space</col> + </row> + <row> + <col id="0" translatable="yes">Nothing</col> + </row> + </data> + </object> <object class="GtkBox" id="OutlinePositionPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">6</property> + <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> @@ -81,12 +116,12 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">12</property> + <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="numfollowedby"> @@ -94,13 +129,11 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Numbering followed by</property> + <property name="label" translatable="yes">Numbering followed by:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -108,13 +141,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Numbering Alignment</property> + <property name="label" translatable="yes">Numbering alignment:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -122,13 +153,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Aligned at</property> + <property name="label" translatable="yes">Aligned at:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -136,13 +165,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Indent at</property> + <property name="label" translatable="yes">Indent at:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -153,8 +180,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -162,14 +187,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="digits">2</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -177,13 +199,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">at</property> + <property name="label" translatable="yes">at:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -191,14 +211,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="digits">2</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -206,14 +223,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="digits">2</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -225,39 +239,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="swuilo-NumberingPreview" id="preview"> - <property name="width_request">300</property> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="standard"> - <property name="label" translatable="yes">Default</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">end</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -265,13 +246,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Indent</property> + <property name="label" translatable="yes">Indent:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -285,8 +264,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -303,7 +280,6 @@ <property name="left_attach">0</property> <property name="top_attach">6</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -311,13 +287,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Width of numbering</property> + <property name="label" translatable="yes">Width of numbering:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -331,8 +305,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -346,8 +318,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -355,13 +325,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Minimum space numbering <-> textlabel</property> + <property name="label" translatable="yes">Minimum space between numbering and text:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -369,13 +337,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Numbering alignment</property> + <property name="label" translatable="yes">Numbering alignment:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">9</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -387,8 +353,33 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">9</property> - <property name="width">1</property> - <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="standard"> + <property name="label" translatable="yes">Default</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="swuilo-NumberingPreview" id="preview"> + <property name="width_request">250</property> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> </packing> </child> </object> @@ -413,38 +404,4 @@ </packing> </child> </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Left</col> - </row> - <row> - <col id="0" translatable="yes">Centered</col> - </row> - <row> - <col id="0" translatable="yes">Right</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Tab stop</col> - </row> - <row> - <col id="0" translatable="yes">Space</col> - </row> - <row> - <col id="0" translatable="yes">Nothing</col> - </row> - </data> - </object> </interface>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
