cui/uiconfig/ui/charnamepage.ui | 81 +++++++++++++++++++++++----------------- cui/uiconfig/ui/positionpage.ui | 44 ++++++++++----------- 2 files changed, 69 insertions(+), 56 deletions(-)
New commits: commit 1d33fc35f787061c9440ba44dfd53de405bd430a Author: Caolán McNamara <[email protected]> Date: Mon Jul 29 19:51:04 2013 +0100 Related: fdo#67395 adjust height of font name tabpage, etc. + put the language label beside the language listbox which reduces height by a line + use standard spacing between frames in position tabpage + use standard spacing horizonally between elements Change-Id: I1191db7aaf0922978bf6dd8da17ec4f133944b94 diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 89bc974..9e720c0 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkBox" id="CharNamePage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -79,38 +80,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="westlangft-nocjk"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Language</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">westlanglb-nocjk</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">3</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxLanguageBox" id="westlanglb-nocjk"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="halign">start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">3</property> - <property name="height">1</property> - </packing> - </child> - <child> <object class="svtlo-FontNameBox" id="westfontnamelb-nocjk"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -171,7 +140,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">4</property> <property name="width">3</property> <property name="height">1</property> </packing> @@ -184,7 +153,51 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="top_attach">5</property> + <property name="width">3</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="westlangft-nocjk"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Language</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">westlanglb-nocjk</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxcorelo-SvxLanguageBox" id="westlanglb-nocjk"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</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">3</property> <property name="width">3</property> <property name="height">1</property> </packing> diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 7416e3d..236f1a9 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> @@ -20,29 +21,12 @@ <property name="step_increment">1</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">Default</col> - </row> - <row> - <col id="0" translatable="yes">Expanded</col> - </row> - <row> - <col id="0" translatable="yes">Condensed</col> - </row> - </data> - </object> <object class="GtkBox" id="PositionPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame5"> <property name="visible">True</property> @@ -255,7 +239,7 @@ <object class="GtkBox" id="rotationcontainer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="0deg"> <property name="label" translatable="yes">0 degrees</property> @@ -330,12 +314,11 @@ <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">2</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="margin_right">12</property> <property name="label" translatable="yes">Scale width</property> </object> <packing> @@ -430,7 +413,7 @@ <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkComboBox" id="kerninglb"> <property name="visible">True</property> @@ -548,4 +531,21 @@ </packing> </child> </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Default</col> + </row> + <row> + <col id="0" translatable="yes">Expanded</col> + </row> + <row> + <col id="0" translatable="yes">Condensed</col> + </row> + </data> + </object> </interface>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
