diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
annotation_2d(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
annotation_3d(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp k3d-source-0.7.10.0/modules/annotation/annotation.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -55,7 +55,7 @@
public:
annotation(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/core/axes.cpp k3d-source-0.7.10.0/modules/core/axes.cpp
--- k3d-source-0.7.10.0.orig/modules/core/axes.cpp 2008-12-14 22:03:50.000000000 +0100
+++ k3d-source-0.7.10.0/modules/core/axes.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -67,7 +67,7 @@
m_y_color(init_owner(*this) + init_name("ycolor") + init_label(_("Y Color")) + init_description(_("Y axis color")) + init_value(k3d::color(0, 0.7, 0))),
m_z_color(init_owner(*this) + init_name("zcolor") + init_label(_("Z Color")) + init_description(_("Z axis color")) + init_value(k3d::color(0, 0, 0.7))),
m_grid_color(init_owner(*this) + init_name("gridcolor") + init_label(_("Grid Color")) + init_description(_("Grid color")) + init_value(k3d::color(0.4, 0.4, 0.4))),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(12.0))
{
m_axes.changed_signal().connect(make_async_redraw_slot());
diff -ur k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp
--- k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp 2008-12-14 22:03:50.000000000 +0100
+++ k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -51,7 +51,7 @@
const k3d::filesystem::path default_font()
{
- return k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf");
+ return k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf");
}
/// Defines a closed contour
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
edge_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
face_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
nurbs_curve_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected curves.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
nurbs_patch_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected patches.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
point_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -82,7 +82,7 @@
public:
varying_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the text")) + init_value(k3d::color(0, 1, 0))),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -80,7 +80,7 @@
public:
vertex_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the numbers")) + init_value(k3d::color(0.5, 0, 0))),