[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/uiconfig
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Thu Feb 18 09:40:15 UTC 2016
cui/uiconfig/ui/specialcharacters.ui | 110 +++++++++++++++--------------------
1 file changed, 48 insertions(+), 62 deletions(-)
New commits:
commit 2b45d15bab35830444bff6ec29c9f37a320f6367
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Thu Jan 7 12:02:31 2016 -0600
tdf#34882 Harmonize alignment of hex./decimal boxes
Stack these boxes vertically again
Thanks Eike for the feedback!
Change-Id: Ie2a5af6c3c46508df1763b33bf8446983e49e11c
Reviewed-on: https://gerrit.libreoffice.org/21225
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index d5b8bd6..be01696 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -212,70 +212,46 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="decimallabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Decimal:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="decimalvalue">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="text">162</property>
- <property name="halign">center</property>
- <property name="width_chars">11</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">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="halign">center</property>
+ <property name="row_spacing">3</property>
<child>
<object class="GtkLabel" id="hexlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Hexadecimal:</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="column_spacing">3</property>
+ <child>
+ <object class="GtkEntry" id="hexvalue">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="width_chars">8</property>
+ <property name="text">A2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="hexulabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">U+</property>
- <property name="selectable">True</property>
<property name="width_chars">3</property>
<property name="single_line_mode">True</property>
<property name="max_width_chars">3</property>
@@ -286,24 +262,34 @@
<property name="top_attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkEntry" id="hexvalue">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="text">A2</property>
- <property name="halign">center</property>
- <property name="width_chars">8</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="decimallabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Decimal:</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="decimalvalue">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">8</property>
+ <property name="text">162</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list