cui/uiconfig/ui/personalization_tab.ui | 23 ++++++++++------------- vcl/source/window/builder.cxx | 1 + 2 files changed, 11 insertions(+), 13 deletions(-)
New commits: commit fbfba66ac4990875e90f7af56113ca453d83f069 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 25 00:17:46 2013 +0000 Resolves: fdo#59422 if loading a ll-TT trans succeeds, don't fallback to ll Change-Id: I169d9e95a2ac1f22bc94e46781bfcee07b133ad4 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9d6ab86..e62e4dc 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -110,6 +110,7 @@ void VclBuilder::loadTranslations(const com::sun::star::lang::Locale &rLocale, c { xmlreader::XmlReader reader(sTransUri); handleTranslations(reader); + break; } catch (const ::com::sun::star::uno::Exception &) { commit 3f099e64b1d6602bd7b145f23e2a43afbe6ce54a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 25 00:10:34 2013 +0000 Set requested name on .ui page, and use sizegroups rather than making super-wide buttons, set them to not expand and use sizegroups to give them equal width of the largest Change-Id: Ic915ea42ec26b6dd4a32696957bc98e02fa3e282 diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index a537c8f..f3e012e 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.24"/> - <!-- interface-naming-policy project-wide --> - <object class="GtkVBox" id="vbox1"> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkVBox" id="PersonalizationTabPage"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -23,7 +22,6 @@ <child> <object class="GtkRadioButton" id="no_background"> <property name="label" translatable="yes">Plain look, do not use background images</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -40,7 +38,6 @@ <child> <object class="GtkRadioButton" id="default_background"> <property name="label" translatable="yes">Pre-installed background image (if available)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -62,7 +59,6 @@ <child> <object class="GtkRadioButton" id="own_background"> <property name="label" translatable="yes">Own image</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -79,14 +75,13 @@ <child> <object class="GtkButton" id="select_background"> <property name="label" translatable="yes">Select Background Image</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -137,7 +132,6 @@ <child> <object class="GtkRadioButton" id="no_persona"> <property name="label" translatable="yes">Plain look, do not use Personas</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -154,7 +148,6 @@ <child> <object class="GtkRadioButton" id="default_persona"> <property name="label" translatable="yes">Pre-installed Persona (if available)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -176,7 +169,6 @@ <child> <object class="GtkRadioButton" id="own_persona"> <property name="label" translatable="yes">Own Persona</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -193,14 +185,13 @@ <child> <object class="GtkButton" id="select_persona"> <property name="label" translatable="yes">Select Persona</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -237,4 +228,10 @@ <placeholder/> </child> </object> + <object class="GtkSizeGroup" id="sizegroup1"> + <widgets> + <widget name="select_background"/> + <widget name="select_persona"/> + </widgets> + </object> </interface>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits