[Xfce4-commits] r30123 - in xfc/trunk: . debian examples/ui/printing libXFCui/xfc/cairo libXFCui/xfc/gtk libXFCui/xfc/gtk/inline libXFCui/xfc/pango
Bo Lorentsen
bl at xfce.org
Sun Jun 28 23:21:47 CEST 2009
Author: bl
Date: 2009-06-28 21:21:47 +0000 (Sun, 28 Jun 2009)
New Revision: 30123
Modified:
xfc/trunk/ChangeLog
xfc/trunk/debian/changelog
xfc/trunk/debian/libxfcui-dev.install
xfc/trunk/examples/ui/printing/Makefile
xfc/trunk/libXFCui/xfc/cairo/Makefile.am
xfc/trunk/libXFCui/xfc/cairo/context.cc
xfc/trunk/libXFCui/xfc/cairo/context.hh
xfc/trunk/libXFCui/xfc/gtk/inline/Makefile.am
xfc/trunk/libXFCui/xfc/gtk/inline/printpagesetup.inl
xfc/trunk/libXFCui/xfc/gtk/printoperation.cc
xfc/trunk/libXFCui/xfc/gtk/printpagesetup.cc
xfc/trunk/libXFCui/xfc/gtk/printpagesetup.hh
xfc/trunk/libXFCui/xfc/pango/Makefile.am
Log:
PageSetup and show_layout added
Modified: xfc/trunk/ChangeLog
===================================================================
--- xfc/trunk/ChangeLog 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/ChangeLog 2009-06-28 21:21:47 UTC (rev 30123)
@@ -1,3 +1,9 @@
+2009-06-28 23:21 bl
+
+ * PageSetup code added
+ * show_layout in cairo context added
+ * printer bug fixes
+
2009-05-22 10:40 bl
* Experimental printing support added
Modified: xfc/trunk/debian/changelog
===================================================================
--- xfc/trunk/debian/changelog 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/debian/changelog 2009-06-28 21:21:47 UTC (rev 30123)
@@ -1,3 +1,10 @@
+xfc (4.3.2-3) unstable; urgency=low
+
+ * Basic printing support added
+ * Cairo support
+
+ -- Bo Lorentsen <bl at lue.dk> Tue, 11 Jun 2009 19:27:00 +0200
+
xfc (4.3.2-2) unstable; urgency=low
* pkg-config cflags fixups
Modified: xfc/trunk/debian/libxfcui-dev.install
===================================================================
--- xfc/trunk/debian/libxfcui-dev.install 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/debian/libxfcui-dev.install 2009-06-28 21:21:47 UTC (rev 30123)
@@ -15,4 +15,5 @@
debian/tmp/usr/include/xfce4/xfc/gtk/inline/*.inl
debian/tmp/usr/include/xfce4/xfc/pango/*.hh
debian/tmp/usr/include/xfce4/xfc/pango/inline/*.inl
+debian/tmp/usr/include/xfce4/xfc/cairo/*.hh
debian/tmp/usr/lib/pkgconfig/xfcui-4.3.pc
Modified: xfc/trunk/examples/ui/printing/Makefile
===================================================================
--- xfc/trunk/examples/ui/printing/Makefile 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/examples/ui/printing/Makefile 2009-06-28 21:21:47 UTC (rev 30123)
@@ -30,8 +30,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/examples/Makefile.fragment \
$(top_srcdir)/examples/ui/Makefile.fragment
@@ -82,13 +82,13 @@
AUTOHEADER = ${SHELL} /home/bl/svn/XFC/missing --run autoheader
AUTOMAKE = ${SHELL} /home/bl/svn/XFC/missing --run automake-1.10
AWK = mawk
-CC = gcc
+CC = x86_64-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
+CFLAGS = -Wall -g -O2
+CPP = x86_64-linux-gnu-gcc -E
CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
+CXX = x86_64-linux-gnu-g++
+CXXCPP = x86_64-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2 -Wall -ansi --pedantic-errors
CYGPATH_W = echo
@@ -147,8 +147,8 @@
SED = /bin/sed
SET_MAKE =
SHELL = /bin/sh
-SOURCEVIEW_EXAMPLEDIR =
-SOURCEVIEW_SUBDIR =
+SOURCEVIEW_EXAMPLEDIR = sourceview
+SOURCEVIEW_SUBDIR = libXFCsourceview
STRIP = strip
VERSION = 4.3.2
XFCEDIR = xfce4
@@ -179,9 +179,9 @@
XFC_RELEASE = 4.3
XFC_SIGC_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include
XFC_SIGC_LIBS = -lsigc-2.0
-XFC_SOURCEVIEW_CFLAGS =
+XFC_SOURCEVIEW_CFLAGS = -D_REENTRANT -I/usr/include/gtksourceview-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeprint-2.2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libart-2.0
XFC_SOURCEVIEW_LIBRARY_NAME = xfcsourceview
-XFC_SOURCEVIEW_LIBS =
+XFC_SOURCEVIEW_LIBS = -lgtksourceview-1.0 -lgtk-x11-2.0 -lgnomeprint-2-2 -lz -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lfreetype -lfontconfig -lart_lgpl_2 -lxml2 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
XFC_UI_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DXFC_CAIRO=1 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
XFC_UI_LIBRARY_NAME = xfcui
XFC_UI_LIBS = -lsigc-2.0 -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -DXFC_CAIRO=1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
@@ -192,8 +192,8 @@
abs_srcdir = /home/bl/svn/XFC/examples/ui/printing
abs_top_builddir = /home/bl/svn/XFC
abs_top_srcdir = /home/bl/svn/XFC
-ac_ct_CC = gcc
-ac_ct_CXX = g++
+ac_ct_CC =
+ac_ct_CXX =
ac_ct_DUMPBIN =
am__include = include
am__leading_dot = .
@@ -201,36 +201,36 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
+build = x86_64-pc-linux-gnu
+build_alias = x86_64-linux-gnu
build_cpu = x86_64
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
+host = x86_64-pc-linux-gnu
+host_alias = x86_64-linux-gnu
host_cpu = x86_64
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
-infodir = ${datarootdir}/info
+infodir = ${prefix}/share/info
install_sh = $(SHELL) /home/bl/svn/XFC/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
lt_ECHO = echo
-mandir = ${datarootdir}/man
+mandir = ${prefix}/share/man
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local
+prefix = /usr
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
Modified: xfc/trunk/libXFCui/xfc/cairo/Makefile.am
===================================================================
--- xfc/trunk/libXFCui/xfc/cairo/Makefile.am 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/cairo/Makefile.am 2009-06-28 21:21:47 UTC (rev 30123)
@@ -9,29 +9,29 @@
-I$(top_builddir)/libXFCui
hh_sources = \
-context.hh \
-matrix.hh \
-ps_surface.hh \
-types.hh \
-fontoptions.hh \
-pattern.hh \
-surface.hh \
-xlib_surface.hh \
-image_surface.hh \
-pdf_surface.hh \
-svg_surface.hh
+ context.hh \
+ matrix.hh \
+ ps_surface.hh \
+ types.hh \
+ fontoptions.hh \
+ pattern.hh \
+ surface.hh \
+ xlib_surface.hh \
+ image_surface.hh \
+ pdf_surface.hh \
+ svg_surface.hh
cc_sources = \
-context.cc \
-matrix.cc \
-ps_surface.cc \
-xlib_surface.cc \
-fontoptions.cc \
-pattern.cc \
-surface.cc \
-image_surface.cc \
-pdf_surface.cc \
-svg_surface.cc
+ context.cc \
+ matrix.cc \
+ ps_surface.cc \
+ xlib_surface.cc \
+ fontoptions.cc \
+ pattern.cc \
+ surface.cc \
+ image_surface.cc \
+ pdf_surface.cc \
+ svg_surface.cc
library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/cairo
library_include_HEADERS = $(hh_sources)
Modified: xfc/trunk/libXFCui/xfc/cairo/context.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/cairo/context.cc 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/cairo/context.cc 2009-06-28 21:21:47 UTC (rev 30123)
@@ -1,4 +1,5 @@
#include <xfc/cairo/context.hh>
+#include <pango/pangocairo.h>
using namespace Xfc;
using namespace Cairo;
@@ -354,3 +355,8 @@
{
cairo_rotate( m_cr, angle );
}
+
+void Context::show_layout( Pango::Layout &layout )
+{
+ pango_cairo_show_layout( m_cr, layout.pango_layout());
+}
Modified: xfc/trunk/libXFCui/xfc/cairo/context.hh
===================================================================
--- xfc/trunk/libXFCui/xfc/cairo/context.hh 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/cairo/context.hh 2009-06-28 21:21:47 UTC (rev 30123)
@@ -11,6 +11,7 @@
#include <xfc/cairo/types.hh>
#include <xfc/cairo/pattern.hh>
+#include <xfc/pango/layout.hh>
#include <string>
@@ -415,6 +416,9 @@
void translate( double tx, double ty );
void scale( double sx, double sy );
void rotate( double angle );
+
+ // pango integration
+ void show_layout( Pango::Layout &layout );
};
}
}
Modified: xfc/trunk/libXFCui/xfc/gtk/inline/Makefile.am
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/inline/Makefile.am 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/gtk/inline/Makefile.am 2009-06-28 21:21:47 UTC (rev 30123)
@@ -80,6 +80,8 @@
paned.inl \
plug.inl \
progressbar.inl \
+ printoperationpreview.inl \
+ printpagesetup.inl \
radioaction.inl \
radiobutton.inl \
radiomenuitem.inl \
Modified: xfc/trunk/libXFCui/xfc/gtk/inline/printpagesetup.inl
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/inline/printpagesetup.inl 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/gtk/inline/printpagesetup.inl 2009-06-28 21:21:47 UTC (rev 30123)
@@ -1,4 +1,4 @@
-inline GtkPageSetup *Xfc::Gtk::PageSetup::gtk_pagesetup() const
+inline GtkPageSetup *Xfc::Gtk::PageSetup::gtk_page_setup() const
{
return reinterpret_cast<GtkPageSetup*>(instance_);
}
Modified: xfc/trunk/libXFCui/xfc/gtk/printoperation.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperation.cc 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperation.cc 2009-06-28 21:21:47 UTC (rev 30123)
@@ -27,7 +27,7 @@
void PrintOperation::set_default_page_setup(PageSetup *default_page_setup)
{
- gtk_print_operation_set_default_page_setup( gtk_print_operation(), default_page_setup->gtk_pagesetup() );
+ gtk_print_operation_set_default_page_setup( gtk_print_operation(), default_page_setup->gtk_page_setup() );
}
PageSetup* PrintOperation::get_default_page_setup()
Modified: xfc/trunk/libXFCui/xfc/gtk/printpagesetup.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printpagesetup.cc 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/gtk/printpagesetup.cc 2009-06-28 21:21:47 UTC (rev 30123)
@@ -14,6 +14,93 @@
{
}
+PageOrientation PageSetup::get_orientation()
+{
+ gtk_page_setup_get_orientation( gtk_page_setup());
}
+void PageSetup::set_orientation( PageOrientation orientation )
+{
+ gtk_page_setup_set_orientation( gtk_page_setup(), (GtkPageOrientation)orientation );
}
+
+#if 0
+PaperSize* PageSetup::get_paper_size()
+{
+}
+
+void PageSetup::set_paper_size( PaperSize *size)
+{
+}
+#endif
+
+double PageSetup::get_top_margin( Unit unit)
+{
+ return gtk_page_setup_get_top_margin( gtk_page_setup(), (GtkUnit)unit );
+}
+
+void PageSetup::set_top_margin( double margin, Unit unit)
+{
+ gtk_page_setup_set_top_margin( gtk_page_setup(), margin, (GtkUnit)unit );
+}
+
+double PageSetup::get_bottom_margin( Unit unit)
+{
+ return gtk_page_setup_get_bottom_margin( gtk_page_setup(), (GtkUnit)unit );
+}
+
+void PageSetup::set_bottom_margin( double margin, Unit unit )
+{
+ gtk_page_setup_set_bottom_margin( gtk_page_setup(), margin, (GtkUnit)unit );
+}
+
+double PageSetup::get_left_margin( Unit unit )
+{
+ return gtk_page_setup_get_left_margin( gtk_page_setup(), (GtkUnit)unit );
+}
+
+void PageSetup::set_left_margin( double margin, Unit unit )
+{
+ gtk_page_setup_set_left_margin( gtk_page_setup(), margin, (GtkUnit)unit );
+}
+
+double PageSetup::get_right_margin( Unit unit )
+{
+ return gtk_page_setup_get_right_margin( gtk_page_setup(), (GtkUnit)unit );
+}
+
+void PageSetup::set_right_margin( double margin, Unit unit )
+{
+ gtk_page_setup_set_right_margin( gtk_page_setup(), margin, (GtkUnit)unit );
+}
+
+#if 0
+void PageSetup::set_paper_size_and_default_margins( PaperSize *size )
+{
+
+}
+#endif
+
+double PageSetup::get_paper_width( Unit unit)
+{
+ return gtk_page_setup_get_paper_width( gtk_page_setup(), (GtkUnit)unit );
+}
+
+double PageSetup::get_paper_height( Unit unit )
+{
+ return gtk_page_setup_get_paper_height( gtk_page_setup(), (GtkUnit)unit );
+}
+
+double PageSetup::get_page_width( Unit unit)
+{
+ return gtk_page_setup_get_page_width( gtk_page_setup(), (GtkUnit)unit );
+}
+
+double PageSetup::get_page_height( Unit unit )
+{
+ return gtk_page_setup_get_page_height( gtk_page_setup(), (GtkUnit)unit );
+}
+
+}
+
+}
Modified: xfc/trunk/libXFCui/xfc/gtk/printpagesetup.hh
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printpagesetup.hh 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/gtk/printpagesetup.hh 2009-06-28 21:21:47 UTC (rev 30123)
@@ -46,7 +46,7 @@
PageSetup( const PageSetup *pagesetup );
PageSetup( GtkPageSetup *ctx, bool owns_reference = true );
- GtkPageSetup *gtk_pagesetup() const;
+ GtkPageSetup *gtk_page_setup() const;
operator GtkPageSetup* () const;
@@ -54,19 +54,19 @@
void set_orientation( PageOrientation orientation );
PaperSize* get_paper_size();
void set_paper_size( PaperSize *size);
- gdouble get_top_margin( Unit unit);
- void set_top_margin( gdouble margin, Unit unit);
- gdouble get_bottom_margin( Unit unit);
- void set_bottom_margin( gdouble margin, Unit unit );
- gdouble get_left_margin( Unit unit );
- void set_left_margin( gdouble margin, Unit unit );
- gdouble get_right_margin( Unit unit );
- void set_right_margin( gdouble margin, Unit unit );
+ double get_top_margin( Unit unit);
+ void set_top_margin( double margin, Unit unit);
+ double get_bottom_margin( Unit unit);
+ void set_bottom_margin( double margin, Unit unit );
+ double get_left_margin( Unit unit );
+ void set_left_margin( double margin, Unit unit );
+ double get_right_margin( Unit unit );
+ void set_right_margin( double margin, Unit unit );
void set_paper_size_and_default_margins( PaperSize *size );
- gdouble get_paper_width( Unit unit);
- gdouble get_paper_height( Unit unit );
- gdouble get_page_width( Unit unit);
- gdouble get_page_height( Unit unit );
+ double get_paper_width( Unit unit);
+ double get_paper_height( Unit unit );
+ double get_page_width( Unit unit);
+ double get_page_height( Unit unit );
};
}
}
Modified: xfc/trunk/libXFCui/xfc/pango/Makefile.am
===================================================================
--- xfc/trunk/libXFCui/xfc/pango/Makefile.am 2009-06-28 20:59:11 UTC (rev 30122)
+++ xfc/trunk/libXFCui/xfc/pango/Makefile.am 2009-06-28 21:21:47 UTC (rev 30123)
@@ -25,7 +25,6 @@
tabs.hh \
types.hh
-
cc_sources = \
attributes.cc \
break.cc \
More information about the Xfce4-commits
mailing list