cui/uiconfig/ui/optviewpage.ui | 139 +++++++++++++++++++++--------------------
1 file changed, 72 insertions(+), 67 deletions(-)
New commits:
commit 828a54cfb944c1b98cd38628dbb8cb99fc86dfec
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Date: Wed Mar 29 03:25:43 2017 -0600
tdf#105281 Rearrange a few things for l10n-friendliness
With the Notebookbar addition, no care was taken to update this UI
bearing in mind that there *might* be a few languages suffering in
consequence.
Change-Id: I78c4a1846e192c4c7a64328b730517d42aff979f
(cherry picked from commit bd911c02594c77e1f7e8a01a364b6e0967d4db26)
Reviewed-on: https://gerrit.libreoffice.org/35832
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Sophie Gautier <gautier.sop...@gmail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 06cb489d7e77..fc75fc821e9d 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -166,11 +166,12 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Icons in
men_us:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">menuicons</property>
@@ -181,7 +182,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="menuicons">
+ <object class="GtkComboBoxText"
id="contextmenushortcuts">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
@@ -191,44 +192,39 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="contextmenushortcuts">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item translatable="yes">Automatic</item>
- <item translatable="yes">Hide</item>
- <item translatable="yes">Show</item>
- </items>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Shortcuts in
context menus:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">contextmenushortcuts</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label10">
+ <object class="GtkComboBoxText" id="menuicons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
- <property name="label" translatable="yes">Shortcuts in
context menus:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">contextmenushortcuts</property>
+ <items>
+ <item translatable="yes">Automatic</item>
+ <item translatable="yes">Hide</item>
+ <item translatable="yes">Show</item>
+ </items>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -339,12 +335,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Toolbar
icon _size:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">iconsize</property>
@@ -373,8 +368,8 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -389,22 +384,22 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Icon
s_tyle:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">iconstyle</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -419,49 +414,21 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="aafrom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label"
translatable="yes">fro_m:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">aanf:0pixels</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="aanf:0pixels">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="invisible_char">â¢</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Sidebar
_icon size:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">iconsize</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -475,22 +442,22 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label"
translatable="yes">_Notebookbar icon size:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">iconsize</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -504,8 +471,46 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="aafrom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label"
translatable="yes">fro_m:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">aanf:0pixels</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="aanf:0pixels">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â¢</property>
+ <property
name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
