[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - cui/source cui/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig sw/uiconfig vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 13 04:27:36 PST 2014
cui/source/options/optgdlg.cxx | 13
cui/source/options/optinet2.cxx | 10
cui/uiconfig/ui/connpooloptions.ui | 8
cui/uiconfig/ui/opthtmlpage.ui | 19
cui/uiconfig/ui/optlanguagespage.ui | 23
cui/uiconfig/ui/optsavepage.ui | 35
cui/uiconfig/ui/optviewpage.ui | 555 ++++++++-------
sc/uiconfig/scalc/ui/optcompatibilitypage.ui | 9
sc/uiconfig/scalc/ui/optformula.ui | 27
sc/uiconfig/scalc/ui/scgeneralpage.ui | 44 -
sc/uiconfig/scalc/ui/tpviewpage.ui | 807 +++++++++++------------
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 23
sd/uiconfig/simpress/ui/prntopts.ui | 20
sfx2/uiconfig/ui/optprintpage.ui | 19
sw/uiconfig/swriter/ui/optcaptionpage.ui | 21
sw/uiconfig/swriter/ui/opttablepage.ui | 15
vcl/source/window/layout.cxx | 12
17 files changed, 824 insertions(+), 836 deletions(-)
New commits:
commit f6f07f6a266ed7505e8113a7078326bfce734cfa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 8 17:05:19 2014 +0000
designate various elements to shrink in options panes for e.g. de
...where labels etc are longer than the space available then specific which
things should shrink to avoid cut off text.
designate which elements should shrink when limited width
(cherry picked from commit 6cdf269a93685d5dfd7811faabb55acd2d7b2561)
(cherry picked from commit 2f6f9236eb6d64f1adaef275df100dde898a8dd5)
designate which elements should shrink when limited width
Calc general page (e.g. .de)
(cherry picked from commit 7fb178343eb121ff5e262a16aa601f7be23edc69)
(cherry picked from commit 9a7bbabc4fd95089068217d38cd0281da65de756)
designate which elements should shrink when limited width
load/save HTML compatibility page (e.g. .de|pl)
(cherry picked from commit 3b0648f2b74b5ac95deabcc3dce2ff690a1f6cc6)
(cherry picked from commit 9a8a7212508151971dde9811e71c1cb775585ac3)
stretch label to fill vertically for long text
calc compatibility page (e.g. de)
(cherry picked from commit 3466f403470c192d24b9d7859b8a6a6ae5c94a2b)
(cherry picked from commit c8204020835de157aaef60e217275612dab8b633)
allow long labels to line break
writer table options page (e.g. de)
(cherry picked from commit 5b29623e0ad6231dd933bd2b2a0017f89436c9d8)
(cherry picked from commit ca070a758cd29315b4e9f91a298c90d2f57936a0)
designate which elements should shrink when limited width
draw/impress print options page (de)
(cherry picked from commit 45b72633d1bea5e75a27f5fd93e91071e04c050c)
(cherry picked from commit 1657e20e663c0cc65168cd193dd19ff78f478e03)
these checkboxes should be indented to indicate their level
(cherry picked from commit 1f5203302b7be632d6a500643e90a63a81ca5d4a)
(cherry picked from commit 0c51aa45e0046a7831f8f365abdfeab3b9271864)
fc5c230040c9b59f8570a64deda0121ac93ed0e9
1d118ebcf8718244dd4f2bab2dc6cb8d60b1008b
eab742900747808a4c27205b190e416b391b7a39
b8f3daad397fc4b8d37979f5c6d1e12b8884677d
e4cf8902d3db68a156d10bd4d1b2c7db33539f9c
5928f416e9bc3567111da99509133e27a2f4ad14
specify that grid color listbox can shrink...
in calc->view options and that the checkbox entries cannot when options pane
isn't wide enough to fit everything in (fr). Necessitates swapping columns so
the stretching/shrinking column can be centered horizontally for e.g. en to
remain pretty.
(cherry picked from commit 8b6823e0bae689519839f18031e9c59a94dfbec8)
(cherry picked from commit 62ebabab96f6cd47e9813ca15b9b8ace3cc5292a)
specify which elements can shrink
in options view if there isn't enough space to show everything (fr)
(cherry picked from commit 6cb6370711f1072e3266d9218f7e42534e8ed58c)
(cherry picked from commit 71a5e5c1f0fb783127fc86a3114a6387553d0037)
stop condition reversed, sigh
(cherry picked from commit 03e0781145bceebca84e5d891ed0df72c75389da)
(cherry picked from commit de9a62919fac612f793793bcb71c5137118b400a)
plenty of space in the empty cell that can be used
(cherry picked from commit 037cd59fe5494baa6cba1bd76f19026fe4cbbb5a)
(cherry picked from commit eee8f68136ffd35947dd7e37a6eb5e8a869badda)
reorganize opt view page to shrink neatly
i.e. all shrinkable elements in the one column (de)
(cherry picked from commit a7a3733d8872551279d2b96aecb5a64e1ffd0c98)
(cherry picked from commit 4619623347175a9b37fde26351df87dee5d91720)
put these col entries back as rows again
because in French they are way too long to go side by side
(cherry picked from commit 52f4526afe382c5c79465484da0d349ade305239)
(cherry picked from commit 55e61c9810d3e7107abfd002cec48b9f83081711)
tweak autocaption option page to shrink nicely
in the face of super wide frame label text (fr)
(cherry picked from commit 4819ccc1ccf245b7df12df7d6bc1c4c458375e36)
(cherry picked from commit f919e2fbb71670777ef06cc06339cae233e5dd12)
wrong title, copied and paste from its neighbour
(cherry picked from commit 224da5bcde2a62d375490456f717e5c2a639a802)
(cherry picked from commit 56994dca201b3573cc99aea1600acbfa43a892d6)
select elements that are to shrink when not enough space
options->language settings (fr)
(cherry picked from commit 1a25a0c9b506294bc40397d2f1cc860290f1ae55)
(cherry picked from commit 316496e1c0c42a02cc3850b494b6a5134d836543)
swap entries to optional checkbox is on last row
so there isn't a hole if the remote control option is
hidden
(cherry picked from commit 4e7333c6a66382e740748ee7dd8c48179ba62b7b)
(cherry picked from commit 6301820d72bca8ab065ed9c3c41ea4a3d04333e4)
Change-Id: Ib9b7eb21cacdf864f309a0a853d64f299ec7b74c
Reviewed-on: https://gerrit.libreoffice.org/7341
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Adolfo Jayme Barrientos <fito at libreoffice.org>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f4599e11..6b3a1a1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -545,6 +545,19 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
get(m_pIconSizeLB, "iconsize");
get(m_pIconStyleLB, "iconstyle");
get(m_pSystemFont, "systemfont");
+
+ VclContainer *pRef = get<VclContainer>("refgrid");
+ //fdo#65595, we need height-for-width support here, but for now we can
+ //bodge it
+ Size aPrefSize(m_pSystemFont->get_preferred_size());
+ Size aSize(pRef->get_preferred_size());
+ if (aPrefSize.Width() > aSize.Width())
+ {
+ aSize = m_pSystemFont->CalcMinimumSize(aSize.Width());
+ m_pSystemFont->set_width_request(aSize.Width());
+ m_pSystemFont->set_height_request(aSize.Height());
+ }
+
get(m_pFontAntiAliasing, "aafont");
get(m_pAAPointLimitLabel, "aafrom");
get(m_pAAPointLimit, "aanf");
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3dc0959..f3486ac 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -585,11 +585,15 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet)
get(m_pSecurityOptionsPB, "options");
get(m_pSavePasswordsCB, "savepassword");
- //fdo#65595, we height-for-width support here, but for now we can
+ //fdo#65595, we need height-for-width support here, but for now we can
//bodge it
+ Size aPrefSize(m_pSavePasswordsCB->get_preferred_size());
Size aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width()));
- m_pSavePasswordsCB->set_width_request(aSize.Width());
- m_pSavePasswordsCB->set_height_request(aSize.Height());
+ if (aPrefSize.Width() > aSize.Width())
+ {
+ m_pSavePasswordsCB->set_width_request(aSize.Width());
+ m_pSavePasswordsCB->set_height_request(aSize.Height());
+ }
get(m_pShowConnectionsPB, "connections");
get(m_pMasterPasswordCB, "usemasterpassword");
diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui
index 2c2c7e4..811e49d 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Thu Jan 9 14:52:53 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">30</property>
<property name="upper">600</property>
@@ -41,7 +43,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -76,6 +77,7 @@
<object class="cuilo-DriverListControl" id="driverlist">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -128,7 +130,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -164,7 +165,6 @@
<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>
@@ -195,7 +195,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Registered databases</property>
+ <property name="label" translatable="yes">Connection pool</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index ea6fb99..56cc127 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 18:33:24 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -60,14 +61,12 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -75,7 +74,6 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
@@ -83,7 +81,6 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -106,7 +103,6 @@
<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">adjustsize7</property>
</object>
<packing>
@@ -136,7 +132,6 @@
<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">adjustsize6</property>
</object>
<packing>
@@ -166,7 +161,6 @@
<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">adjustsize5</property>
</object>
<packing>
@@ -196,7 +190,6 @@
<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">adjustsize4</property>
</object>
<packing>
@@ -226,7 +219,6 @@
<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">adjustsize3</property>
</object>
<packing>
@@ -256,7 +248,6 @@
<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">adjustsize2</property>
</object>
<packing>
@@ -286,7 +277,6 @@
<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">adjustsize1</property>
</object>
<packing>
@@ -431,6 +421,7 @@
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -438,6 +429,7 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
@@ -445,6 +437,7 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkGrid" id="grid4">
@@ -473,6 +466,8 @@
<object class="svxlo-SvxTextEncodingBox" id="charset">
<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="left_attach">1</property>
@@ -567,8 +562,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item>Microsoft Internet Explorer</item>
<item>Mozilla Firefox</item>
diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui
index bf14d21..83129a0 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 10 19:09:18 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -32,7 +33,6 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_User interface</property>
<property name="use_underline">True</property>
@@ -49,7 +49,6 @@
<object class="GtkLabel" id="localesettingFT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Locale setting</property>
<property name="use_underline">True</property>
@@ -66,7 +65,6 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Decimal separator key</property>
<property name="use_underline">True</property>
@@ -83,7 +81,6 @@
<object class="GtkLabel" id="defaultcurrency">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Default currency</property>
<property name="use_underline">True</property>
@@ -100,7 +97,6 @@
<object class="GtkLabel" id="dataaccpatterns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Date acceptance _patterns</property>
<property name="use_underline">True</property>
@@ -117,6 +113,8 @@
<object class="svxcorelo-SvxLanguageBox" id="userinterface">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -129,6 +127,8 @@
<object class="svxcorelo-SvxLanguageBox" id="localesetting">
<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="left_attach">1</property>
@@ -141,6 +141,8 @@
<object class="svxcorelo-SvxLanguageBox" id="currencylb">
<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="left_attach">1</property>
@@ -153,9 +155,10 @@
<object class="GtkEntry" id="datepatterns">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="halign">start</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -228,6 +231,8 @@
<object class="svxcorelo-SvxLanguageBox" id="westernlanguage">
<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="left_attach">1</property>
@@ -240,6 +245,8 @@
<object class="svxcorelo-SvxLanguageBox" id="asianlanguage">
<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="left_attach">1</property>
@@ -252,6 +259,8 @@
<object class="svxcorelo-SvxLanguageBox" id="complexlanguage">
<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="left_attach">1</property>
@@ -283,7 +292,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -301,7 +309,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index afedb0b..c312911 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Thu Jan 9 14:16:44 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -17,7 +18,6 @@
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -107,7 +107,6 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">24</property>
<child>
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
@@ -135,7 +134,6 @@
<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>
@@ -162,7 +160,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -180,7 +178,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -196,14 +194,14 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="relative_inet">
- <property name="label" translatable="yes">Save URLs relative to internet</property>
+ <object class="GtkCheckButton" id="docinfo">
+ <property name="label" translatable="yes">_Edit document properties before saving</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -212,15 +210,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <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>
- <object class="GtkCheckButton" id="docinfo">
- <property name="label" translatable="yes">_Edit document properties before saving</property>
+ <object class="GtkCheckButton" id="relative_inet">
+ <property name="label" translatable="yes">Save URLs relative to internet</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -230,7 +228,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -246,8 +244,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -278,7 +276,6 @@
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -354,8 +351,6 @@
<object class="GtkComboBoxText" id="odfversion">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">1.0/1.1</item>
<item translatable="yes">1.2</item>
@@ -406,8 +401,6 @@
<object class="GtkComboBoxText" id="doctype">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">Text document</item>
<item translatable="yes">HTML document</item>
@@ -429,8 +422,6 @@
<object class="GtkComboBoxText" id="saveas">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index b986e5e..0c68af7 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Thu Jan 9 14:01:27 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -15,142 +16,44 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="lower">10</property>
- <property name="upper">90</property>
- <property name="value">75</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkBox" id="OptViewPage">
+ <object class="GtkGrid" id="OptViewPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
<property name="border_width">6</property>
- <property name="spacing">12</property>
- <property name="homogeneous">True</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="row_spacing">18</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkGrid" id="grid5">
+ <object class="GtkCheckButton" id="useaccel">
+ <property name="label" translatable="yes">Use hard_ware acceleration</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Sc_aling</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">windowsize:0%</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>
- <object class="GtkSpinButton" id="windowsize:0%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</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">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <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">Icon _size and style</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="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="iconsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">Automatic</item>
- <item translatable="yes">Small</item>
- <item translatable="yes">Large</item>
- </items>
- </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>
- <object class="GtkComboBoxText" id="iconstyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">Automatic</item>
- <item translatable="yes">Galaxy</item>
- <item translatable="yes">High Contrast</item>
- <item translatable="yes">Industrial</item>
- <item translatable="yes">Crystal</item>
- <item translatable="yes">Tango</item>
- <item translatable="yes">Oxygen</item>
- <item translatable="yes">Classic</item>
- <item translatable="yes">Human</item>
- <item translatable="yes">Sifr</item>
- <item translatable="yes">Tango Testing</item>
- </items>
- </object>
- <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>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -160,8 +63,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="systemfont">
- <property name="label" translatable="yes">Use system _font for user interface</property>
+ <object class="GtkCheckButton" id="useaa">
+ <property name="label" translatable="yes">Use Anti-A_liasing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -176,9 +79,48 @@
<property name="height">1</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Graphics output</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </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>
+ <object class="GtkFrame" id="frame7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkCheckButton" id="aafont">
- <property name="label" translatable="yes">Screen font antialiasin_g</property>
+ <object class="GtkCheckButton" id="trans">
+ <property name="label" translatable="yes">_Transparency</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -188,51 +130,23 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="fromft">
+ <object class="GtkSpinButton" id="transmf:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</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="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>
- <property name="width">1</property>
- <property name="height">1</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="invisible_char_set">True</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <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>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">75</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="value">75</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -242,10 +156,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">User Interface</property>
+ <property name="label" translatable="yes">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -253,9 +167,10 @@
</child>
</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">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -294,8 +209,6 @@
<object class="GtkComboBoxText" id="menuicons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">Automatic</item>
<item translatable="yes">Hide</item>
@@ -325,9 +238,10 @@
</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -397,61 +311,173 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <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="GtkBox" id="box4">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">18</property>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkCheckButton" id="useaccel">
- <property name="label" translatable="yes">Use hard_ware acceleration</property>
+ <object class="GtkGrid" id="refgrid">
+ <property name="visible">True</property>
+ <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="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sc_aling</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">windowsize:0%</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>
+ <object class="GtkSpinButton" id="windowsize:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <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="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Icon _size and style</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="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="iconsize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes">Automatic</item>
+ <item translatable="yes">Small</item>
+ <item translatable="yes">Large</item>
+ </items>
+ </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>
+ <object class="GtkComboBoxText" id="iconstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">Automatic</item>
+ <item translatable="yes">Galaxy</item>
+ <item translatable="yes">High Contrast</item>
+ <item translatable="yes">Industrial</item>
+ <item translatable="yes">Crystal</item>
+ <item translatable="yes">Tango</item>
+ <item translatable="yes">Oxygen</item>
+ <item translatable="yes">Classic</item>
+ <item translatable="yes">Human</item>
+ <item translatable="yes">Sifr</item>
+ <item translatable="yes">Tango Testing</item>
+ </items>
+ </object>
+ <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>
+ </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>
+ <object class="GtkCheckButton" id="systemfont:wrap">
+ <property name="label" translatable="yes">Use system _font for user interface</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="useaa">
- <property name="label" translatable="yes">Use Anti-A_liasing</property>
+ <object class="GtkCheckButton" id="aafont">
+ <property name="label" translatable="yes">Screen font antialiasin_g</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -461,7 +487,50 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="fromft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</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="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>
+ <property name="width">1</property>
+ <property name="height">1</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </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>
@@ -471,10 +540,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Graphics output</property>
+ <property name="label" translatable="yes">User Interface</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -482,27 +551,31 @@
</child>
</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label11">
@@ -540,8 +613,8 @@
<object class="GtkComboBoxText" id="mousepos">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes">Default button</item>
<item translatable="yes">Dialog center</item>
@@ -559,8 +632,8 @@
<object class="GtkComboBoxText" id="mousemiddle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes">No function</item>
<item translatable="yes">Automatic scrolling</item>
@@ -590,87 +663,33 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="trans">
- <property name="label" translatable="yes">_Transparency</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</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>
- <object class="GtkSpinButton" id="transmf:0%">
- <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">adjustment3</property>
- </object>
- <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>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Selection</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">10</property>
+ <property name="upper">90</property>
+ <property name="value">75</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="mousepos"/>
+ <widget name="mousemiddle"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index c71e37a..bc01915 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 18:42:59 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="OptCompatibilityPage">
@@ -12,6 +13,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -19,6 +21,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
@@ -26,6 +29,7 @@
<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">6</property>
<property name="column_spacing">12</property>
<child>
@@ -33,6 +37,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property>
@@ -52,9 +57,7 @@
<object class="GtkComboBoxText" id="keybindings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <property name="valign">start</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">OpenOffice.org legacy</item>
diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui
index b77d2da..dfefcc0 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 17:04:17 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">32000</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkBox" id="OptFormula">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -293,8 +287,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -308,8 +302,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -323,8 +317,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -437,8 +431,7 @@
<object class="GtkComboBoxText" id="ooxmlrecalc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes">Always recalculate</item>
<item translatable="yes">Never recalculate</item>
@@ -456,8 +449,7 @@
<object class="GtkComboBoxText" id="odfrecalc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes">Always recalculate</item>
<item translatable="yes">Never recalculate</item>
@@ -500,4 +492,11 @@
</packing>
</child>
</object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">32000</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 675d6d9..d35a99a 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 17:08:51 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -76,7 +77,6 @@
<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>
<property name="digits">2</property>
</object>
@@ -91,9 +91,6 @@
<object class="GtkComboBoxText" id="unitlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_span_column">7</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -288,7 +285,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -305,7 +302,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -322,7 +319,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -339,7 +336,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -355,7 +352,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -372,7 +369,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -380,10 +377,8 @@
<object class="GtkComboBoxText" id="alignlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="row_span_column">7</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">Down</item>
<item translatable="yes">Right</item>
@@ -428,31 +423,10 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 0f1068d..9c454cf 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Thu Jan 9 10:47:53 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -8,315 +9,83 @@
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkCheckButton" id="formula">
+ <property name="label" translatable="yes">_Formulas</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="svxlo-ColorLB" id="color">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <object class="GtkCheckButton" id="break">
- <property name="label" translatable="yes">_Page breaks</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="guideline">
- <property name="label" translatable="yes">Helplines _while moving</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="grid_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Grid lines:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">grid</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>
- <object class="GtkLabel" id="color_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Color:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">color</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>
- <object class="GtkComboBoxText" id="grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">Show</item>
- <item translatable="yes">Show on colored cells</item>
- <item translatable="yes">Hide</item>
- </items>
- </object>
- <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>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Visual aids</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkCheckButton" id="nil">
+ <property name="label" translatable="yes">Zero val_ues</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="objgrf_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Ob_jects/Image:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">objgrf</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>
- <object class="GtkLabel" id="diagram_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Cha_rts:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">diagram</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>
- <object class="GtkLabel" id="draw_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Drawing objects:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">draw</property>
- </object>
- <packing>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list