[Libreoffice-commits] core.git: 2 commits - cairo/ExternalProject_cairo.mk cui/uiconfig
Caolán McNamara
caolanm at redhat.com
Thu Feb 28 01:47:57 PST 2013
cairo/ExternalProject_cairo.mk | 2 +-
cui/uiconfig/ui/pageformatpage.ui | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 28 09:45:54 2013 +0000
Resolves: fdo#61571 cairo not linking against internal libpng
the flag is called SYSTEM_LIBPNG not SYSTEM_PNG
Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 8d21189..42a5c7f 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
ZLIB3RDLIB=-lz \
- $(if $(filter NO,$(SYSTEM_PNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
+ $(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
commit b1c0d8a7cbbf60cc6725727f61880e27e7e6346f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 27 23:26:35 2013 +0000
make things line up nicely in page format
5 sizegroups is probably excessive, but results looks reasonable to me
Change-Id: I1c0318e2ba0abf77b529d78b30d9af5ec630e6ac
diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui
index 00bb88d..1463671 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -13,7 +13,6 @@
<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>
@@ -235,7 +234,6 @@
<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>
<property name="column_spacing">12</property>
<child>
@@ -258,6 +256,7 @@
<object class="GtkLabel" id="labelPaperTray">
<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">Paper _tray:</property>
<property name="use_underline">True</property>
@@ -274,7 +273,6 @@
<object class="GtkComboBox" id="comboPaperTray">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -503,13 +501,13 @@
<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>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="labelPageLayout">
<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">_Page layout:</property>
<property name="use_underline">True</property>
@@ -526,6 +524,7 @@
<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">_Format:</property>
<property name="use_underline">True</property>
@@ -585,6 +584,7 @@
<object class="GtkLabel" id="labelTblAlign">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Table alignment:</property>
<property name="use_underline">True</property>
@@ -637,6 +637,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
@@ -911,12 +912,14 @@ Do you still want to apply these settings?</property>
</data>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
<widgets>
<widget name="grid3"/>
<widget name="grid6"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
<widgets>
<widget name="grid4"/>
<widget name="grid7"/>
@@ -928,6 +931,8 @@ Do you still want to apply these settings?</property>
<widget name="comboPaperTray"/>
<widget name="comboPageLayout"/>
<widget name="comboLayoutFormat"/>
+ <widget name="checkbuttonHorz"/>
+ <widget name="checkbuttonVert"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup5">
More information about the Libreoffice-commits
mailing list