[Libreoffice-commits] core.git: cui/uiconfig

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 11 07:53:22 UTC 2018


 cui/uiconfig/ui/charnamepage.ui |  115 ++++++++++++++++++++++------------------
 1 file changed, 65 insertions(+), 50 deletions(-)

New commits:
commit 934735795dbddf074c85ae2a9d5d2b358d65e403
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 10 16:45:41 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 11 09:53:00 2018 +0200

    move 'features' button for format->character to next row
    
    for non CJK/CTL case, there's loads of space there for it
    
    Change-Id: I713e827b2d332fd29fec7f09f900406b98d08762
    Reviewed-on: https://gerrit.libreoffice.org/60273
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index d46795b75434..47be2ee42ca1 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -27,50 +27,7 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="width">4</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="label" translatable="yes" context="charnamepage|westlangft-nocjk">Language:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">westlanglb-nocjk</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="svxcorelo-SvxLanguageComboBox" 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">1</property>
-            <property name="width">4</property>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
@@ -192,15 +149,73 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="west_features_button-nocjk">
-            <property name="label" translatable="yes" context="charnamepage|west_features_button-nocjk">Features...</property>
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">24</property>
+            <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="label" translatable="yes" context="charnamepage|westlangft-nocjk">Language:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">westlanglb-nocjk</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="svxcorelo-SvxLanguageComboBox" 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="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="west_features_button-nocjk">
+                <property name="label" translatable="yes" context="charnamepage|west_features_button-nocjk">Features...</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">end</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">3</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">3</property>
           </packing>
         </child>
       </object>


More information about the Libreoffice-commits mailing list