cui/uiconfig/ui/optlanguagespage.ui | 23 +++++++++++++++--------
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 23 +++++++++--------------
2 files changed, 24 insertions(+), 22 deletions(-)
New commits:
commit 4e7333c6a66382e740748ee7dd8c48179ba62b7b
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 10 19:16:59 2014 +0000
swap entries to optional checkbox is on last row
so there isn't a hole if the remote control option is
hidden
Change-Id: I514b76d35ef831f4c74ea43f18b2fa812059cfd2
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index d68cf1b..750c9f9 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 10 17:09:42 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -264,10 +265,7 @@
<object class="GtkComboBoxText" id="units">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_span_column">7</property>
<property name="add_tearoffs">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -313,7 +311,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>
@@ -375,8 +372,8 @@
<property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="GtkCheckButton" id="enremotcont">
- <property name="label" translatable="yes">Enable remote
control</property>
+ <object class="GtkCheckButton" id="enprsntcons">
+ <property name="label" translatable="yes">Enable Presenter
Console</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -385,15 +382,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">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="GtkCheckButton" id="enprsntcons">
- <property name="label" translatable="yes">Enable Presenter
Console</property>
+ <object class="GtkCheckButton" id="strtwithPag">
+ <property name="label" translatable="yes">Always with
current page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -402,15 +399,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">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>
<child>
- <object class="GtkCheckButton" id="strtwithPag">
- <property name="label" translatable="yes">Always with
current page</property>
+ <object class="GtkCheckButton" id="enremotcont">
+ <property name="label" translatable="yes">Enable remote
control</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -567,7 +564,6 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -597,7 +593,6 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">3</property>
commit 1a25a0c9b506294bc40397d2f1cc860290f1ae55
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 10 19:13:04 2014 +0000
select elements that are to shrink when not enough space
options->language settings (fr)
Change-Id: I32ccb9c7d1b131d91b99ed983cbba46f7d9a6821
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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
